Reworking of Paraview and TTK build: catalyst adaptor working in WFA#6
Merged
rupertnash merged 6 commits intomainfrom Aug 31, 2021
Merged
Reworking of Paraview and TTK build: catalyst adaptor working in WFA#6rupertnash merged 6 commits intomainfrom
rupertnash merged 6 commits intomainfrom
Conversation
CharlesGueunet
approved these changes
Aug 24, 2021
CharlesGueunet
left a comment
CharlesGueunet
left a comment
There was a problem hiding this comment.
I do not understand where is built the TTK module now, is this PR dependant on #5 ?
| cmake_vars[PARAVIEW_BUILD_EDITION]=CATALYST_RENDERING | ||
| cmake_vars[paraview_SOURCE_SELECTION]=$version | ||
| cmake_vars[ENABLE_boost]=ON | ||
| cmake_vars[USE_SYSTEM_boost]=ON |
Collaborator
Author
There was a problem hiding this comment.
I'd equally ask why not? Boost is available as a system module so means the install is a little faster and uses less disk
| # TTK needs a patched version of Paraview | ||
| pv_version=5.8.1 | ||
| pv_source_dir_name=ParaView-v$pv_version | ||
| pv_version=5.9.0 |
| @@ -13,23 +13,33 @@ if [ -z "$INSTALLER_PARAVIEW_ENV_SH" ]; then | |||
| name=paraview | |||
| version=5.9.0 | |||
There was a problem hiding this comment.
we should use 5.9.1, or even master / git
| cmake_vars[USE_SYSTEM_boost]=ON | ||
| cmake_vars[ENABLE_numpy]=ON | ||
| cmake_vars[USE_SYSTEM_numpy]=ON | ||
| cmake_vars[ENABLE_protobuf]=ON |
There was a problem hiding this comment.
Where is TTK now ? in #5 I update this part to use the one provided by the superbuild
Collaborator
Author
|
TTK is built as a separate module, as before. Except now this module does not need to build its own, patched, version of ParaView |
Collaborator
Author
|
I should add that this does not depend on #5, but this is now installed and working on Cirrus at least. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This branch removes TTK's patch of paraview and just build that normally via super build. PV now includes GDAL and numpy. I've also updated the build of WFA to enable catalyst by default.