zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DaV SDK: Enable ParaView raytracing with in SDK (#36844)

Browse Source 
* 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
This commit is contained in:
kwryankrattiger 2023-04-18 13:39:47 -05:00 committed by GitHub
parent accbf2cffc
commit 9745865250
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
share/spack/gitlab/cloud_pipelines/stacks/data-vis-sdk/spack.yaml
View File

@ -4,11 +4,17 @@ spack:
cmake:
variants: ~ownlibs
mesa:
require: "@21 +glx +osmesa +opengl ~opengles +llvm swr=auto"
require: "+glx +osmesa +opengl ~opengles +llvm"
libosmesa:
require: ^mesa +osmesa
libglx:
require: ^mesa +glx
ospray:
require: "@2.8.0 +denoiser +mpi"
llvm:
require: "@14:"
# Minimize LLVM
variants: ~lldb~lld~internal_unwind~polly~compiler-rt~gold
all:
require: target=x86_64_v3

3
var/spack/repos/builtin/packages/ecp-data-vis-sdk/package.py
View File

@ -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,
)

2
var/spack/repos/builtin/packages/ispc/package.py
View File

@ -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")