diff --git a/configs/sites/tier1/nautilus/compilers.yaml b/configs/sites/tier1/nautilus/compilers.yaml index aff3f05dd..147614a13 100644 --- a/configs/sites/tier1/nautilus/compilers.yaml +++ b/configs/sites/tier1/nautilus/compilers.yaml @@ -59,6 +59,31 @@ compilers: append_path: CPATH: '/p/app/projects/NEPTUNE/spack-stack/oneapi-2024.2.1/compiler/2024.2/opt/compiler/include/intel64' extra_rpaths: [] +#- compiler: +# spec: oneapi@2025.0.0 +# paths: +# cc: /p/app/projects/NEPTUNE/spack-stack/oneapi-2025.0.0/compiler/2025.0/bin/icx +# cxx: /p/app/projects/NEPTUNE/spack-stack/oneapi-2025.0.0/compiler/2025.0/bin/icpx +# f77: /p/app/projects/NEPTUNE/spack-stack/oneapi-2025.0.0/compiler/2025.0/bin/ifx +# fc: /p/app/projects/NEPTUNE/spack-stack/oneapi-2025.0.0/compiler/2025.0/bin/ifx +# flags: {} +# operating_system: rhel8 +# target: x86_64 +# modules: +# - slurm +# - tbb/2022.0 +# - compiler-rt/2025.0.0 +# - umf/0.9.0 +# - compiler-intel-llvm/2025.0.0 +# environment: +# prepend_path: +# PATH: '/opt/rh/gcc-toolset-11/root/usr/bin' +# CPATH: '/opt/rh/gcc-toolset-11/root/usr/include' +# LD_LIBRARY_PATH: '/opt/scyld/slurm/lib64:/opt/scyld/slurm/lib64/slurm:/opt/rh/gcc-toolset-11/root/usr/lib64:/opt/rh/gcc-toolset-11/root/usr/lib' +# MODULEPATH: '/p/app/projects/NEPTUNE/spack-stack/oneapi-2025.0.0/modulefiles' +# append_path: +# CPATH: '/p/app/projects/NEPTUNE/spack-stack/oneapi-2025.0.0/compiler/2025.0/opt/compiler/include/intel64' +# extra_rpaths: [] - compiler: spec: gcc@12.2.1 paths: diff --git a/configs/sites/tier1/nautilus/packages_oneapi.yaml b/configs/sites/tier1/nautilus/packages_oneapi.yaml index 53254442f..263c72bf9 100644 --- a/configs/sites/tier1/nautilus/packages_oneapi.yaml +++ b/configs/sites/tier1/nautilus/packages_oneapi.yaml @@ -1,8 +1,10 @@ packages: all: compiler:: [oneapi@2024.2.1,gcc@11.2.1] + #compiler:: [oneapi@2025.0.0, gcc@11.2.1] providers: mpi:: [intel-oneapi-mpi@2021.13] + #mpi:: [intel-oneapi-mpi@2021.14] mpi: buildable: False intel-oneapi-mpi: @@ -11,18 +13,30 @@ packages: prefix: /p/app/projects/NEPTUNE/spack-stack/oneapi-2024.2.1 modules: - mpi/2021.13 + #- spec: intel-oneapi-mpi@2021.14%oneapi@2025.0.0 + # prefix: /p/app/projects/NEPTUNE/spack-stack/oneapi-2025.0.0 + # modules: + # - mpi/2021.14 intel-oneapi-mkl: externals: - spec: intel-oneapi-mkl@2024.2%oneapi@2024.2.1 prefix: /p/app/projects/NEPTUNE/spack-stack/oneapi-2024.2.1 modules: - mkl/2024.2 + #- spec: intel-oneapi-mkl@2025.0%oneapi@2025.0.0 + # prefix: /p/app/projects/NEPTUNE/spack-stack/oneapi-2025.0.0 + # modules: + # - mkl/2025.0 intel-oneapi-tbb: externals: - spec: intel-oneapi-tbb@2021.13%oneapi@2024.2.1 prefix: /p/app/projects/NEPTUNE/spack-stack/oneapi-2024.2.1 modules: - tbb/2021.13 + #- spec: intel-oneapi-tbb@2022.0%oneapi@2025.0.0 + # prefix: /p/app/projects/NEPTUNE/spack-stack/oneapi-2025.0.0 + # modules: + # - tbb/2022.0 intel-oneapi-runtime: externals: - spec: intel-oneapi-runtime@2024.2.1%oneapi@2024.2.1 @@ -30,3 +44,8 @@ packages: modules: - tbb/2021.13 - compiler-rt/2024.2.1 + #- spec: intel-oneapi-runtime@2025.0.0%oneapi@2025.0.0 + # prefix: /p/app/projects/NEPTUNE/spack-stack/oneapi-2025.0.0 + # modules: + # - tbb/2022.0 + # - compiler-rt/2025.0.0 diff --git a/spack b/spack index b6ef265ec..b274d591f 160000 --- a/spack +++ b/spack @@ -1 +1 @@ -Subproject commit b6ef265ec4582ddca131534a9d314e233919ae69 +Subproject commit b274d591fc82d38609124e3fe6f8ef1753357947