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
This commit is contained in:
		@@ -4,11 +4,17 @@ spack:
 | 
				
			|||||||
    cmake:
 | 
					    cmake:
 | 
				
			||||||
      variants: ~ownlibs
 | 
					      variants: ~ownlibs
 | 
				
			||||||
    mesa:
 | 
					    mesa:
 | 
				
			||||||
      require: "@21 +glx +osmesa +opengl ~opengles +llvm swr=auto"
 | 
					      require: "+glx +osmesa +opengl ~opengles +llvm"
 | 
				
			||||||
    libosmesa:
 | 
					    libosmesa:
 | 
				
			||||||
      require: ^mesa +osmesa
 | 
					      require: ^mesa +osmesa
 | 
				
			||||||
    libglx:
 | 
					    libglx:
 | 
				
			||||||
      require: ^mesa +glx
 | 
					      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:
 | 
					    all:
 | 
				
			||||||
      require: target=x86_64_v3
 | 
					      require: target=x86_64_v3
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -141,6 +141,7 @@ class EcpDataVisSdk(BundlePackage, CudaPackage, ROCmPackage):
 | 
				
			|||||||
    dav_sdk_depends_on("parallel-netcdf+shared", when="+pnetcdf", propagate=["fortran"])
 | 
					    dav_sdk_depends_on("parallel-netcdf+shared", when="+pnetcdf", propagate=["fortran"])
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    dav_sdk_depends_on("unifyfs", when="+unifyfs ")
 | 
					    dav_sdk_depends_on("unifyfs", when="+unifyfs ")
 | 
				
			||||||
 | 
					    conflicts("unifyfs@develop")
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    dav_sdk_depends_on("veloc", when="+veloc")
 | 
					    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
 | 
					    # ParaView needs @5.11: in order to use CUDA/ROCM, therefore it is the minimum
 | 
				
			||||||
    # required version since GPU capability is desired for ECP
 | 
					    # required version since GPU capability is desired for ECP
 | 
				
			||||||
    dav_sdk_depends_on(
 | 
					    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",
 | 
					        when="+paraview",
 | 
				
			||||||
        propagate=["adios2", "cuda", "hdf5", "rocm"] + amdgpu_target_variants + cuda_arch_variants,
 | 
					        propagate=["adios2", "cuda", "hdf5", "rocm"] + amdgpu_target_variants + cuda_arch_variants,
 | 
				
			||||||
    )
 | 
					    )
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -42,7 +42,7 @@ class Ispc(CMakePackage):
 | 
				
			|||||||
    depends_on("ncurses", type="link")
 | 
					    depends_on("ncurses", type="link")
 | 
				
			||||||
    depends_on("zlib", type="link")
 | 
					    depends_on("zlib", type="link")
 | 
				
			||||||
    depends_on("llvm+clang")
 | 
					    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.0:14.0", when="@1.18")
 | 
				
			||||||
    depends_on("llvm@11:14", when="@1.17")
 | 
					    depends_on("llvm@11:14", when="@1.17")
 | 
				
			||||||
    depends_on("llvm@:12", when="@:1.16")
 | 
					    depends_on("llvm@:12", when="@:1.16")
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user