diff --git a/config.yaml b/config.yaml index e298a84..2f6318d 100644 --- a/config.yaml +++ b/config.yaml @@ -5,12 +5,12 @@ clusters: uarch: 'a100' partition: 'normal' variables: - F7T_URL: 'https://api.cscs.ch/mch/firecrest/v1' + F7T_URL: 'https://api.cscs.ch/mch/firecrest/v2' - uarch: 'zen3' partition: 'postproc' variables: - F7T_URL: 'https://api.cscs.ch/mch/firecrest/v1' + F7T_URL: 'https://api.cscs.ch/mch/firecrest/v2' SLURM_EXCLUSIVE: '' SLURM_NODES: '1' SLURM_CPU_BIND: 'none' diff --git a/readme.md b/readme.md index 30ed942..3bd60a7 100644 --- a/readme.md +++ b/readme.md @@ -21,6 +21,7 @@ UENV_CIBUILDV_GIT_CONFIG_VALUE_0=git@gitlab.dkrz.de: UENV_CIBUILDV_GIT_CONFIG_KEY_0=url.https://${NAME}:${TOKEN}@gitlab.dkrz.de/.insteadOf ``` + The `NAME` is specific to the git provider: | provider | `NAME` | diff --git a/recipes/fdb/5.18/environments.yaml b/recipes/fdb/5.18/environments.yaml index 34350cd..261bde2 100644 --- a/recipes/fdb/5.18/environments.yaml +++ b/recipes/fdb/5.18/environments.yaml @@ -6,11 +6,11 @@ fdb: mpi: null packages: [] specs: - - fdb@=5.18.3 backends=lustre + - fdb@git.develop backends=lustre - gribjump@=0.10.2 - - eckit@=1.32.3 linalg=none - - metkit@=1.15.2-levelist - - eccodes@=2.39.5 jp2k=none ~fortran +pthreads +aec + - eckit@git.feature/eckit-geo linalg=none compression=lz4 +curl +ssl + - metkit@git.levelist + - eccodes@git.feature/eckit-geo jp2k=none ~fortran +pthreads +aec +geo - ecbuild@=3.12.0 - python@=3.11.6 variants: diff --git a/recipes/fdb/5.18/post-install b/recipes/fdb/5.18/post-install index 07bc76d..d9ade37 100755 --- a/recipes/fdb/5.18/post-install +++ b/recipes/fdb/5.18/post-install @@ -1,4 +1,5 @@ #!/bin/bash +# test # Post-install for the uenv: # - Fetch eccodes/GRIB shared definitions # - Install Poetry and create a venv for FDB tooling diff --git a/recipes/fdb/5.18/repo/packages/eccodes/package.py b/recipes/fdb/5.18/repo/packages/eccodes/package.py index 836b865..46ba989 100644 --- a/recipes/fdb/5.18/repo/packages/eccodes/package.py +++ b/recipes/fdb/5.18/repo/packages/eccodes/package.py @@ -50,6 +50,8 @@ class Eccodes(CMakePackage): version("develop", branch="develop") + version("2.45.0", sha256="6c84b39d7cc5e3b8330eeabe880f3e337f9b2ee1ebce20ea03eecd785f6c39a1") + version("2.44.0", sha256="c75fb1f91b765b6b8b4774632a8a6fbcec96934db015fb63c2ad2560aedd443b") version("2.42.0", sha256="60371b357cb011dee546db2eabace5b7e27f0f87d3ea4a5adde7891371b3c128") version("2.39.5", git="https://github.com/ecmwf/eccodes.git", tag="2.39.5") version("2.39.0", sha256="0c4d746700acc49af9c878925f1b26bdd42443ff7c2d7c676deb2babb6847afb") @@ -99,9 +101,12 @@ class Eccodes(CMakePackage): description="List of extra definitions to install", ) + variant("geo", default=False, description="Enable eckit::geo") + depends_on("c", type="build") # generated depends_on("cxx", type="build") # generated depends_on("fortran", type="build") # generated + depends_on("eckit", when="+geo") depends_on("netcdf-c", when="+netcdf") # Cannot be built with openjpeg@2.0.x. @@ -325,6 +330,7 @@ def cmake_args(self): self.define_from_variant("ENABLE_ECCODES_THREADS", "pthreads"), self.define_from_variant("ENABLE_ECCODES_OMP_THREADS", "openmp"), self.define_from_variant("ENABLE_MEMFS", "memfs"), + self.define_from_variant("ENABLE_ECKIT_GEO", "geo"), self.define( "ENABLE_PYTHON{0}".format("2" if self.spec.satisfies("@2.20.0:") else ""), False ), diff --git a/recipes/fdb/5.18/repo/packages/eckit/package.py b/recipes/fdb/5.18/repo/packages/eckit/package.py index 2a16c8a..2546871 100644 --- a/recipes/fdb/5.18/repo/packages/eckit/package.py +++ b/recipes/fdb/5.18/repo/packages/eckit/package.py @@ -13,13 +13,16 @@ class Eckit(CMakePackage): and applications at ECMWF.""" homepage = "https://github.com/ecmwf/eckit" - git = "https://github.com/ecmwf/eckit.git" url = "https://github.com/ecmwf/eckit/archive/refs/tags/1.16.0.tar.gz" + git = "https://github.com/ecmwf/eckit.git" + list_url = "https://github.com/ecmwf/eckit/tags" maintainers("skosukhin", "climbfuji", "victoria-cherkas", "dominichofer") license("Apache-2.0") + version("1.33.1", sha256="89878eb491fbc22c99b88f5b2a1521e1e3fe4b3779b0254ce3e11929a48cea74") + version("1.33.0", sha256="a15f89df0cdaa2d8a74843a1e72a7b3b304958a4fe119b51eec5efadbf113d4f") version("1.32.3", sha256="33e0fac2656cdd2f2d877dbfe7a4751ee657ab732c00dd90bd48a406298a100f") version("1.32.2", sha256="f2940e99f1550119497418221e4c5073eb9c3ea776b15a4f56236ef4438a1210") version("1.31.4", sha256="045ebd9aaecf2773dc8c82f4226022776576cb0d911a76f8d1d069c97e9530c8") diff --git a/recipes/fdb/5.18/repo/packages/fdb/package.py b/recipes/fdb/5.18/repo/packages/fdb/package.py index 6a341e3..3d47bfc 100644 --- a/recipes/fdb/5.18/repo/packages/fdb/package.py +++ b/recipes/fdb/5.18/repo/packages/fdb/package.py @@ -18,6 +18,7 @@ class Fdb(CMakePackage): license("Apache-2.0") + version("develop", branch="develop") version("master", branch="master") version("5.18.3", sha256="8b6fff6c32923bd8e456f2ec1540b171b4efdbf92e81ae2e5ff2967dec224a86") version("5.18.0", sha256="d72c7180b9c0e3048a19bc60df6f2827e7849dea8299b7d3f21d5ffb7fc99951") diff --git a/recipes/fdb/5.18/repo/packages/metkit/package.py b/recipes/fdb/5.18/repo/packages/metkit/package.py index 58f245a..174c567 100644 --- a/recipes/fdb/5.18/repo/packages/metkit/package.py +++ b/recipes/fdb/5.18/repo/packages/metkit/package.py @@ -17,7 +17,8 @@ class Metkit(CMakePackage): maintainers("skosukhin", "victoria-cherkas", "dominichofer") license("Apache-2.0") - + + version("1.16.2", sha256="30a65a2cc14942e7ce64ea5539a1b6b85ecce336811014aba70e1f4f9e651f68") version( "1.15.2-levelist", sha256="25cebe7610949848671131ee3681e3e7e01d376e7b74e1a269872b9fba15ab54",