Rearrange AMD and NVIDIA backend flags

aurora-multiphysics · Jan 17, 2025 · 3599db7 · 3599db7
1 parent fef4a21
commit 3599db7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/scripts/build-platypus.sh b/scripts/build-platypus.sh
@@ -119,13 +119,13 @@ make_spack_env() {
                 replace_in_file ${SPACK_MOD} "blas" "+cublas"
                 replace_in_file ${SPACK_MOD} "llvm_version" "@${LLVM_VER}"
                 replace_in_file ${SPACK_MOD} "openmpi" "openmpi@openmpi_version@ @gpu@ @gpu_arch@"
-                replace_in_file ${SPACK_MOD} "ucx" "ucx @gpu@ @gpu_arch@ +gdrcopy +rdmacm"
+                replace_in_file ${SPACK_MOD} "ucx" "ucx @gpu@ @gpu_arch@ +gdrcopy"
             else
                 export LLVM_TYPE="llvm-amdgpu"
                 replace_in_file ${SPACK_MOD} "blas" "+rocblas"
                 replace_in_file ${SPACK_MOD} "llvm_version" "@${AMDLLVM_VER}"
                 replace_in_file ${SPACK_MOD} "openmpi" "openmpi@openmpi_version@"
-                replace_in_file ${SPACK_MOD} "ucx" "ucx%gcc +cm"
+                replace_in_file ${SPACK_MOD} "ucx" "ucx%gcc @gpu@ @gpu_arch@"
             fi
             replace_in_file ${SPACK_MOD} "gpu" "+${GPU_BACKEND}"
         fi
@@ -148,7 +148,7 @@ make_spack_env() {
 
         # Clean up all GPU options
         replace_in_file ${SPACK_MOD} "openmpi" "openmpi@openmpi_version@"
-        replace_in_file ${SPACK_MOD} "ucx" "ucx +cm"
+        replace_in_file ${SPACK_MOD} "ucx" "ucx"
         replace_in_file ${SPACK_MOD} "gpu_aware_mpi" ""
         replace_in_file ${SPACK_MOD} "gpu" ""
         replace_in_file ${SPACK_MOD} "gpu_arch" ""

diff --git a/scripts/spack-env.txt b/scripts/spack-env.txt
@@ -23,7 +23,7 @@ spack:
   - [email protected]
   - petsc +batch +fortran +hdf5 +hypre +metis +mpi +superlu-dist @gpu@ @gpu_arch@
   - @openmpi@ fabrics=xpmem,knem,ucx +internal-pmix +internal-hwloc
-  - @ucx@ +knem +xpmem +cma +rc +ud +dc +mlx5_dv +ib_hw_tm +dm ^knem%gcc ^xpmem%gcc
+  - @ucx@ +rdmacm +knem +xpmem +cma +rc +ud +dc +mlx5_dv +ib_hw_tm +dm ^knem%gcc ^xpmem%gcc
   - hdf5 +cxx +fortran +hl +mpi +shared
   - [email protected] +mpi +shared +superlu-dist @blas@ +fortran @gpu_aware_mpi@ @gpu@ @gpu_arch@
   - superlu-dist +parmetis +shared @gpu@ @gpu_arch@