[arrayfire] 16/41: BUGFIX: fixed issue in indexing after calling resetDims

Ghislain Vaillant ghisvail-guest at moszumanska.debian.org
Mon Mar 21 14:56:22 UTC 2016


This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch debian/experimental
in repository arrayfire.

commit 24bc76ea2247f05acf975c7b41ed07b47760877e
Author: Pavan Yalamanchili <pavan at arrayfire.com>
Date:   Thu Mar 10 01:53:44 2016 -0500

    BUGFIX: fixed issue in indexing after calling resetDims
---
 src/backend/cpu/Array.hpp    | 4 +---
 src/backend/cuda/Array.hpp   | 4 +---
 src/backend/opencl/Array.hpp | 4 +---
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/backend/cpu/Array.hpp b/src/backend/cpu/Array.hpp
index 2a3afcf..64ef2bf 100644
--- a/src/backend/cpu/Array.hpp
+++ b/src/backend/cpu/Array.hpp
@@ -174,9 +174,7 @@ namespace cpu
 
         dim4 getDataDims() const
         {
-            // This is for moddims
-            // dims and data_dims are different when moddims is used
-            return isOwner() ? info.dims() : data_dims;
+            return data_dims;
         }
 
         void setDataDims(const dim4 &new_dims)
diff --git a/src/backend/cuda/Array.hpp b/src/backend/cuda/Array.hpp
index 7678754..634960e 100644
--- a/src/backend/cuda/Array.hpp
+++ b/src/backend/cuda/Array.hpp
@@ -169,9 +169,7 @@ namespace cuda
 
         dim4 getDataDims() const
         {
-            // This is for moddims
-            // dims and data_dims are different when moddims is used
-            return isOwner() ? dims() : data_dims;
+            return data_dims;
         }
 
         void setDataDims(const dim4 &new_dims)
diff --git a/src/backend/opencl/Array.hpp b/src/backend/opencl/Array.hpp
index 0b1f019..3de54ba 100644
--- a/src/backend/opencl/Array.hpp
+++ b/src/backend/opencl/Array.hpp
@@ -204,9 +204,7 @@ namespace opencl
 
         dim4 getDataDims() const
         {
-            // This is for moddims
-            // dims and data_dims are different when moddims is used
-            return isOwner() ? dims() : data_dims;
+            return data_dims;
         }
 
         void setDataDims(const dim4 &new_dims)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/arrayfire.git



More information about the debian-science-commits mailing list