From 58a9a0708fc6603730cb6fd91a80ad71ac77160d Mon Sep 17 00:00:00 2001
From: Andrea Bocci <andrea.bocci@cern.ch>
Date: Tue, 23 Jan 2024 10:52:44 +0100
Subject: [PATCH 1/2] Update Alpaka to version 1.1.0

Major changes include:
  - introduce SYCL/oneAPI support for CPUs and Intel GPUs
  - make alpaka platforms full objects, and rename from Pltf to Platform
  - make the vendor random number generators support optional
  - refactor Vec type, and add .x(), .y(), .z() accessors
  - enable support for asynchronous memory operations in ROCm 5.3 and later
  - change all CUDA warp operations to synchronise all threads
  - remove ALPAKA_ASSERT_OFFLOAD, introduce ALPAKA_ASSERT_ACC
  - implement copysign(), fma(), log2(), log10() math functions
  - simplify offset and pitch APIs
  - add support for CUDA 12.2, 12.3 and ROCm 5.6, 5.7, 6.0
  - improve error messages related to kernel launches
  - rework thread pool and callback threads
  - fix alpaka::wait(device, event) function for CUDA/HIP GPUs
  - implement alpaka-ls
---
 alpaka.spec | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/alpaka.spec b/alpaka.spec
index 95696a1841c..87374910c3a 100644
--- 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

From 59d4d9413b9c12715ddb2229fac43ca6ad991c63 Mon Sep 17 00:00:00 2001
From: Andrea Bocci <andrea.bocci@cern.ch>
Date: Tue, 23 Jan 2024 11:08:04 +0100
Subject: [PATCH 2/2] Disable the vendor specific random number generators in
 Alpaka (NVIDIA cuRAND, AMD rocRAND, Intel DPL)

---
 scram-tools.file/tools/alpaka/alpaka-rocm.xml | 1 -
 scram-tools.file/tools/alpaka/alpaka.xml      | 4 ++++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/scram-tools.file/tools/alpaka/alpaka-rocm.xml b/scram-tools.file/tools/alpaka/alpaka-rocm.xml
index eb0285bab3d..d33be6a13b4 100644
--- 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
index 7bd410dc735..a21cd4c76cd 100644
--- 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>