Test and complete the fix for 825 in PR 850 #860
Merged
Conversation
This file contains 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
… my O/S - no change, no new files
…pt on my O/S - three new jpg/html files Changes to be committed: modified: susy_gg_t1t1.mad/CODEGEN_mad_susy_gg_t1t1_log.txt new file: susy_gg_t1t1.mad/SubProcesses/P1_gg_t1t1x/card.jpg new file: susy_gg_t1t1.mad/SubProcesses/P1_gg_t1t1x/diagrams.html new file: susy_gg_t1t1.mad/SubProcesses/P1_gg_t1t1x/matrix11.jpg
…grams.html and matrix*.jpg files (created if ghostscript is installed)
…es three jpg/html files generated if ghostscript is installed
…adgraph5#850 fixing madgraph5#825 - all ok no change
…h5#850 fixing susy xsec mismatch madgraph5#825) into tmad2
… susy xsec mismatch madgraph5#825: add Ccoeff to all HelAmps.h files
… tests are now failing (madgraph5#859), probably the reference files must be updated STARTED AT Mon Jun 3 09:14:12 AM CEST 2024 ./tput/teeThroughputX.sh -mix -hrd -makej -eemumu -ggtt -ggttg -ggttgg -gqttq -ggttggg -makeclean ENDED(1) AT Mon Jun 3 09:35:27 AM CEST 2024 [Status=0] ./tput/teeThroughputX.sh -flt -hrd -makej -eemumu -ggtt -ggttgg -inlonly -makeclean ENDED(2) AT Mon Jun 3 09:47:50 AM CEST 2024 [Status=0] ./tput/teeThroughputX.sh -makej -eemumu -ggtt -ggttg -gqttq -ggttgg -ggttggg -flt -bridge -makeclean ENDED(3) AT Mon Jun 3 09:56:04 AM CEST 2024 [Status=0] ./tput/teeThroughputX.sh -eemumu -ggtt -ggttgg -flt -rmbhst ENDED(4) AT Mon Jun 3 09:58:53 AM CEST 2024 [Status=0] ./tput/teeThroughputX.sh -eemumu -ggtt -ggttgg -flt -curhst ENDED(5) AT Mon Jun 3 10:01:40 AM CEST 2024 [Status=0] ./tput/teeThroughputX.sh -eemumu -ggtt -ggttgg -flt -common ENDED(6) AT Mon Jun 3 10:04:34 AM CEST 2024 [Status=0] ./tput/teeThroughputX.sh -mix -hrd -makej -susyggtt -susyggt1t1 -smeftggtttt -heftggbb -makeclean ENDED(7) AT Mon Jun 3 10:16:45 AM CEST 2024 [Status=2] ./tput/logs_susyggt1t1_mad/log_susyggt1t1_mad_f_inl0_hrd1.txt: 1 FAILED TEST ./tput/logs_susyggt1t1_mad/log_susyggt1t1_mad_d_inl0_hrd1.txt: 1 FAILED TEST ./tput/logs_susyggt1t1_mad/log_susyggt1t1_mad_m_inl0_hrd0.txt: 1 FAILED TEST ./tput/logs_susyggt1t1_mad/log_susyggt1t1_mad_f_inl0_hrd0.txt: 1 FAILED TEST ./tput/logs_susyggt1t1_mad/log_susyggt1t1_mad_d_inl0_hrd0.txt: 1 FAILED TEST ./tput/logs_susyggt1t1_mad/log_susyggt1t1_mad_m_inl0_hrd1.txt: 1 FAILED TEST ./tput/logs_susyggtt_mad/log_susyggtt_mad_f_inl0_hrd0.txt: 1 FAILED TEST ./tput/logs_susyggtt_mad/log_susyggtt_mad_d_inl0_hrd1.txt: 1 FAILED TEST ./tput/logs_susyggtt_mad/log_susyggtt_mad_m_inl0_hrd1.txt: 1 FAILED TEST ./tput/logs_susyggtt_mad/log_susyggtt_mad_d_inl0_hrd0.txt: 1 FAILED TEST ./tput/logs_susyggtt_mad/log_susyggtt_mad_m_inl0_hrd0.txt: 1 FAILED TEST ./tput/logs_susyggtt_mad/log_susyggtt_mad_f_inl0_hrd1.txt: 1 FAILED TEST
…adgraph5#825) is fixed as expected, but a SIGFPE crash in gqttq (madgraph5#845) reappears Also still pending: missing xsec in susyggt1t1 (madgraph5#826), LHE mismatch for FPTYPE=f in heftggbb (madgraph5#833) STARTED AT Mon Jun 3 10:16:45 AM CEST 2024 (SM tests) ENDED(1) AT Mon Jun 3 02:56:24 PM CEST 2024 [Status=0] (BSM tests) ENDED(1) AT Mon Jun 3 03:06:33 PM CEST 2024 [Status=0] 24 /data/avalassi/GPU2023/madgraph4gpuX/epochX/cudacpp/tmad/logs_eemumu_mad/log_eemumu_mad_d_inl0_hrd0.txt 24 /data/avalassi/GPU2023/madgraph4gpuX/epochX/cudacpp/tmad/logs_eemumu_mad/log_eemumu_mad_f_inl0_hrd0.txt 24 /data/avalassi/GPU2023/madgraph4gpuX/epochX/cudacpp/tmad/logs_eemumu_mad/log_eemumu_mad_m_inl0_hrd0.txt 24 /data/avalassi/GPU2023/madgraph4gpuX/epochX/cudacpp/tmad/logs_ggttggg_mad/log_ggttggg_mad_d_inl0_hrd0.txt 24 /data/avalassi/GPU2023/madgraph4gpuX/epochX/cudacpp/tmad/logs_ggttggg_mad/log_ggttggg_mad_f_inl0_hrd0.txt 24 /data/avalassi/GPU2023/madgraph4gpuX/epochX/cudacpp/tmad/logs_ggttggg_mad/log_ggttggg_mad_m_inl0_hrd0.txt 24 /data/avalassi/GPU2023/madgraph4gpuX/epochX/cudacpp/tmad/logs_ggttgg_mad/log_ggttgg_mad_d_inl0_hrd0.txt 24 /data/avalassi/GPU2023/madgraph4gpuX/epochX/cudacpp/tmad/logs_ggttgg_mad/log_ggttgg_mad_f_inl0_hrd0.txt 24 /data/avalassi/GPU2023/madgraph4gpuX/epochX/cudacpp/tmad/logs_ggttgg_mad/log_ggttgg_mad_m_inl0_hrd0.txt 24 /data/avalassi/GPU2023/madgraph4gpuX/epochX/cudacpp/tmad/logs_ggttg_mad/log_ggttg_mad_d_inl0_hrd0.txt 24 /data/avalassi/GPU2023/madgraph4gpuX/epochX/cudacpp/tmad/logs_ggttg_mad/log_ggttg_mad_f_inl0_hrd0.txt 24 /data/avalassi/GPU2023/madgraph4gpuX/epochX/cudacpp/tmad/logs_ggttg_mad/log_ggttg_mad_m_inl0_hrd0.txt 24 /data/avalassi/GPU2023/madgraph4gpuX/epochX/cudacpp/tmad/logs_ggtt_mad/log_ggtt_mad_d_inl0_hrd0.txt 24 /data/avalassi/GPU2023/madgraph4gpuX/epochX/cudacpp/tmad/logs_ggtt_mad/log_ggtt_mad_f_inl0_hrd0.txt 24 /data/avalassi/GPU2023/madgraph4gpuX/epochX/cudacpp/tmad/logs_ggtt_mad/log_ggtt_mad_m_inl0_hrd0.txt 24 /data/avalassi/GPU2023/madgraph4gpuX/epochX/cudacpp/tmad/logs_gqttq_mad/log_gqttq_mad_d_inl0_hrd0.txt 16 /data/avalassi/GPU2023/madgraph4gpuX/epochX/cudacpp/tmad/logs_gqttq_mad/log_gqttq_mad_f_inl0_hrd0.txt 24 /data/avalassi/GPU2023/madgraph4gpuX/epochX/cudacpp/tmad/logs_gqttq_mad/log_gqttq_mad_m_inl0_hrd0.txt 24 /data/avalassi/GPU2023/madgraph4gpuX/epochX/cudacpp/tmad/logs_heftggbb_mad/log_heftggbb_mad_d_inl0_hrd0.txt 1 /data/avalassi/GPU2023/madgraph4gpuX/epochX/cudacpp/tmad/logs_heftggbb_mad/log_heftggbb_mad_f_inl0_hrd0.txt 24 /data/avalassi/GPU2023/madgraph4gpuX/epochX/cudacpp/tmad/logs_heftggbb_mad/log_heftggbb_mad_m_inl0_hrd0.txt 24 /data/avalassi/GPU2023/madgraph4gpuX/epochX/cudacpp/tmad/logs_smeftggtttt_mad/log_smeftggtttt_mad_d_inl0_hrd0.txt 24 /data/avalassi/GPU2023/madgraph4gpuX/epochX/cudacpp/tmad/logs_smeftggtttt_mad/log_smeftggtttt_mad_f_inl0_hrd0.txt 24 /data/avalassi/GPU2023/madgraph4gpuX/epochX/cudacpp/tmad/logs_smeftggtttt_mad/log_smeftggtttt_mad_m_inl0_hrd0.txt 0 /data/avalassi/GPU2023/madgraph4gpuX/epochX/cudacpp/tmad/logs_susyggt1t1_mad/log_susyggt1t1_mad_d_inl0_hrd0.txt 0 /data/avalassi/GPU2023/madgraph4gpuX/epochX/cudacpp/tmad/logs_susyggt1t1_mad/log_susyggt1t1_mad_f_inl0_hrd0.txt 0 /data/avalassi/GPU2023/madgraph4gpuX/epochX/cudacpp/tmad/logs_susyggt1t1_mad/log_susyggt1t1_mad_m_inl0_hrd0.txt 24 /data/avalassi/GPU2023/madgraph4gpuX/epochX/cudacpp/tmad/logs_susyggtt_mad/log_susyggtt_mad_d_inl0_hrd0.txt 24 /data/avalassi/GPU2023/madgraph4gpuX/epochX/cudacpp/tmad/logs_susyggtt_mad/log_susyggtt_mad_f_inl0_hrd0.txt 24 /data/avalassi/GPU2023/madgraph4gpuX/epochX/cudacpp/tmad/logs_susyggtt_mad/log_susyggtt_mad_m_inl0_hrd0.txt
…ence log file for susy_gg_tt.mad (fix madgraph5#859 after adding PR#850 fix for madgraph5#825 xsec mismatch) CUDACPP_RUNTEST_DUMPEVENTS=1 ./build.none_d_inl0_hrd0/runTest_cpp.exe \cp ../../test/ref/dump* ../../../CODEGEN/PLUGIN/CUDACPP_SA_OUTPUT/test/ref/ \cp ../../test/ref/dump* ../../../susy_gg_tt.sa/test/ref/
…erence log file for susy_gg_t1t1.mad (fix madgraph5#859 after adding PR#850 fix for madgraph5#825 xsec mismatch) CUDACPP_RUNTEST_DUMPEVENTS=1 ./build.none_d_inl0_hrd0/runTest_cpp.exe \cp ../../test/ref/dump* ../../../CODEGEN/PLUGIN/CUDACPP_SA_OUTPUT/test/ref/ \cp ../../test/ref/dump* ../../../susy_gg_t1t1.sa/test/ref/
…(new reference files for susyggtt and susyggt1t1) - all ok now ./tput/allTees.sh -bsmonly |& tee pippotput1 STARTED AT Mon Jun 3 03:50:08 PM CEST 2024 SKIP './tput/teeThroughputX.sh -mix -hrd -makej -eemumu -ggtt -ggttg -ggttgg -gqttq -ggttggg -makeclean ' ENDED(1) AT Mon Jun 3 03:50:08 PM CEST 2024 [Status=0] SKIP './tput/teeThroughputX.sh -flt -hrd -makej -eemumu -ggtt -ggttgg -inlonly -makeclean ' ENDED(2) AT Mon Jun 3 03:50:08 PM CEST 2024 [Status=0] SKIP './tput/teeThroughputX.sh -makej -eemumu -ggtt -ggttg -gqttq -ggttgg -ggttggg -flt -bridge -makeclean ' ENDED(3) AT Mon Jun 3 03:50:08 PM CEST 2024 [Status=0] SKIP './tput/teeThroughputX.sh -eemumu -ggtt -ggttgg -flt -rmbhst ' ENDED(4) AT Mon Jun 3 03:50:08 PM CEST 2024 [Status=0] SKIP './tput/teeThroughputX.sh -eemumu -ggtt -ggttgg -flt -curhst ' ENDED(5) AT Mon Jun 3 03:50:08 PM CEST 2024 [Status=0] SKIP './tput/teeThroughputX.sh -eemumu -ggtt -ggttgg -flt -common ' ENDED(6) AT Mon Jun 3 03:50:08 PM CEST 2024 [Status=0] ./tput/teeThroughputX.sh -mix -hrd -makej -susyggtt -susyggt1t1 -smeftggtttt -heftggbb -makeclean ENDED(7) AT Mon Jun 3 04:01:43 PM CEST 2024 [Status=0] No errors found in logs
…es for debug builds (for gdb on SIGFPE crash madgraph5#845)
…adgraph5#859), remove temporary patch for gqttq build (madgraph5#845)
git checkout upstream/master $(git ls-tree --name-only HEAD */CODEGEN*txt)
… logs for easier merging git checkout upstream/master $(git ls-tree --name-only HEAD tput/logs* tmad/logs*)
|
Hi Olivier, this is now also ready for merging.It includes your #850 and complements it with an update of the susy reference files for runTest (#859), plus various other tests. Can you please have a look and approve? I would suggest to first merge your #850 and then this one. Or I think that one can merge this directly and it will automatically close your #850 as merged. Reminder, there are two other PRs from me ready to be reviewed and merged: PR #854 (just adding matrix.pdf files for easier visualization than ps) and PR #857 (fixing the SIGFPE crash in rotxxx by adding volatile). Instead, I think that issues #826 (no xsec in susy_gg_t1t1) and #845 (SIGFPE crash in gqttq) are still pedning to be debugged. I think that a combination of your PR #852 and my PR #853 might fix those, but as far as I am concerned this will wait for end June. Thanks! |
Merged
oliviermattelaer
approved these changes
Jun 3, 2024
|
Thanks Olivier, merging now |
valassi
added a commit
to valassi/madgraph4gpu
that referenced
this pull request
Jun 3, 2024
…raph5#850 and madgraph5#860 for xsec mismatch madgraph5#825) into susy2 Fix conflicts: epochX/cudacpp/CODEGEN/generateAndCompare.sh
valassi
added a commit
to valassi/madgraph4gpu
that referenced
this pull request
Jun 3, 2024
…raph5#850 and madgraph5#860 for xsec mismatch madgraph5#825) into tmad
valassi
added a commit
to valassi/madgraph4gpu
that referenced
this pull request
Jun 3, 2024
…raph5#850 and madgraph5#860 for xsec mismatch madgraph5#825) into susy Fix conflicts: epochX/cudacpp/CODEGEN/generateAndCompare.sh
This was referenced Jun 3, 2024
valassi
added a commit
to valassi/madgraph4gpu
that referenced
this pull request
Jun 3, 2024
…aph5#860 and madgraph5#850 for Ccoeff madgraph5#825) STARTED AT Mon Jun 3 05:51:20 PM CEST 2024 ./tput/teeThroughputX.sh -mix -hrd -makej -eemumu -ggtt -ggttg -ggttgg -gqttq -ggttggg -makeclean ENDED(1) AT Mon Jun 3 06:12:34 PM CEST 2024 [Status=0] ./tput/teeThroughputX.sh -flt -hrd -makej -eemumu -ggtt -ggttgg -inlonly -makeclean ENDED(2) AT Mon Jun 3 06:20:51 PM CEST 2024 [Status=0] ./tput/teeThroughputX.sh -makej -eemumu -ggtt -ggttg -gqttq -ggttgg -ggttggg -flt -bridge -makeclean ENDED(3) AT Mon Jun 3 06:29:05 PM CEST 2024 [Status=0] ./tput/teeThroughputX.sh -eemumu -ggtt -ggttgg -flt -rmbhst ENDED(4) AT Mon Jun 3 06:31:55 PM CEST 2024 [Status=0] ./tput/teeThroughputX.sh -eemumu -ggtt -ggttgg -flt -curhst ENDED(5) AT Mon Jun 3 06:34:42 PM CEST 2024 [Status=0] ./tput/teeThroughputX.sh -eemumu -ggtt -ggttgg -flt -common ENDED(6) AT Mon Jun 3 06:37:37 PM CEST 2024 [Status=0] ./tput/teeThroughputX.sh -mix -hrd -makej -susyggtt -susyggt1t1 -smeftggtttt -heftggbb -makeclean ENDED(7) AT Mon Jun 3 06:47:12 PM CEST 2024 [Status=0] No errors found in logs
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.
Hi @oliviermattelaer this is a PR where I test and complete your fix in PR #850 for #825 (xsec mismatch in susy_gg_tt).
Your patch is good and we should merge it. In these tests however I found that a few additions are needed, in particular the reference files for runTest.exe must be updated (the code changed after adding Ccoeff, so I would say that the old reference files were wrong, see #859).
Still in WIP for now but will be ready soon.