Skip to content

Update Alpaka and add support for ROCm #8284

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cmsbuild merged 2 commits into from
Feb 5, 2023
Merged

Update Alpaka and add support for ROCm #8284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e92d077
Update the develop branch to 2023.02.01 / a68c866cc6c
fwyzard Feb 1, 2023
7620e37
Add support for the HIP/ROCm alpaka backend
fwyzard Feb 2, 2023
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
4 changes: 2 additions & 2 deletions alpaka.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
### RPM external alpaka develop-20220902
### RPM external alpaka develop-20230201
## NOCOMPILER

%define git_commit b518e8c943a816eba06c3e12c0a7e1b58c8faedc
%define git_commit a68c866cc6c3019748cf127b4eac61be38e7f687

Source: https://github.com/alpaka-group/%{n}/archive/%{git_commit}.tar.gz
Requires: boost
Expand Down
9 changes: 9 additions & 0 deletions scram-tools.file/tools/alpaka/alpaka-rocm.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<tool name="alpaka-rocm" version="@TOOL_VERSION@">
<use name="alpaka"/>
<use name="rocm"/>
<!-- 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"/>
<!-- device comiplation should run without ALPAKA_HOST_ONLY defined -->
<flags ROCM_FLAGS="-DALPAKA_ACC_GPU_HIP_ENABLED -UALPAKA_HOST_ONLY"/>
Copy link
Contributor

@smuzaffar smuzaffar Feb 2, 2023

Choose a reason for hiding this comment

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

As CXXFLAGS already has -DALPAKA_ACC_GPU_HIP_ENABLED so it is not needed here

Copy link
Contributor Author

@fwyzard fwyzard Feb 2, 2023

Choose a reason for hiding this comment

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

Yes, you're right.

However, I've copied this from the CUDA case, and I would prefer to clean them all up together in a separate PR.

Copy link
Contributor

@smuzaffar smuzaffar Feb 2, 2023

Choose a reason for hiding this comment

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

-UALPAKA_HOST_ONLY should work too but if you prefer then you can use

<flags REM_ROCM_HOST_CXXFLAGS="-DALPAKA_HOST_ONLY"/>

Copy link
Contributor Author

@fwyzard fwyzard Feb 2, 2023

Choose a reason for hiding this comment

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

Following what you told me the other day, I was going to move the flags to CPPDEFINES - but I guess we do not have a REM_CPPDEFINES or REM_ROCM_HOST_CPPDEFINES functionality ?

Copy link
Contributor Author

@fwyzard fwyzard Feb 2, 2023

Choose a reason for hiding this comment

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

So I think we can stick to CXXFLAGS and use REM_CUDA_HOST_CXXFLAGS/REM_ROCM_HOST_CXXFLAGS .

Copy link
Contributor

@smuzaffar smuzaffar Feb 2, 2023

Choose a reason for hiding this comment

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

yes that is correct, currently there is no REM_ROCM_HOST_CPPDEFINES , so lets stick to CXXFLAGS

</tool>