Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix vtk patch error #280

Merged
merged 2 commits into from
Aug 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1105,7 +1105,7 @@ endif()
################################
if( ENABLE_VTK )
set( VTK_DIR "${CMAKE_INSTALL_PREFIX}/vtk" )
set( VTK_URL "${TPL_MIRROR_DIR}/VTK-9.2.6.tar.gz" )
set( VTK_URL "${TPL_MIRROR_DIR}/VTK-9.3.1.tar.gz" )

message( STATUS "Building VTK found at ${VTK_URL}" )

Expand Down Expand Up @@ -1133,7 +1133,6 @@ endif( ENABLE_MPI )
PREFIX ${PROJECT_BINARY_DIR}/vtk
URL ${VTK_URL}
INSTALL_DIR ${VTK_DIR}
PATCH_COMMAND patch -p0 -t < ${TPL_MIRROR_DIR}/vtkXML-fpe.patch
BUILD_COMMAND ${TPL_BUILD_COMMAND}
INSTALL_COMMAND "${TPL_INSTALL_COMMAND}"
CMAKE_GENERATOR ${TPL_GENERATOR}
Expand Down
7 changes: 5 additions & 2 deletions scripts/setupLC-TPL.bash
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@ mv build-* toBeDeleted
rm -rf toBeDeleted &

echo "Building all LC TPLs from $GEOS_DIR to be installed at $INSTALL_DIR"
chmod -R g+rx $INSTALL_DIR
chgrp -R GEOS $INSTALL_DIR

./scripts/setupLC-TPL-helper.bash $GEOS_DIR $INSTALL_DIR ruby clang-14 "srun -N 1 -t 90 -n 1 -A vortex" $@ &
./scripts/setupLC-TPL-helper.bash $GEOS_DIR $INSTALL_DIR ruby gcc-12 "srun -N 1 -t 90 -n 1 -A vortex" $@ &
./scripts/setupLC-TPL-helper.bash $GEOS_DIR $INSTALL_DIR dane gcc-12 "srun -N 1 -t 90 -n 1 -A vortex" $@ &
Expand All @@ -36,4 +35,8 @@ chgrp -R GEOS $INSTALL_DIR
./scripts/setupLC-TPL-helper.bash $GEOS_DIR $INSTALL_DIR lassen clang-13-cuda-12 "lalloc 1 -qpdebug" $@ &

wait

chmod -R g+rx $INSTALL_DIR
chgrp -R GEOS $INSTALL_DIR

echo "Complete"
3 changes: 0 additions & 3 deletions tplMirror/VTK-9.2.6.tar.gz

This file was deleted.

3 changes: 3 additions & 0 deletions tplMirror/VTK-9.3.1.tar.gz
Git LFS file not shown
41 changes: 0 additions & 41 deletions tplMirror/vtkXML-fpe.patch

This file was deleted.

19 changes: 0 additions & 19 deletions tplMirror/vtkXMLReader-fpe.patch

This file was deleted.

19 changes: 0 additions & 19 deletions tplMirror/vtkXMLWriter-fpe.patch

This file was deleted.