-
Notifications
You must be signed in to change notification settings - Fork 9
Fix #438, add three PDI deactivation option through CMake #543
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
base: main
Are you sure you want to change the base?
Conversation
|
Warning you're updating the tutorial. This is unrelated |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this PR is almost ready for merge. Just a few changes are needed.
The tutorial previously used broke the CI. |
Changing back to tutorial @ 7334107. |
…ses used by each specific CI configuration
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't see the example being run here. It should, with pdi and no-pdi.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The example is now run with "PDI_example_trace_C" as part of the PDI tests, then on its own for no-PDI.
|
In addition to my review: it seems like you are testing that the scripts work directly in CI, could you not test locally by using the same docker images as in CI ? This would avoid small intermediate commits. |
Related PR : #595 |
…ile /tmp/tests.xml'
run-local-CI.sh
Outdated
| @@ -0,0 +1,99 @@ | |||
| #!/usr/bin/env bash | |||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is this file still necessary, as discussed yesterday? I would keep this local, not on git.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm not sure all the tests and example are run depending on the run configuration.
For instance, the example should run with PDI and no-pdi, with and without paraconf on the system, and this is not currently the case.
bin/build_and_run_all_tests
Outdated
|
|
||
| cmake -DDIST_PROFILE=Devel ${CMAKE_FLAGS} "${SRCDIR}" | ||
| cd "${TEST_DIR_WITH_PDI}" | ||
| cmake -DBUILD_BENCHMARKING=OFF -DDIST_PROFILE=Devel ${CMAKE_FLAGS} "${SRCDIR}" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why deactivate benchmarking ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is temporary, waiting for a definitive commit.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Now reactivated with the following commit.
| # Configure, build & test for pdi's example with CMAKE_PREFIX_PATH (find_package) for no-pdi, with Paraconf | ||
|
|
||
| cd "${TEST_DIR_NO_PDI}" | ||
| cmake -DBUILD_FORTRAN=OFF -DBUILD_DECL_HDF5_PLUGIN=OFF -DBUILD_DECL_NETCDF_PLUGIN=OFF -DCMAKE_PREFIX_PATH="${SRCDIR}/${RELATIVE_NO_PDI_PATH}" "${SRCDIR}/example" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why deactivate fortran, hdf5 and netcdf plugins ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Example's CMakeLists does not use or account for those options, the cmake command here returns a warning of ignored option.
|
|
||
| cd "${TEST_DIR_API}" | ||
| NO_PDI_TESTS="test_api_C test_api_CXX" | ||
| cmake -DBUILD_DECL_HDF5_PLUGIN=OFF -DBUILD_DECL_NETCDF_PLUGIN=OFF -DCMAKE_PREFIX_PATH="${SRCDIR}/${RELATIVE_NO_PDI_PATH}" "${SRCDIR}/tests" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why deactivate dhf5 and netcdf plugins ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Tests' CMakeLists does not use or account for those options, the cmake command here returns a warning of ignored option.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm not sure if this is correct. It looks like the example is only run if paraconf is found on the system.
As a reminder, here is what should be run:
| n/a | PDI | no-pdi |
|---|---|---|
| paraconf system | test PDI, example | test no-pdi, exemple |
| no paraconf system (use embedded) | test PDI, exemple | test no-pdi |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The example is already included in the "test PDI" part (so the left column "PDI" is always run).
The if condition of this file only runs the top-right case, to run the example with no-pdi only with the system's paraconf.
Missing the case where paraconf is missing.
List of things to check before making a PR
Before merging your code, please check the following:
.clang-format;Fix #issuekeyword to autoclose the issue when merged.