SubArray of subArray now returns subArray of original parent

willyborn · willyborn · commit 59ed76e01e40 · 2025-01-28T22:12:00.000+01:00
diff --git a/src/backend/cpu/Array.cpp b/src/backend/cpu/Array.cpp
@@ -279,7 +279,23 @@ Array<T> createSubArray(const Array<T> &parent, const vector<af_seq> &index,
     dim4 dDims          = parent.getDataDims();
     dim4 parent_strides = parent.strides();
 
-    if (parent.isLinear() == false) {
+    // Subarray is only possible on linear data (parent) array.
+    // Subarray of a subarray is only possible on linear data array.  Since the
+    // parent array is already a subarray, it is frequently non-linear.
+    bool data_isLinear = true;
+    dim_t count        = 1;
+    for (dim_t i = 0; i < parent.ndims(); ++i) {
+        if (count != parent_strides[i]) { data_isLinear = false; }
+        count *= dDims[i];
+    }
+
+    if (!data_isLinear) {
+        if (!copy) {
+            // Linearizing parent through copy, is in conflict with the request
+            // of remaining inLine.
+            AF_ERROR("createSubArray inLine is impossible on non-Linear arrays",
+                     AF_ERR_INVALID_ARRAY);
+        }
         const Array<T> parentCopy = copyArray(parent);
         return createSubArray(parentCopy, index, copy);
     }
diff --git a/src/backend/cuda/Array.cpp b/src/backend/cuda/Array.cpp
@@ -391,7 +391,23 @@ Array<T> createSubArray(const Array<T> &parent,
     dim4 dDims          = parent.getDataDims();
     dim4 parent_strides = parent.strides();
 
-    if (parent.isLinear() == false) {
+    // Subarray is only possible on linear data (parent) array.
+    // Subarray of a subarray is only possible on linear data array.  Since the
+    // parent array is already a subarray, it is frequently non-linear.
+    bool data_isLinear = true;
+    dim_t count        = 1;
+    for (dim_t i = 0; i < parent.ndims(); ++i) {
+        if (count != parent_strides[i]) { data_isLinear = false; }
+        count *= dDims[i];
+    }
+
+    if (!data_isLinear) {
+        if (!copy) {
+            // Linearizing parent through copy, is in conflict with the request
+            // of remaining inLine.
+            AF_ERROR("createSubArray inLine is impossible on non-Linear arrays",
+                     AF_ERR_INVALID_ARRAY);
+        }
         const Array<T> parentCopy = copyArray(parent);
         return createSubArray(parentCopy, index, copy);
     }
diff --git a/src/backend/oneapi/Array.cpp b/src/backend/oneapi/Array.cpp
@@ -434,7 +434,23 @@ Array<T> createSubArray(const Array<T> &parent, const vector<af_seq> &index,
     dim4 dDims          = parent.getDataDims();
     dim4 parent_strides = parent.strides();
 
-    if (parent.isLinear() == false) {
+    // Subarray is only possible on linear data (parent) array.
+    // Subarray of a subarray is only possible on linear data array.  Since the
+    // parent array is already a subarray, it is frequently non-linear.
+    bool data_isLinear = true;
+    dim_t count        = 1;
+    for (dim_t i = 0; i < parent.ndims(); ++i) {
+        if (count != parent_strides[i]) { data_isLinear = false; }
+        count *= dDims[i];
+    }
+
+    if (!data_isLinear) {
+        if (!copy) {
+            // Linearizing parent through copy, is in conflict with the request
+            // of remaining inLine.
+            AF_ERROR("createSubArray inLine is impossible on non-Linear arrays",
+                     AF_ERR_INVALID_ARRAY);
+        }
         const Array<T> parentCopy = copyArray(parent);
         return createSubArray(parentCopy, index, copy);
     }
diff --git a/src/backend/opencl/Array.cpp b/src/backend/opencl/Array.cpp
@@ -446,15 +446,30 @@ Array<T> createSubArray(const Array<T> &parent, const vector<af_seq> &index,
     dim4 dDims          = parent.getDataDims();
     dim4 parent_strides = parent.strides();
 
-    if (parent.isLinear() == false) {
+    // Subarray is only possible on linear data (parent) array.
+    // Subarray of a subarray is only possible on linear data array.  Since the
+    // parent array is already a subarray, it is frequently non-linear.
+    bool data_isLinear = true;
+    dim_t count        = 1;
+    for (dim_t i = 0; i < parent.ndims(); ++i) {
+        if (count != parent_strides[i]) { data_isLinear = false; }
+        count *= dDims[i];
+    }
+
+    if (!data_isLinear) {
+        if (!copy) {
+            // Linearizing parent through copy, is in conflict with the request
+            // of remaining inLine.
+            AF_ERROR("createSubArray inLine is impossible on non-Linear arrays",
+                     AF_ERR_INVALID_ARRAY);
+        }
         const Array<T> parentCopy = copyArray(parent);
         return createSubArray(parentCopy, index, copy);
     }
 
     const dim4 &pDims = parent.dims();
-
-    dim4 dims    = toDims(index, pDims);
-    dim4 strides = toStride(index, dDims);
+    dim4 dims         = toDims(index, pDims);
+    dim4 strides      = toStride(index, dDims);
 
     // Find total offsets after indexing
     dim4 offsets = toOffset(index, pDims);
diff --git a/test/array.cpp b/test/array.cpp
@@ -420,6 +420,23 @@ TEST(Array, ISSUE_951) {
     array b       = a.cols(0, 20).rows(10, 20);
 }
 
+TEST(Array, ISSUE_3534) {
+    // This works
+    // array a = range(dim4(5,5));
+    // a = a.rows(0,3).copy();
+    // Following assignment failed silently without above copy()
+    // a(0,0) = 1234;
+
+    array a = range(dim4(5, 5));
+    a       = a.rows(1, 4);
+    a(1, 1) = 1234;
+
+    array b = range(dim4(4, 5)) + 1.0;
+    b(1, 1) = 1234;
+
+    ASSERT_ARRAYS_EQ(a, b);
+}
+
 TEST(Array, CreateHandleInvalidNullDimsPointer) {
     af_array out = 0;
     EXPECT_EQ(AF_ERR_ARG, af_create_handle(&out, 1, NULL, f32));
