From 5d70c0f1006fb8412bb3acdd9d28811d641345df Mon Sep 17 00:00:00 2001 From: eugeneswalker <38933153+eugeneswalker@users.noreply.github.com> Date: Tue, 8 Aug 2023 12:03:23 -0700 Subject: e4s ci: add libpressio (#34222) * e4s ci: add libpressio * libpressio ~cuda, +cuda: add +mgard --- share/spack/gitlab/cloud_pipelines/stacks/e4s/spack.yaml | 5 +++++ var/spack/repos/builtin/packages/cusz/package.py | 1 + var/spack/repos/builtin/packages/libpressio/package.py | 2 ++ 3 files changed, 8 insertions(+) diff --git a/share/spack/gitlab/cloud_pipelines/stacks/e4s/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/e4s/spack.yaml index 1e20d8778f..77eafdfbf2 100644 --- a/share/spack/gitlab/cloud_pipelines/stacks/e4s/spack.yaml +++ b/share/spack/gitlab/cloud_pipelines/stacks/e4s/spack.yaml @@ -97,6 +97,8 @@ spack: - lammps - legion - libnrm + - libpressio +bitgrooming +bzip2 ~cuda ~cusz +fpzip +hdf5 +libdistributed + +lua +openmp +python +sz +sz3 +unix +zfp +json +remote +netcdf +mgard - libquo - libunwind - mercury @@ -174,6 +176,9 @@ spack: - hypre +cuda - kokkos +wrapper +cuda - kokkos-kernels +cuda ^kokkos +wrapper +cuda +cuda_lambda + - libpressio +bitgrooming +bzip2 +fpzip +hdf5 +libdistributed +lua + +openmp +python +sz +sz3 +unix +zfp +json +remote +netcdf +cusz + +mgard +cuda ^cusz +cuda - magma +cuda - mfem +cuda - mgard +serial +openmp +timing +unstructured +cuda diff --git a/var/spack/repos/builtin/packages/cusz/package.py b/var/spack/repos/builtin/packages/cusz/package.py index abfec5ad34..500886889a 100644 --- a/var/spack/repos/builtin/packages/cusz/package.py +++ b/var/spack/repos/builtin/packages/cusz/package.py @@ -20,6 +20,7 @@ class Cusz(CMakePackage, CudaPackage): conflicts("cuda_arch=none", when="+cuda") version("develop", branch="develop") + version("0.3.1", commit="02be3cbd07db467decaf45ec9eb593ba6173c809") version("0.3", sha256="0feb4f7fd64879fe147624dd5ad164adf3983f79b2e0383d35724f8d185dcb11") # these version of Cuda provide the CUB headers, but not CUB cmake configuration that we use. diff --git a/var/spack/repos/builtin/packages/libpressio/package.py b/var/spack/repos/builtin/packages/libpressio/package.py index 05f0f25d23..2c2bfa48e3 100644 --- a/var/spack/repos/builtin/packages/libpressio/package.py +++ b/var/spack/repos/builtin/packages/libpressio/package.py @@ -344,6 +344,8 @@ class Libpressio(CMakePackage, CudaPackage): args.append("-DLIBPRESSIO_HAS_QoZ=ON") if "+cusz" in self.spec: args.append("-DLIBPRESSIO_HAS_CUSZ=ON") + if self.spec.satisfies("+cusz +cuda"): + args.append("-DCMAKE_EXE_LINKER_FLAGS=-Wl,--allow-shlib-undefined") if "+core" in self.spec: args.append("-DLIBPRESSIO_BUILD_MODE=FULL") else: -- cgit v1.2.3-60-g2f50