Update upstream mg5amcnlo, including vecsizeFIX rollback and patches for CMS Drell Yan #654
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
…er's fix for CMS Drell-Yan (madgraph5#645) This is using the not-yet-merged mg5amcnlo/mg5amcnlo#49
…ream changes (CHANNEL -> ICONFIG)
…lso my modified vecsizeFIX The code is now generated and builds successfully
… Olivier's patches and my vecsizeFIX: all looks ok? This test was done a posteriori, after seeing tmad failures with Olivier's patches WITHOUT my vecsizeFIX. So the issue there is probably in my changes rather than in livier's changes?
Revert "[cmsdy] (a posteriori and temporary: will revert) test tmad ggtt with Olivier's patches and my vecsizeFIX: all looks ok?" This reverts commit d4f85b7.
…anges as expected ./CODEGEN/generateAndCompare.sh gg_tt --mad --nopatch git diff --no-ext-diff -R gg_tt.mad/Source/dsample.f gg_tt.mad/Source/genps.inc gg_tt.mad/Source/vector.inc gg_tt.mad/SubProcesses/makefile > CODEGEN/MG5aMC_patches/PROD/patch.common git diff --no-ext-diff -R gg_tt.mad/SubProcesses/P1_gg_ttx/auto_dsig1.f gg_tt.mad/SubProcesses/P1_gg_ttx/driver.f gg_tt.mad/SubProcesses/P1_gg_ttx/matrix1.f > CODEGEN/MG5aMC_patches/PROD/patch.P1 git checkout gg_tt.mad
…ivier's patch, as expected (NB conversely, there are almost no changes involving vector.inc, as this uses my modified vecsizeFIX patch)
…ry change, that breaks patching when I remove vecsizeFIX changes
…s changes, the code still builds ok (this particular change was about Fortran line length, but here it seems totally unnecessary)
…anges as expected ./CODEGEN/generateAndCompare.sh gg_tt --mad --nopatch git diff --no-ext-diff -R gg_tt.mad/Source/dsample.f gg_tt.mad/Source/genps.inc gg_tt.mad/Source/vector.inc gg_tt.mad/SubProcesses/makefile > CODEGEN/MG5aMC_patches/PROD/patch.common git diff --no-ext-diff -R gg_tt.mad/SubProcesses/P1_gg_ttx/auto_dsig1.f gg_tt.mad/SubProcesses/P1_gg_ttx/driver.f gg_tt.mad/SubProcesses/P1_gg_ttx/matrix1.f > CODEGEN/MG5aMC_patches/PROD/patch.P1 git checkout gg_tt.mad
…nges as expected with the simpler patch.P1
…for CMS Drell-Yan (madgraph5#645) NB: Olivier's patch also includes one commit fixing madgraph5#629, making vecsizeFIX unnecessary (at least for the moment)
…atch - many changes (vector.inc is back in many places) The code generates and builds ok
…nc is back), as expected
…all due to higher processor frequency in GHz?! STARTED AT Tue May 16 18:50:06 CEST 2023 ./tput/teeThroughputX.sh -mix -hrd -makej -eemumu -ggtt -ggttg -ggttgg -gqttq -ggttggg -makeclean ENDED(1) AT Tue May 16 22:13:27 CEST 2023 [Status=0] ./tput/teeThroughputX.sh -flt -hrd -makej -eemumu -ggtt -ggttgg -inlonly -makeclean ENDED(2) AT Tue May 16 22:38:08 CEST 2023 [Status=0] ./tput/teeThroughputX.sh -makej -eemumu -ggtt -ggttg -gqttq -ggttgg -ggttggg -flt -bridge -makeclean ENDED(3) AT Tue May 16 22:47:14 CEST 2023 [Status=0] ./tput/teeThroughputX.sh -eemumu -ggtt -ggttgg -flt -rmbhst ENDED(4) AT Tue May 16 22:50:15 CEST 2023 [Status=0] ./tput/teeThroughputX.sh -eemumu -ggtt -ggttgg -flt -curhst ENDED(5) AT Tue May 16 22:53:13 CEST 2023 [Status=0]
…nput parameters? or issue in my changes?) STARTED AT Tue May 16 22:56:16 CEST 2023 ENDED AT Tue May 16 22:57:32 CEST 2023 NB: a posteriori I tested tmad on an earlier commit with my vecsizeFIX as well as Olivier's patches and all looked ok...
…nserting new code in the wrong place (patch should have failed?...)
Revert "[cmsdy] rerun 15 tmad alltees, they all failed (Olivier changed the input parameters? or issue in my changes?)" This reverts commit 7fbf6e0. Revert "[cmddy] rerun 70 tput alltees - generally (much) faster, but this is all due to higher processor frequency in GHz?!" This reverts commit 11541b7.
…driver.f ./CODEGEN/generateAndCompare.sh gg_tt --mad --nopatch git diff --no-ext-diff -R gg_tt.mad/Source/dsample.f gg_tt.mad/Source/genps.inc gg_tt.mad/Source/vector.inc gg_tt.mad/SubProcesses/makefile > CODEGEN/MG5aMC_patches/PROD/patch.common git diff --no-ext-diff -R gg_tt.mad/SubProcesses/P1_gg_ttx/auto_dsig1.f gg_tt.mad/SubProcesses/P1_gg_ttx/driver.f gg_tt.mad/SubProcesses/P1_gg_ttx/matrix1.f > CODEGEN/MG5aMC_patches/PROD/patch.P1 git checkout gg_tt.mad
…h minor cchanges in passcuts and in comments)
….sh, after removing VECSIZE_MEMMAX_COUPL Revert "[vecsizeFIX] madgraph5#629 in codegen patchMad.sh, use VECSIZE_MEMMAX_COUPL instead of VECSIZE_MEMMAX for coupl_write.inc" This reverts commit a541807.
…s first coupling instead of full array madgraph5#456)
…rite.inc, all looks ok
|
This is WIP because I am just reruning all tput and (especially) tmad tests. Then I will merge this. Note, it depends on upstream mg5amcnlo/mg5amcnlo#54 being merged but that should happen soon after Olivier checks it. |
…is is all due to higher processor frequency in GHz?! STARTED AT Wed May 17 17:46:23 CEST 2023 ./tput/teeThroughputX.sh -mix -hrd -makej -eemumu -ggtt -ggttg -ggttgg -gqttq -ggttggg -makeclean ENDED(1) AT Wed May 17 18:10:47 CEST 2023 [Status=0] ./tput/teeThroughputX.sh -flt -hrd -makej -eemumu -ggtt -ggttgg -inlonly -makeclean ENDED(2) AT Wed May 17 18:19:34 CEST 2023 [Status=0] ./tput/teeThroughputX.sh -makej -eemumu -ggtt -ggttg -gqttq -ggttgg -ggttggg -flt -bridge -makeclean ENDED(3) AT Wed May 17 18:28:43 CEST 2023 [Status=0] ./tput/teeThroughputX.sh -eemumu -ggtt -ggttgg -flt -rmbhst ENDED(4) AT Wed May 17 18:31:43 CEST 2023 [Status=0] ./tput/teeThroughputX.sh -eemumu -ggtt -ggttgg -flt -curhst ENDED(5) AT Wed May 17 18:34:42 CEST 2023 [Status=0]
STARTED AT Wed May 17 18:37:45 CEST 2023 ENDED AT Wed May 17 22:47:20 CEST 2023 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 1 /data/avalassi/GPU2023/madgraph4gpuX/epochX/cudacpp/tmad/logs_ggttgg_mad/log_ggttgg_mad_d_inl0_hrd0.txt 1 /data/avalassi/GPU2023/madgraph4gpuX/epochX/cudacpp/tmad/logs_ggttgg_mad/log_ggttgg_mad_f_inl0_hrd0.txt 1 /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 0 /data/avalassi/GPU2023/madgraph4gpuX/epochX/cudacpp/tmad/logs_gqttq_mad/log_gqttq_mad_d_inl0_hrd0.txt In tmad/logs_ggttgg_mad/log_ggttgg_mad_d_inl0_hrd0.txt: +ERROR! events.lhe.cpp.1 and events.lhe.ref.1 differ! +diff /data/avalassi/GPU2023/madgraph4gpuX/epochX/cudacpp/gg_ttgg.mad/SubProcesses/P1_gg_ttxgg/events.lhe.cpp.1 /data/avalassi/GPU2023/madgraph4gpuX/epochX/cudacpp/gg_ttgg.mad/SubProcesses/P1_gg_ttxgg/events.lhe.ref.1 | head -20 +3,4c3,4 +< 21 -1 0 0 503 502 0.00000000000E+00 0.00000000000E+00 0.13289043826E+04 0.13289043826E+04 0.00000000000E+00 0. -1. +< 21 -1 0 0 504 503 -0.00000000000E+00 -0.00000000000E+00 -0.81223316322E+02 0.81223316322E+02 0.00000000000E+00 0. -1. +--- +> 21 -1 0 0 505 502 0.00000000000E+00 0.00000000000E+00 0.13289043826E+04 0.13289043826E+04 0.00000000000E+00 0. -1. +> 21 -1 0 0 502 503 -0.00000000000E+00 -0.00000000000E+00 -0.81223316322E+02 0.81223316322E+02 0.00000000000E+00 0. -1. +6,8c6,8 +< -6 1 1 2 0 505 0.39403209480E+02 -0.10079469096E+02 0.28578226692E+03 0.33653337532E+03 0.17300000000E+03 0. -1. +< 21 1 1 2 504 501 -0.19269775075E+03 0.33434234480E+02 0.26595208036E+03 0.33012237159E+03 0.00000000000E+00 0. -1. +< 21 1 1 2 505 502 0.20498361398E+02 0.29398294961E+02 0.12436578484E+03 0.12942677855E+03 0.00000000000E+00 0. -1. +--- +> -6 1 1 2 0 504 0.39403209480E+02 -0.10079469096E+02 0.28578226692E+03 0.33653337532E+03 0.17300000000E+03 0. -1. +> 21 1 1 2 504 503 -0.19269775075E+03 0.33434234480E+02 0.26595208036E+03 0.33012237159E+03 0.00000000000E+00 0. -1. +> 21 1 1 2 505 501 0.20498361398E+02 0.29398294961E+02 0.12436578484E+03 0.12942677855E+03 0.00000000000E+00 0. -1. +54,56c54,56 +< -6 1 1 2 0 504 0.12539878316E+03 0.25084537686E+03 0.17266798312E+03 0.37201006747E+03 0.17300000000E+03 0. 1. +< 21 1 1 2 504 505 0.91559552940E+02 -0.56451043237E+03 0.74367925168E+03 0.93814391719E+03 0.00000000000E+00 0. -1. +< 21 1 1 2 505 503 -0.59178509296E+01 -0.20888672560E+02 0.16637826240E+02 0.27352785287E+02 0.00000000000E+00 0. 1. +--- +> -6 1 1 2 0 505 0.12539878316E+03 0.25084537686E+03 0.17266798312E+03 0.37201006747E+03 0.17300000000E+03 0. 1.
|
There is an issue in ggttgg tmad logs after this update... see #655 |
…er during the merge of vecsize3 mg5amcnlo/mg5amcnlo#54
…eam fix for madgraph5#655 (NB no need to regenerate the SA processes as there is no change in the code there)
|
I have created and merged a noop upstream MR mg5amcnlo/mg5amcnlo#56 which includes a commit hash that can be used in this MR #654. This ceratinly fixes #655 in ggttgg. I am now rerunning tests on all processes as usual, to make sure that all is ok. Then I will merge this #654. Then later on the issue #655 will probably need to be fixed in the GPU plugin. Whan changed upstream is the use of iconficg vs channel in select_color. |
…ding ggttgg STARTED AT Fri May 19 15:21:10 CEST 2023 ENDED AT Fri May 19 19:41:18 CEST 2023 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 0 /data/avalassi/GPU2023/madgraph4gpuX/epochX/cudacpp/tmad/logs_gqttq_mad/log_gqttq_mad_d_inl0_hrd0.txt
|
I have rerun all tmad tests and they look good. All CI tests are ok - I am self merging. As a brief summary, this MR includes an update of the upstream and correspoding GPU plugin changes, including
|
This was referenced May 23, 2023
# for free
to join this conversation on GitHub.
Already have an account?
# 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.
This is mainly an update in upstream mg5amcnlo. It will use the code from mg5amcnlo/mg5amcnlo#54.
This includes a patch from Olivier that will fix #629 (the fact that "launch" was not working out of the box). It removes instead my previous vecsizeFIX changes, which dependend on upstream mg5amcnlo/mg5amcnlo#49, which was closed and mot merged. Essentially, VECSIZE_MEMMAX_COUPL disappears and we go back to having only VECSIZE_MEMMAX. The comments around vector.inc however are improved consistently.
This also includes the patch from Olivier that has fixed #645 for the CMS Drell Yan process.
cc @oliviermattelaer @roiser