Add [email protected] compiler to tier2 site bounty

JCSDA · Jan 7, 2025 · 2035906 · 2035906
1 parent 6a34dba
commit 2035906
Show file tree

Hide file tree

Showing 5 changed files with 73 additions and 2 deletions.
diff --git a/configs/sites/tier1/atlantis/compilers.yaml b/configs/sites/tier1/atlantis/compilers.yaml
@@ -54,3 +54,26 @@ compilers:
       append_path:
         CPATH: /cm/shared/apps/intel/oneapi-2024.2.1/compiler/2024.2/opt/compiler/include/intel64/
     extra_rpaths: []
+#- compiler:
+#    spec: [email protected]
+#    paths:
+#      cc: /gpfs/neptune/spack-stack/oneapi-2025.0.3/compiler/2025.0/bin/icx
+#      cxx: /gpfs/neptune/spack-stack/oneapi-2025.0.3/compiler/2025.0/bin/icpx
+#      f77: /gpfs/neptune/spack-stack/oneapi-2025.0.3/compiler/2025.0/bin/ifx
+#      fc: /gpfs/neptune/spack-stack/oneapi-2025.0.3/compiler/2025.0/bin/ifx
+#    flags: {}
+#    operating_system: rhel8
+#    target: x86_64
+#    modules:
+#    - umf/0.9.1
+#    - compiler-rt/2025.0.1
+#    - tbb/2022.0
+#    - compiler-intel-llvm/2025.0.1
+#    environment:
+#      prepend_path:
+#        PATH: /cm/local/apps/gcc/11.2.0/bin
+#        CPATH: /cm/local/apps/gcc/11.2.0/include
+#        LD_LIBRARY_PATH: /cm/shared/apps/slurm/21.08.8/lib64:/cm/shared/apps/slurm/21.08.8/lib64/slurm:/gpfs/neptune/spack-stack/oneapi-2025.0.3/compiler/2025.0
+#      append_path:
+#        CPATH: /gpfs/neptune/spack-stack/oneapi-2025.0.3/compiler/2025.0/opt/compiler/include/intel64
+#    extra_rpaths: []
diff --git a/configs/sites/tier1/atlantis/packages_oneapi.yaml b/configs/sites/tier1/atlantis/packages_oneapi.yaml
@@ -1,8 +1,10 @@
 packages:
   all:
     compiler:: [[email protected],[email protected]]
+    #compiler:: [[email protected], [email protected]]
     providers:
       mpi:: [[email protected]]
+      #mpi:: [[email protected]]
   mpi:
     buildable: False
   intel-oneapi-mpi:
@@ -12,15 +14,41 @@ packages:
       modules:
       - mpi/2021.13
       - slurm
+    #- spec: [email protected]%[email protected]
+    #  prefix: /gpfs/neptune/spack-stack/oneapi-2025.0.3
+    #  modules:
+    #  - mpi/2021.14
+    #  - slurm
   intel-oneapi-mkl:
     externals:
     - spec: [email protected]
+      prefix: /cm/shared/apps/intel/oneapi-2024.2.1
       modules:
       - mkl/2024.2
-      prefix: /cm/shared/apps/intel/oneapi-2024.2.1
+    #- spec: [email protected]
+    #  prefix: /gpfs/neptune/spack-stack/oneapi-2025.0.3
+    #  modules:
+    #  - mkl/2025.0
   intel-oneapi-tbb:
     externals:
     - spec: [email protected]
       prefix: /cm/shared/apps/intel/oneapi-2024.2.1
       modules:
       - tbb/2021.13
+    #- spec: [email protected]
+    #  prefix: /gpfs/neptune/spack-stack/oneapi-2025.0.3
+    #  modules:
+    #  - tbb/2022.0
+  intel-oneapi-runtime:
+    externals:
+    - spec: [email protected]%[email protected]
+      prefix: /cm/shared/apps/intel/oneapi-2024.2.1
+      modules:
+      - intel-oneapi-2024.2.1
+      - tbb/2021.13
+      - compiler-rt/2024.2.1
+    #- spec: [email protected]%[email protected]
+    #  prefix: /gpfs/neptune/spack-stack/oneapi-2025.0.3
+    #  modules:
+    #  - tbb/2022.0
+    #  - compiler-rt/2025.0.1
diff --git a/configs/sites/tier2/blackpearl/compilers.yaml b/configs/sites/tier2/blackpearl/compilers.yaml
@@ -61,3 +61,4 @@ compilers:
         # For libquadmath etc
         LD_LIBRARY_PATH: /usr/lib/gcc/x86_64-redhat-linux/11
     extra_rpaths: []
+
diff --git a/configs/sites/tier2/bounty/compilers.yaml b/configs/sites/tier2/bounty/compilers.yaml
@@ -52,4 +52,21 @@ compilers:
     environment:
       append_path:
         LD_LIBRARY_PATH: /home/dom/prod/llvm-19.1.4/lib
-    extra_rpaths: [/home/dom/prod/llvm-19.1.4/lib] 
+    extra_rpaths: [/home/dom/prod/llvm-19.1.4/lib]
+- compiler:
+    spec: aocc@=5.0.0
+    paths:
+      cc: /home/dom/prod/aocc-5.0.0/bin/clang
+      cxx: /home/dom/prod/aocc-5.0.0/bin/clang++
+      f77: /home/dom/prod/aocc-5.0.0/bin/flang
+      fc: /home/dom/prod/aocc-5.0.0/bin/flang
+    flags: {}
+    operating_system: almalinux9
+    target: x86_64
+    modules: []
+    environment: {}
+      #append_path:
+        # For libquadmath etc
+        # NEEDED? LD_LIBRARY_PATH: /usr/lib/gcc/x86_64-redhat-linux/11
+    extra_rpaths: []
+
diff --git a/configs/templates/neptune-dev/spack.yaml b/configs/templates/neptune-dev/spack.yaml
@@ -19,3 +19,5 @@ spack:
       # Skip neptune-python-env with Intel Classic due to problems
       # with new versions of py-numpy, py-scipy, ...
       - neptune-python-env%intel
+      # Same for LLVM compilers
+      - neptune-python-env%clang
Original file line number	Diff line number	Diff line change
Expand Up		@@ -61,3 +61,4 @@ compilers:
		# For libquadmath etc
		LD_LIBRARY_PATH: /usr/lib/gcc/x86_64-redhat-linux/11
		extra_rpaths: []