Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions alpaka.spec
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
### RPM external alpaka 1.3.0
### RPM external alpaka 2.0.0
## NOCOMPILER

%define git_commit %{realversion}

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

%prep
%setup -n %{n}-%{git_commit}
Expand Down
11 changes: 9 additions & 2 deletions scram-tools.file/tools/alpaka/alpaka.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<tool name="@TOOL@" version="@TOOL_VERSION@" revision="2">
<use name="boost"/>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@fwyzard , can you please update the revision here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you explain how it works ?

I understand updating the revision if there are only changes to the xml file, but if I already update the version, isn't that enough ?

In fact, wouldn't it make sense to reset the revision to 1 when one updates the version ?

Copy link
Contributor

@smuzaffar smuzaffar Oct 30, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

revision is kind of version of the xml file, so when ever you change the contents of xml file then update the revision too.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK.

I disagree, but will comply.

<tool name="@TOOL@" version="@TOOL_VERSION@" revision="3">
<client>
<environment name="@TOOL_BASE@" default="@TOOL_ROOT@"/>
<environment name="INCLUDE" default="$@TOOL_BASE@/include"/>
Expand All @@ -13,4 +12,12 @@
<flags CXXFLAGS="-DALPAKA_DISABLE_VENDOR_RNG"/>
<flags CUDA_FLAGS="-DALPAKA_DISABLE_VENDOR_RNG"/>
<flags GENREFLEX_CPPFLAGS="-DALPAKA_DISABLE_VENDOR_RNG"/>
<!-- enable the use of std::atomic_ref -->
<flags CXXFLAGS="-DALPAKA_HAS_STD_ATOMIC_REF"/>
<flags CUDA_FLAGS="-DALPAKA_HAS_STD_ATOMIC_REF"/>
<flags GENREFLEX_CPPFLAGS="-DALPAKA_HAS_STD_ATOMIC_REF"/>
<!-- std::call_once is implemented using a pthread weak symbol on EL8 -->
<ifarchitecture name="el8">
<flags LDFLAGS="-Wl,-no-as-needed -lpthread -Wl,-as-needed"/>
</ifarchitecture>
</tool>