Merge branch 'cuda_9_update' into 'master'

Update for CUDA 9.0 See merge request amd/hipRAND!129
ROCm · Sep 28, 2017 · 383ebce · 383ebce
2 parents 758a1e4 + 4df7fe5
commit 383ebce
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/library/src/rng/philox4x32_10.hpp b/library/src/rng/philox4x32_10.hpp
@@ -127,7 +127,11 @@ namespace detail {
 
     inline __device__ unsigned int warp_reduce_min(unsigned int val, int size) {
       for (int offset = size/2; offset > 0; offset /= 2) {
+        #if defined(__HIP_PLATFORM_NVCC__) && __CUDACC_VER_MAJOR__ >= 9
+        unsigned int temp = __shfl_xor_sync(0xffffffff, (int)val, offset);
+        #else
         unsigned int temp = __shfl_xor((int)val, offset);
+        #endif
         val = (temp < val) ? temp : val;
       }
       return val;