diff options
| author | kwryankrattiger <80296582+kwryankrattiger@users.noreply.github.com> | 2023-04-18 13:39:47 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-18 13:39:47 -0500 |
| commit | 9745865250dfd1504fb4c90a0e835be3e2fe53ff (patch) | |
| tree | 9b07b7bc3482480973573749c51e32633c8d6245 /var | |
| parent | accbf2cffc6801daa6a2732ea308d8c2fc836eea (diff) | |
| download | spack-9745865250dfd1504fb4c90a0e835be3e2fe53ff.tar.gz spack-9745865250dfd1504fb4c90a0e835be3e2fe53ff.tar.bz2 spack-9745865250dfd1504fb4c90a0e835be3e2fe53ff.tar.xz spack-9745865250dfd1504fb4c90a0e835be3e2fe53ff.zip | |
DaV SDK: Enable ParaView raytracing with in SDK (#36844)
* DaV SDK: Enable ParaView raytracing with in SDK
* CI: Drop swr testing from Data Vis SDK
* ISPC: extend LLVM requirement to main
* DaV SDK: Disallow concretizing develop unifyfs
No longer needed after mochi-margo patch
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/ecp-data-vis-sdk/package.py | 3 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/ispc/package.py | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/ecp-data-vis-sdk/package.py b/var/spack/repos/builtin/packages/ecp-data-vis-sdk/package.py index 4706e85344..27adceba3e 100644 --- a/var/spack/repos/builtin/packages/ecp-data-vis-sdk/package.py +++ b/var/spack/repos/builtin/packages/ecp-data-vis-sdk/package.py @@ -141,6 +141,7 @@ class EcpDataVisSdk(BundlePackage, CudaPackage, ROCmPackage): dav_sdk_depends_on("parallel-netcdf+shared", when="+pnetcdf", propagate=["fortran"]) dav_sdk_depends_on("unifyfs", when="+unifyfs ") + conflicts("unifyfs@develop") dav_sdk_depends_on("veloc", when="+veloc") @@ -170,7 +171,7 @@ class EcpDataVisSdk(BundlePackage, CudaPackage, ROCmPackage): # ParaView needs @5.11: in order to use CUDA/ROCM, therefore it is the minimum # required version since GPU capability is desired for ECP dav_sdk_depends_on( - "paraview@5.11:+mpi+openpmd+python+kits+shared+catalyst+libcatalyst", + "paraview@5.11:+mpi+openpmd+python+kits+shared+catalyst+libcatalyst+raytracing", when="+paraview", propagate=["adios2", "cuda", "hdf5", "rocm"] + amdgpu_target_variants + cuda_arch_variants, ) diff --git a/var/spack/repos/builtin/packages/ispc/package.py b/var/spack/repos/builtin/packages/ispc/package.py index 7def7c4e59..68b7ecf382 100644 --- a/var/spack/repos/builtin/packages/ispc/package.py +++ b/var/spack/repos/builtin/packages/ispc/package.py @@ -42,7 +42,7 @@ class Ispc(CMakePackage): depends_on("ncurses", type="link") depends_on("zlib", type="link") depends_on("llvm+clang") - depends_on("llvm@13:15", when="@1.19") + depends_on("llvm@13:15", when="@1.19:") depends_on("llvm@11.0:14.0", when="@1.18") depends_on("llvm@11:14", when="@1.17") depends_on("llvm@:12", when="@:1.16") |