From 4ccef372e89a8fdd03e0123ec5250510ed52ac1e Mon Sep 17 00:00:00 2001 From: Ryan Krattiger <80296582+kwryankrattiger@users.noreply.github.com> Date: Fri, 21 Mar 2025 11:07:37 -0500 Subject: [PATCH] E4S: Allow building newer ParaView for Linux CI (#47823) 5.11 was locked at a time when master was building by default. Allowing building newer paraview in CI --- .../cloud_pipelines/stacks/e4s-rocm-external/spack.yaml | 2 +- share/spack/gitlab/cloud_pipelines/stacks/e4s/spack.yaml | 5 +++-- var/spack/repos/builtin/packages/paraview/package.py | 2 ++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/share/spack/gitlab/cloud_pipelines/stacks/e4s-rocm-external/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/e4s-rocm-external/spack.yaml index 14bbfe975e5..3c28d10e8e5 100644 --- a/share/spack/gitlab/cloud_pipelines/stacks/e4s-rocm-external/spack.yaml +++ b/share/spack/gitlab/cloud_pipelines/stacks/e4s-rocm-external/spack.yaml @@ -23,7 +23,7 @@ spack: paraview: # Don't build GUI support or GLX rendering for HPC/container deployments require: - - "@5.11 +examples ~qt ^[virtuals=gl] osmesa" + - "@5.11: +examples ~qt ^[virtuals=gl] osmesa" - 'target=x86_64_v3' # ROCm diff --git a/share/spack/gitlab/cloud_pipelines/stacks/e4s/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/e4s/spack.yaml index 8c01747ef43..c9894a74de2 100644 --- a/share/spack/gitlab/cloud_pipelines/stacks/e4s/spack.yaml +++ b/share/spack/gitlab/cloud_pipelines/stacks/e4s/spack.yaml @@ -61,8 +61,9 @@ spack: paraview: # Don't build GUI support or GLX rendering for HPC/container deployments require: - - "+examples ~qt ^[virtuals=gl] osmesa target=x86_64_v3" - - 'target=x86_64_v3 %gcc' + - "+examples" + - "~qt ^[virtuals=gl] osmesa" # Headless + - "target=x86_64_v3 %gcc" specs: # CPU diff --git a/var/spack/repos/builtin/packages/paraview/package.py b/var/spack/repos/builtin/packages/paraview/package.py index e40636e7728..931f3acb135 100644 --- a/var/spack/repos/builtin/packages/paraview/package.py +++ b/var/spack/repos/builtin/packages/paraview/package.py @@ -299,6 +299,8 @@ class Paraview(CMakePackage, CudaPackage, ROCmPackage): depends_on("zlib-api") depends_on("libcatalyst@2:", when="+libcatalyst") 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: depends_on( "kokkos@:3.7.01 +rocm amdgpu_target={0}".format(target),