From e68ea2b0a45fd07d82d72fe114030e6118fee0d7 Mon Sep 17 00:00:00 2001 From: Peter Willendrup Date: Tue, 21 Jul 2026 18:23:01 +0200 Subject: [PATCH 1/5] Patches for 2 rare, potential pitfalls: 1) Over/underrun of reflection list in calc_xsect() 2) Add guard for rand01()==1.0 edge case --- mcstas-comps/samples/PowderN.comp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/mcstas-comps/samples/PowderN.comp b/mcstas-comps/samples/PowderN.comp index 36f6baf586..81809bea1c 100644 --- a/mcstas-comps/samples/PowderN.comp +++ b/mcstas-comps/samples/PowderN.comp @@ -745,7 +745,10 @@ SHARE /* check if a line_info element has been recorded already - not on OpenACC */ #ifndef OPENACC if (v >= line_info->v_min && v <= line_info->v_max && line_info->neutron_passed >= CHAR_BUF_LENGTH) { - line = (int)floor (v - line_info->v_min) * CHAR_BUF_LENGTH / (line_info->v_max - line_info->v_min); + double frac = (v - line_info->v_min) / (line_info->v_max - line_info->v_min); + line = (int)floor(frac * CHAR_BUF_LENGTH); + if (line < 0) line = 0; + if (line >= CHAR_BUF_LENGTH) line = CHAR_BUF_LENGTH - 1; Nq = line_info->xs_Nq[line]; *sum = line_info->xs_sum[line]; if (!Nq && *sum == 0) { @@ -1172,10 +1175,11 @@ TRACE if (neutrontype == 3) { /* Make coherent scattering event */ if (line_info.count > 0) { /* choose line */ - if (Nq > 1) + if (Nq > 1) { line = floor (Nq * rand01 ()); /* Select between Nq powder lines */ - else - line = 0; + if (line >= Nq) line = (int)Nq - 1; /* guard rand01()==1.0 edge case */ + } else + line = 0; if (line_info.w_v[line]) arg = line_info.q_v[line] * (1 + line_info.w_v[line] * randnorm ()) / (2.0 * v); else From 8162da309ec01e05039319fa8dfcdfc221759a3d Mon Sep 17 00:00:00 2001 From: Peter Willendrup Date: Tue, 21 Jul 2026 21:34:44 +0200 Subject: [PATCH 2/5] Fix for unbound labeldir var, temporarily test BNL only --- .github/workflows/mcstas-conda-testsuite.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/mcstas-conda-testsuite.yml b/.github/workflows/mcstas-conda-testsuite.yml index 629e2cf7ca..e4a394071d 100644 --- a/.github/workflows/mcstas-conda-testsuite.yml +++ b/.github/workflows/mcstas-conda-testsuite.yml @@ -107,7 +107,7 @@ jobs: export TMPDIR=${HOME}/tmp fi # Run the test with 2 core mpi - ${MCTEST_EXECUTABLE} --verbose --testdir $PWD --suffix ${{ matrix.os }}_${{ matrix.mpi }} --mpi=2 + ${MCTEST_EXECUTABLE} --verbose --testdir $PWD --suffix ${{ matrix.os }}_${{ matrix.mpi }} --mpi=2 --instr=BNL_H8_simple - name: 'Tar output files' id: tar-package @@ -207,7 +207,7 @@ jobs: # predict, so identify it via the source artifact/tarball name # instead of hardcoding it. if [[ "$tgz" == *"ubuntu-latest"* ]]; then - REFLABEL=$(basename "$labeldir") + REFLABEL=$(basename "$tgz") fi rm -rf "$work" done From 198304ccabaffa38e0c95553c7b6f2225bfc3ae7 Mon Sep 17 00:00:00 2001 From: Peter Willendrup Date: Tue, 21 Jul 2026 21:52:57 +0200 Subject: [PATCH 3/5] Remodel from basictest solution --- .github/workflows/mcstas-conda-testsuite.yml | 36 +++++++++++--------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/.github/workflows/mcstas-conda-testsuite.yml b/.github/workflows/mcstas-conda-testsuite.yml index e4a394071d..5aa7e2a31a 100644 --- a/.github/workflows/mcstas-conda-testsuite.yml +++ b/.github/workflows/mcstas-conda-testsuite.yml @@ -200,31 +200,33 @@ jobs: for tgz in downloaded_artifacts/*/*.tgz; do work=$(mktemp -d) tar xzf "$tgz" -C "$work" - mv "$work"/run_test-suite/* mcstas-nightly/ - - # Linux (ubuntu-latest) is the reference platform; the label - # name itself embeds a version string and timestamp we can't - # predict, so identify it via the source artifact/tarball name - # instead of hardcoding it. - if [[ "$tgz" == *"ubuntu-latest"* ]]; then - REFLABEL=$(basename "$tgz") - fi + artifact_name=$(basename "$(dirname "$tgz")") + + for labeldir in "$work"/run_test-suite/*/; do + if [[ "$artifact_name" == *"ubuntu-latest"* ]]; then + REFLABEL=$(basename "$labeldir") + fi + mv $labeldir mcstas-nightly/ + done + done rm -rf "$work" - done if [ -z "$REFLABEL" ]; then - echo "ERROR: could not identify the Linux/reference column (ubuntu-latest artifact missing?)" - exit 1 + echo "WARNING: could not identify the ubuntu-latest/conda reference column" + else + echo "REFLABEL=$REFLABEL" >> "$GITHUB_ENV" + echo "Reference column: $REFLABEL" fi - echo "REFLABEL=$REFLABEL" >> "$GITHUB_ENV" - echo "Reference column: $REFLABEL" - ls mcstas-nightly - - name: 'Run mcviewtest across all platform columns' id: viewtest run: | - cd "$PWD/mcstas-nightly" && mcviewtest --reflabel "$REFLABEL" --nobrowse + cd "$PWD/mcstas-nightly" + if [ -z "$REFLABEL" ]; then + mcviewtest --reflabel "$REFLABEL" --nobrowse + else + mcviewtest --reflabel --nobrowse + fi - name: 'Tar mcstas-nightly output (all platform folders + comparison table)' id: tar-package From 31195549d90de6adf126c2bfadcb9c8e9a08f585 Mon Sep 17 00:00:00 2001 From: Peter Willendrup Date: Tue, 21 Jul 2026 22:05:58 +0200 Subject: [PATCH 4/5] Now works again. Use mpi=auto and sync McStas <-> McXtrace --- .github/workflows/mcstas-conda-testsuite.yml | 3 +- .../workflows/mcxtrace-conda-testsuite.yml | 36 +++++++++---------- 2 files changed, 18 insertions(+), 21 deletions(-) diff --git a/.github/workflows/mcstas-conda-testsuite.yml b/.github/workflows/mcstas-conda-testsuite.yml index 5aa7e2a31a..d27ac04dd2 100644 --- a/.github/workflows/mcstas-conda-testsuite.yml +++ b/.github/workflows/mcstas-conda-testsuite.yml @@ -107,8 +107,7 @@ jobs: export TMPDIR=${HOME}/tmp fi # Run the test with 2 core mpi - ${MCTEST_EXECUTABLE} --verbose --testdir $PWD --suffix ${{ matrix.os }}_${{ matrix.mpi }} --mpi=2 --instr=BNL_H8_simple - + ${MCTEST_EXECUTABLE} --verbose --testdir $PWD --suffix ${{ matrix.os }}_${{ matrix.mpi }} --mpi=auto - name: 'Tar output files' id: tar-package if: always() diff --git a/.github/workflows/mcxtrace-conda-testsuite.yml b/.github/workflows/mcxtrace-conda-testsuite.yml index ff0247e779..bce716a2e1 100644 --- a/.github/workflows/mcxtrace-conda-testsuite.yml +++ b/.github/workflows/mcxtrace-conda-testsuite.yml @@ -107,7 +107,7 @@ jobs: export TMPDIR=${HOME}/tmp fi # Run the test with 2 core mpi - ${MXTEST_EXECUTABLE} --verbose --testdir $PWD --suffix ${{ matrix.os }}_${{ matrix.mpi }} --mpi=2 + ${MXTEST_EXECUTABLE} --verbose --testdir $PWD --suffix ${{ matrix.os }}_${{ matrix.mpi }} --mpi=auto - name: 'Tar output files' id: tar-package @@ -201,35 +201,33 @@ jobs: for tgz in downloaded_artifacts/*/*.tgz; do work=$(mktemp -d) tar xzf "$tgz" -C "$work" - labeldir=$(ls -d "$work"/run_test-suite/*/) - mv "$labeldir" mcxtrace-nightly/ - - # Linux (ubuntu-latest) is the reference platform; the label - # name itself embeds a version string and timestamp we can't - # predict, so identify it via the source artifact/tarball name - # instead of hardcoding it. - if [[ "$tgz" == *"ubuntu-latest"* ]]; then + artifact_name=$(basename "$(dirname "$tgz")") + + for labeldir in "$work"/run_test-suite/*/; do + if [[ "$artifact_name" == *"ubuntu-latest"* ]]; then REFLABEL=$(basename "$labeldir") fi + mv $labeldir mcxtrace-nightly/ + done + done rm -rf "$work" - done if [ -z "$REFLABEL" ]; then - echo "ERROR: could not identify the Linux/reference column (ubuntu-latest artifact missing?)" - exit 1 - fi - + echo "WARNING: could not identify the ubuntu-latest/conda reference column" + else echo "REFLABEL=$REFLABEL" >> "$GITHUB_ENV" echo "Reference column: $REFLABEL" - ls mcxtrace-nightly + fi - name: 'Run mxviewtest across all platform columns' id: viewtest run: | - set -e - set -u - set -x - cd "$PWD/mcxtrace-nightly" && mxviewtest --reflabel "$REFLABEL" --nobrowse + cd "$PWD/mcxtrace-nightly" + if [ -z "$REFLABEL" ]; then + mxviewtest --reflabel "$REFLABEL" --nobrowse + else + mxviewtest --reflabel --nobrowse + fi - name: 'Tar mcxtrace-nightly output (all platform folders + comparison table)' id: tar-package From dd80dd25695c1cdd49a9311c7669ca540aa0d33b Mon Sep 17 00:00:00 2001 From: Peter Willendrup Date: Wed, 22 Jul 2026 09:08:36 +0200 Subject: [PATCH 5/5] Port edge-case protection from McStas PowderN to McXtrace --- mcxtrace-comps/samples/PowderN.comp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/mcxtrace-comps/samples/PowderN.comp b/mcxtrace-comps/samples/PowderN.comp index 554381372c..6599e9548e 100644 --- a/mcxtrace-comps/samples/PowderN.comp +++ b/mcxtrace-comps/samples/PowderN.comp @@ -596,7 +596,10 @@ SHARE /* check if a line_info element has been recorded already - not on OpenACC */ #ifndef OPENACC if (k >= line_info->k_min && k <= line_info->k_max && line_info->photon_passed >= CHAR_BUF_LENGTH) { - line = (int)floor (k - line_info->k_min) * CHAR_BUF_LENGTH / (line_info->k_max - line_info->k_min); + double frac = (k - line_info->k_min) / (line_info->k_max - line_info->k_min); + line = (int)floor(frac * CHAR_BUF_LENGTH); + if (line < 0) line = 0; + if (line >= CHAR_BUF_LENGTH) line = CHAR_BUF_LENGTH - 1; Nq = line_info->xs_Nq[line]; *sum = line_info->xs_sum[line]; if (!Nq && *sum == 0) { @@ -1070,9 +1073,10 @@ TRACE if (photontype == 3) { /* Make coherent scattering event */ if (line_info.count > 0) { /* choose line */ - if (Nq > 1) + if (Nq > 1) { line = floor (Nq * rand01 ()); /* Select between Nq powder lines */ - else + if (line >= Nq) line = (int)Nq - 1; /* guard rand01()==1.0 edge case */ + } else line = 0; if (line_info.w[line]) arg = line_info.q[line] * (1 + line_info.w[line] * randnorm ()) / (2.0 * k);