Skip to content

Commit 8bd20e7

Browse files
xylarxylar
authored
Merge pull request #113 from xylar/update-to-1.9.2
Update to 1.9.2
2 parents 209c5fc + ea6c0b7 commit 8bd20e7

File tree

7 files changed

+85
-59
lines changed

7 files changed

+85
-59
lines changed

‎e3sm_supported_machines/bootstrap.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,12 +134,12 @@ def build_env(is_test, recreate, compiler, mpi, conda_mpi, version,
134134
channels = f'{channels} -c conda-forge/label/{package}_dev'
135135

136136
# edit if not using a release candidate for a given package
137-
dev_labels = ['zppy', 'zstash']
137+
dev_labels = ['e3sm_diags', 'e3sm_to_cmip', 'mache', 'mpas_analysis',
138+
'mpas_tools', 'zstash']
138139
for package in dev_labels:
139140
channels = f'{channels} -c conda-forge/label/{package}_dev'
140141
channels = f'{channels} ' \
141142
f'-c conda-forge ' \
142-
f'-c defaults ' \
143143
f'-c e3sm/label/e3sm_dev'
144144
else:
145145
channels = '--override-channels -c conda-forge -c defaults -c e3sm'

‎e3sm_supported_machines/default.cfg‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ python = 3.10
1818
mpi = nompi
1919

2020
# the version of ILAMB
21-
ilamb = 2.6
21+
ilamb = 2.7
2222

2323
# the version of mache to use during deployment (should match the version used
2424
# in the package itself)
25-
mache = 1.17.0
25+
mache = 1.18.0
2626

2727
# the version of mpi4py to build if using system compilers
28-
mpi4py = 3.1.4
28+
mpi4py = 3.1.5
2929

3030
# the version of esmpy to build if using system compilers (must match esmf from
3131
# spack below)

‎e3sm_supported_machines/shared.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
def parse_args(bootstrap):
1515
parser = argparse.ArgumentParser(
1616
description='Deploy E3SM-Unified')
17-
parser.add_argument("--version", dest="version", default="1.9.1",
17+
parser.add_argument("--version", dest="version", default="1.9.2",
1818
help="The version of E3SM-Unified to deploy")
1919
parser.add_argument("--conda", dest="conda_base",
2020
help="Path for the conda base")

‎e3sm_supported_machines/templates/load_e3sm_unified.sh.template‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ source {{ conda_base }}/etc/profile.d/mamba.sh
44
export E3SMU_SCRIPT="{{ script_filename }}"
55
export E3SMU_MACHINE="{{ machine }}"
66

7-
if [ -z "${SLURM_JOB_ID}" ] && [ -z "${COBALT_JOBID}" ]
7+
if [ -z ${SLURM_JOB_ID+x} ] && [ -z ${COBALT_JOBID+x} ]
88
then
99
# we seem to be on a login node, so load the no-MPI environment
1010

‎recipes/e3sm-unified/build_and_upload.bash‎

Lines changed: 31 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,44 @@
22

33
set -e
44

5-
rm -rf ~/mambaforge/conda-bld
5+
conda_dir=${HOME}/miniforge
6+
os_dir=linux-64
67
upload=False
78
dev=False
89

10+
rm -rf ${conda_dir}/conda-bld
11+
912
if [ $dev == "True" ]
1013
then
11-
channels="-c conda-forge/label/zstash_dev \
12-
-c conda-forge/label/zppy_dev \
14+
15+
channels="-c conda-forge/label/e3sm_diags_dev \
16+
-c conda-forge/label/e3sm_to_cmip_dev \
17+
-c conda-forge/label/mache_dev \
18+
-c conda-forge/label/mpas_analysis_dev \
19+
-c conda-forge/label/mpas_tools_dev \
20+
-c conda-forge/label/zstash_dev \
1321
-c conda-forge"
22+
23+
for file in configs/mpi_mpich_python3.10.yaml configs/mpi_hpc_python3.10.yaml
24+
do
25+
conda mambabuild -m $file --override-channels --use-local $channels .
26+
done
27+
28+
if [ $upload == "True" ]
29+
then
30+
anaconda upload -u e3sm -l e3sm_dev ${conda_dir}/conda-bld/${os_dir}/e3sm-unified-*.tar.bz2
31+
fi
32+
1433
else
15-
channels="-c conda-forge"
16-
fi
1734

18-
# for file in configs/mpi_mpich_python3.10.yaml configs/mpi_hpc_python3.10.yaml
19-
for file in configs/mpi_*_python*.yaml
20-
do
21-
conda mambabuild -m $file --override-channels --use-local $channels .
22-
done
35+
channels="-c conda-forge"
36+
for file in configs/mpi_*_python*.yaml
37+
do
38+
conda mambabuild -m $file --override-channels --use-local $channels .
39+
done
2340

24-
if [ $upload == "True" ]
25-
then
26-
anaconda upload -u e3sm ${HOME}/miniconda3/conda-bld/linux-64/e3sm-unified-*.tar.bz2
41+
if [ $upload == "True" ]
42+
then
43+
anaconda upload -u e3sm ${conda_dir}/conda-bld/${os_dir}/e3sm-unified-*.tar.bz2
44+
fi
2745
fi

‎recipes/e3sm-unified/conda_first_failure.py‎

Lines changed: 33 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,29 @@
22
import subprocess
33

44
specs = ['python=3.10',
5-
'openssl >=3.1.0,<4.0a0',
6-
#'globus-cli',
7-
'hdf5=1.14.0 nompi_*',
8-
'libnetcdf 4.9.2 nompi_*',
9-
'netcdf4 1.6.4 nompi_*',
10-
'xarray 2023.5.0',
11-
'dask 2023.6.0',
12-
'proj 9.2.1',
13-
'pyproj 3.6.0',
14-
#'e3sm_diags 2.8.0',
15-
#'e3sm_to_cmip 1.9.1',
5+
'ncvis-climate 2023.09.12',
6+
'libnetcdf 4.9.2 mpi_mpich_*',
7+
'chemdyg 0.1.4',
8+
'e3sm_diags 2.9.0',
9+
'e3sm_to_cmip 1.11.0',
1610
'geometric_features 1.2.0',
11+
'globus-cli >=3.15.0',
12+
'ilamb 2.7',
1713
'ipython',
1814
'jupyter',
1915
'livvkit 3.0.1',
20-
'mache 1.16.0rc1',
21-
'mpas-analysis 1.9.0rc1',
22-
'mpas_tools 0.20.0',
16+
'mache 1.17.0',
17+
'moab 5.5.1',
18+
'mpas-analysis 1.9.1rc1',
19+
'mpas_tools 0.27.0',
20+
'nco 5.1.9',
2321
'pcmdi_metrics 2.3.1',
24-
#'xcdat 0.5.0',
25-
#'zstash 1.3.0',
26-
'zppy 2.3.0rc1',
22+
'tempest-remap 2.2.0',
23+
'tempest-extremes 2.2.1',
24+
'xcdat 0.6.1',
25+
'zppy 2.3.1',
26+
'zstash 1.4.2rc1',
27+
'mpich',
2728
'blas',
2829
'bottleneck',
2930
'cartopy >=0.17.0',
@@ -32,27 +33,36 @@
3233
'cdtime 3.1.4',
3334
'cdutil 8.2.1',
3435
'cmocean',
36+
'dask 2023.6.0',
3537
'dogpile.cache',
3638
'eofs',
39+
'esmf 8.4.2 mpi_mpich_*',
40+
'esmpy 8.4.2',
3741
'f90nml',
3842
'ffmpeg',
3943
'genutil 8.2.1',
4044
'globus-sdk',
4145
'gsw',
46+
'hdf5 1.14.2 mpi_mpich_*',
4247
'ipygany',
4348
'lxml',
44-
'matplotlib',
49+
'matplotlib 3.7.1',
4550
'metpy',
51+
'mpi4py',
4652
'nb_conda',
4753
'nb_conda_kernels',
4854
'ncview 2.1.8',
49-
'ncvis-climate',
55+
'ncvis-climate 2023.09.12',
56+
'netcdf4 1.6.4 nompi_*',
57+
'notebook <7.0.0',
5058
'numpy >1.13',
5159
'output_viewer 1.3.3',
5260
'pillow',
5361
'plotly',
5462
'progressbar2',
63+
'proj 9.3.1',
5564
'pyevtk',
65+
'pyproj 3.6.1',
5666
'pyremap',
5767
'pytest',
5868
'pywavelets',
@@ -61,20 +71,19 @@
6171
'shapely',
6272
'sympy >=0.7.6',
6373
'tabulate',
74+
'xarray 2023.5.0',
6475
'xesmf',
6576
'cython',
6677
'cf-units >=2.0.0',
6778
'psutil',
68-
'pandas',
79+
'pandas'
6980
]
7081

7182
base_command = ['mamba', 'create', '-y', '-n', 'test', '--dry-run',
7283
'--override-channels',
73-
'-c', 'conda-forge/label/mache_dev',
7484
'-c', 'conda-forge/label/mpas_analysis_dev',
75-
'-c', 'conda-forge/label/zppy_dev',
76-
'-c', 'conda-forge',
77-
'-c', 'defaults']
85+
'-c', 'conda-forge/label/zstash_dev',
86+
'-c', 'conda-forge']
7887

7988
prevEnd = None
8089
highestValid = -1

‎recipes/e3sm-unified/meta.yaml‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{% set name = "E3SM-Unified" %}
2-
{% set version = "1.9.1" %}
2+
{% set version = "1.9.2" %}
33
{% set build = 0 %}
44

55
package:
@@ -31,26 +31,26 @@ requirements:
3131
### main packages ###
3232
- python
3333
- chemdyg 0.1.4
34-
- e3sm_diags 2.9.0
35-
- e3sm_to_cmip 1.10.0
34+
- e3sm_diags 2.10.1
35+
- e3sm_to_cmip 1.11.1
3636
- geometric_features 1.2.0
3737
# fixes an issues with cryptography <37 constraint
3838
- globus-cli >=3.15.0
39-
- ilamb 2.6 # [mpi != 'nompi' and mpi != 'hpc']
39+
- ilamb 2.7 # [mpi != 'nompi' and mpi != 'hpc']
4040
- ipython
4141
- jupyter
4242
- livvkit 3.0.1
43-
- mache 1.17.0
43+
- mache 1.18.0
4444
- moab 5.5.1 {{ mpi_prefix }}_tempest_* # [mpi != 'hpc']
45-
- mpas-analysis 1.9.0
46-
- mpas_tools 0.27.0
45+
- mpas-analysis 1.9.1
46+
- mpas_tools 0.30.0
4747
- nco 5.1.9 # [mpi != 'hpc']
4848
- pcmdi_metrics 2.3.1
4949
- tempest-remap 2.2.0 # [mpi != 'hpc']
5050
- tempest-extremes 2.2.1 {{ mpi_prefix }}_* # [mpi != 'hpc']
51-
- xcdat 0.5.0
51+
- xcdat 0.6.1
5252
- zppy 2.3.1
53-
- zstash 1.4.1 # [linux]
53+
- zstash 1.4.2 # [linux]
5454
### dependencies ###
5555
- {{ mpi }} # [mpi != 'nompi' and mpi != 'hpc']
5656
- blas
@@ -71,7 +71,7 @@ requirements:
7171
- genutil 8.2.1
7272
- globus-sdk
7373
- gsw
74-
- hdf5 1.14.2 {{ mpi_prefix }}_*
74+
- hdf5 1.14.3 {{ mpi_prefix }}_*
7575
- ipygany
7676
- libnetcdf 4.9.2 {{ mpi_prefix }}_*
7777
- lxml
@@ -81,7 +81,7 @@ requirements:
8181
- nb_conda
8282
- nb_conda_kernels
8383
- ncview 2.1.8
84-
- ncvis-climate
84+
- ncvis-climate 2023.09.12
8585
- netcdf4 1.6.4 nompi_*
8686
- notebook <7.0.0
8787
- numpy >1.13
@@ -90,9 +90,9 @@ requirements:
9090
- pillow
9191
- plotly
9292
- progressbar2
93-
- proj 9.2.1
93+
- proj 9.3.1
9494
- pyevtk
95-
- pyproj 3.6.0
95+
- pyproj 3.6.1
9696
- pyremap
9797
- pytest
9898
- pywavelets
@@ -104,7 +104,7 @@ requirements:
104104
- xarray 2023.5.0
105105
- xesmf
106106

107-
# addition ilamb 2.6 dependencies, for system MPI builds
107+
# addition ilamb 2.7 dependencies, for system MPI builds
108108
- cython
109109
- cf-units >=2.0.0
110110
- psutil
@@ -132,7 +132,6 @@ test:
132132
- zstash --help # [linux]
133133
- ilamb-fetch -h # [mpi != 'nompi' and mpi != 'hpc']
134134
- ilamb-run -h # [mpi != 'nompi' and mpi != 'hpc']
135-
- ilamb-table -h # [mpi != 'nompi' and mpi != 'hpc']
136135
- ncks --help # [mpi != 'hpc']
137136
- ncap2 --help # [mpi != 'hpc']
138137
- jupyter --help

0 commit comments

Comments
 (0)