summaryrefslogtreecommitdiff
path: root/share/spack/gitlab
diff options
context:
space:
mode:
authorMassimiliano Culpo <massimiliano.culpo@gmail.com>2023-10-06 10:24:21 +0200
committerGitHub <noreply@github.com>2023-10-06 10:24:21 +0200
commite20c05fcdfc7a9ad995956bfee269e123860288f (patch)
treebb94c72fce83126116e0bcd8561a7c3b560ecc3c /share/spack/gitlab
parent36183eac408539e84323fe5ec514d7ae83e4bca6 (diff)
downloadspack-e20c05fcdfc7a9ad995956bfee269e123860288f.tar.gz
spack-e20c05fcdfc7a9ad995956bfee269e123860288f.tar.bz2
spack-e20c05fcdfc7a9ad995956bfee269e123860288f.tar.xz
spack-e20c05fcdfc7a9ad995956bfee269e123860288f.zip
Make "minimal" the default duplicate strategy (#39621)
* Allow branching out of the "generic build" unification set For cases like the one in https://github.com/spack/spack/pull/39661 we need to relax rules on unification sets. The issue is that, right now, nodes in the "generic build" unification set are unified together with their build dependencies. This was done out of caution to avoid the risk of circular dependencies, which would ultimately cause a very slow solve. For build-tools like Cython, however, the build dependencies is masked by a long chain of "build, run" dependencies that belong in the "generic build" unification space. To allow splitting on cases like this, we relax the rule disallowing branching out of the "generic build" unification set. * Fix issue with pure build virtual dependencies Pure build virtual dependencies were not accounted properly in the list of possible virtuals. This caused some facts connecting virtuals to the corresponding providers to not be emitted, and in the end lead to unsat problems. * Fixed a few issues in packages py-gevent: restore dependency on py-cython@3 jsoncpp: fix typo in build dependency ecp-data-vis-sdk: update spack.yaml and cmake recipe py-statsmodels: add v0.13.5 * Make dependency on "blt" of type "build"
Diffstat (limited to 'share/spack/gitlab')
-rw-r--r--share/spack/gitlab/cloud_pipelines/stacks/data-vis-sdk/spack.yaml16
1 files changed, 6 insertions, 10 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 b4534f0814..9963f4b777 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
@@ -4,22 +4,16 @@ spack:
cmake:
variants: ~ownlibs
ecp-data-vis-sdk:
- require:
- - one_of:
- - +ascent +adios2 +cinema +darshan +faodel +hdf5 +pnetcdf +sensei +sz +unifyfs
- +veloc +vtkm +zfp
- - one_of:
- - +paraview ~visit
- - ~paraview +visit
+ require: "+ascent +adios2 +cinema +darshan +faodel +hdf5 +pnetcdf +sensei +sz +unifyfs +veloc +vtkm +zfp"
hdf5:
require:
- one_of: ['@1.14', '@1.12']
mesa:
- require: +glx +osmesa +opengl ~opengles +llvm
+ require: "+glx +osmesa +opengl ~opengles +llvm"
libosmesa:
- require: mesa +osmesa
+ require: "mesa +osmesa"
libglx:
- require: mesa +glx
+ require: "mesa +glx"
ospray:
require: '@2.8.0 +denoiser +mpi'
llvm:
@@ -57,9 +51,11 @@ spack:
# Test ParaView and VisIt builds with different GL backends
- matrix:
- [$sdk_base_spec]
+ - ["+paraview ~visit"]
- [$^paraview_specs]
- matrix:
- [$sdk_base_spec]
+ - ["~paraview +visit"]
- [$^visit_specs]
mirrors: {mirror: s3://spack-binaries/develop/data-vis-sdk}