From f96b23e7f6672e41153f8130e3f449f3414f32a2 Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Sat, 27 Mar 2021 12:26:44 -0500 Subject: [PATCH 1/2] Bump size parameters to size_t for a few memcpys --- src/cpp/cuda.hpp | 6 +++--- src/wrapper/wrap_cudadrv.cpp | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/cpp/cuda.hpp b/src/cpp/cuda.hpp index e3f8ef24..21cb219c 100644 --- a/src/cpp/cuda.hpp +++ b/src/cpp/cuda.hpp @@ -1624,18 +1624,18 @@ namespace pycuda } inline - void memcpy_dtoa(array const &ary, unsigned int index, CUdeviceptr src, unsigned int len) + void memcpy_dtoa(array const &ary, unsigned int index, CUdeviceptr src, size_t len) { CUDAPP_CALL_GUARDED_THREADED(cuMemcpyDtoA, (ary.handle(), index, src, len)); } inline - void memcpy_atod(CUdeviceptr dst, array const &ary, unsigned int index, unsigned int len) + void memcpy_atod(CUdeviceptr dst, array const &ary, unsigned int index, size_t len) { CUDAPP_CALL_GUARDED_THREADED(cuMemcpyAtoD, (dst, ary.handle(), index, len)); } inline void memcpy_atoa( array const &dst, unsigned int dst_index, array const &src, unsigned int src_index, - unsigned int len) + size_t len) { CUDAPP_CALL_GUARDED_THREADED(cuMemcpyAtoA, (dst.handle(), dst_index, src.handle(), src_index, len)); } // }}} diff --git a/src/wrapper/wrap_cudadrv.cpp b/src/wrapper/wrap_cudadrv.cpp index 7c513a1a..c0fdd99d 100644 --- a/src/wrapper/wrap_cudadrv.cpp +++ b/src/wrapper/wrap_cudadrv.cpp @@ -268,7 +268,7 @@ namespace void py_memcpy_dtod(CUdeviceptr dest, CUdeviceptr src, - unsigned int byte_count) + size_t int byte_count) { CUDAPP_CALL_GUARDED_THREADED(cuMemcpyDtoD, (dest, src, byte_count)); } @@ -276,7 +276,7 @@ namespace #if CUDAPP_CUDA_VERSION >= 3000 void py_memcpy_dtod_async(CUdeviceptr dest, CUdeviceptr src, - unsigned int byte_count, py::object stream_py) + size_t byte_count, py::object stream_py) { PYCUDA_PARSE_STREAM_PY; @@ -287,7 +287,7 @@ namespace #if CUDAPP_CUDA_VERSION >= 4000 void py_memcpy_peer(CUdeviceptr dest, CUdeviceptr src, - unsigned int byte_count, + size_t byte_count, py::object dest_context_py, py::object src_context_py ) { @@ -307,7 +307,7 @@ namespace } void py_memcpy_peer_async(CUdeviceptr dest, CUdeviceptr src, - unsigned int byte_count, + size_t byte_count, py::object dest_context_py, py::object src_context_py, py::object stream_py) { -- GitLab From 3c1b724efd02322f66acc5bde4108ce1902a5f52 Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Sat, 27 Mar 2021 12:40:18 -0500 Subject: [PATCH 2/2] Fix type typo in size_t transition --- src/wrapper/wrap_cudadrv.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/wrapper/wrap_cudadrv.cpp b/src/wrapper/wrap_cudadrv.cpp index c0fdd99d..0be5a0a2 100644 --- a/src/wrapper/wrap_cudadrv.cpp +++ b/src/wrapper/wrap_cudadrv.cpp @@ -268,7 +268,7 @@ namespace void py_memcpy_dtod(CUdeviceptr dest, CUdeviceptr src, - size_t int byte_count) + size_t byte_count) { CUDAPP_CALL_GUARDED_THREADED(cuMemcpyDtoD, (dest, src, byte_count)); } -- GitLab