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

E4S: Allow building newer ParaView for Linux CI (#47823)

Browse Source 
5.11 was locked at a time when master was building by default. Allowing
building newer paraview in CI
This commit is contained in:
Ryan Krattiger 2025-03-21 11:07:37 -05:00 committed by GitHub
parent ac6e534806
commit 4ccef372e8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
share/spack/gitlab/cloud_pipelines/stacks/e4s-rocm-external/spack.yaml
View File

@ -23,7 +23,7 @@ spack:
paraview: paraview:
# Don't build GUI support or GLX rendering for HPC/container deployments # Don't build GUI support or GLX rendering for HPC/container deployments
require: require:
- "@5.11 +examples ~qt ^[virtuals=gl] osmesa" - "@5.11: +examples ~qt ^[virtuals=gl] osmesa"
- 'target=x86_64_v3' - 'target=x86_64_v3'
# ROCm # ROCm

5
share/spack/gitlab/cloud_pipelines/stacks/e4s/spack.yaml
View File

@ -61,8 +61,9 @@ spack:
paraview: paraview:
# Don't build GUI support or GLX rendering for HPC/container deployments # Don't build GUI support or GLX rendering for HPC/container deployments
require: require:
- "+examples ~qt ^[virtuals=gl] osmesa target=x86_64_v3" - "+examples"
- 'target=x86_64_v3 %gcc' - "~qt ^[virtuals=gl] osmesa" # Headless
- "target=x86_64_v3 %gcc"
specs: specs:
# CPU # CPU

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

@ -299,6 +299,8 @@ class Paraview(CMakePackage, CudaPackage, ROCmPackage):
depends_on("zlib-api") depends_on("zlib-api")
depends_on("libcatalyst@2:", when="+libcatalyst") depends_on("libcatalyst@2:", when="+libcatalyst")
depends_on("hip@5.2:", when="+rocm") depends_on("hip@5.2:", when="+rocm")
# CUDA thrust is already include in the CUDA pkg
depends_on("rocthrust", when="@5.13: +rocm ^cmake@3.24:")
for target in ROCmPackage.amdgpu_targets: for target in ROCmPackage.amdgpu_targets:
depends_on( depends_on(
"kokkos@:3.7.01 +rocm amdgpu_target={0}".format(target), "kokkos@:3.7.01 +rocm amdgpu_target={0}".format(target),