From 7ed8d627a7f8a0d44a30e2c7065d602e0e59e51d Mon Sep 17 00:00:00 2001
From: John Biddiscombe <biddisco@cscs.ch>
Date: Fri, 10 Jan 2025 08:17:46 +0100
Subject: [PATCH] paraview: cleanup views in environment setup

---
 recipes/paraview/5.13.1/gh200/config.yaml     |  2 +-
 .../paraview/5.13.1/gh200/environments.yaml   | 42 +++++++------------
 .../5.13.1/scripts/job-build-daint.sh         |  2 +-
 3 files changed, 17 insertions(+), 29 deletions(-)

diff --git a/recipes/paraview/5.13.1/gh200/config.yaml b/recipes/paraview/5.13.1/gh200/config.yaml
index 338df0c8..f8282cf9 100644
--- a/recipes/paraview/5.13.1/gh200/config.yaml
+++ b/recipes/paraview/5.13.1/gh200/config.yaml
@@ -1,7 +1,7 @@
 name: ParaView
 store: /user-environment
 spack:
-  commit: develop-2024-11-24
+  commit: 85d83f9c26cea76051cf95bc7194c43bfa0a0b5a
   repo: https://github.com/spack/spack.git
 description: ParaView for grace-hopper using EGL
 modules: false
diff --git a/recipes/paraview/5.13.1/gh200/environments.yaml b/recipes/paraview/5.13.1/gh200/environments.yaml
index f8733b6c..cc9c724a 100644
--- a/recipes/paraview/5.13.1/gh200/environments.yaml
+++ b/recipes/paraview/5.13.1/gh200/environments.yaml
@@ -3,17 +3,29 @@ paraview-gh200-egl-cuda:
   - toolchain: gcc
     spec: gcc
   mpi:
-    spec: cray-mpich@8.1.30
+    spec: cray-mpich
     gpu: cuda
   unify: true
   views:
-    paraview-gh200-egl-cuda:
+    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:
 
@@ -113,28 +125,4 @@ paraview-gh200-egl-cuda:
   - ~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:
-        prefix_paths:
-          LD_LIBRARY_PATH: [lib, lib64]
-
-  specs:
-  - python@3.11
-  - py-numpy
-  - py-pandas
-  - py-matplotlib
-  - py-mpi4py
-  - py-cftime
-  - py-h5py
+  - +cxx
diff --git a/recipes/paraview/5.13.1/scripts/job-build-daint.sh b/recipes/paraview/5.13.1/scripts/job-build-daint.sh
index 7b5aae50..faa1758b 100755
--- a/recipes/paraview/5.13.1/scripts/job-build-daint.sh
+++ b/recipes/paraview/5.13.1/scripts/job-build-daint.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-#SBATCH --job-name=stackinator-paraview
+#SBATCH --job-name=uenv-prepare
 #SBATCH --time=04:00:00
 #SBATCH --nodes=1
 #SBATCH --partition=normal