Merge branch 'develop' into feature_caliper_modifier

LLNL · Dec 28, 2023 · ccd874d · ccd874d
2 parents 6328547 + f2a8abf
commit ccd874d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/configs/HPECray-zen3-MI250X-Slingshot/auxiliary_software_files/compilers.yaml b/configs/HPECray-zen3-MI250X-Slingshot/auxiliary_software_files/compilers.yaml
@@ -7,10 +7,10 @@ compilers:
 - compiler:
     spec: [email protected]
     paths:
-      cc:  /usr/tce/packages/cce-tce/cce-16.0.0/bin/craycc
-      cxx:  /usr/tce/packages/cce-tce/cce-16.0.0/bin/crayCC
-      f77:  /usr/tce/packages/cce-tce/cce-16.0.0/bin/crayftn
-      fc:  /usr/tce/packages/cce-tce/cce-16.0.0/bin/crayftn
+      cc:  /opt/cray/pe/cce/16.0.0/bin/craycc
+      cxx:  /opt/cray/pe/cce/16.0.0/bin/crayCC
+      f77:  /opt/cray/pe/cce/16.0.0/bin/crayftn
+      fc:  /opt/cray/pe/cce/16.0.0/bin/crayftn
     flags:
       cflags: -g -O2
       cxxflags: -g -O2 -std=c++14

diff --git a/configs/HPECray-zen3-MI250X-Slingshot/auxiliary_software_files/packages.yaml b/configs/HPECray-zen3-MI250X-Slingshot/auxiliary_software_files/packages.yaml
@@ -5,7 +5,7 @@
 
 packages:
   all:
-    require: target=x86_64:
+    require: 'target=x86_64:'
     variants: amdgpu_target=gfx90a
   papi:
     externals:

diff --git a/configs/HPECray-zen3-MI250X-Slingshot/spack.yaml b/configs/HPECray-zen3-MI250X-Slingshot/spack.yaml
@@ -9,8 +9,6 @@ spack:
       spack_spec: [email protected]
     default-mpi:
       spack_spec: [email protected]%cce ~gtl
-    compiler-gcc:
-      spack_spec: [email protected]
     compiler-rocm:
       spack_spec: [email protected]
     blas-rocm: