From 3dce605cc86bd7078a37dbe3339e6829b9cb52e9 Mon Sep 17 00:00:00 2001 From: John Biddiscombe Date: Tue, 4 Feb 2025 12:19:47 +0100 Subject: [PATCH] Cleanup commits to ensure we always use a fixed version/commit --- recipes/paraview/5.13.2/gh200/config.yaml | 2 +- .../paraview/5.13.2/gh200/environments.yaml | 3 +- recipes/paraview/5.13.2/zen2/config.yaml | 2 +- .../paraview/5.13.2/zen2/environments.yaml | 52 +++++++------------ 4 files changed, 21 insertions(+), 38 deletions(-) diff --git a/recipes/paraview/5.13.2/gh200/config.yaml b/recipes/paraview/5.13.2/gh200/config.yaml index f8282cf9..e356d0cd 100644 --- a/recipes/paraview/5.13.2/gh200/config.yaml +++ b/recipes/paraview/5.13.2/gh200/config.yaml @@ -1,7 +1,7 @@ name: ParaView store: /user-environment spack: - commit: 85d83f9c26cea76051cf95bc7194c43bfa0a0b5a + commit: 195b869e1c5f0f850fe16ca1cc0c77fc71f5fcd6 repo: https://github.com/spack/spack.git description: ParaView for grace-hopper using EGL modules: false diff --git a/recipes/paraview/5.13.2/gh200/environments.yaml b/recipes/paraview/5.13.2/gh200/environments.yaml index cc9c724a..5b4b93f4 100644 --- a/recipes/paraview/5.13.2/gh200/environments.yaml +++ b/recipes/paraview/5.13.2/gh200/environments.yaml @@ -51,7 +51,6 @@ paraview-gh200-egl-cuda: # c++ helpers - fmt@10 - - stdexec@main - boost +atomic +chrono +container +context +coroutine +date_time +filesystem +graph +json +mpi +multithreaded +program_options +regex +serialization +shared +system +test +thread # IO and parallelism @@ -107,7 +106,7 @@ paraview-gh200-egl-cuda: - py-h5py # raytracing in VTK/ParaView - - ospray@3.1 ~mpi +denoiser +volumes ~apps ~glm + - ospray@3.2 ~mpi +denoiser +volumes ~apps ~glm - ispc@1.24 - openvkl - embree diff --git a/recipes/paraview/5.13.2/zen2/config.yaml b/recipes/paraview/5.13.2/zen2/config.yaml index 398c40b1..1a9f5e1c 100644 --- a/recipes/paraview/5.13.2/zen2/config.yaml +++ b/recipes/paraview/5.13.2/zen2/config.yaml @@ -1,7 +1,7 @@ name: ParaView store: /user-environment spack: - commit: 4f0e336ed09408809df1b570422a64b3e02e9eb2 + commit: 195b869e1c5f0f850fe16ca1cc0c77fc71f5fcd6 repo: https://github.com/spack/spack.git description: ParaView for eiger using osmesa modules: false diff --git a/recipes/paraview/5.13.2/zen2/environments.yaml b/recipes/paraview/5.13.2/zen2/environments.yaml index 8bc42dfe..17202ffd 100644 --- a/recipes/paraview/5.13.2/zen2/environments.yaml +++ b/recipes/paraview/5.13.2/zen2/environments.yaml @@ -3,17 +3,29 @@ paraview-zen2-osmesa: - toolchain: gcc spec: gcc mpi: - spec: cray-mpich@8.1.30 + spec: cray-mpich gpu: Null unify: true views: - paraview-zen2-osmesa: + develop: + exclude: [] + uenv: + add_compilers: true + prefix_paths: + LD_LIBRARY_PATH: [lib, lib64] + paraview: link: run exclude: [] uenv: add_compilers: true prefix_paths: LD_LIBRARY_PATH: [lib, lib64] + paraview-python: + link: run + exclude: [] + uenv: + prefix_paths: + LD_LIBRARY_PATH: [lib, lib64] specs: @@ -36,13 +48,11 @@ paraview-zen2-osmesa: # c++ helpers - fmt@10 - - stdexec@main - boost +atomic +chrono +container +context +coroutine +date_time +filesystem +graph +json +mpi +multithreaded +program_options +regex +serialization +shared +system +test +thread # IO and parallelism - hdf5 +mpi +cxx +hl +threadsafe +shared ~java - netcdf-c +mpi - - h5hut@master - lz4 - adios2 +python +hdf5 @@ -80,8 +90,7 @@ paraview-zen2-osmesa: - seacas ~fortran ~applications ~legacy ~tests ~x11 - utf8cpp - # c2sm - # - libcdi-pio + # climate/weather - cdi # python @@ -94,8 +103,8 @@ paraview-zen2-osmesa: - py-h5py # raytracing in VTK/ParaView - - ospray@3.1 ~mpi +denoiser +volumes ~apps ~glm - - ispc@main + - ospray@3.2 ~mpi +denoiser +volumes ~apps ~glm + - ispc@1.24 - openvkl - embree - rkcommon @@ -116,29 +125,4 @@ paraview-zen2-osmesa: - ~x11 - ~examples - ~tests - -paraview-python: - compiler: - - toolchain: gcc - spec: gcc - mpi: - spec: cray-mpich@8.1.30 - gpu: Null - unify: true - views: - paraview-python: - link: run - exclude: [] - uenv: - add_compilers: true - prefix_paths: - LD_LIBRARY_PATH: [lib, lib64] - - specs: - - python@3.11 - - py-numpy - - py-pandas - - py-matplotlib - - py-mpi4py - - py-cftime - - py-h5py + - +cxx