diff options
| author | Erik Heeren <erik.heeren@epfl.ch> | 2023-03-16 22:11:03 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-16 14:11:03 -0700 |
| commit | d97bb895e86bdfdd2d6f18be95ffb3408de4b4fc (patch) | |
| tree | 93bb12f610d9979fc06250298b4f5ae580bdad24 /var | |
| parent | e8482d9e79f2db63aa8d0fca816135172df9c466 (diff) | |
| download | spack-d97bb895e86bdfdd2d6f18be95ffb3408de4b4fc.tar.gz spack-d97bb895e86bdfdd2d6f18be95ffb3408de4b4fc.tar.bz2 spack-d97bb895e86bdfdd2d6f18be95ffb3408de4b4fc.tar.xz spack-d97bb895e86bdfdd2d6f18be95ffb3408de4b4fc.zip | |
Ospray (#36128)
* ospray: denoiser and GLM variants
* ospray: denoiser defaults to True to preserve previous behaviour
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/ospray/package.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/ospray/package.py b/var/spack/repos/builtin/packages/ospray/package.py index fcb0d3ef62..fcac3239a4 100644 --- a/var/spack/repos/builtin/packages/ospray/package.py +++ b/var/spack/repos/builtin/packages/ospray/package.py @@ -24,6 +24,8 @@ class Ospray(CMakePackage): version("2.6.0", sha256="5efccd7eff5774b77f8894e68a6b803b535a0d12f32ab49edf13b954e2848f2e") variant("apps", default=False, description="Enable building OSPRay Apps") + variant("denoiser", default=True, description="Enable denoiser image operation") + variant("glm", default=False, description="Build ospray_cpp GLM tests/tutorial") variant("mpi", default=True, description="Enable MPI support") depends_on("rkcommon@1.5:") @@ -36,7 +38,7 @@ class Ospray(CMakePackage): depends_on("openvkl@1.0.1:", when="@2.7.0:") depends_on("openvkl@1.2.0:", when="@2.9.0:") depends_on("openvkl@1.3.0:", when="@2.10.0:") - depends_on("openimagedenoise@1.2.3:") + depends_on("openimagedenoise@1.2.3:", when="+denoiser") depends_on("ispc@1.14.1:", type=("build")) depends_on("ispc@1.16.0:", when="@2.7.0:", type=("build")) depends_on("ispc@1.18.0:", when="@2.10.0:", type=("build")) @@ -47,12 +49,13 @@ class Ospray(CMakePackage): def cmake_args(self): args = [ - self.define("OSPRAY_MODULE_DENOISER", True), + self.define_from_variant("OSPRAY_MODULE_DENOISER", "denoiser"), self.define("OSPRAY_ENABLE_MODULES", True), self.define("OSPRAY_ENABLE_APPS", False), self.define_from_variant("OSPRAY_MODULE_MPI", "mpi"), self.define("OSPRAY_MPI_BUILD_TUTORIALS", False), self.define("OSPRAY_ISPC_DIRECTORY", self.spec["ispc"].prefix.bin), + self.define_from_variant("OSPRAY_APPS_ENABLE_GLM", "glm"), ] # Apps |