diff options
| author | kwryankrattiger <80296582+kwryankrattiger@users.noreply.github.com> | 2024-10-23 12:46:09 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-23 11:46:09 -0600 |
| commit | fd1c95a43214fc3e83db1eb14992de8b2484b154 (patch) | |
| tree | 441e8e74dabb644f666ed2aa934e112e7883afa2 | |
| parent | 5b5be0582f7c4f09a39e0ea5d1c0d68a200bf216 (diff) | |
| download | spack-fd1c95a43214fc3e83db1eb14992de8b2484b154.tar.gz spack-fd1c95a43214fc3e83db1eb14992de8b2484b154.tar.bz2 spack-fd1c95a43214fc3e83db1eb14992de8b2484b154.tar.xz spack-fd1c95a43214fc3e83db1eb14992de8b2484b154.zip | |
ParaView: Various fixes to better support no mpi and fides builds (#47114)
* ParaView: Explicitly set the ENABLE_MPI on/off
* Disallow MPI in the DAG when ~mpi
* @5.13 uses 'remove_children', use pugixml@1.11:, See #47098
* cloud_pipelines/stacks/data-vis-sdk: paraview +raytracing: add +adios2 +fides
Co-authored-by: Bernhard Kaindl <bernhardkaindl7@gmail.com>
| -rw-r--r-- | share/spack/gitlab/cloud_pipelines/stacks/data-vis-sdk/spack.yaml | 2 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/paraview/package.py | 9 |
2 files changed, 6 insertions, 5 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 be0ec9b235..17b67bb268 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 @@ -24,7 +24,7 @@ spack: definitions: - paraview_specs: - matrix: - - - paraview +raytracing + - - paraview +raytracing +adios2 +fides - - +qt ^[virtuals=gl] glx # GUI Support w/ GLX Rendering - ~qt ^[virtuals=gl] glx # GLX Rendering - ^[virtuals=gl] osmesa # OSMesa Rendering diff --git a/var/spack/repos/builtin/packages/paraview/package.py b/var/spack/repos/builtin/packages/paraview/package.py index 06ab1adf15..874f8bed64 100644 --- a/var/spack/repos/builtin/packages/paraview/package.py +++ b/var/spack/repos/builtin/packages/paraview/package.py @@ -229,6 +229,7 @@ class Paraview(CMakePackage, CudaPackage, ROCmPackage): depends_on("tbb", when="+tbb") depends_on("mpi", when="+mpi") + conflicts("mpi", when="~mpi") depends_on("qt@:4", when="@:5.2.0+qt") depends_on("qt+sql", when="+qt") @@ -308,6 +309,8 @@ class Paraview(CMakePackage, CudaPackage, ROCmPackage): # and pre-5.9 is unable to handle that. depends_on("pugixml@:1.10", when="@:5.8") depends_on("pugixml", when="@5.9:") + # 5.13 uses 'remove_children': https://github.com/spack/spack/issues/47098 + depends_on("pugixml@1.11:", when="@5.13:") # ParaView depends on cli11 due to changes in MR # https://gitlab.kitware.com/paraview/paraview/-/merge_requests/4951 @@ -609,11 +612,9 @@ class Paraview(CMakePackage, CudaPackage, ROCmPackage): else: cmake_args.append("-DPARAVIEW_ENABLE_PYTHON:BOOL=OFF") + cmake_args.append("-DPARAVIEW_USE_MPI:BOOL=%s" % variant_bool("+mpi")) if "+mpi" in spec: - mpi_args = [ - "-DPARAVIEW_USE_MPI:BOOL=ON", - "-DMPIEXEC:FILEPATH=%s/bin/mpiexec" % spec["mpi"].prefix, - ] + mpi_args = ["-DMPIEXEC:FILEPATH=%s/bin/mpiexec" % spec["mpi"].prefix] if not sys.platform == "win32": mpi_args.extend( [ |