Skip to content

Commit cbc67c7

Browse files
kwryankrattigerkwryankrattiger
committed
Updates to CI and recipes
1 parent 6e019fd commit cbc67c7

File tree

2 files changed

+80
-77
lines changed

2 files changed

+80
-77
lines changed

‎repos/spack_repo/builtin/packages/paraview/package.py‎

Lines changed: 34 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -61,37 +61,40 @@ class Paraview(CMakePackage, CudaPackage, ROCmPackage):
6161

6262
version("master", branch="master", submodules=True)
6363
version(
64-
"5.13.3",
65-
sha256="3bd31bb56e07aa2af2a379895745bbc430c565518a363d935f2efc35b076df09",
64+
"6.0.0",
65+
sha256="0ee07ae6377e5e97766aebf858eb9758668a52df041f319e7c975037a63bf189",
6666
preferred=True,
6767
)
68-
version("5.13.2", sha256="4e116250f8e1a9c480f97c5696c9cd72b4d4998b039ca46da8b224f27445f13e")
69-
version("5.13.1", sha256="a16503ce37b999c2967d84234596e7bf67ac98221851a288bb1399c7e1dc2004")
70-
version("5.13.0", sha256="886f530bebd6b24c6a7f8a5f4b1afa72c53d4737ccaa4b5fd5946b4e5a758c91")
68+
version("5.13.3", sha256="3bd31bb56e07aa2af2a379895745bbc430c565518a363d935f2efc35b076df09")
7169
version("5.12.1", sha256="927f880c13deb6dde4172f4727d2b66f5576e15237b35778344f5dd1ddec863e")
72-
version("5.12.0", sha256="d289afe7b48533e2ca4a39a3b48d3874bfe67cf7f37fdd2131271c57e64de20d")
7370
version("5.11.2", sha256="5c5d2f922f30d91feefc43b4a729015dbb1459f54c938896c123d2ac289c7a1e")
74-
version("5.11.1", sha256="5cc2209f7fa37cd3155d199ff6c3590620c12ca4da732ef7698dec37fa8dbb34")
75-
version("5.11.0", sha256="9a0b8fe8b1a2cdfd0ace9a87fa87e0ec21ee0f6f0bcb1fdde050f4f585a25165")
76-
version("5.10.1", sha256="520e3cdfba4f8592be477314c2f6c37ec73fb1d5b25ac30bdbd1c5214758b9c2")
77-
version("5.10.0", sha256="86d85fcbec395cdbc8e1301208d7c76d8f48b15dc6b967ffbbaeee31242343a5")
78-
version("5.9.1", sha256="0d486cb6fbf55e428845c9650486f87466efcb3155e40489182a7ea85dfd4c8d")
79-
version("5.9.0", sha256="b03258b7cddb77f0ee142e3e77b377e5b1f503bcabc02bfa578298c99a06980d")
80-
version("5.8.1", sha256="7653950392a0d7c0287c26f1d3a25cdbaa11baa7524b0af0e6a1a0d7d487d034")
81-
version("5.8.0", sha256="219e4107abf40317ce054408e9c3b22fb935d464238c1c00c0161f1c8697a3f9")
82-
version("5.7.0", sha256="e41e597e1be462974a03031380d9e5ba9a7efcdb22e4ca2f3fec50361f310874")
83-
version("5.6.2", sha256="1f3710b77c58a46891808dbe23dc59a1259d9c6b7bb123aaaeaa6ddf2be882ea")
84-
version("5.6.0", sha256="cb8c4d752ad9805c74b4a08f8ae6e83402c3f11e38b274dba171b99bb6ac2460")
85-
version("5.5.2", sha256="64561f34c4402b88f3cb20a956842394dde5838efd7ebb301157a837114a0e2d")
86-
version("5.5.1", sha256="a6e67a95a7a5711a2b5f95f38ccbff4912262b3e1b1af7d6b9afe8185aa85c0d")
87-
version("5.5.0", sha256="1b619e326ff574de808732ca9a7447e4cd14e94ae6568f55b6581896cd569dff")
88-
version("5.4.1", sha256="390d0f5dc66bf432e202a39b1f34193af4bf8aad2355338fa5e2778ea07a80e4")
89-
version("5.4.0", sha256="f488d84a53b1286d2ee1967e386626c8ad05a6fe4e6cbdaa8d5e042f519f94a9")
90-
version("5.3.0", sha256="046631bbf00775edc927314a3db207509666c9c6aadc7079e5159440fd2f88a0")
91-
version("5.2.0", sha256="894e42ef8475bb49e4e7e64f4ee2c37c714facd18bfbb1d6de7f69676b062c96")
92-
version("5.1.2", sha256="ff02b7307a256b7c6e8ad900dee5796297494df7f9a0804fe801eb2f66e6a187")
93-
version("5.0.1", sha256="caddec83ec284162a2cbc46877b0e5a9d2cca59fb4ab0ea35b0948d2492950bb")
94-
version("4.4.0", sha256="c2dc334a89df24ce5233b81b74740fc9f10bc181cd604109fd13f6ad2381fc73")
71+
72+
with default_args(deprecated=True):
73+
version("5.13.2", sha256="4e116250f8e1a9c480f97c5696c9cd72b4d4998b039ca46da8b224f27445f13e")
74+
version("5.13.1", sha256="a16503ce37b999c2967d84234596e7bf67ac98221851a288bb1399c7e1dc2004")
75+
version("5.13.0", sha256="886f530bebd6b24c6a7f8a5f4b1afa72c53d4737ccaa4b5fd5946b4e5a758c91")
76+
version("5.12.0", sha256="d289afe7b48533e2ca4a39a3b48d3874bfe67cf7f37fdd2131271c57e64de20d")
77+
version("5.11.1", sha256="5cc2209f7fa37cd3155d199ff6c3590620c12ca4da732ef7698dec37fa8dbb34")
78+
version("5.11.0", sha256="9a0b8fe8b1a2cdfd0ace9a87fa87e0ec21ee0f6f0bcb1fdde050f4f585a25165")
79+
version("5.10.1", sha256="520e3cdfba4f8592be477314c2f6c37ec73fb1d5b25ac30bdbd1c5214758b9c2")
80+
version("5.10.0", sha256="86d85fcbec395cdbc8e1301208d7c76d8f48b15dc6b967ffbbaeee31242343a5")
81+
version("5.9.1", sha256="0d486cb6fbf55e428845c9650486f87466efcb3155e40489182a7ea85dfd4c8d")
82+
version("5.9.0", sha256="b03258b7cddb77f0ee142e3e77b377e5b1f503bcabc02bfa578298c99a06980d")
83+
version("5.8.1", sha256="7653950392a0d7c0287c26f1d3a25cdbaa11baa7524b0af0e6a1a0d7d487d034")
84+
version("5.8.0", sha256="219e4107abf40317ce054408e9c3b22fb935d464238c1c00c0161f1c8697a3f9")
85+
version("5.7.0", sha256="e41e597e1be462974a03031380d9e5ba9a7efcdb22e4ca2f3fec50361f310874")
86+
version("5.6.2", sha256="1f3710b77c58a46891808dbe23dc59a1259d9c6b7bb123aaaeaa6ddf2be882ea")
87+
version("5.6.0", sha256="cb8c4d752ad9805c74b4a08f8ae6e83402c3f11e38b274dba171b99bb6ac2460")
88+
version("5.5.2", sha256="64561f34c4402b88f3cb20a956842394dde5838efd7ebb301157a837114a0e2d")
89+
version("5.5.1", sha256="a6e67a95a7a5711a2b5f95f38ccbff4912262b3e1b1af7d6b9afe8185aa85c0d")
90+
version("5.5.0", sha256="1b619e326ff574de808732ca9a7447e4cd14e94ae6568f55b6581896cd569dff")
91+
version("5.4.1", sha256="390d0f5dc66bf432e202a39b1f34193af4bf8aad2355338fa5e2778ea07a80e4")
92+
version("5.4.0", sha256="f488d84a53b1286d2ee1967e386626c8ad05a6fe4e6cbdaa8d5e042f519f94a9")
93+
version("5.3.0", sha256="046631bbf00775edc927314a3db207509666c9c6aadc7079e5159440fd2f88a0")
94+
version("5.2.0", sha256="894e42ef8475bb49e4e7e64f4ee2c37c714facd18bfbb1d6de7f69676b062c96")
95+
version("5.1.2", sha256="ff02b7307a256b7c6e8ad900dee5796297494df7f9a0804fe801eb2f66e6a187")
96+
version("5.0.1", sha256="caddec83ec284162a2cbc46877b0e5a9d2cca59fb4ab0ea35b0948d2492950bb")
97+
version("4.4.0", sha256="c2dc334a89df24ce5233b81b74740fc9f10bc181cd604109fd13f6ad2381fc73")
9598

9699
variant(
97100
"development_files",
@@ -103,7 +106,7 @@ class Paraview(CMakePackage, CudaPackage, ROCmPackage):
103106
variant("mpi", default=True, description="Enable MPI support")
104107
variant("qt", default=False, description="Enable Qt (gui) support")
105108
variant("opengl2", default=True, description="Enable OpenGL2 backend", when="@5:5")
106-
variant("x", default=True, description="Enable OpenGL2 backend")
109+
variant("x", default=True, description="Enable X11 support")
107110
variant("examples", default=False, description="Build examples")
108111
variant("hdf5", default=False, description="Use external HDF5")
109112
variant("shared", default=True, description="Builds a shared version of the library")
@@ -250,8 +253,8 @@ class Paraview(CMakePackage, CudaPackage, ROCmPackage):
250253
depends_on("libx11")
251254
depends_on("libxcursor")
252255
# When Qt and X are enabled, GLX is required in the runtime
253-
requires("^[virtuals=gl] glx", when="@:5 +x")
254-
depends_on("glx", when="@6: +x", type=("run"))
256+
requires("^[virtuals=gl] glx", when="@:5")
257+
depends_on("glx", when="@6:", type=("run"))
255258

256259
# ParaView@:5 support Qt5 and requires a GL provider to be known at
257260
# build/link time.
@@ -271,10 +274,8 @@ class Paraview(CMakePackage, CudaPackage, ROCmPackage):
271274
depends_on("gl@1.2:", when="~opengl2")
272275
depends_on("glew")
273276

274-
# OpenGL is dropped as a direct dependency after ParaView@6:
275-
# and switches to a runtime driven GL loader model using GLAD
276-
# ParaView will also no longer support Spack builds with Qt5.
277277
with when("@6:"):
278+
# ParaView 6 and later will not support Spack builds with Qt5.
278279
with when("+qt"):
279280
depends_on("qt-base+accessibility+gui+opengl+sql+network")
280281
depends_on("qt-tools+assistant")

‎stacks/data-vis-sdk/spack.yaml‎

Lines changed: 46 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ spack:
22
view: false
33
include:
44
- $CI_PROJECT_DIR/.ci/gitlab/
5+
#- path: https://raw.githubusercontent.com/DAV-SDK/davsdk/refs/tags/v0.2.0/spack/configs/packages.yaml
6+
- path: https://raw.githubusercontent.com/DAV-SDK/davsdk/refs/heads/main/spack/configs/packages.yaml
7+
sha256: "2a0e0a30fed482df45a5bb33f840ee66a9e6f5507b8d7d8379beea25474c4147"
58

69
packages:
710
all:
@@ -20,79 +23,78 @@ spack:
2023

2124
cmake:
2225
variants: ~ownlibs
23-
ecp-data-vis-sdk:
24-
require:
25-
- "+ascent +adios2 ~cinema ~darshan ~faodel +hdf5 +pnetcdf ~sensei ~sz ~unifyfs ~veloc +vtkm +zfp"
26-
- target=x86_64_v3
27-
hdf5:
28-
require:
29-
- "@1.14"
30-
- target=x86_64_v3
26+
3127
mesa:
3228
require:
33-
- "+glx +osmesa +opengl ~opengles +llvm"
34-
- target=x86_64_v3
29+
- +glx +osmesa +opengl ~opengles +llvm
30+
3531
libglx:
36-
require: "mesa +glx"
37-
ospray:
38-
require:
39-
- "@2.8.0"
40-
- "+denoiser +mpi"
41-
- target=x86_64_v3
32+
require: [mesa +glx]
33+
4234
llvm:
4335
require:
4436
- "@14:"
4537
- target=x86_64_v3
4638
# Minimize LLVM
4739
variants: ~lldb~lld~libomptarget~polly~gold libunwind=none compiler-rt=none
40+
41+
ospray:
42+
require: [+denoiser +mpi]
43+
44+
paraview:
45+
require: ["@6:", "+raytracing +fides"]
46+
4847
libllvm:
4948
require: ["llvm"]
5049
visit:
51-
require:
52-
- "@3.4.1"
53-
- target=x86_64_v3
50+
require: ["@3.4.1:"]
5451

5552
concretizer:
56-
unify: false
53+
unify: when_possible
5754

5855
definitions:
56+
# Test ParaView and VisIt builds with different GL backends
5957
- paraview_specs:
6058
- matrix:
61-
- - paraview +raytracing +adios2 +fides
62-
- - +qt ^[virtuals=gl] glx # GUI Support w/ GLX Rendering
63-
- ~qt ^[virtuals=gl] glx # GLX Rendering
64-
- ^[virtuals=gl] osmesa # OSMesa Rendering
59+
- - paraview
60+
- - +qt
61+
- ~qt
6562
- visit_specs:
6663
- matrix:
6764
- - visit
6865
- - ~gui ^[virtuals=gl] glx
6966
- ~gui ^[virtuals=gl] osmesa
7067
- +gui ^[virtuals=gl] glx # GUI Support w/ GLX Rendering
71-
- sdk_base_spec:
72-
- matrix:
73-
- - ecp-data-vis-sdk +ascent +adios2 ~cinema ~darshan ~faodel +hdf5 +pnetcdf
74-
~sensei ~sz ~unifyfs ~veloc +vtkm +zfp
75-
- - ~cuda ~rocm
76-
# Current testing of GPU supported configurations
77-
# is provided in the E4S stack
78-
# - +cuda ~rocm
79-
# - ~cuda +rocm
68+
69+
- hdf5_specs:
70+
- hdf5
71+
- hdf5-vol-async
72+
- hdf5-vol-cache
73+
- hdf5-vol-log
74+
8075

8176
specs:
82-
# Test ParaView and VisIt builds with different GL backends
83-
- matrix:
84-
- [$sdk_base_spec]
85-
- ["+paraview ~visit"]
86-
- [$^paraview_specs]
87-
- matrix:
88-
- [$sdk_base_spec]
89-
- ["~paraview +visit"]
90-
- [$^visit_specs]
77+
# Compression
78+
- zfp
79+
80+
# IO
81+
- adios2
82+
- $hdf5_specs
83+
- parallel-netcdf
84+
85+
# Visualization
86+
- ascent
87+
- $paraview_specs
88+
- $visit_specs
89+
- vtk-m
9190

9291
ci:
9392
pipeline-gen:
9493
- build-job:
95-
image: {name: ghcr.io/spack/ubuntu20.04-runner-x86_64:2023-01-01, entrypoint: [''] }
94+
image: {name: ghcr.io/spack/ubuntu20.04-runner-x86_64:2023-01-01, entrypoint: [""]}
9695

9796
cdash:
98-
'build-group:': Data and Vis SDK
97+
"build-group:": Data and Vis SDK
98+
repos:
99+
builtin:
100+
destination: /home/local/KHQ/ryan.krattiger/Projects/spack/spack-packages/src/paraview_6_updates

0 commit comments

Comments
 (0)