diff options
| author | Chuck Atkins <chuck.atkins@kitware.com> | 2021-11-01 11:54:50 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-01 08:54:50 -0700 |
| commit | 15d407c6748bb236e633e11a4765b36436f35c76 (patch) | |
| tree | cdbb16ca16a72948853294261fe2c7f531b1b699 | |
| parent | a1eb5596eca33c6c006156f56bc25669ac827dbb (diff) | |
| download | spack-15d407c6748bb236e633e11a4765b36436f35c76.tar.gz spack-15d407c6748bb236e633e11a4765b36436f35c76.tar.bz2 spack-15d407c6748bb236e633e11a4765b36436f35c76.tar.xz spack-15d407c6748bb236e633e11a4765b36436f35c76.zip | |
ci: Enable more packages in the DVSDK CI pipeline (#27025)
* ci: Enable more packages in the DVSDK CI pipeline
* doxygen: Add conflicts for gcc bugs
* dray: Add version constraints for api breakage with newer deps
3 files changed, 15 insertions, 1 deletions
diff --git a/share/spack/gitlab/cloud_pipelines/stacks/data-vis-sdk/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/data-vis-sdk/spack.yaml index a92863201e..d67c8f1abb 100644 --- a/share/spack/gitlab/cloud_pipelines/stacks/data-vis-sdk/spack.yaml +++ b/share/spack/gitlab/cloud_pipelines/stacks/data-vis-sdk/spack.yaml @@ -10,21 +10,30 @@ spack: all: '{architecture}/{compiler.name}-{compiler.version}/{name}-{version}-{hash}' packages: + mesa: + variants: ~glx +osmesa + paraview: + variants: +osmesa all: target: [x86_64] # The spec will be gradually expanded to enable all the SDK components. - # Currently disabled: ascent, catalyst, cinema, paraview, unifyfs, visit, vtkm + # Currently disabled: ascent, catalyst, visit specs: - matrix: - - ecp-data-vis-sdk +adios2 + +ascent + +cinema +darshan +faodel +hdf5 + +paraview +pnetcdf +sz + +unifyfs +veloc + +vtkm +zfp mirrors: { "mirror": "s3://spack-binaries-develop/data-vis-sdk" } diff --git a/var/spack/repos/builtin/packages/doxygen/package.py b/var/spack/repos/builtin/packages/doxygen/package.py index 9d3df0a12a..06b4900374 100644 --- a/var/spack/repos/builtin/packages/doxygen/package.py +++ b/var/spack/repos/builtin/packages/doxygen/package.py @@ -88,6 +88,9 @@ class Doxygen(CMakePackage): # Workaround for gcc getting stuck in an infinite loop patch('gcc-partial-inlining-bug.patch', when='@1.8.20: %gcc@7') + # Some GCC 7.x get stuck in an infinite loop + conflicts('%gcc@7.0:7.9', when='@1.9:') + def patch(self): if self.spec['iconv'].name == 'libc': return diff --git a/var/spack/repos/builtin/packages/dray/package.py b/var/spack/repos/builtin/packages/dray/package.py index 737e428579..a994e86d81 100644 --- a/var/spack/repos/builtin/packages/dray/package.py +++ b/var/spack/repos/builtin/packages/dray/package.py @@ -69,6 +69,7 @@ class Dray(Package, CudaPackage): depends_on("apcomp~shared~openmp~mpi", when="~shared~openmp~mpi") depends_on("apcomp+shared~openmp~mpi", when="+shared~openmp~mpi") + depends_on("raja@:0.13", when="@:0.1.6") depends_on("raja+cuda~openmp+shared", when="+cuda~openmp+shared") depends_on("raja+cuda+openmp+shared", when="+cuda+openmp+shared") depends_on("raja+cuda~openmp~shared", when="+cuda~openmp~shared") @@ -79,6 +80,7 @@ class Dray(Package, CudaPackage): depends_on("raja~cuda~openmp~shared", when="~cuda~openmp~shared") depends_on("raja~cuda+openmp~shared", when="~cuda+openmp~shared") + depends_on("umpire@:4.9", when="@:0.1.6") depends_on("umpire+cuda+shared", when="+cuda+shared") depends_on("umpire+cuda~shared", when="+cuda~shared") depends_on("umpire~cuda+shared", when="~cuda+shared") |