Skip to content

Commit 0e4887c

Browse files
authored
Merge pull request #10103 from fwyzard/IB/CMSSW_16_0_X/master_alpaka_2.0
Update alpaka to 2.0.0 "Concepts Ahead"
2 parents 9e90070 + 69d6a42 commit 0e4887c

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

alpaka.spec

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
### RPM external alpaka 1.3.0
1+
### RPM external alpaka 2.0.0
22
## NOCOMPILER
33

44
%define git_commit %{realversion}
55

66
Source: https://github.com/cms-externals/%{n}/archive/%{git_commit}.tar.gz
7-
Requires: boost
87

98
%prep
109
%setup -n %{n}-%{git_commit}

scram-tools.file/tools/alpaka/alpaka.xml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
<tool name="@TOOL@" version="@TOOL_VERSION@" revision="2">
2-
<use name="boost"/>
1+
<tool name="@TOOL@" version="@TOOL_VERSION@" revision="3">
32
<client>
43
<environment name="@TOOL_BASE@" default="@TOOL_ROOT@"/>
54
<environment name="INCLUDE" default="$@TOOL_BASE@/include"/>
@@ -13,4 +12,12 @@
1312
<flags CXXFLAGS="-DALPAKA_DISABLE_VENDOR_RNG"/>
1413
<flags CUDA_FLAGS="-DALPAKA_DISABLE_VENDOR_RNG"/>
1514
<flags GENREFLEX_CPPFLAGS="-DALPAKA_DISABLE_VENDOR_RNG"/>
15+
<!-- enable the use of std::atomic_ref -->
16+
<flags CXXFLAGS="-DALPAKA_HAS_STD_ATOMIC_REF"/>
17+
<flags CUDA_FLAGS="-DALPAKA_HAS_STD_ATOMIC_REF"/>
18+
<flags GENREFLEX_CPPFLAGS="-DALPAKA_HAS_STD_ATOMIC_REF"/>
19+
<!-- std::call_once is implemented using a pthread weak symbol on EL8 -->
20+
<ifarchitecture name="el8">
21+
<flags LDFLAGS="-Wl,-no-as-needed -lpthread -Wl,-as-needed"/>
22+
</ifarchitecture>
1623
</tool>

0 commit comments

Comments
 (0)