From fe5caa760daa49f43812ca7c4d5415f90d8c8ebd Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Thu, 11 Jan 2024 13:13:20 -0700 Subject: [PATCH 1/2] Fix bug in documentation for Hercules --- doc/source/PreConfiguredSites.rst | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/source/PreConfiguredSites.rst b/doc/source/PreConfiguredSites.rst index e0b55d61b..947d39ffa 100644 --- a/doc/source/PreConfiguredSites.rst +++ b/doc/source/PreConfiguredSites.rst @@ -147,7 +147,9 @@ For ``spack-stack-1.6.0`` with GNU, load the following modules after loading mys For testing, an additional version of spack-stack-1.6.0 with GNU+OpenMPI is available. Load the following modules after loading mysql and ecflow: - module use /work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.6.0/envs/ue-gcc12-openmpi416/install/modulefiles/Core/ +.. code-block:: console + + module use /work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.6.0/envs/ue-gcc12-openmpi416/install/modulefiles/Core module load stack-gcc/12.2.0 module load stack-openmpi/4.1.6 module load stack-python/3.10.13 From a0a1a710afc40300c08037cc91e14e206d018511 Mon Sep 17 00:00:00 2001 From: Natalie Perlin Date: Fri, 12 Jan 2024 15:20:48 +0000 Subject: [PATCH 2/2] Changes for NOAA Azure, remove use of intel/2018 compiler on NOAA platforms --- configs/sites/noaa-aws/compilers.yaml | 14 -------------- configs/sites/noaa-aws/packages.yaml | 8 -------- configs/sites/noaa-azure/compilers.yaml | 14 -------------- configs/sites/noaa-azure/packages.yaml | 12 ------------ configs/sites/noaa-gcloud/compilers.yaml | 14 -------------- configs/sites/noaa-gcloud/packages.yaml | 8 -------- configs/templates/unified-dev/spack.yaml | 8 -------- 7 files changed, 78 deletions(-) diff --git a/configs/sites/noaa-aws/compilers.yaml b/configs/sites/noaa-aws/compilers.yaml index 7a2b91b60..aec6336cf 100644 --- a/configs/sites/noaa-aws/compilers.yaml +++ b/configs/sites/noaa-aws/compilers.yaml @@ -16,20 +16,6 @@ compilers: PATH: '/apps/gnu/gcc-9.2.0/bin' LD_LIBRARY_PATH: '/apps/oneapi/compiler/2021.3.0/linux/compiler/lib/intel64_lin:/apps/gnu/gcc-9.2.0/lib64' extra_rpaths: [] -- compiler: - spec: intel@18.0.5 - paths: - cc: /apps/intel/parallel_studio_xe_2018.4.057/compilers_and_libraries_2018/linux/bin/intel64/icc - cxx: /apps/intel/parallel_studio_xe_2018.4.057/compilers_and_libraries_2018/linux/bin/intel64/icpc - 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 - target: x86_64 - modules: - - intel/18.0.5.274 - environment: {} - extra_rpaths: [] - compiler: spec: gcc@9.2.0 paths: diff --git a/configs/sites/noaa-aws/packages.yaml b/configs/sites/noaa-aws/packages.yaml index 1cbe78222..3af5a9560 100644 --- a/configs/sites/noaa-aws/packages.yaml +++ b/configs/sites/noaa-aws/packages.yaml @@ -1,10 +1,8 @@ packages: all: compiler:: [intel@2021.3.0, gcc@9.2.0] - #compiler:: [intel@18.0.5] providers: mpi:: [intel-oneapi-mpi@2021.3.0, openmpi@3.1.4] - #mpi:: [intel-mpi@2018.4.274] ### MPI, Python, MKL mpi: @@ -15,12 +13,6 @@ packages: prefix: /apps/oneapi modules: - impi/2021.3.0 - intel-mpi: - externals: - - spec: intel-mpi@2018.4.274%intel@18.0.5 - prefix: /apps/intel/compilers_and_libraries_2018 - modules: - - impi/2018.4.274 openmpi: externals: - spec: openmpi@3.1.4%gcc@9.2.0 diff --git a/configs/sites/noaa-azure/compilers.yaml b/configs/sites/noaa-azure/compilers.yaml index 7a2b91b60..aec6336cf 100644 --- a/configs/sites/noaa-azure/compilers.yaml +++ b/configs/sites/noaa-azure/compilers.yaml @@ -16,20 +16,6 @@ compilers: PATH: '/apps/gnu/gcc-9.2.0/bin' LD_LIBRARY_PATH: '/apps/oneapi/compiler/2021.3.0/linux/compiler/lib/intel64_lin:/apps/gnu/gcc-9.2.0/lib64' extra_rpaths: [] -- compiler: - spec: intel@18.0.5 - paths: - cc: /apps/intel/parallel_studio_xe_2018.4.057/compilers_and_libraries_2018/linux/bin/intel64/icc - cxx: /apps/intel/parallel_studio_xe_2018.4.057/compilers_and_libraries_2018/linux/bin/intel64/icpc - 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 - target: x86_64 - modules: - - intel/18.0.5.274 - environment: {} - extra_rpaths: [] - compiler: spec: gcc@9.2.0 paths: diff --git a/configs/sites/noaa-azure/packages.yaml b/configs/sites/noaa-azure/packages.yaml index 886727adf..6cec5293b 100644 --- a/configs/sites/noaa-azure/packages.yaml +++ b/configs/sites/noaa-azure/packages.yaml @@ -1,10 +1,8 @@ packages: all: compiler:: [intel@2021.3.0, gcc@9.2.0] - #compiler:: [intel@18.0.5] providers: mpi:: [intel-oneapi-mpi@2021.3.0, openmpi@3.1.4] - #mpi:: [intel-mpi@2018.4.274] ### MPI, Python, MKL mpi: @@ -15,12 +13,6 @@ packages: prefix: /apps/oneapi modules: - impi/2021.3.0 - intel-mpi: - externals: - - spec: intel-mpi@2018.4.274%intel@18.0.5 - prefix: /apps/intel/compilers_and_libraries_2018 - modules: - - impi/2018.4.274 openmpi: externals: - spec: openmpi@3.1.4%gcc@9.2.0 @@ -50,10 +42,6 @@ packages: externals: - spec: berkeley-db@5.3.21 prefix: /usr - cmake: - externals: - - spec: cmake@3.27.2 - prefix: /contrib/spack-stack/cmake-3.27.2 cpio: externals: - spec: cpio@2.11 diff --git a/configs/sites/noaa-gcloud/compilers.yaml b/configs/sites/noaa-gcloud/compilers.yaml index 7a2b91b60..aec6336cf 100644 --- a/configs/sites/noaa-gcloud/compilers.yaml +++ b/configs/sites/noaa-gcloud/compilers.yaml @@ -16,20 +16,6 @@ compilers: PATH: '/apps/gnu/gcc-9.2.0/bin' LD_LIBRARY_PATH: '/apps/oneapi/compiler/2021.3.0/linux/compiler/lib/intel64_lin:/apps/gnu/gcc-9.2.0/lib64' extra_rpaths: [] -- compiler: - spec: intel@18.0.5 - paths: - cc: /apps/intel/parallel_studio_xe_2018.4.057/compilers_and_libraries_2018/linux/bin/intel64/icc - cxx: /apps/intel/parallel_studio_xe_2018.4.057/compilers_and_libraries_2018/linux/bin/intel64/icpc - 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 - target: x86_64 - modules: - - intel/18.0.5.274 - environment: {} - extra_rpaths: [] - compiler: spec: gcc@9.2.0 paths: diff --git a/configs/sites/noaa-gcloud/packages.yaml b/configs/sites/noaa-gcloud/packages.yaml index b3abc7a21..7a7215bd7 100644 --- a/configs/sites/noaa-gcloud/packages.yaml +++ b/configs/sites/noaa-gcloud/packages.yaml @@ -1,10 +1,8 @@ packages: all: compiler:: [intel@2021.3.0, gcc@9.2.0] - #compiler:: [intel@18.0.5] providers: mpi:: [intel-oneapi-mpi@2021.3.0, openmpi@3.1.4] - #mpi:: [intel-mpi@2018.4.274] ### MPI, Python, MKL mpi: @@ -15,12 +13,6 @@ packages: prefix: /apps/oneapi modules: - impi/2021.3.0 - intel-mpi: - externals: - - spec: intel-mpi@2018.4.274%intel@18.0.5 - prefix: /apps/intel/compilers_and_libraries_2018 - modules: - - impi/2018.4.274 openmpi: externals: - spec: openmpi@3.1.4%gcc@9.2.0 diff --git a/configs/templates/unified-dev/spack.yaml b/configs/templates/unified-dev/spack.yaml index 54d6c1e69..8baebc82b 100644 --- a/configs/templates/unified-dev/spack.yaml +++ b/configs/templates/unified-dev/spack.yaml @@ -48,11 +48,3 @@ spack: exclude: # jedi-tools doesn't build with Intel - jedi-tools-env%intel - ## Don't even bother building those with Intel 18, - ## not needed. Many of the Python packages don't build. - #- ewok-env%intel@18 - #- jedi-fv3-env%intel@18 - #- jedi-tools-env%intel@18 - #- jedi-ufs-env%intel@18 - #- jedi-um-env%intel@18 - #- soca-env%intel@18