BUGFIX: Fixed issues with offsets in moddims after using indexing

pavanky · pavanky · commit 2d595034d8ef · 2016-02-11T13:41:44.000-05:00
diff --git a/src/api/c/moddims.cpp b/src/api/c/moddims.cpp
@@ -32,6 +32,7 @@ Array<T> modDims(const Array<T>& in, const af::dim4 &newDims)
     }
 
     Out.modDims(newDims);
+    Out.setDataDims(newDims);
 
     return Out;
 }
diff --git a/src/backend/cpu/Array.hpp b/src/backend/cpu/Array.hpp
@@ -173,6 +173,11 @@ namespace cpu
             return isOwner() ? info.dims() : data_dims;
         }
 
+        void setDataDims(const dim4 &new_dims)
+        {
+            data_dims = new_dims;
+        }
+
         T* device()
         {
             getQueue().sync();
diff --git a/src/backend/cuda/Array.hpp b/src/backend/cuda/Array.hpp
@@ -168,6 +168,11 @@ namespace cuda
             return isOwner() ? dims() : data_dims;
         }
 
+        void setDataDims(const dim4 &new_dims)
+        {
+            data_dims = new_dims;
+        }
+
         T* device()
         {
             if (!isOwner() || data.use_count() > 1) {
diff --git a/src/backend/opencl/Array.hpp b/src/backend/opencl/Array.hpp
@@ -200,6 +200,11 @@ namespace opencl
             return isOwner() ? dims() : data_dims;
         }
 
+        void setDataDims(const dim4 &new_dims)
+        {
+            data_dims = new_dims;
+        }
+
         operator Param() const
         {
             KParam info = {{dims()[0], dims()[1], dims()[2], dims()[3]},

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@ Array<T> modDims(const Array<T>& in, const af::dim4 &newDims)`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`Out.modDims(newDims);`
	`35`	`+ Out.setDataDims(newDims);`
`35`	`36`
`36`	`37`	`return Out;`
`37`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -173,6 +173,11 @@ namespace cpu`
`173`	`173`	`return isOwner() ? info.dims() : data_dims;`
`174`	`174`	`}`
`175`	`175`
	`176`	`+ void setDataDims(const dim4 &new_dims)`
	`177`	`+ {`
	`178`	`+ data_dims = new_dims;`
	`179`	`+ }`
	`180`	`+`
`176`	`181`	`T* device()`
`177`	`182`	`{`
`178`	`183`	`getQueue().sync();`
Original file line number	Diff line number	Diff line change
`@@ -168,6 +168,11 @@ namespace cuda`
`168`	`168`	`return isOwner() ? dims() : data_dims;`
`169`	`169`	`}`
`170`	`170`
	`171`	`+ void setDataDims(const dim4 &new_dims)`
	`172`	`+ {`
	`173`	`+ data_dims = new_dims;`
	`174`	`+ }`
	`175`	`+`
`171`	`176`	`T* device()`
`172`	`177`	`{`
`173`	`178`	`if (!isOwner() \|\| data.use_count() > 1) {`
Original file line number	Diff line number	Diff line change
`@@ -200,6 +200,11 @@ namespace opencl`
`200`	`200`	`return isOwner() ? dims() : data_dims;`
`201`	`201`	`}`
`202`	`202`
	`203`	`+ void setDataDims(const dim4 &new_dims)`
	`204`	`+ {`
	`205`	`+ data_dims = new_dims;`
	`206`	`+ }`
	`207`	`+`
`203`	`208`	`operator Param() const`
`204`	`209`	`{`
`205`	`210`	`KParam info = {{dims()[0], dims()[1], dims()[2], dims()[3]},`