diff --git a/configs/sites/hera/compilers.yaml b/configs/sites/hera/compilers.yaml index 6f8f2fb05..8150d7afc 100644 --- a/configs/sites/hera/compilers.yaml +++ b/configs/sites/hera/compilers.yaml @@ -7,7 +7,7 @@ compilers: f77: /apps/oneapi/compiler/2022.0.2/linux/bin/intel64/ifort fc: /apps/oneapi/compiler/2022.0.2/linux/bin/intel64/ifort flags: {} - operating_system: centos7 + operating_system: rocky8 modules: - intel/2022.1.2 environment: @@ -24,7 +24,7 @@ compilers: f77: /apps/intel/parallel_studio_xe_2018.4.057/compilers_and_libraries_2018/linux/bin/intel64/ifort fc: /apps/intel/parallel_studio_xe_2018.4.057/compilers_and_libraries_2018/linux/bin/intel64/ifort flags: {} - operating_system: centos7 + operating_system: rocky8 modules: - intel/18.0.5.274 - compiler: @@ -35,7 +35,7 @@ compilers: f77: /apps/gnu/gcc-9.2.0/bin/gfortran fc: /apps/gnu/gcc-9.2.0/bin/gfortran flags: {} - operating_system: centos7 + operating_system: rocky8 modules: - gnu/9.2.0 environment: {} diff --git a/configs/sites/hera/packages.yaml b/configs/sites/hera/packages.yaml index 95c8e4e42..a1a0b3817 100644 --- a/configs/sites/hera/packages.yaml +++ b/configs/sites/hera/packages.yaml @@ -3,7 +3,7 @@ packages: compiler:: [intel@2021.5.0, gcc@9.2.0] #compiler:: [intel@18.0.5.274] providers: - mpi:: [intel-oneapi-mpi@2021.5.1, openmpi@4.1.5] + mpi:: [intel-oneapi-mpi@2021.5.1, openmpi@4.1.6] #mpi:: [intel-mpi@2018.0.4] # To support hecflow01 target: [haswell] @@ -22,11 +22,14 @@ packages: prefix: /apps/oneapi openmpi: externals: - - spec: openmpi@4.1.5~cuda~cxx~cxx_exceptions~java+lustre~memchecker+pmi~static~wrapper-rpath schedulers=slurm - prefix: /scratch1/NCEPDEV/jcsda/jedipara/spack-stack/openmpi-4.1.5 + - spec: openmpi@4.1.6~atomics~cuda~cxx~cxx_exceptions~gpfs~internal-hwloc~internal-libevent~internal-pmix~java+legacylaunchers~lustre~memchecker~openshmem~orterunprefix+pmi+romio+rsh~singularity+static+vt+wrapper-rpath fabrics=ucx schedulers=slurm modules: - gnu/9.2.0 - - openmpi/4.1.5 + - openmpi/4.1.6_gnu9.2.0 + zlib-ng: + require: + - any_of: ['~shared'] + when: "%intel" ### All other external packages listed alphabetically autoconf: diff --git a/spack b/spack index 9fa8fc54d..98226920e 160000 --- a/spack +++ b/spack @@ -1 +1 @@ -Subproject commit 9fa8fc54dd47d416cb618bfff62a803db87eacfa +Subproject commit 98226920e767e329dd100f7f45a49046de5a7f75