Repository navigation
Conversation
jmorice91
commented
Oct 27, 2026
Comment on lines
+194
to
+195
| #RUN git -C /root clone --recurse-submodules https://github.com/pdidev/pdi.git /root/pdi | ||
| RUN git -C /root clone -b catalyst-plugin --recurse-submodules https://github.com/francois-kitware/pdi /root/pdi |
Contributor
Author
There was a problem hiding this comment.
this will have to be reverted before integration
jbigot
approved these changes
Oct 30, 2026
jbigot
left a comment
jbigot
left a comment
Member
There was a problem hiding this comment.
I proposed a few changes, just for the fun of it. But this is ready to ship! Great work and good news.
| fi | ||
|
|
||
| git clone --branch v${CATALYST_VERSION}.0 \ | ||
| --single-branch \ |
Member
There was a problem hiding this comment.
Suggested change
| --single-branch \ | |
| --single-branch \ | |
| --depth 1 \ | |
| --recurse-submodules \ | |
| --shallow-submodules \ |
If that works, that prevents us from downloading the whole history for nothing and handles the submodules at the same time
| ${HOME}/catalyst_clone/ | ||
| cd ${HOME}/catalyst_clone/ | ||
| mkdir build | ||
| git submodule update --depth=1 --init --recursive |
Member
There was a problem hiding this comment.
Suggested change
| git submodule update --depth=1 --init --recursive |
If done above, this can go
Comment on lines
+124
to
+129
| cmake_installed=$(cmake --version | head -1 | cut -f3 -d" ") | ||
|
|
||
| mapfile -t sorted < <(printf "%s\n" "$cmake_installed" "$CMAKE_MINIMAL_VERSION_FOR_CATALYST" | sort -V) | ||
|
|
||
| cmake_exec=cmake | ||
| if [[ ${sorted[0]} == ${CMAKE_MINIMAL_VERSION_FOR_CATALYST} ]]; then |
Member
There was a problem hiding this comment.
Suggested change
| cmake_installed=$(cmake --version | head -1 | cut -f3 -d" ") | |
| mapfile -t sorted < <(printf "%s\n" "$cmake_installed" "$CMAKE_MINIMAL_VERSION_FOR_CATALYST" | sort -V) | |
| cmake_exec=cmake | |
| if [[ ${sorted[0]} == ${CMAKE_MINIMAL_VERSION_FOR_CATALYST} ]]; then | |
| rejected_cmake_version="$(printf "%s\n" "$(cmake --version | head -1 | cut -f3 -d" ")" "$CMAKE_MINIMAL_VERSION_FOR_CATALYST" | sort -V | head -1)" | |
| if [ "${rejected_cmake_version}" = "${CMAKE_MINIMAL_VERSION_FOR_CATALYST}" ]; then |
|
|
||
| # add Catalyst | ||
| COPY --from=builder_catalyst /opt/catalyst /opt/catalyst | ||
| ENV catalyst_DIR=/opt/catalyst/lib/cmake/catalyst-${CATALYST_VERSION} |
Member
There was a problem hiding this comment.
Suggested change
| ENV catalyst_DIR=/opt/catalyst/lib/cmake/catalyst-${CATALYST_VERSION} | |
| ENV catalyst_ROOT=/opt/catalyst/ |
| # force parallel HDF5 as first try (see #43) | ||
| ENV HDF5_DIR=/usr/lib/x86_64-linux-gnu/cmake/hdf5_${MPI} | ||
|
|
||
| # create user ci |
Member
There was a problem hiding this comment.
Suggested change
| # create user ci |
| # libraries that depend on MPI & are required in all cases | ||
| BASE_MPILIBS="py-mpi4py veloc" | ||
| BASE_MPILIBS="py-mpi4py veloc libcatalyst+mpi+python" | ||
| BASE_MPILIBS_OLDSPACK="py-mpi4py veloc libcatalyst+mpi" |
Member
There was a problem hiding this comment.
Suggested change
| BASE_MPILIBS_OLDSPACK="py-mpi4py veloc libcatalyst+mpi" | |
| #TODO: libcatalyst+python was introduced in spack 0.22, switch back to a single list when our minimum requirement goes at or above above that | |
| BASE_MPILIBS_OLDSPACK="py-mpi4py veloc libcatalyst+mpi" |
| # Add our MPI of choice and base MPI-dependant libs to the environment and install it | ||
| RUN spack -e pdienv add -l mpi "${MPI}" | ||
| RUN . deps.sh && spack -e pdienv add -l mpilibs ${BASE_MPILIBS} | ||
| RUN <<EORUN |
Member
There was a problem hiding this comment.
Suggested change
| RUN <<EORUN | |
| RUN <<EORUN | |
| #TODO: introduced to handle a missing variant in spack<0.22, remove when our minimum requirement goes at or above above that |
Comment on lines
+18
to
+26
| if ( spack --version | grep -qs '^1\.' ) | ||
| then | ||
| . deps.sh | ||
| spack -e pdienv add -l mpilibs ${BASE_MPILIBS} | ||
| else | ||
| . deps.sh | ||
| spack -e pdienv add -l mpilibs ${BASE_MPILIBS_OLDSPACK} | ||
| fi | ||
| EORUN |
Member
There was a problem hiding this comment.
Suggested change
| if ( spack --version | grep -qs '^1\.' ) | |
| then | |
| . deps.sh | |
| spack -e pdienv add -l mpilibs ${BASE_MPILIBS} | |
| else | |
| . deps.sh | |
| spack -e pdienv add -l mpilibs ${BASE_MPILIBS_OLDSPACK} | |
| fi | |
| EORUN | |
| . deps.sh | |
| if ( spack --version | grep -qs '^1\.' ) | |
| then | |
| spack -e pdienv add -l mpilibs ${BASE_MPILIBS} | |
| else | |
| spack -e pdienv add -l mpilibs ${BASE_MPILIBS_OLDSPACK} | |
| fi | |
| EORUN |
jmorice91
marked this pull request as draft
November 3, 2026 15:40
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
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.
Reopen the previous #36 due to a force push