Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Create template for unified environment, test install on orion and AWS parallelcluster #454

Merged
merged 42 commits into from
Feb 18, 2023
Merged

Create template for unified environment, test install on orion and AWS parallelcluster #454

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
ee8de7a
Delete configs/common/packages.yaml and rename/update configs/templat…
climbfuji Jan 25, 2023
02761ae
Update configs/sites/orion/packages.yaml
climbfuji Jan 25, 2023
30d3dc1
Put pinning of py-poetry-core back in
climbfuji Jan 25, 2023
157e543
Update submodule pointer for spack
climbfuji Jan 25, 2023
25a6e5d
Update submodule pointer for spack
climbfuji Jan 25, 2023
c8f030a
Restore configs/common/packages.yaml
climbfuji Jan 26, 2023
dacdfc6
Update CI to use unified-dev
climbfuji Jan 26, 2023
b804780
Revert indent changes in configs/common/packages.yaml
climbfuji Jan 30, 2023
63ebfeb
[skip ci] Update versions of hdf5, netcdf-c, netcdf-fortran, parallel…
climbfuji Jan 30, 2023
b9d6c06
[skip ci] Update submodule pointer for spack
climbfuji Jan 30, 2023
bf386d3
Bump parallelio to 2.5.9
climbfuji Feb 1, 2023
a89a3ec
Add a known issue for macOS to documentation
climbfuji Feb 1, 2023
b5d8f87
Merge branch 'develop' of https://github.com/noaa-emc/spack-stack int…
climbfuji Feb 3, 2023
603940d
Add Orion Intel-18 config
climbfuji Feb 3, 2023
0f750d6
Update documentation to - for now - manually adjust the compiler matrix
climbfuji Feb 6, 2023
7df3d34
Debug CI tests
climbfuji Feb 8, 2023
c7e3bc0
Update .gitmodules and submodule pointer for spack for code review an…
climbfuji Feb 8, 2023
ffb7e33
Bug fix in .github/workflows/macos-dom.yaml
climbfuji Feb 8, 2023
fbaaf69
Update submodule pointer for spack
climbfuji Feb 9, 2023
06bc4a0
Update netcdf-c to 4.9.1
climbfuji Feb 9, 2023
b192d0f
Manually add the ESMF snapshot variant changes in configs/common/modu…
climbfuji Feb 9, 2023
35ca74d
Limit unified environment with Intel 18 to UFS libraries
climbfuji Feb 9, 2023
35e4986
Trigger CI
climbfuji Feb 9, 2023
e3eaf1b
Set snapshot variant for ESMF in configs/common/packages.yaml
climbfuji Feb 9, 2023
8d91209
Update submodule pointer for spack
climbfuji Feb 9, 2023
973216d
Update submodule pointer for spack
climbfuji Feb 10, 2023
327fee1
Revert netcdf-c back to 4.9.0
climbfuji Feb 10, 2023
9e0d5a1
Merge branch 'develop' of https://github.com/noaa-emc/spack-stack int…
climbfuji Feb 10, 2023
baebb9d
Revert CI tests to smaller templates
climbfuji Feb 10, 2023
b06a7f0
Change netcdf-c to 4.9.1 in configs/common/packages.yaml
climbfuji Feb 13, 2023
a932bf1
Update Orion site config and set variant for netcdf-c byterange in co…
climbfuji Feb 13, 2023
a9b3efd
Revert netcdf-c version one last time
climbfuji Feb 13, 2023
0fa7b1b
Update submodule pointer for spack
climbfuji Feb 14, 2023
272d0fe
Merge branch 'develop' of https://github.com/noaa-emc/spack-stack int…
climbfuji Feb 14, 2023
5b3ea91
Final touches to Orion packages and documentation
climbfuji Feb 14, 2023
f0b6a08
Update submodule pointer for spack
climbfuji Feb 14, 2023
037dea8
Remove logic for unified-dev from CI scripts
climbfuji Feb 14, 2023
df2f25d
Enable variant +szip for hdf5, required for global-workflow-env
climbfuji Feb 14, 2023
4b04929
Revert .gitmodules and update submodule pointer for spack
climbfuji Feb 15, 2023
2b9c16a
Shut off ncl on macOS
climbfuji Feb 16, 2023
3ed4632
Update .gitmodules and submodule pointer for spack
climbfuji Feb 16, 2023
b376663
Revert .gitmodules and update submodule pointer for spack
climbfuji Feb 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/macos-dom.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ on:
template:
description: 'Base spack.yaml template. Default is a complete JEDI-UFS environment.'
required: true
default: 'skylab-dev'
default: 'unified-dev'
specs:
description: 'Which specs to add to the template. Default is none (empty string).'
required: false
Expand All @@ -38,8 +38,8 @@ jobs:
- name: create-env
run: |
source ./setup.sh
spack stack create env --site macos.default --template ${{ inputs.template || 'skylab-dev' }} --name ${{ inputs.template || 'skylab-dev' }}.macos-dom
spack env activate -d envs/${{ inputs.template || 'skylab-dev' }}.macos-dom
spack stack create env --site macos.default --template ${{ inputs.template || 'unified-dev' }} --name ${{ inputs.template || 'unified-dev' }}.macos-dom
spack env activate -d envs/${{ inputs.template || 'unified-dev' }}.macos-dom
spack add ${{ inputs.specs || '' }}

spack external find
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/macos.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:
strategy:
matrix:
compiler-mpi: [ {compiler: [email protected], mpi: [email protected]} ]
template: [skylab-dev, ufs-weather-model, ufs-srw-dev]
template: [unified-dev] # [skylab-dev, ufs-weather-model, ufs-srw-dev]
runs-on: macos-11
steps:

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ubuntu.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:
strategy:
matrix:
compiler-mpi: [ {compiler: [email protected], mpi: [email protected]}, {compiler: [email protected], mpi: [email protected]}, {compiler: [email protected], mpi: [email protected]} ]
template: [skylab-dev, ufs-weather-model, ufs-srw-dev]
template: [unified-dev] # [skylab-dev, ufs-weather-model, ufs-srw-dev]
runs-on: ubuntu-20.04
steps:

Expand Down
10 changes: 6 additions & 4 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
[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
url = https://github.com/climbfuji/spack
branch = feature/unified-env
[submodule "doc/CMakeModules"]
path = doc/CMakeModules
url = https://github.com/noaa-emc/cmakemodules
Expand Down
12 changes: 6 additions & 6 deletions configs/common/modules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ modules:
arch_folder: false
tcl:
# Core compiler is a dummy that is not used to build the stack, do not change.
# Hopefully nobody is trying to build software with gcc-4.6 in 2022 ...
# Hopefully nobody is trying to build software with gcc-4.6 in 2023 ...
core_compilers::
- [email protected]
projections:
Expand Down Expand Up @@ -117,10 +117,10 @@ modules:
suffixes:
^[email protected]~debug: 'esmf-8.2.0'
^[email protected]+debug: 'esmf-8.2.0-debug'
^[email protected]~debug: 'esmf-8.3.0b09'
^[email protected]+debug: 'esmf-8.3.0b09-debug'
^[email protected]~debug: 'esmf-8.3.0'
^[email protected]+debug: 'esmf-8.3.0-debug'
^[email protected]~debug: 'esmf-8.3.0b09'
^[email protected]+debug: 'esmf-8.3.0b09-debug'
openmpi:
environment:
set:
Expand Down Expand Up @@ -231,7 +231,7 @@ modules:

lmod:
# Core compiler is a dummy that is not used to build the stack, do not change.
# Hopefully nobody is trying to build software with gcc-4.6 in 2022 ...
# Hopefully nobody is trying to build software with gcc-4.6 in 2023 ...
core_compilers::
- [email protected]
projections:
Expand Down Expand Up @@ -340,10 +340,10 @@ modules:
suffixes:
^[email protected]~debug: 'esmf-8.2.0'
^[email protected]+debug: 'esmf-8.2.0-debug'
^[email protected]~debug: 'esmf-8.3.0b09'
^[email protected]+debug: 'esmf-8.3.0b09-debug'
^[email protected]~debug: 'esmf-8.3.0'
^[email protected]+debug: 'esmf-8.3.0-debug'
^[email protected]~debug: 'esmf-8.3.0b09'
^[email protected]+debug: 'esmf-8.3.0b09-debug'
openmpi:
environment:
set:
Expand Down
Loading