Skip to content

Commit 7de06e4

Browse files
committed
update paraview to 5.13.1, add adios2, h5py and conduit
1 parent 1d017c3 commit 7de06e4

38 files changed

+657
-11
lines changed

config.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -274,10 +274,10 @@ uenvs:
274274
daint: [gh200]
275275
develop: False
276276
paraview:
277-
"5.13.0":
277+
"5.13.1":
278278
recipes:
279-
gh200: 5.13.0/gh200
280-
zen2: 5.13.0/zen2
279+
gh200: 5.13.1/gh200
280+
zen2: 5.13.1/zen2
281281
deploy:
282282
daint: [gh200]
283283
eiger: [zen2]

recipes/paraview/5.13.0/gh200/environments.yaml renamed to recipes/paraview/5.13.1/gh200/environments.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ paraview-gh200-egl-cuda:
9393
- py-matplotlib
9494
- py-mpi4py
9595
- py-cftime
96+
- py-h5py
9697

9798
# raytracing in VTK/ParaView
9899
- [email protected] ~mpi +denoiser +volumes ~apps ~glm
@@ -137,3 +138,4 @@ paraview-python:
137138
- py-matplotlib
138139
- py-mpi4py
139140
- py-cftime
141+
- py-h5py

recipes/paraview/5.13.0/gh200/post-install renamed to recipes/paraview/5.13.1/gh200/post-install

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ SCRATCH=/capstor/scratch/cscs/biddisco
6868

6969
# setup paths for src/build/install
7070
PARAVIEW_VERSION_MAIN=5.13
71-
PARAVIEW_VERSION_FULL=5.13.0
71+
PARAVIEW_VERSION_FULL=5.13.1
7272
PARAVIEW_SRC_DIR=$SRC_ROOT/ParaView-v${PARAVIEW_VERSION_FULL}
7373
PARAVIEW_BINARY_DIR=$BUILD_ROOT/paraview
7474
PARAVIEW_INSTALL_DIR=$mount_path/ParaView-$PARAVIEW_VERSION_MAIN
@@ -98,8 +98,8 @@ if [[ $CLONE_PARAVIEW == "true" ]]; then
9898
cd $PARAVIEW_SRC_DIR/VTK/ThirdParty/vtkm/vtkvtkm/vtk-m
9999
git checkout v2.1.0
100100
else
101-
# wget https://www.paraview.org/files/v${PARAVIEW_VERSION_MAIN}/ParaView-v${PARAVIEW_VERSION_FULL}.tar.xz
102-
cp $SCRATCH/uenv-data/ParaView-v${PARAVIEW_VERSION_FULL}.tar.xz .
101+
wget https://www.paraview.org/files/v${PARAVIEW_VERSION_MAIN}/ParaView-v${PARAVIEW_VERSION_FULL}.tar.xz
102+
# cp $SCRATCH/uenv-data/ParaView-v${PARAVIEW_VERSION_FULL}.tar.xz .
103103
tar --directory $SRC_ROOT -xf ParaView-v${PARAVIEW_VERSION_FULL}.tar.xz
104104
fi
105105

@@ -139,6 +139,7 @@ cmake -G Ninja \
139139
-DPARAVIEW_PLUGIN_ENABLE_pvNVIDIAIndeX=ON \
140140
-DPARAVIEW_PLUGIN_AUTOLOAD_pvNVIDIAIndeX=ON \
141141
`# Plugin related options` \
142+
-DPARAVIEW_ENABLE_ADIOS2=ON \
142143
-DPARAVIEW_PLUGIN_ENABLE_CDIReader=ON \
143144
-DPARAVIEW_PLUGIN_ENABLE_NetCDFTimeAnnotationPlugin=ON \
144145
-DPARAVIEW_ENABLE_FIDES:BOOL=ON \
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
--- a/src/libs/blueprint/conduit_blueprint_mpi_mesh_parmetis.cpp 2022-01-13 12:48:31.000000000 -0800
2+
+++ b/src/libs/blueprint/conduit_blueprint_mpi_mesh_parmetis.cpp 2022-01-26 14:18:32.274814000 -0800
3+
@@ -22,6 +22,7 @@
4+
5+
#include <parmetis.h>
6+
7+
+#include <algorithm>
8+
#include <unordered_map>
9+
10+
//-----------------------------------------------------------------------------
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
diff -u -r -N a/src/blt/cmake/SetupCompilerOptions.cmake b/src/blt/cmake/SetupCompilerOptions.cmake
2+
--- a/src/blt/cmake/SetupCompilerOptions.cmake 2020-08-26 11:58:24.000000000 +0900
3+
+++ b/src/blt/cmake/SetupCompilerOptions.cmake 2020-08-26 13:31:04.000000000 +0900
4+
@@ -206,7 +206,9 @@
5+
6+
endif()
7+
8+
-
9+
+set(CMAKE_Fortran_MODDIR_FLAG -M)
10+
+set(CMAKE_Fortran_FLAGS_RELWITHDEBINFO "-O2 -g -DNDEBUG")
11+
+set(CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS "--linkfortran")
12+
13+
################################
14+
# RPath Settings

0 commit comments

Comments
 (0)