diff --git a/README.md b/README.md index 98143aa320..caf5149078 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,7 @@ Spack is the package manager used by C2SM and MeteoSwiss to install and deploy s **Infos about c2sm-supported software and machines** * [spack-c2sm latest](https://C2SM.github.io/spack-c2sm/latest) + * [spack-c2sm v0.18.1.12](https://C2SM.github.io/spack-c2sm/v0.18.1.12) * [spack-c2sm v0.18.1.10](https://C2SM.github.io/spack-c2sm/v0.18.1.10) * [spack-c2sm v0.18.1.9](https://C2SM.github.io/spack-c2sm/v0.18.1.9) * [spack-c2sm v0.18.1.8](https://C2SM.github.io/spack-c2sm/v0.18.1.8) @@ -27,7 +28,7 @@ With spack v0.18 we suggest local/individual spack instances and the use of spac A user clones the spack repo ```bash -git clone --depth 1 --recurse-submodules --shallow-submodules -b v0.18.1.10 https://github.com/C2SM/spack-c2sm.git +git clone --depth 1 --recurse-submodules --shallow-submodules -b v0.18.1.12 https://github.com/C2SM/spack-c2sm.git ``` gets spack in the command line ```bash diff --git a/docs/QuickStart.rst b/docs/QuickStart.rst index 5c377ad43d..438a63da42 100644 --- a/docs/QuickStart.rst +++ b/docs/QuickStart.rst @@ -9,7 +9,7 @@ To set up a Spack instance, clone the repository .. code-block:: console - $ git clone --depth 1 --recurse-submodules --shallow-submodules -b v0.18.1.10 https://github.com/C2SM/spack-c2sm.git + $ git clone --depth 1 --recurse-submodules --shallow-submodules -b v0.18.1.12 https://github.com/C2SM/spack-c2sm.git To load it into your command line, execute @@ -113,7 +113,7 @@ Example to build ICON for CPU with NVHPC: .. code-block:: console - $ spack env activate -d config/cscs/spack/v0.18.1.10/daint_cpu_nvhpc + $ spack env activate -d config/cscs/spack/v0.18.1.12/daint_cpu_nvhpc $ spack install .. attention:: @@ -126,7 +126,7 @@ Out-of-source builds are possible as follows: $ mkdir cpu && cd cpu $ cp -r ../config . - $ spack env activate -d config/cscs/spack/v0.18.1.10/daint_cpu_nvhpc + $ spack env activate -d config/cscs/spack/v0.18.1.12/daint_cpu_nvhpc $ spack install .. attention:: diff --git a/docs/Testing.rst b/docs/Testing.rst index 68e92f725a..5444522178 100644 --- a/docs/Testing.rst +++ b/docs/Testing.rst @@ -10,7 +10,7 @@ This is a common way to do it. .. code-block:: console # cd into the packages repo! - $ git clone --depth 1 --recurse-submodules --shallow-submodules -b v0.18.1.10 https://github.com/C2SM/spack-c2sm.git + $ git clone --depth 1 --recurse-submodules --shallow-submodules -b v0.18.1.12 https://github.com/C2SM/spack-c2sm.git $ . spack-c2sm/setup-env.sh $ spack dev-build --test=root --show-log-on-error @develop diff --git a/docs/UpstreamManagement.rst b/docs/UpstreamManagement.rst index be5608cac1..22546d2fff 100644 --- a/docs/UpstreamManagement.rst +++ b/docs/UpstreamManagement.rst @@ -7,7 +7,7 @@ its own software stack. Install upstream ---------------------- -The upstream instances are installed for each tag through a dedicated `Jenkinks plan (Install upstream) `_. +The upstream instances are installed for each tag through a dedicated `Jenkinks plan (Install upstream) `_. Each new tag of spack-c2sm needs a new plan, it can simply be copied from existing one. The only thing to adapt is the default value of the spack-tag. Uninstall upstream diff --git a/sysconfigs/daint/upstreams.yaml b/sysconfigs/daint/upstreams.yaml index eca8ee08b6..b66a655703 100644 --- a/sysconfigs/daint/upstreams.yaml +++ b/sysconfigs/daint/upstreams.yaml @@ -1,7 +1,7 @@ upstreams: base: - install_tree: /project/g110/spack/upstream/daint_v0.18.1.5/base + install_tree: /project/g110/spack/upstream/daint_v0.18.1.12/base icon-dsl: - install_tree: /project/g110/spack/upstream/daint_v0.18.1.7/icon-dsl + install_tree: /project/g110/spack/upstream/daint_v0.18.1.12/icon-dsl icon-rttov: - install_tree: /project/g110/spack/upstream/daint_v0.18.1.5/icon-rttov + install_tree: /project/g110/spack/upstream/daint_v0.18.1.12/icon-rttov diff --git a/test/unit_test.py b/test/unit_test.py index 357d4fcdd5..b75b159f96 100644 --- a/test/unit_test.py +++ b/test/unit_test.py @@ -145,7 +145,7 @@ def test_upstream_from_config(self): upstream_base = read_upstream_from_spack_yaml( os.path.join(os.path.normpath(spack_c2sm_path), 'upstreams/daint/base')) - self.assertEqual('/project/g110/spack/upstream/daint_v0.18.1.5/base', + self.assertEqual('/project/g110/spack/upstream/daint_v0.18.1.12/base', upstream_base) def test_upstream_from_another_tag(self): diff --git a/upstreams/daint/base/spack.yaml b/upstreams/daint/base/spack.yaml index 4b2106462f..205b84e915 100644 --- a/upstreams/daint/base/spack.yaml +++ b/upstreams/daint/base/spack.yaml @@ -26,4 +26,4 @@ spack: view: false config: install_tree: - root: /project/g110/spack/upstream/daint_v0.18.1.5/base + root: /project/g110/spack/upstream/daint_v0.18.1.12/base diff --git a/upstreams/daint/icon-dsl/spack.yaml b/upstreams/daint/icon-dsl/spack.yaml index 79b77c905a..7e9d08cc30 100644 --- a/upstreams/daint/icon-dsl/spack.yaml +++ b/upstreams/daint/icon-dsl/spack.yaml @@ -4,9 +4,10 @@ spack: - py-icon4py@0.0.6%gcc@9.3.0 - py-gt4py@1.1.1%gcc@9.3.0 - py-gt4py@1.1.2%gcc@9.3.0 + - py-gt4py@1.1.3%gcc@9.3.0 concretizer: unify: when_possible view: false config: install_tree: - root: /project/g110/spack/upstream/daint_v0.18.1.7/icon-dsl + root: /project/g110/spack/upstream/daint_v0.18.1.12/icon-dsl diff --git a/upstreams/daint/icon-rttov/spack.yaml b/upstreams/daint/icon-rttov/spack.yaml index 78bf1438f2..ab6d48a8e8 100644 --- a/upstreams/daint/icon-rttov/spack.yaml +++ b/upstreams/daint/icon-rttov/spack.yaml @@ -12,4 +12,4 @@ spack: view: false config: install_tree: - root: /project/g110/spack/upstream/daint_v0.18.1.5/icon-rttov + root: /project/g110/spack/upstream/daint_v0.18.1.12/icon-rttov