From 3e3ca5aab0b010c82cbebfc552cd0c6500b9f72f Mon Sep 17 00:00:00 2001 From: Xylar Asay-Davis Date: Wed, 13 Apr 2022 15:49:21 +0200 Subject: [PATCH 1/4] Update to compass v1.1.0-alpha.2 --- compass/version.py | 2 +- conda/recipe/meta.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/compass/version.py b/compass/version.py index fb1eacc3d6..5cf747c5c2 100644 --- a/compass/version.py +++ b/compass/version.py @@ -1 +1 @@ -__version__ = '1.1.0-alpha.1' +__version__ = '1.1.0-alpha.2' diff --git a/conda/recipe/meta.yaml b/conda/recipe/meta.yaml index f3b56d9084..cf7175c9aa 100644 --- a/conda/recipe/meta.yaml +++ b/conda/recipe/meta.yaml @@ -1,5 +1,5 @@ {% set name = "compass" %} -{% set version = "1.1.0alpha.1" %} +{% set version = "1.1.0alpha.2" %} {% set build = 0 %} {% if mpi == "nompi" %} From 0d25e2d6c849d587c4c5fde602dfa106610c6c77 Mon Sep 17 00:00:00 2001 From: Xylar Asay-Davis Date: Wed, 13 Apr 2022 15:45:51 +0200 Subject: [PATCH 2/4] Update to Scorpio 1.3.2 --- conda/compass_env/spec-file.template | 2 +- conda/default.cfg | 2 +- conda/recipe/meta.yaml | 2 +- conda/scorpio/recipe/meta.yaml | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/conda/compass_env/spec-file.template b/conda/compass_env/spec-file.template index 9d4c14afb6..e87fe5a4a1 100644 --- a/conda/compass_env/spec-file.template +++ b/conda/compass_env/spec-file.template @@ -40,7 +40,7 @@ cxx-compiler fortran-compiler libnetcdf=4.8.1={{ mpi_prefix }}_* libpnetcdf=1.12.2={{ mpi_prefix }}_* -scorpio=1.2.2={{ mpi_prefix }}_* +scorpio=1.3.2={{ mpi_prefix }}_* m4 make {{ mpi }} diff --git a/conda/default.cfg b/conda/default.cfg index a20e0540b3..2658f7b2a7 100644 --- a/conda/default.cfg +++ b/conda/default.cfg @@ -25,5 +25,5 @@ hdf5 = 1.12.1 netcdf_c = 4.8.1 netcdf_fortran = 4.5.3 pnetcdf = 1.12.2 -scorpio = 1.2.2 +scorpio = 1.3.2 albany = develop diff --git a/conda/recipe/meta.yaml b/conda/recipe/meta.yaml index cf7175c9aa..f13d45d8a1 100644 --- a/conda/recipe/meta.yaml +++ b/conda/recipe/meta.yaml @@ -80,7 +80,7 @@ requirements: - make - {{ mpi }} - netcdf-fortran - - scorpio 1.2.2 {{ mpi_prefix }}_* + - scorpio 1.3.2 {{ mpi_prefix }}_* {% endif %} test: diff --git a/conda/scorpio/recipe/meta.yaml b/conda/scorpio/recipe/meta.yaml index 2188620588..4628640d32 100644 --- a/conda/scorpio/recipe/meta.yaml +++ b/conda/scorpio/recipe/meta.yaml @@ -1,5 +1,5 @@ -{% set version = "1.2.2" %} -{% set build = 2 %} +{% set version = "1.3.2" %} +{% set build = 0 %} # recipe-lint fails if mpi is undefined {% set mpi = mpi or 'mpich' %} @@ -14,7 +14,7 @@ package: source: url: https://github.com/E3SM-Project/scorpio/archive/refs/tags/scorpio-v{{ version }}.tar.gz - sha256: f944a8b8527b188cf474d9cd26c0aaae5d8a263c245eb67cad92d8dd02ca7bfb + sha256: 663805fa24e85c88509ecd7893264e3d7d2ff27efb304e0f75dd1f0c450b08a6 build: number: {{ build }} From 77416fbca3a969a51c4ea6580340d1e9d626c841 Mon Sep 17 00:00:00 2001 From: Xylar Asay-Davis Date: Thu, 14 Apr 2022 09:58:01 +0200 Subject: [PATCH 3/4] Update scorpio conda recipe --- conda/scorpio/recipe/build.sh | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/conda/scorpio/recipe/build.sh b/conda/scorpio/recipe/build.sh index 0df898c86a..ffe22dd9cd 100644 --- a/conda/scorpio/recipe/build.sh +++ b/conda/scorpio/recipe/build.sh @@ -6,13 +6,15 @@ export PNETCDF_PATH=$(dirname $(dirname $(which pnetcdf-config))) mkdir build cd build +# turning TESTS off temporarily because of a bug in 1.3.2 FC=mpifort CC=mpicc CXX=mpicxx cmake \ -DCMAKE_INSTALL_PREFIX=$PREFIX \ - -DPIO_USE_MALLOC=ON \ - -DPIO_ENABLE_TOOLS=OFF \ - -DPIO_ENABLE_TESTS=ON \ - -DPIO_ENABLE_TIMING=OFF \ - -DPIO_ENABLE_INTERNAL_TIMING=ON \ + -DPIO_USE_MALLOC:BOOL=ON \ + -DPIO_ENABLE_TOOLS:BOOL=OFF \ + -DPIO_ENABLE_TESTS:BOOL=OFF \ + -DPIO_ENABLE_EXAMPLES:BOOL=OFF \ + -DPIO_ENABLE_TIMING:BOOL=OFF \ + -DPIO_ENABLE_INTERNAL_TIMING:BOOL=ON \ -DNetCDF_C_PATH=$NETCDF_C_PATH \ -DNetCDF_Fortran_PATH=$NETCDF_FORTRAN_PATH \ -DPnetCDF_PATH=$PNETCDF_PATH .. From 37ae401c05f9e86f72c5c3998058b96e9d1d0c11 Mon Sep 17 00:00:00 2001 From: Xylar Asay-Davis Date: Fri, 15 Apr 2022 03:22:08 -0500 Subject: [PATCH 4/4] Turn on timing for scorpio because of bug There is a known bug in v1.3.2 that means scorpio depends on GPTL even when timing is off. The easiest fix for now is to turn on timing and bring in this dependency. --- conda/bootstrap.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/bootstrap.py b/conda/bootstrap.py index 25aafaf8c0..d63f28ca6c 100755 --- a/conda/bootstrap.py +++ b/conda/bootstrap.py @@ -305,7 +305,7 @@ def build_spack_env(config, update_spack, machine, compiler, mpi, env_name, if esmf != 'None': specs.append(f'esmf@{esmf}+mpi+netcdf~pio+pnetcdf') if scorpio != 'None': - specs.append(f'scorpio@{scorpio}+pnetcdf~timing+internal-timing~tools+malloc') + specs.append(f'scorpio@{scorpio}+pnetcdf+timing+internal-timing~tools+malloc') if albany != 'None': specs.append(f'albany@{albany}+mpas')