From d33a70cca54ce59a3427f56e57e95be36db37f2c Mon Sep 17 00:00:00 2001 From: AlexanderRichert-NOAA Date: Thu, 23 Jan 2025 01:24:43 +0000 Subject: [PATCH 1/4] add provides's for hdf5, netcdf-c, esmf, python --- var/spack/repos/builtin/packages/esmf/package.py | 3 +++ var/spack/repos/builtin/packages/hdf5/package.py | 3 +++ var/spack/repos/builtin/packages/netcdf-c/package.py | 3 +++ var/spack/repos/builtin/packages/python/package.py | 3 +++ 4 files changed, 12 insertions(+) diff --git a/var/spack/repos/builtin/packages/esmf/package.py b/var/spack/repos/builtin/packages/esmf/package.py index 98ac62e7e57d2e..bdf4813287d5ba 100644 --- a/var/spack/repos/builtin/packages/esmf/package.py +++ b/var/spack/repos/builtin/packages/esmf/package.py @@ -66,6 +66,9 @@ class Esmf(MakefilePackage, PythonExtension): deprecated=True, ) + # For WCOSS2 (JCSDA repo only): + provides("esmf_virt") + depends_on("c", type="build") # generated depends_on("cxx", type="build") # generated depends_on("fortran", type="build") # generated diff --git a/var/spack/repos/builtin/packages/hdf5/package.py b/var/spack/repos/builtin/packages/hdf5/package.py index cf06058312058f..516b04b3537e5d 100644 --- a/var/spack/repos/builtin/packages/hdf5/package.py +++ b/var/spack/repos/builtin/packages/hdf5/package.py @@ -109,6 +109,9 @@ class Hdf5(CMakePackage): version("1.8.12", sha256="b5cccea850096962b5fd9e96f22c4f47d2379224bb41130d9bc038bb6c37dfcb") version("1.8.10", sha256="4813b79c5fb8701a625b9924b8203bc7154a77f9b826ad4e034144b4056a160a") + # For WCOSS2 (JCSDA repo only): + provides("hdf5_virt") + depends_on("c", type="build") # generated depends_on("cxx", type="build") # generated depends_on("fortran", type="build") # generated diff --git a/var/spack/repos/builtin/packages/netcdf-c/package.py b/var/spack/repos/builtin/packages/netcdf-c/package.py index 986fbfe7492ddf..f2355c5a943d10 100644 --- a/var/spack/repos/builtin/packages/netcdf-c/package.py +++ b/var/spack/repos/builtin/packages/netcdf-c/package.py @@ -53,6 +53,9 @@ class NetcdfC(CMakePackage, AutotoolsPackage): version("4.3.3.1", sha256="f2ee78eb310637c007f001e7c18e2d773d23f3455242bde89647137b7344c2e2") version("4.3.3", sha256="3f16e21bc3dfeb3973252b9addf5defb48994f84fc9c9356081f871526a680e7") + # For WCOSS2 (JCSDA repo only): + provides("netcdf_c_virt") + depends_on("c", type="build") # generated depends_on("cxx", type="build") # generated diff --git a/var/spack/repos/builtin/packages/python/package.py b/var/spack/repos/builtin/packages/python/package.py index fb470b3af2a5ae..2b30153a3d8297 100644 --- a/var/spack/repos/builtin/packages/python/package.py +++ b/var/spack/repos/builtin/packages/python/package.py @@ -222,6 +222,9 @@ class Python(Package): deprecated=True, ) + # For WCOSS2 (JCSDA repo only): + provides("python_virt") + depends_on("c", type="build") # generated depends_on("cxx", type="build") # generated From 56910bdc521cb6318b904fe3e81a9db0d92e34fc Mon Sep 17 00:00:00 2001 From: AlexanderRichert-NOAA Date: Thu, 23 Jan 2025 01:46:22 +0000 Subject: [PATCH 2/4] add defaults for dummy providers --- etc/spack/defaults/packages.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/etc/spack/defaults/packages.yaml b/etc/spack/defaults/packages.yaml index b9fdd4b3dbaf86..4f255f97c9294f 100644 --- a/etc/spack/defaults/packages.yaml +++ b/etc/spack/defaults/packages.yaml @@ -25,6 +25,7 @@ packages: D: [ldc] daal: [intel-oneapi-daal] elf: [elfutils] + esmf_virt: [esmf] fftw-api: [fftw, amdfftw] flame: [libflame, amdlibflame] fortran: [gcc] @@ -34,6 +35,7 @@ packages: glu: [mesa-glu, openglu] golang: [go, gcc] go-or-gccgo-bootstrap: [go-bootstrap, gcc] + hdf5: [hdf5_virt] iconv: [libiconv] ipp: [intel-oneapi-ipp] java: [openjdk, jdk, ibm-java] @@ -51,11 +53,13 @@ packages: mpe: [mpe2] mpi: [openmpi, mpich] mysql-client: [mysql, mariadb-c-client] + netcdf_c_virt: [netcdf-c] opencl: [pocl] onedal: [intel-oneapi-dal] pbs: [openpbs, torque] pil: [py-pillow] pkgconfig: [pkgconf, pkg-config] + python_virt: [python] qmake: [qt-base, qt] rpc: [libtirpc] scalapack: [netlib-scalapack, amdscalapack] From d6733b9c2be3f8da8a5a8ad95ba26d5405d340ec Mon Sep 17 00:00:00 2001 From: Alex Richert Date: Wed, 22 Jan 2025 20:59:10 -0500 Subject: [PATCH 3/4] Update packages.yaml --- etc/spack/defaults/packages.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/spack/defaults/packages.yaml b/etc/spack/defaults/packages.yaml index 4f255f97c9294f..096fb737319f56 100644 --- a/etc/spack/defaults/packages.yaml +++ b/etc/spack/defaults/packages.yaml @@ -35,7 +35,7 @@ packages: glu: [mesa-glu, openglu] golang: [go, gcc] go-or-gccgo-bootstrap: [go-bootstrap, gcc] - hdf5: [hdf5_virt] + hdf5_virt: [hdf5] iconv: [libiconv] ipp: [intel-oneapi-ipp] java: [openjdk, jdk, ibm-java] From cf0a50d8e076d697a28335bc0020562b2fcacb77 Mon Sep 17 00:00:00 2001 From: Alex Richert Date: Fri, 24 Jan 2025 12:34:07 -0800 Subject: [PATCH 4/4] _virt -> _virtual --- etc/spack/defaults/packages.yaml | 9 +++++---- var/spack/repos/builtin/packages/esmf/package.py | 4 ++-- var/spack/repos/builtin/packages/hdf5/package.py | 4 ++-- var/spack/repos/builtin/packages/netcdf-c/package.py | 4 ++-- var/spack/repos/builtin/packages/python/package.py | 4 ++-- 5 files changed, 13 insertions(+), 12 deletions(-) diff --git a/etc/spack/defaults/packages.yaml b/etc/spack/defaults/packages.yaml index 096fb737319f56..830bf07e5cfa3d 100644 --- a/etc/spack/defaults/packages.yaml +++ b/etc/spack/defaults/packages.yaml @@ -25,7 +25,6 @@ packages: D: [ldc] daal: [intel-oneapi-daal] elf: [elfutils] - esmf_virt: [esmf] fftw-api: [fftw, amdfftw] flame: [libflame, amdlibflame] fortran: [gcc] @@ -35,7 +34,6 @@ packages: glu: [mesa-glu, openglu] golang: [go, gcc] go-or-gccgo-bootstrap: [go-bootstrap, gcc] - hdf5_virt: [hdf5] iconv: [libiconv] ipp: [intel-oneapi-ipp] java: [openjdk, jdk, ibm-java] @@ -53,13 +51,11 @@ packages: mpe: [mpe2] mpi: [openmpi, mpich] mysql-client: [mysql, mariadb-c-client] - netcdf_c_virt: [netcdf-c] opencl: [pocl] onedal: [intel-oneapi-dal] pbs: [openpbs, torque] pil: [py-pillow] pkgconfig: [pkgconf, pkg-config] - python_virt: [python] qmake: [qt-base, qt] rpc: [libtirpc] scalapack: [netlib-scalapack, amdscalapack] @@ -73,6 +69,11 @@ packages: yacc: [bison, byacc] ziglang: [zig] zlib-api: [zlib-ng+compat, zlib] + # Dummy providers for module hierarchy (JCSDA repo only): + esmf_virtual: [esmf] + hdf5_virtual: [hdf5] + netcdf_c_virtual: [netcdf-c] + python_virtual: [python] permissions: read: world write: user diff --git a/var/spack/repos/builtin/packages/esmf/package.py b/var/spack/repos/builtin/packages/esmf/package.py index bdf4813287d5ba..361e8a8d7ddd65 100644 --- a/var/spack/repos/builtin/packages/esmf/package.py +++ b/var/spack/repos/builtin/packages/esmf/package.py @@ -66,8 +66,8 @@ class Esmf(MakefilePackage, PythonExtension): deprecated=True, ) - # For WCOSS2 (JCSDA repo only): - provides("esmf_virt") + # For module hierarchy (JCSDA repo only): + provides("esmf_virtual") depends_on("c", type="build") # generated depends_on("cxx", type="build") # generated diff --git a/var/spack/repos/builtin/packages/hdf5/package.py b/var/spack/repos/builtin/packages/hdf5/package.py index 516b04b3537e5d..8dcf7abfd4d0bd 100644 --- a/var/spack/repos/builtin/packages/hdf5/package.py +++ b/var/spack/repos/builtin/packages/hdf5/package.py @@ -109,8 +109,8 @@ class Hdf5(CMakePackage): version("1.8.12", sha256="b5cccea850096962b5fd9e96f22c4f47d2379224bb41130d9bc038bb6c37dfcb") version("1.8.10", sha256="4813b79c5fb8701a625b9924b8203bc7154a77f9b826ad4e034144b4056a160a") - # For WCOSS2 (JCSDA repo only): - provides("hdf5_virt") + # For module hierarchy (JCSDA repo only): + provides("hdf5_virtual") depends_on("c", type="build") # generated depends_on("cxx", type="build") # generated diff --git a/var/spack/repos/builtin/packages/netcdf-c/package.py b/var/spack/repos/builtin/packages/netcdf-c/package.py index f2355c5a943d10..9ea284a57bf159 100644 --- a/var/spack/repos/builtin/packages/netcdf-c/package.py +++ b/var/spack/repos/builtin/packages/netcdf-c/package.py @@ -53,8 +53,8 @@ class NetcdfC(CMakePackage, AutotoolsPackage): version("4.3.3.1", sha256="f2ee78eb310637c007f001e7c18e2d773d23f3455242bde89647137b7344c2e2") version("4.3.3", sha256="3f16e21bc3dfeb3973252b9addf5defb48994f84fc9c9356081f871526a680e7") - # For WCOSS2 (JCSDA repo only): - provides("netcdf_c_virt") + # For module hierarchy (JCSDA repo only): + provides("netcdf_c_virtual") depends_on("c", type="build") # generated depends_on("cxx", type="build") # generated diff --git a/var/spack/repos/builtin/packages/python/package.py b/var/spack/repos/builtin/packages/python/package.py index 2b30153a3d8297..78e752071df586 100644 --- a/var/spack/repos/builtin/packages/python/package.py +++ b/var/spack/repos/builtin/packages/python/package.py @@ -222,8 +222,8 @@ class Python(Package): deprecated=True, ) - # For WCOSS2 (JCSDA repo only): - provides("python_virt") + # For module hierarchy (JCSDA repo only): + provides("python_virtual") depends_on("c", type="build") # generated depends_on("cxx", type="build") # generated