use streak.llnl.gov as runner for GHA #2873
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -143,6 +143,26 @@ EOT | |
| # The path to the `sccache` executable is available through the SCCACHE environment variable. | ||
| SCCACHE_CMAKE_ARGS="-DCMAKE_CXX_COMPILER_LAUNCHER=${SCCACHE} -DCMAKE_CUDA_COMPILER_LAUNCHER=${SCCACHE}" | ||
|
|
||
| if [[ ${HOSTNAME} == 'streak.llnl.gov' ]]; then | ||
| DOCKER_CERTS_DIR=/usr/local/share/ca-certificates | ||
| for file in "${GEOS_SRC_DIR}"/certificates/*.crt.pem; do | ||
| if [ -f "$file" ]; then | ||
| filename=$(basename -- "$file") | ||
| filename_no_ext="${filename%.*}" | ||
| new_filename="${DOCKER_CERTS_DIR}/${filename_no_ext}.crt" | ||
| cp "$file" "$new_filename" | ||
| echo "Copied $filename to $new_filename" | ||
| fi | ||
| done | ||
| update-ca-certificates | ||
| # gcloud config set core/custom_ca_certs_file cert.pem' | ||
|
|
||
| NPROC=8 | ||
|
There was a problem hiding this comment. this is hard coded right now for streak. |
||
| else | ||
| NPROC=$(nproc) | ||
| fi | ||
| echo "Using ${NPROC} cores." | ||
|
|
||
| echo "sccache initial state" | ||
| ${SCCACHE} --show-stats | ||
| fi | ||
|
|
@@ -154,7 +174,7 @@ if [[ "${RUN_INTEGRATED_TESTS}" = true ]]; then | |
| or_die apt-get install -y virtualenv python3-dev python-is-python3 | ||
| ATS_PYTHON_HOME=/tmp/run_integrated_tests_virtualenv | ||
| or_die virtualenv ${ATS_PYTHON_HOME} | ||
| ATS_CMAKE_ARGS="-DATS_ARGUMENTS=\"--machine openmpi --ats openmpi_mpirun=/usr/bin/mpirun --ats openmpi_args=--allow-run-as-root --ats openmpi_procspernode=${NPROC} --ats openmpi_maxprocs=${NPROC}\" -DPython3_ROOT_DIR=${ATS_PYTHON_HOME}" | ||
| fi | ||
|
|
||
|
|
||
|
|
@@ -208,9 +228,9 @@ fi | |
|
|
||
| # Performing the requested build. | ||
| if [[ "${BUILD_EXE_ONLY}" = true ]]; then | ||
| or_die ninja -j $NPROC geosx | ||
| else | ||
| or_die ninja -j $NPROC | ||
| or_die ninja install | ||
|
|
||
| if [[ ! -z "${DATA_BASENAME_WE}" ]]; then | ||
|
|
@@ -232,7 +252,11 @@ fi | |
|
|
||
| # Run the unit tests (excluding previously ran checks). | ||
| if [[ "${RUN_UNIT_TESTS}" = true ]]; then | ||
| if [[ ${HOSTNAME} == 'streak.llnl.gov' ]]; then | ||
| or_die ctest --output-on-failure -E "testUncrustifyCheck|testDoxygenCheck|testLifoStorage|testExternalSolvers" | ||
|
There was a problem hiding this comment. This is to exclude the two failing unit tests on GPU systems so we can merge this and follow up with fix PR's. There was a problem hiding this comment. Can you create an issue pointing at this line though? If someone other than you fixes the tests I am pretty sure they'll forget to remove this. There was a problem hiding this comment. I'd add a There was a problem hiding this comment. I would, but I actually don't think we should be excluding unit tests once they are fixed. This is just a hack to get us to the next step (passing tests), after witch this goes away. I actually do want to make it as hard as possible to exclude specific tests 😁 There was a problem hiding this comment. This makes sense. I kind of prefer having an easy way to do thing with a Cerberus at the code review, but it's OK. There was a problem hiding this comment. well....that is a good enough reason. |
||
| else | ||
| or_die ctest --output-on-failure -E "testUncrustifyCheck|testDoxygenCheck" | ||
| fi | ||
| fi | ||
|
|
||
| if [[ "${RUN_INTEGRATED_TESTS}" = true ]]; then | ||
|
|
@@ -256,8 +280,14 @@ if [[ "${RUN_INTEGRATED_TESTS}" = true ]]; then | |
| or_die tar cfM ${DATA_EXCHANGE_DIR}/${DATA_BASENAME_WE}.tar --directory ${GEOS_SRC_DIR} --transform "s/^integratedTests/${DATA_BASENAME_WE}\/repo/" integratedTests | ||
| or_die tar rfM ${DATA_EXCHANGE_DIR}/${DATA_BASENAME_WE}.tar --directory ${GEOSX_BUILD_DIR} --transform "s/^integratedTests/${DATA_BASENAME_WE}\/logs/" integratedTests | ||
| or_die gzip ${DATA_EXCHANGE_DIR}/${DATA_BASENAME_WE}.tar | ||
|
|
||
| # want to clean the integrated tests folder to avoid polluting the next build. | ||
| or_die integratedTests/geos_ats.sh -a clean | ||
|
There was a problem hiding this comment. With @cssherman 's patch to build the baselines out of source, cleaning the integrated tests will surely not be mandatory anymore, since they disappear with the There was a problem hiding this comment. I think this was before the There was a problem hiding this comment. Oh, I think @cssherman 's PR has not been merged already. Am I wrong? There was a problem hiding this comment.
There was a problem hiding this comment. An option can be to mount the workspace read-only in the container, then copy it to a temporary and work in it (waiting for an out-of-source integrated tests which should solve the last item which touches the src dir). Eventually, we'll be able to skip the workspace copy, but not right now. |
||
| fi | ||
|
|
||
| # Cleaning the build directory. | ||
| or_die ninja clean | ||
|
Comment on lines
+288
to
+289
There was a problem hiding this comment. This is most likely superfluous since the build dir is in There was a problem hiding this comment. I think you are right. |
||
|
|
||
| # If we're here, either everything went OK or we have to deal with the integrated tests manually. | ||
| if [[ ! -z "${INTEGRATED_TEST_EXIT_STATUS+x}" ]]; then | ||
| echo "Exiting the build process with exit status ${INTEGRATED_TEST_EXIT_STATUS} from the integrated tests." | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -98,7 +98,7 @@ class SolidBaseUpdates | |
| arrayView1d< real64 const > const m_thermalExpansionCoefficient; | ||
|
|
||
| /// Flag to disable inelasticity | ||
| const bool m_disableInelasticity; | ||
|
There was a problem hiding this comment. This was a bug on heterogeneous memory systems. @klevzoff This was the problem with the constitutive unit tests from the remove There was a problem hiding this comment. is there any way to automatically check for this kind of bugs? Any way to at least get a warning whenever a reference is captured by value in a raja |
||
|
|
||
| /** | ||
| * @brief Get bulkModulus | ||
|
|
||
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.
Could we use the
DOCKER_RUN_ARGSinput to add-v /etc/pki/ca-trust/source/anchors/.../bundle.crt:/etc/pki/ca-trust/.../llnl.bundle.crt:ro.That way the certificate would be at the proper location in read-only, with no copy required from within the container.
Then inside of the docker container simply update the certificates list (we can do it whatever the case : it's fast and could do not harm?). Or if we really want it, we can add an 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.
We certainly can...and probably should. Would you mind if we did this in a follow up PR. We are getting another workstation to run integratedTests on the CPU, and we will require a generic treatment at that time. I would rather just get this merged as is, and in separate PR's:
we can do all of these steps independent of each other IMO.
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.
OK, I'm good with it. We need to be sure we actually have time to revisit this.