diff --git a/configs/sites/tier1/s4/compilers.yaml b/configs/sites/tier1/s4/compilers.yaml index 6e8ebb5c7..d23d4be3c 100644 --- a/configs/sites/tier1/s4/compilers.yaml +++ b/configs/sites/tier1/s4/compilers.yaml @@ -17,6 +17,27 @@ compilers: LD_LIBRARY_PATH: /opt/intel/oneapi/2023.2/compiler/2023.2.0/linux/compiler/lib/intel64_lin:/opt/gcc/10.2.0/lib64:/opt/gcc/10.2.0/lib CPATH: /opt/gcc/10.2.0/include extra_rpaths: [] +- compiler: + spec: oneapi@2024.2.1 + paths: + cc: /opt/intel/oneapi/2024/compiler/2024.2/bin/icx + cxx: /opt/intel/oneapi/2024/compiler/2024.2/bin/icpx + f77: /opt/intel/oneapi/2024/compiler/2024.2/bin/ifort + fc: /opt/intel/oneapi/2024/compiler/2024.2/bin/ifort + flags: + fflags: -diag-disable=10448 + operating_system: rocky8 + target: x86_64 + modules: + - intel/2024.2 + environment: + prepend_path: + PATH: /opt/gcc/10.2.0/bin + LD_LIBRARY_PATH: /opt/gcc/10.2.0/lib64:/opt/gcc/10.2.0/lib + CPATH: /opt/gcc/10.2.0/include + append_path: + PATH: /opt/intel/oneapi/2024/compiler/2024.2/opt/compiler/include/intel64 + extra_rpaths: [] - compiler: spec: gcc@=13.3.0 paths: @@ -58,3 +79,4 @@ compilers: modules: [] environment: {} extra_rpaths: [] + diff --git a/configs/sites/tier1/s4/packages.yaml b/configs/sites/tier1/s4/packages.yaml index eb7bb70c8..e589d9c5c 100644 --- a/configs/sites/tier1/s4/packages.yaml +++ b/configs/sites/tier1/s4/packages.yaml @@ -1,8 +1,10 @@ packages: all: - compiler:: [intel@2021.10.0,gcc@10.2.0] + compiler:: [oneapi@2024.2.1,gcc@10.2.0] + #compiler:: [intel@2021.10.0,gcc@10.2.0] providers: - mpi:: [intel-oneapi-mpi@2021.10.0] + mpi:: [intel-oneapi-mpi@2021.13] + # mpi:: [intel-oneapi-mpi@2021.10.0] # Remove the next three lines to switch to intel-oneapi-mkl blas:: [openblas] fftw-api:: [fftw] @@ -14,18 +16,24 @@ packages: ### MPI, Python, MKL mpi: buildable: False + #intel-oneapi-mpi: + # externals: + # - spec: intel-oneapi-mpi@2021.10.0%intel@2021.10.0 +classic-names + # prefix: /opt/intel/oneapi/2024 + # modules: + # - intel/2023.2 intel-oneapi-mpi: externals: - - spec: intel-oneapi-mpi@2021.10.0%intel@2021.10.0 +classic-names - prefix: /opt/intel/oneapi/2023.2 + - spec: intel-oneapi-mpi@2021.13%oneapi@2024.2.1 + prefix: /opt/intel/oneapi/2024 modules: - - intel/2023.2 + - intel/2024.2 intel-oneapi-mkl: # Remove buildable: False and uncomment externals section below to use intel-oneapi-mkl buildable: False #externals: #- spec: intel-oneapi-mkl@2023.2.0%intel@2021.10.0 - # prefix: /opt/intel/oneapi/2023.2 + # prefix: /opt/intel/oneapi/2024 # modules: # - intel/2023.2 # Remove this section to switch to intel-oneapi-mkl @@ -80,7 +88,7 @@ packages: externals: - spec: cpio@2.12 prefix: /usr - # OS curl/openssl cause problems + # OS curl/openssl cause problems #curl: # externals: # - spec: curl@7.61.1+gssapi+ldap+nghttp2 @@ -203,3 +211,4 @@ packages: externals: - spec: zip@3.0 prefix: /usr +