From 085e508713f23725bc76d575414a711125fd35de Mon Sep 17 00:00:00 2001 From: cameronbook Date: Tue, 27 Sep 2022 16:41:08 +0000 Subject: [PATCH 1/7] Add ufs-wm-dev template to develop. --- configs/templates/ufs-wm-dev/spack.yaml | 44 +++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 configs/templates/ufs-wm-dev/spack.yaml diff --git a/configs/templates/ufs-wm-dev/spack.yaml b/configs/templates/ufs-wm-dev/spack.yaml new file mode 100644 index 000000000..838c5f71a --- /dev/null +++ b/configs/templates/ufs-wm-dev/spack.yaml @@ -0,0 +1,44 @@ +spack: + config: + install_tree: + root: $env/install + deprecated: true + modules: + default: + roots: + lmod: $env/install/modulefiles + tcl: $env/install/modulefiles + lmod: + projections: + parallelio: 'pio/{version}' + tcl: + projections: + parallelio: '{^mpi.name}/{^mpi.version}/{compiler.name}/{compiler.version}/pio/{version}' + + include: [] + + concretizer: + unify: when_possible + + specs: + - jasper@2.0.25 + - zlib@1.2.11 + - libpng@1.6.37 + - hdf5@1.10.6 + - netcdf-c@4.7.4 + - netcdf-fortran@4.5.4 + - parallelio@2.5.7 + - esmf@8.3.0b09 + - fms@2022.01 + - bacio@2.4.1 + - crtm@2.3.0 + - g2@3.4.5 + - g2tmpl@1.10.0 + - ip@3.3.3 + - sp@2.3.3 + - w3emc@2.9.2 + - gftl-shared@1.5.0 + - yafyaml@0.5.1 + - mapl@2.22.0 + + From 80307564bfd1b571bd1342887bc8211298ad44a9 Mon Sep 17 00:00:00 2001 From: cameronbook Date: Thu, 6 Oct 2022 21:33:43 +0000 Subject: [PATCH 2/7] Remove ufs-wm-dev template to get fork dev aligned with main dev. --- configs/templates/ufs-wm-dev/spack.yaml | 44 ------------------------- 1 file changed, 44 deletions(-) delete mode 100644 configs/templates/ufs-wm-dev/spack.yaml diff --git a/configs/templates/ufs-wm-dev/spack.yaml b/configs/templates/ufs-wm-dev/spack.yaml deleted file mode 100644 index 838c5f71a..000000000 --- a/configs/templates/ufs-wm-dev/spack.yaml +++ /dev/null @@ -1,44 +0,0 @@ -spack: - config: - install_tree: - root: $env/install - deprecated: true - modules: - default: - roots: - lmod: $env/install/modulefiles - tcl: $env/install/modulefiles - lmod: - projections: - parallelio: 'pio/{version}' - tcl: - projections: - parallelio: '{^mpi.name}/{^mpi.version}/{compiler.name}/{compiler.version}/pio/{version}' - - include: [] - - concretizer: - unify: when_possible - - specs: - - jasper@2.0.25 - - zlib@1.2.11 - - libpng@1.6.37 - - hdf5@1.10.6 - - netcdf-c@4.7.4 - - netcdf-fortran@4.5.4 - - parallelio@2.5.7 - - esmf@8.3.0b09 - - fms@2022.01 - - bacio@2.4.1 - - crtm@2.3.0 - - g2@3.4.5 - - g2tmpl@1.10.0 - - ip@3.3.3 - - sp@2.3.3 - - w3emc@2.9.2 - - gftl-shared@1.5.0 - - yafyaml@0.5.1 - - mapl@2.22.0 - - From ed2eaa446e92011a2e2b4671833fd85c67b39e96 Mon Sep 17 00:00:00 2001 From: Cameron Book <43379611+ulmononian@users.noreply.github.com> Date: Tue, 21 Feb 2023 08:40:50 -0800 Subject: [PATCH 3/7] Update .gitmodules --- .gitmodules | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/.gitmodules b/.gitmodules index c92fbbc5e..d230ca57d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,10 +1,7 @@ [submodule "spack"] path = spack - #url = https://github.com/spack/spack - #branch = develop - url = https://github.com/NOAA-EMC/spack - branch = jcsda_emc_spack_stack -[submodule "doc/CMakeModules"] - path = doc/CMakeModules - url = https://github.com/noaa-emc/cmakemodules + url = https://github.com/spack/spack branch = develop + #url = https://github.com/NOAA-EMC/spack + #branch = jcsda_emc_spack_stack + From ef05e46db24b8eeb02fd213db08446098acd3f6d Mon Sep 17 00:00:00 2001 From: Cameron Book <43379611+ulmononian@users.noreply.github.com> Date: Tue, 21 Feb 2023 10:04:29 -0800 Subject: [PATCH 4/7] Update .gitmodules Revert to EMC spack-stack dev --- .gitmodules | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index d230ca57d..f72a46356 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,9 @@ [submodule "spack"] path = spack - url = https://github.com/spack/spack - branch = develop - #url = https://github.com/NOAA-EMC/spack - #branch = jcsda_emc_spack_stack - + #url = https://github.com/spack/spack + #branch = develop + url = https://github.com/NOAA-EMC/spack + branch = jcsda_emc_spack_stack +[submodule "doc/CMakeModules"] + path = doc/CMakeModules + url = https://github.com/noaa-emc/cmakemodules From 12d18180ce8c3469bdbaad618fa71946cb0f9561 Mon Sep 17 00:00:00 2001 From: Parallel Works app-run user Date: Mon, 13 Mar 2023 12:18:40 +0000 Subject: [PATCH 5/7] Fix .gitmodules branch in develop of fork. --- .gitmodules | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitmodules b/.gitmodules index f72a46356..c92fbbc5e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,3 +7,4 @@ [submodule "doc/CMakeModules"] path = doc/CMakeModules url = https://github.com/noaa-emc/cmakemodules + branch = develop From 7d299ea40b90cd80fd3e8d4c0996016e6307ed32 Mon Sep 17 00:00:00 2001 From: Cameron Book Date: Sun, 16 Jul 2023 00:10:48 -0500 Subject: [PATCH 6/7] Update Hercules' compilers.yaml and packages.yaml w/ intel 2023 for testing. --- configs/sites/hercules/compilers.yaml | 23 ++++++++++++++--------- configs/sites/hercules/packages.yaml | 14 +++++++++----- 2 files changed, 23 insertions(+), 14 deletions(-) diff --git a/configs/sites/hercules/compilers.yaml b/configs/sites/hercules/compilers.yaml index d0318bf40..36d8b436f 100644 --- a/configs/sites/hercules/compilers.yaml +++ b/configs/sites/hercules/compilers.yaml @@ -1,18 +1,23 @@ compilers: - compiler: - spec: intel@2021.7.1 + #spec: intel@2021.7.1 + spec: intel@2021.9.0 paths: - cc: /apps/spack-managed/gcc-11.3.1/intel-oneapi-compilers-2022.2.1-z2sjni66fcyqcsamnoccgb7c77mn37qj/compiler/2022.2.1/linux/bin/intel64/icc - cxx: /apps/spack-managed/gcc-11.3.1/intel-oneapi-compilers-2022.2.1-z2sjni66fcyqcsamnoccgb7c77mn37qj/compiler/2022.2.1/linux/bin/intel64/icpc - f77: /apps/spack-managed/gcc-11.3.1/intel-oneapi-compilers-2022.2.1-z2sjni66fcyqcsamnoccgb7c77mn37qj/compiler/2022.2.1/linux/bin/intel64/ifort - fc: /apps/spack-managed/gcc-11.3.1/intel-oneapi-compilers-2022.2.1-z2sjni66fcyqcsamnoccgb7c77mn37qj/compiler/2022.2.1/linux/bin/intel64/ifort - flags: - cflags: -diag-disable=10441 - cxxflags: -diag-disable=10441 + cc: /apps/spack-managed/gcc-11.3.1/intel-oneapi-compilers-2023.1.0-sb753366rvywq75zeg4ml5k5c72xgj72/compiler/2023.1.0/linux/bin/intel64/icc + cxx: /apps/spack-managed/gcc-11.3.1/intel-oneapi-compilers-2023.1.0-sb753366rvywq75zeg4ml5k5c72xgj72/compiler/2023.1.0/linux/bin/intel64/icpc + f77: /apps/spack-managed/gcc-11.3.1/intel-oneapi-compilers-2023.1.0-sb753366rvywq75zeg4ml5k5c72xgj72/compiler/2023.1.0/linux/bin/intel64/ifort + fc: /apps/spack-managed/gcc-11.3.1/intel-oneapi-compilers-2023.1.0-sb753366rvywq75zeg4ml5k5c72xgj72/compiler/2023.1.0/linux/bin/intel64/ifort + #cc: /apps/spack-managed/gcc-11.3.1/intel-oneapi-compilers-2022.2.1-z2sjni66fcyqcsamnoccgb7c77mn37qj/compiler/2022.2.1/linux/bin/intel64/icc + #cxx: /apps/spack-managed/gcc-11.3.1/intel-oneapi-compilers-2022.2.1-z2sjni66fcyqcsamnoccgb7c77mn37qj/compiler/2022.2.1/linux/bin/intel64/icpc + #f77: /apps/spack-managed/gcc-11.3.1/intel-oneapi-compilers-2022.2.1-z2sjni66fcyqcsamnoccgb7c77mn37qj/compiler/2022.2.1/linux/bin/intel64/ifort + #fc: /apps/spack-managed/gcc-11.3.1/intel-oneapi-compilers-2022.2.1-z2sjni66fcyqcsamnoccgb7c77mn37qj/compiler/2022.2.1/linux/bin/intel64/ifort + flags: {} + #cflags: -diag-disable=10441 + #cxxflags: -diag-disable=10441 operating_system: rocky9 target: x86_64 modules: - - intel-oneapi-compilers/2022.2.1 + - intel-oneapi-compilers/2023.1.0 environment: {} extra_rpaths: [] # Spack gets confused if both intel and oneapi are present diff --git a/configs/sites/hercules/packages.yaml b/configs/sites/hercules/packages.yaml index e29456191..ba7ec6aae 100644 --- a/configs/sites/hercules/packages.yaml +++ b/configs/sites/hercules/packages.yaml @@ -1,19 +1,23 @@ packages: all: - compiler:: [intel@2021.7.1, gcc@11.3.1] + compiler:: [intel@2021.9.0, gcc@11.3.1] #compiler:: [oneapi@2022.2.1] providers: - mpi:: [intel-oneapi-mpi@2021.7.1, openmpi@4.1.5] + mpi:: [intel-oneapi-mpi@2021.9.0, openmpi@4.1.5] ### MPI, Python, MKL mpi: buildable: False intel-oneapi-mpi: externals: - - spec: intel-oneapi-mpi@2021.7.1%intel@2021.7.1 - prefix: /apps/spack-managed/oneapi-2022.2.1/intel-oneapi-mpi-2021.7.1-zfmfvyc4a4wkhgxe2f34irg663e6dcoh + - spec: intel-oneapi-mpi@2021.9.0%intel@2021.9.0 + prefix: /apps/spack-managed/oneapi-2023.1.0/intel-oneapi-mpi-2021.9.0-a66eaipzsnyrdgaqzxmqmqz64qzvhkse modules: - - intel-oneapi-mpi/2021.7.1 + - intel-oneapi-mpi/2021.9.0 + #- spec: intel-oneapi-mpi@2021.7.1%intel@2021.7.1 + # prefix: /apps/spack-managed/oneapi-2022.2.1/intel-oneapi-mpi-2021.7.1-zfmfvyc4a4wkhgxe2f34irg663e6dcoh + # modules: + #- intel-oneapi-mpi/2021.7.1 #- spec: intel-oneapi-mpi@2021.7.1%oneapi@2022.2.1 # prefix: /apps/spack-managed/oneapi-2022.2.1/intel-oneapi-mpi-2021.7.1-zfmfvyc4a4wkhgxe2f34irg663e6dcoh # modules: From 32bcb72a56b3884ef537a0618e7de58eff4c2b93 Mon Sep 17 00:00:00 2001 From: Cameron Book Date: Mon, 17 Jul 2023 08:21:15 -0500 Subject: [PATCH 7/7] Update hercules compilers/packages YAMLS. --- configs/sites/hercules/compilers.yaml | 11 +++-------- configs/sites/hercules/packages.yaml | 9 --------- 2 files changed, 3 insertions(+), 17 deletions(-) diff --git a/configs/sites/hercules/compilers.yaml b/configs/sites/hercules/compilers.yaml index 36d8b436f..b92ec62bb 100644 --- a/configs/sites/hercules/compilers.yaml +++ b/configs/sites/hercules/compilers.yaml @@ -1,19 +1,14 @@ compilers: - compiler: - #spec: intel@2021.7.1 spec: intel@2021.9.0 paths: cc: /apps/spack-managed/gcc-11.3.1/intel-oneapi-compilers-2023.1.0-sb753366rvywq75zeg4ml5k5c72xgj72/compiler/2023.1.0/linux/bin/intel64/icc cxx: /apps/spack-managed/gcc-11.3.1/intel-oneapi-compilers-2023.1.0-sb753366rvywq75zeg4ml5k5c72xgj72/compiler/2023.1.0/linux/bin/intel64/icpc f77: /apps/spack-managed/gcc-11.3.1/intel-oneapi-compilers-2023.1.0-sb753366rvywq75zeg4ml5k5c72xgj72/compiler/2023.1.0/linux/bin/intel64/ifort fc: /apps/spack-managed/gcc-11.3.1/intel-oneapi-compilers-2023.1.0-sb753366rvywq75zeg4ml5k5c72xgj72/compiler/2023.1.0/linux/bin/intel64/ifort - #cc: /apps/spack-managed/gcc-11.3.1/intel-oneapi-compilers-2022.2.1-z2sjni66fcyqcsamnoccgb7c77mn37qj/compiler/2022.2.1/linux/bin/intel64/icc - #cxx: /apps/spack-managed/gcc-11.3.1/intel-oneapi-compilers-2022.2.1-z2sjni66fcyqcsamnoccgb7c77mn37qj/compiler/2022.2.1/linux/bin/intel64/icpc - #f77: /apps/spack-managed/gcc-11.3.1/intel-oneapi-compilers-2022.2.1-z2sjni66fcyqcsamnoccgb7c77mn37qj/compiler/2022.2.1/linux/bin/intel64/ifort - #fc: /apps/spack-managed/gcc-11.3.1/intel-oneapi-compilers-2022.2.1-z2sjni66fcyqcsamnoccgb7c77mn37qj/compiler/2022.2.1/linux/bin/intel64/ifort - flags: {} - #cflags: -diag-disable=10441 - #cxxflags: -diag-disable=10441 + flags: + cflags: -diag-disable=10441 + cxxflags: -diag-disable=10441 operating_system: rocky9 target: x86_64 modules: diff --git a/configs/sites/hercules/packages.yaml b/configs/sites/hercules/packages.yaml index ba7ec6aae..33048df19 100644 --- a/configs/sites/hercules/packages.yaml +++ b/configs/sites/hercules/packages.yaml @@ -1,7 +1,6 @@ packages: all: compiler:: [intel@2021.9.0, gcc@11.3.1] - #compiler:: [oneapi@2022.2.1] providers: mpi:: [intel-oneapi-mpi@2021.9.0, openmpi@4.1.5] @@ -14,14 +13,6 @@ packages: prefix: /apps/spack-managed/oneapi-2023.1.0/intel-oneapi-mpi-2021.9.0-a66eaipzsnyrdgaqzxmqmqz64qzvhkse modules: - intel-oneapi-mpi/2021.9.0 - #- spec: intel-oneapi-mpi@2021.7.1%intel@2021.7.1 - # prefix: /apps/spack-managed/oneapi-2022.2.1/intel-oneapi-mpi-2021.7.1-zfmfvyc4a4wkhgxe2f34irg663e6dcoh - # modules: - #- intel-oneapi-mpi/2021.7.1 - #- spec: intel-oneapi-mpi@2021.7.1%oneapi@2022.2.1 - # prefix: /apps/spack-managed/oneapi-2022.2.1/intel-oneapi-mpi-2021.7.1-zfmfvyc4a4wkhgxe2f34irg663e6dcoh - # modules: - # - intel-oneapi-mpi/2021.7.1 openmpi: externals: - spec: openmpi@4.1.5%gcc@11.3.1~cuda~cxx~cxx_exceptions~java~memchecker+pmi~static~wrapper-rpath