fix issue #162 (cudaBindTexture returns cudaErrorInvalidValue if a me…

…mory block from a pool allocator is passed)
NVIDIA · Jul 30, 2021 · 01980f9 · 01980f9
1 parent 4aaed71
commit 01980f9
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/cub/device/dispatch/dispatch_spmv_orig.cuh b/cub/device/dispatch/dispatch_spmv_orig.cuh
@@ -607,7 +607,7 @@ struct DispatchSpmv
                 if (CUB_IS_HOST_CODE)
                 {
                     // Init textures
-                    if (CubDebug(error = spmv_params.t_vector_x.BindTexture(spmv_params.d_vector_x))) break;
+                    if (CubDebug(error = spmv_params.t_vector_x.BindTexture(spmv_params.d_vector_x, spmv_params.num_cols * sizeof(ValueT)))) break;
                 }
             #endif
 

diff --git a/cub/iterator/tex_obj_input_iterator.cuh b/cub/iterator/tex_obj_input_iterator.cuh
@@ -157,7 +157,7 @@ public:
     template <typename QualifiedT>
     cudaError_t BindTexture(
         QualifiedT      *ptr,               ///< Native pointer to wrap that is aligned to cudaDeviceProp::textureAlignment
-        size_t          bytes = size_t(-1),         ///< Number of bytes in the range
+        size_t          bytes,              ///< Number of bytes in the range
         size_t          tex_offset = 0)     ///< OffsetT (in items) from \p ptr denoting the position of the iterator
     {
         this->ptr = const_cast<typename RemoveQualifiers<QualifiedT>::Type *>(ptr);

diff --git a/cub/iterator/tex_ref_input_iterator.cuh b/cub/iterator/tex_ref_input_iterator.cuh
@@ -99,13 +99,13 @@ struct CUB_DEPRECATED IteratorTexRef
         static TexRef ref;
 
         /// Bind texture
-        static cudaError_t BindTexture(void *d_in, size_t &offset)
+        static cudaError_t BindTexture(void *d_in, size_t &bytes, size_t &offset)
         {
             if (d_in)
             {
                 cudaChannelFormatDesc tex_desc = cudaCreateChannelDesc<TextureWord>();
                 ref.channelDesc = tex_desc;
-                return (CubDebug(cudaBindTexture(&offset, ref, d_in)));
+                return (CubDebug(cudaBindTexture(&offset, ref, d_in, bytes)));
             }
 
             return cudaSuccess;
@@ -275,12 +275,12 @@ public:
     template <typename QualifiedT>
     cudaError_t BindTexture(
         QualifiedT      *ptr,                   ///< Native pointer to wrap that is aligned to cudaDeviceProp::textureAlignment
-        size_t          /*bytes*/ = size_t(-1), ///< Number of bytes in the range
+        size_t          bytes,                  ///< Number of bytes in the range
         size_t          tex_offset = 0)         ///< OffsetT (in items) from \p ptr denoting the position of the iterator
     {
         this->ptr = const_cast<typename RemoveQualifiers<QualifiedT>::Type *>(ptr);
         size_t offset;
-        cudaError_t retval = TexId::BindTexture(this->ptr + tex_offset, offset);
+        cudaError_t retval = TexId::BindTexture(this->ptr + tex_offset, bytes, offset);
         this->tex_offset = (difference_type) (offset / sizeof(QualifiedT));
         return retval;
     }

diff --git a/experimental/spmv_compare.cu b/experimental/spmv_compare.cu
@@ -193,7 +193,7 @@ float TestGpuCsrIoProxy(
 
     typedef TexRefInputIterator<ValueT, 1234, int> TexItr;
     TexItr x_itr;
-    CubDebugExit(x_itr.BindTexture(params.d_vector_x));
+    CubDebugExit(x_itr.BindTexture(params.d_vector_x, params.num_cols * sizeof(ValueT)));
 
     // Get device ordinal
     int device_ordinal;