[arrayfire] 15/75: BUGFIX: Fixing offsets when writing to Arrays for CPU and CUDA backends

[Ghislain Vaillant]

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

ghisvail-guest pushed a commit to branch dfsg-clean
in repository arrayfire.

commit d7d79af742ba999f44c5c8b4275cae0dd5ae8c26
Author: Pavan Yalamanchili <pavan at arrayfire.com>
Date:   Wed Feb 10 23:30:55 2016 -0500

    BUGFIX: Fixing offsets when writing to Arrays for CPU and CUDA backends
---
 src/backend/cpu/Array.cpp  | 4 ++--
 src/backend/cuda/Array.cpp | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/backend/cpu/Array.cpp b/src/backend/cpu/Array.cpp
index fbb8e10..0db8a82 100644
--- a/src/backend/cpu/Array.cpp
+++ b/src/backend/cpu/Array.cpp
@@ -227,7 +227,7 @@ writeHostDataArray(Array<T> &arr, const T * const data, const size_t bytes)
     if(!arr.isOwner()) {
         arr = createEmptyArray<T>(arr.dims());
     }
-    memcpy(arr.get() + arr.getOffset(), data, bytes);
+    memcpy(arr.get(), data, bytes);
 }
 
 template<typename T>
@@ -237,7 +237,7 @@ writeDeviceDataArray(Array<T> &arr, const void * const data, const size_t bytes)
     if(!arr.isOwner()) {
         arr = createEmptyArray<T>(arr.dims());
     }
-    memcpy(arr.get() + arr.getOffset(), (const T * const)data, bytes);
+    memcpy(arr.get(), (const T * const)data, bytes);
 }
 
 #define INSTANTIATE(T)                                                  \
diff --git a/src/backend/cuda/Array.cpp b/src/backend/cuda/Array.cpp
index 366d8e2..c44db35 100644
--- a/src/backend/cuda/Array.cpp
+++ b/src/backend/cuda/Array.cpp
@@ -257,7 +257,7 @@ namespace cuda
 
         T *ptr = arr.get();
 
-        CUDA_CHECK(cudaMemcpyAsync(ptr + arr.getOffset(), data, bytes, cudaMemcpyHostToDevice,
+        CUDA_CHECK(cudaMemcpyAsync(ptr, data, bytes, cudaMemcpyHostToDevice,
                     cuda::getStream(cuda::getActiveDeviceId())));
         CUDA_CHECK(cudaStreamSynchronize(cuda::getStream(cuda::getActiveDeviceId())));
 
@@ -274,7 +274,7 @@ namespace cuda
 
         T *ptr = arr.get();
 
-        CUDA_CHECK(cudaMemcpyAsync(ptr + arr.getOffset(), data,
+        CUDA_CHECK(cudaMemcpyAsync(ptr, data,
                                    bytes, cudaMemcpyDeviceToDevice,
                                    cuda::getStream(cuda::getActiveDeviceId())));
 

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