Skip to content

Update RAJA suite to v2025.03.0 #303

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
rrsettgast merged 7 commits into from
Apr 14, 2025
Merged

Update RAJA suite to v2025.03.0 #303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
26643e3
Update CMake-based tplMirrors to new RAJA suite 3/25
bmhan12 Mar 20, 2025
66517d9
Update spack commit hashes for new RAJA suite to 03/25
bmhan12 Mar 20, 2025
9c0d899
LC spack script - Remove extra build files on successful completion
bmhan12 Apr 3, 2025
6d26f9b
Add cuda version to host-config name to avoid naming collision
bmhan12 Apr 3, 2025
95d226b
Change permission specific directories to avoid NFS errors; recipe - …
bmhan12 Apr 3, 2025
35b6dad
Merge branch 'master' into feature/han12/raja_3_25
bmhan12 Apr 10, 2025
709fa2a
Point to correct provider of blas
bmhan12 Apr 11, 2025
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 CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ list(APPEND build_list silo )


set(RAJA_DIR "${CMAKE_INSTALL_PREFIX}/raja")
set(RAJA_URL "${TPL_MIRROR_DIR}/RAJA-v2024.07.0.tar.gz")
set(RAJA_URL "${TPL_MIRROR_DIR}/RAJA-v2025.03.0.tar.gz")


message(STATUS "Building RAJA found at ${RAJA_URL}")
Expand Down Expand Up @@ -374,7 +374,7 @@ list(APPEND build_list raja )
# CHAI
################################
set(CHAI_DIR "${CMAKE_INSTALL_PREFIX}/chai")
set(CHAI_URL "${TPL_MIRROR_DIR}/chai-2024.07.0.tar.gz")
set(CHAI_URL "${TPL_MIRROR_DIR}/chai-2025.03.0.tar.gz")
message(STATUS "Building CHAI found at ${CHAI_URL}")

ExternalProject_Add( chai
Expand Down
16 changes: 8 additions & 8 deletions docker/pangea-spack.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,21 +49,21 @@ spack:
hypre:
require: "@git.21e5953ddc6daaa24699236108866afa597a415c"

# v2024.07.0
# v2025.0.3.0
chai:
require: "@git.df7741f1dbbdc5fff5f7d626151fdf1904e62b19=develop"
require: "@git.4b9060b18b9bec1167026cfb3132bd540c4bd56b=develop"

# v2024.07.0
# v2025.0.3.0
umpire:
require: "@git.abd729f40064175e999a83d11d6b073dac4c01d2=develop"
require: "@git.1ed0669c57f041baa1f1070693991c3a7a43e7ee=develop"

# v2024.07.0
# v2025.0.3.0
raja:
require: "@git.4d7fcba55ebc7cb972b7cc9f6778b48e43792ea1=develop"
require: "@git.1d70abf171474d331f1409908bdf1b1c3fe19222=develop"

# v2024.07.0
# v2025.0.3.0
camp:
require: "@git.0f07de4240c42e0b38a8d872a20440cb4b33d9f5=main"
require: "@git.ee0a3069a7ae72da8bcea63c06260fad34901d43=main"

# v2.12.0
caliper:
Expand Down
16 changes: 8 additions & 8 deletions docker/pecan-spack.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,21 +50,21 @@ spack:
hypre:
require: "@git.21e5953ddc6daaa24699236108866afa597a415c"

# v2024.07.0
# v2025.0.3.0
chai:
require: "@git.df7741f1dbbdc5fff5f7d626151fdf1904e62b19=develop"
require: "@git.4b9060b18b9bec1167026cfb3132bd540c4bd56b=develop"

# v2024.07.0
# v2025.0.3.0
umpire:
require: "@git.abd729f40064175e999a83d11d6b073dac4c01d2=develop"
require: "@git.1ed0669c57f041baa1f1070693991c3a7a43e7ee=develop"

# v2024.07.0
# v2025.0.3.0
raja:
require: "@git.4d7fcba55ebc7cb972b7cc9f6778b48e43792ea1=develop"
require: "@git.1d70abf171474d331f1409908bdf1b1c3fe19222=develop"

# v2024.07.0
# v2025.0.3.0
camp:
require: "@git.0f07de4240c42e0b38a8d872a20440cb4b33d9f5=main"
require: "@git.ee0a3069a7ae72da8bcea63c06260fad34901d43=main"

# v2.12.0
caliper:
Expand Down
18 changes: 9 additions & 9 deletions docker/rocky-spack.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ spack:
target: [x86_64]
compiler: [gcc, clang]
providers:
blas: [netlib-blas]
blas: [netlib-lapack]
lapack: [netlib-lapack]
mpi: [openmpi]

Expand All @@ -67,21 +67,21 @@ spack:
hypre:
require: "@git.21e5953ddc6daaa24699236108866afa597a415c"

# v2024.07.0
# v2025.0.3.0
chai:
require: "@git.df7741f1dbbdc5fff5f7d626151fdf1904e62b19=develop"
require: "@git.4b9060b18b9bec1167026cfb3132bd540c4bd56b=develop"

# v2024.07.0
# v2025.0.3.0
umpire:
require: "@git.abd729f40064175e999a83d11d6b073dac4c01d2=develop"
require: "@git.1ed0669c57f041baa1f1070693991c3a7a43e7ee=develop"

# v2024.07.0
# v2025.0.3.0
raja:
require: "@git.4d7fcba55ebc7cb972b7cc9f6778b48e43792ea1=develop"
require: "@git.1d70abf171474d331f1409908bdf1b1c3fe19222=develop"

# v2024.07.0
# v2025.0.3.0
camp:
require: "@git.0f07de4240c42e0b38a8d872a20440cb4b33d9f5=main"
require: "@git.ee0a3069a7ae72da8bcea63c06260fad34901d43=main"

# v2.12.0
caliper:
Expand Down
18 changes: 9 additions & 9 deletions docker/spack.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ spack:
target: [x86_64]
compiler: [gcc, clang]
providers:
blas: [netlib-blas]
blas: [netlib-lapack]
lapack: [netlib-lapack]
mpi: [openmpi]

Expand All @@ -153,21 +153,21 @@ spack:
hypre:
require: "@git.21e5953ddc6daaa24699236108866afa597a415c"

# v2024.07.0
# v2025.0.3.0
chai:
require: "@git.df7741f1dbbdc5fff5f7d626151fdf1904e62b19=develop"
require: "@git.4b9060b18b9bec1167026cfb3132bd540c4bd56b=develop"

# v2024.07.0
# v2025.0.3.0
umpire:
require: "@git.abd729f40064175e999a83d11d6b073dac4c01d2=develop"
require: "@git.1ed0669c57f041baa1f1070693991c3a7a43e7ee=develop"

# v2024.07.0
# v2025.0.3.0
raja:
require: "@git.4d7fcba55ebc7cb972b7cc9f6778b48e43792ea1=develop"
require: "@git.1d70abf171474d331f1409908bdf1b1c3fe19222=develop"

# v2024.07.0
# v2025.0.3.0
camp:
require: "@git.0f07de4240c42e0b38a8d872a20440cb4b33d9f5=main"
require: "@git.ee0a3069a7ae72da8bcea63c06260fad34901d43=main"

# v2.12.0
caliper:
Expand Down
16 changes: 8 additions & 8 deletions docker/stanford-spack.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,21 +50,21 @@ spack:
hypre:
require: "@git.21e5953ddc6daaa24699236108866afa597a415c"

# v2024.07.0
# v2025.0.3.0
chai:
require: "@git.df7741f1dbbdc5fff5f7d626151fdf1904e62b19=develop"
require: "@git.4b9060b18b9bec1167026cfb3132bd540c4bd56b=develop"

# v2024.07.0
# v2025.0.3.0
umpire:
require: "@git.abd729f40064175e999a83d11d6b073dac4c01d2=develop"
require: "@git.1ed0669c57f041baa1f1070693991c3a7a43e7ee=develop"

# v2024.07.0
# v2025.0.3.0
raja:
require: "@git.4d7fcba55ebc7cb972b7cc9f6778b48e43792ea1=develop"
require: "@git.1d70abf171474d331f1409908bdf1b1c3fe19222=develop"

# v2024.07.0
# v2025.0.3.0
camp:
require: "@git.0f07de4240c42e0b38a8d872a20440cb4b33d9f5=main"
require: "@git.ee0a3069a7ae72da8bcea63c06260fad34901d43=main"

# v2.12.0
caliper:
Expand Down
20 changes: 18 additions & 2 deletions scripts/setupLC-TPL-uberenv-helper.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,24 @@ exit" > $LOG_FILE 2>&1
## A successful install should show up on one of the final lines.
tail -10 $LOG_FILE | grep -E "Successfully installed geos" > /dev/null
if [ $? -eq 0 ]; then
chmod g+rx -R $INSTALL_DIR
chgrp GEOS -R $INSTALL_DIR
echo "Cleanup extra build files at ${INSTALL_DIR}/${CONFIG}_tpls/ ."
rm -rf ${INSTALL_DIR}/${CONFIG}_tpls/${CONFIG}_env
rm -rf ${INSTALL_DIR}/${CONFIG}_tpls/.spack-db
rm -rf ${INSTALL_DIR}/${CONFIG}_tpls/misc_cache
rm -rf ${INSTALL_DIR}/${CONFIG}_tpls/spack
rm -rf ${INSTALL_DIR}/${CONFIG}_tpls/build_stage

echo "Updating file permissions at ${INSTALL_DIR}/${CONFIG}_tpls/ ."
# Install directory root
chmod g+rx $INSTALL_DIR
chgrp GEOS $INSTALL_DIR

# Update only executable and library directories to avoid NFS errors
chmod g+rx -R $INSTALL_DIR/${CONFIG}_tpls/bin
chgrp GEOS -R $INSTALL_DIR/${CONFIG}_tpls/bin
chmod g+rx -R $INSTALL_DIR/${CONFIG}_tpls/${COMPILER%%-*}*
chgrp GEOS -R $INSTALL_DIR/${CONFIG}_tpls/${COMPILER%%-*}*

echo "Build of ${CONFIG} completed successfully."
exit 0
else
Expand Down
16 changes: 8 additions & 8 deletions scripts/spack_configs/blueos_3_ppc64le_ib_p9/spack.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,21 +106,21 @@ spack:
hypre:
require: "@git.21e5953ddc6daaa24699236108866afa597a415c"

# v2024.07.0
# v2025.0.3.0
chai:
require: "@git.df7741f1dbbdc5fff5f7d626151fdf1904e62b19=develop"
require: "@git.4b9060b18b9bec1167026cfb3132bd540c4bd56b=develop"

# v2024.07.0
# v2025.0.3.0
umpire:
require: "@git.abd729f40064175e999a83d11d6b073dac4c01d2=develop"
require: "@git.1ed0669c57f041baa1f1070693991c3a7a43e7ee=develop"

# v2024.07.0
# v2025.0.3.0
Copy link
Contributor

@CusiniM CusiniM Apr 7, 2025

Choose a reason for hiding this comment

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

can we specify this in the geos package instead of specifying a commit hash here? seems easier and does not require duplication.

Copy link
Contributor Author

@bmhan12 bmhan12 Apr 10, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

can we specify this in the geos package instead of specifying a commit hash here? seems easier and does not require duplication

As of a few days ago, yes: https://github.com/spack/spack/blame/8885f6b861ea8721711ad7d9030593968a62e959/var/spack/repos/builtin/packages/raja/package.py#L34-L39

Before that spack commit, v2025.03.0 was not in spack yet, so I went with the commit hash.

However, this involves updating our spack version to a newer commit, which may cause other issues.
I think it makes sense to get the v2025.03.0 changes in this PR in first, then do the refactoring and spack version bump in #305.

Copy link
Contributor

@CusiniM CusiniM Apr 10, 2025

Choose a reason for hiding this comment

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

sounds good!

raja:
require: "@git.4d7fcba55ebc7cb972b7cc9f6778b48e43792ea1=develop"
require: "@git.1d70abf171474d331f1409908bdf1b1c3fe19222=develop"

# v2024.07.0
# v2025.0.3.0
camp:
require: "@git.0f07de4240c42e0b38a8d872a20440cb4b33d9f5=main"
require: "@git.ee0a3069a7ae72da8bcea63c06260fad34901d43=main"

# v2.12.0
caliper:
Expand Down
16 changes: 8 additions & 8 deletions scripts/spack_configs/toss_4_x86_64_ib/spack.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,21 +102,21 @@ spack:
hypre:
require: "@git.21e5953ddc6daaa24699236108866afa597a415c"

# v2024.07.0
# v2025.0.3.0
chai:
require: "@git.df7741f1dbbdc5fff5f7d626151fdf1904e62b19=develop"
require: "@git.4b9060b18b9bec1167026cfb3132bd540c4bd56b=develop"

# v2024.07.0
# v2025.0.3.0
umpire:
require: "@git.abd729f40064175e999a83d11d6b073dac4c01d2=develop"
require: "@git.1ed0669c57f041baa1f1070693991c3a7a43e7ee=develop"

# v2024.07.0
# v2025.0.3.0
raja:
require: "@git.4d7fcba55ebc7cb972b7cc9f6778b48e43792ea1=develop"
require: "@git.1d70abf171474d331f1409908bdf1b1c3fe19222=develop"

# v2024.07.0
# v2025.0.3.0
camp:
require: "@git.0f07de4240c42e0b38a8d872a20440cb4b33d9f5=main"
require: "@git.ee0a3069a7ae72da8bcea63c06260fad34901d43=main"

# v2.12.0
caliper:
Expand Down
1 change: 1 addition & 0 deletions scripts/spack_packages/packages/geosx/package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,7 @@ def _get_host_config_path(self, spec, lvarray=False):
var = ''
if '+cuda' in spec:
var = '-'.join([var, 'cuda'])
var += "@" + str(spec['cuda'].version)

hostname = socket.gethostname().rstrip('1234567890')

Expand Down
3 changes: 0 additions & 3 deletions tplMirror/RAJA-v2024.07.0.tar.gz
View file
Open in desktop

This file was deleted.

3 changes: 3 additions & 0 deletions tplMirror/RAJA-v2025.03.0.tar.gz
View file
Open in desktop
Git LFS file not shown
3 changes: 0 additions & 3 deletions tplMirror/chai-2024.07.0.tar.gz
View file
Open in desktop

This file was deleted.

3 changes: 3 additions & 0 deletions tplMirror/chai-2025.03.0.tar.gz
View file
Open in desktop
Git LFS file not shown
17 changes: 0 additions & 17 deletions tplMirror/umpire_fcompare-debug-second.patch
View file
Open in desktop

This file was deleted.