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

ParaView: Various fixes to better support no mpi and fides builds (#47114)

Browse Source 
* 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>
This commit is contained in:
kwryankrattiger 2024-10-23 12:46:09 -05:00 committed by GitHub
parent 5b5be0582f
commit fd1c95a432
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

9
var/spack/repos/builtin/packages/paraview/package.py
View File

@ -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 @@ def use_x11():
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(
[