Merge pull request #9010 from fwyzard/IB/CMSSW_14_0_X/master_alpaka_1…

….1.0 Update Alpaka to version 1.1.0 [14.0.x]
cms-sw · Feb 14, 2024 · 3821874 · 3821874
2 parents 8e26010 + 59d4d94
commit 3821874
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/alpaka.spec b/alpaka.spec
@@ -1,9 +1,9 @@
-### RPM external alpaka develop-20230621
+### RPM external alpaka 1.1.0
 ## NOCOMPILER
 
-%define git_commit 0286cd8fa24e50179e24b62a48c89201e51eb80a
+%define git_commit 1.1.0
 
-Source: https://github.com/cms-patatrack/%{n}/archive/%{git_commit}.tar.gz
+Source: https://github.com/alpaka-group/%{n}/archive/%{git_commit}.tar.gz
 Requires: boost
 
 %prep

diff --git a/scram-tools.file/tools/alpaka/alpaka-rocm.xml b/scram-tools.file/tools/alpaka/alpaka-rocm.xml
@@ -1,7 +1,6 @@
 <tool name="alpaka-rocm" version="@TOOL_VERSION@">
   <use name="alpaka"/>
   <use name="rocm"/>
-  <use name="rocm-rocrand"/>
   <!-- host comiplation should run with ALPAKA_HOST_ONLY defined -->
   <flags CXXFLAGS="-DALPAKA_ACC_GPU_HIP_ENABLED -DALPAKA_HOST_ONLY"/>
   <flags GENREFLEX_CPPFLAGS="-DALPAKA_ACC_GPU_HIP_ENABLED -DALPAKA_HOST_ONLY"/>

diff --git a/scram-tools.file/tools/alpaka/alpaka.xml b/scram-tools.file/tools/alpaka/alpaka.xml
@@ -9,4 +9,8 @@
   <flags CXXFLAGS="-DALPAKA_DEFAULT_HOST_MEMORY_ALIGNMENT=128"/>
   <flags CUDA_FLAGS="-DALPAKA_DEFAULT_HOST_MEMORY_ALIGNMENT=128"/>
   <flags GENREFLEX_CPPFLAGS="-DALPAKA_DEFAULT_HOST_MEMORY_ALIGNMENT=128"/>
+  <!-- disable the vendor specific random number generators (NVIDIA cuRAND, AMD rocRAND, Intel DPL) -->
+  <flags CXXFLAGS="-DALPAKA_DISABLE_VENDOR_RNG"/>
+  <flags CUDA_FLAGS="-DALPAKA_DISABLE_VENDOR_RNG"/>
+  <flags GENREFLEX_CPPFLAGS="-DALPAKA_DISABLE_VENDOR_RNG"/>
 </tool>