Master for360 #992

oliviermattelaer · 2024-09-03T21:47:08Z

Hi Andrea,

This is based on valassi/goodhel and only add one (non controversial) commit for being compatible with gpucpp_for360
(so this also point mg5amc to that commit/branch).

Currently in draft in order to test the CI (but since this is based on your commit, I do expect the same issue of missmatch)

But do not hesitate to cherry-pick this last commit to other branch since it should be fully fine to have it into master.

…m/master_goodhel Many changes, also because the version number has moved from 3.5.3 to 3.6.0

…is that 3.5.3 becomes 3.6.0, but the code is identical

…(valassi_goodhel, i.e. gpucpp plus the merge of gpucpp_goodhel) I will soon merge master into this branch goodhel (which so far is essentially identical to master_goodhel)

…rging git checkout upstream/master gg_tt.mad/CODEGEN* gg_tt.sa/CODEGEN*

Fix conflicts: - MG5aMC/mg5amcnlo (use current version i.e. valassi_goodhel) - epochX/cudacpp/CODEGEN/PLUGIN/CUDACPP_SA_OUTPUT/MG5aMC_patches/PROD/patch.P1 (remove call counters_smatrix1_start) - epochX/cudacpp/CODEGEN/PLUGIN/CUDACPP_SA_OUTPUT/MG5aMC_patches/PROD/patch.common (remove both genps.inc LIMHEL and Source/makefile patches) - epochX/cudacpp/gg_tt.mad/SubProcesses/P1_gg_ttx/matrix1.f (remove call counters_smatrix1_start)

…c is now longer needed) The only files that still need to be patched are - 1 in patch.common: SubProcesses/makefile - 3 in patch.P1: auto_dsig1.f, driver.f, matrix1.f ./CODEGEN/generateAndCompare.sh gg_tt --mad --nopatch git diff --no-ext-diff -R gg_tt.mad/SubProcesses/makefile > CODEGEN/PLUGIN/CUDACPP_SA_OUTPUT/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/PLUGIN/CUDACPP_SA_OUTPUT/MG5aMC_patches/PROD/patch.P1 git checkout gg_tt.mad

…/lep_densities, which I had previously forgotten

…_variable is no longer called) There are some minor performance slowdowns - note however that the number of events processe is lower (eg 81920 instead of 90112) ./tmad/teeMadX.sh -ggtt -makeclean +10x

…atch, because many things changed in 3.6.0 rm -rf $(git ls-tree --name-only HEAD *.mad *.sa) ./CODEGEN/allGenerateAndCompare.sh git add $(git ls-tree --name-only HEAD *.mad *.sa)

STARTED AT Mon Sep 2 12:36:25 PM CEST 2024 ./tput/teeThroughputX.sh -mix -hrd -makej -eemumu -ggtt -ggttg -ggttgg -gqttq -ggttggg -makeclean ENDED(1) AT Mon Sep 2 12:59:35 PM CEST 2024 [Status=0] ./tput/teeThroughputX.sh -flt -hrd -makej -eemumu -ggtt -ggttgg -inlonly -makeclean ENDED(2) AT Mon Sep 2 01:08:27 PM CEST 2024 [Status=0] ./tput/teeThroughputX.sh -makej -eemumu -ggtt -ggttg -gqttq -ggttgg -ggttggg -flt -bridge -makeclean ENDED(3) AT Mon Sep 2 01:16:51 PM CEST 2024 [Status=0] ./tput/teeThroughputX.sh -eemumu -ggtt -ggttgg -flt -rmbhst ENDED(4) AT Mon Sep 2 01:19:36 PM CEST 2024 [Status=0] ./tput/teeThroughputX.sh -eemumu -ggtt -ggttgg -flt -curhst ENDED(5) AT Mon Sep 2 01:22:18 PM CEST 2024 [Status=0] ./tput/teeThroughputX.sh -eemumu -ggtt -ggttgg -flt -common ENDED(6) AT Mon Sep 2 01:25:06 PM CEST 2024 [Status=0] ./tput/teeThroughputX.sh -mix -hrd -makej -susyggtt -susyggt1t1 -smeftggtttt -heftggbb -makeclean ENDED(7) AT Mon Sep 2 01:36:00 PM CEST 2024 [Status=0]

…l as expected (failures in heft #833) STARTED AT Mon Sep 2 01:36:00 PM CEST 2024 (SM tests) ENDED(1) AT Mon Sep 2 05:30:03 PM CEST 2024 [Status=0] (BSM tests) ENDED(1) AT Mon Sep 2 05:39:56 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 24 /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 24 /data/avalassi/GPU2023/madgraph4gpuX/epochX/cudacpp/tmad/logs_susyggt1t1_mad/log_susyggt1t1_mad_d_inl0_hrd0.txt 24 /data/avalassi/GPU2023/madgraph4gpuX/epochX/cudacpp/tmad/logs_susyggt1t1_mad/log_susyggt1t1_mad_f_inl0_hrd0.txt 24 /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

…72a63ab (valassi_goodhel_june24, i.e. merge of valassi_goodhel into gpucpp, with two conflict-fix commits)

… for easier merging git checkout upstream/master $(git ls-tree --name-only upstream/master */CODEGEN*txt)

…master for easier merging git checkout upstream/master $(git ls-tree --name-only upstream/master tput/logs* tmad/logs*)

…the latest upstream/master for easier merging git checkout upstream/master $(git ls-tree --name-only upstream/master *.mad | grep -v ^gg_tt.mad)

…and #985) into goodhel Fix conflicts: - MG5aMC/mg5amcnlo (keep current version) - epochX/cudacpp/CODEGEN/PLUGIN/CUDACPP_SA_OUTPUT/MG5aMC_patches/PROD/patch.P1 (use upstream/master, will rebuild anyway) - epochX/cudacpp/gg_tt.mad/SubProcesses/P1_gg_ttx/auto_dsig1.f (keep goodhel comment style) - epochX/cudacpp/gg_tt.mad/SubProcesses/P1_gg_ttx/matrix1.f (keep goodhel comment style) - epochX/cudacpp/gg_tt.mad/bin/internal/file_writers.py (keep goodhel version)

…robably need more iterations) Build the patch from the following files, though some may no longer be necessary: - 2 in patch.common: Source/genps.inc (can be removed?), SubProcesses/makefile - 3 in patch.P1: auto_dsig1.f (can be removed?), driver.f, matrix1.f ./CODEGEN/generateAndCompare.sh gg_tt --mad --nopatch git diff --no-ext-diff -R gg_tt.mad/Source/genps.inc gg_tt.mad/SubProcesses/makefile > CODEGEN/PLUGIN/CUDACPP_SA_OUTPUT/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/PLUGIN/CUDACPP_SA_OUTPUT/MG5aMC_patches/PROD/patch.P1 git checkout gg_tt.mad

In particular, remove the patches resulting in a different style of comments This is the equivalent of build the patch from the following files in gg_tt.mad: - 1 in patch.common: SubProcesses/makefile - 2 in patch.P1: driver.f, matrix1.f ./CODEGEN/generateAndCompare.sh gg_tt --mad --nopatch git diff --no-ext-diff -R gg_tt.mad/SubProcesses/makefile > CODEGEN/PLUGIN/CUDACPP_SA_OUTPUT/MG5aMC_patches/PROD/patch.common git diff --no-ext-diff -R gg_tt.mad/SubProcesses/P1_gg_ttx/driver.f gg_tt.mad/SubProcesses/P1_gg_ttx/matrix1.f > CODEGEN/PLUGIN/CUDACPP_SA_OUTPUT/MG5aMC_patches/PROD/patch.P1 git checkout gg_tt.mad

…: a few comments have changed, but this is functionally equivalent (I do not like the comment style, but this will need to be changed upstream in mg5amcnlo: focus on minimising the patch size instead)

…nally equivalent, only a few line numbers change) Only the following files are needed to build the patch: - 1 in patch.common: SubProcesses/makefile - 2 in patch.P1: driver.f, matrix1.f ./CODEGEN/generateAndCompare.sh gg_tt --mad --nopatch git diff --no-ext-diff -R gg_tt.mad/SubProcesses/makefile > CODEGEN/PLUGIN/CUDACPP_SA_OUTPUT/MG5aMC_patches/PROD/patch.common git diff --no-ext-diff -R gg_tt.mad/SubProcesses/P1_gg_ttx/driver.f gg_tt.mad/SubProcesses/P1_gg_ttx/matrix1.f > CODEGEN/PLUGIN/CUDACPP_SA_OUTPUT/MG5aMC_patches/PROD/patch.P1 git checkout gg_tt.mad

…a 1 per mille cross section mismatch?! #991 ./tmad/teeMadX.sh -ggtt -makeclean +10x

…ne24) to 61fdd0d8e (new valassi_goodhel_june24, including commits cherry-picked from ghav_gpucpp_june24 to try and fix fortran xsec issue #991)

…nitialization lines appear in dsample.f, will this fix #991?

…o fails with a 1 per mille cross section mismatch #991 ./tmad/teeMadX.sh -ggtt -makeclean +10x

oliviermattelaer · 2024-09-03T22:15:25Z

Since all CI are working here, Let me remove the WIP.
I'm thrill that this was so easy :-)

Let's merge this !

Olivier

…or360 (which already includes the latest master)

valassi · 2024-09-15T07:23:13Z

Since all CI are working here, Let me remove the WIP.
I'm thrill that this was so easy :-)

Hi @oliviermattelaer wow well done! :-)
Indeed, it seems too easy to be true ;-)

I am just having a quick look now on Sunday, then I will look better tomorrow during my work day. I will open a new branch where I just extend the work you have done here, and regenerate all code, and relaunch my usual tests.

But for the moment what I find great is that you have fixed all conflicts, and you are already up to date with the latest gpucpp in mg5amcnlo and with the latest master in madgraph4gpu. So this looks really good.

More tomorrow, thanks again Andrea

PS And apologies again for the delay, I was on holiday last week

…or360 #992, which includes his/my goodhel #955 and #986) - all ok STARTED AT Sun Sep 15 09:27:42 AM CEST 2024 ./tput/teeThroughputX.sh -mix -hrd -makej -eemumu -ggtt -ggttg -ggttgg -gqttq -ggttggg -makeclean ENDED(1) AT Sun Sep 15 11:28:15 AM CEST 2024 [Status=0] ./tput/teeThroughputX.sh -flt -hrd -makej -eemumu -ggtt -ggttgg -inlonly -makeclean ENDED(2) AT Sun Sep 15 11:41:01 AM CEST 2024 [Status=0] ./tput/teeThroughputX.sh -makej -eemumu -ggtt -ggttg -gqttq -ggttgg -ggttggg -flt -bridge -makeclean ENDED(3) AT Sun Sep 15 11:51:46 AM CEST 2024 [Status=0] ./tput/teeThroughputX.sh -eemumu -ggtt -ggttgg -flt -rmbhst ENDED(4) AT Sun Sep 15 11:54:36 AM CEST 2024 [Status=0] ./tput/teeThroughputX.sh -eemumu -ggtt -ggttgg -flt -curhst ENDED(5) AT Sun Sep 15 11:57:23 AM CEST 2024 [Status=0] ./tput/teeThroughputX.sh -eemumu -ggtt -ggttgg -flt -common ENDED(6) AT Sun Sep 15 12:00:17 PM CEST 2024 [Status=0] ./tput/teeThroughputX.sh -mix -hrd -makej -susyggtt -susyggt1t1 -smeftggtttt -heftggbb -makeclean ENDED(7) AT Sun Sep 15 12:22:27 PM CEST 2024 [Status=0]

…r360 #992, which includes his/my goodhel #955 and #986) - all ok NB: with respect to my goodhel #986, the xsec mismatch #991 in ggtt is now fixed (by Olivier's additional commit 7d0a553 I assume) The only failure is the expected LHE mismatch #833 in heft_gg_bb fptype=f STARTED AT Sun Sep 15 12:22:27 PM CEST 2024 (SM tests) ENDED(1) AT Sun Sep 15 04:18:02 PM CEST 2024 [Status=0] (BSM tests) ENDED(1) AT Sun Sep 15 04:28:37 PM CEST 2024 [Status=0] 24 /data/avalassi/GPU2023/madgraph4gpuBis/epochX/cudacpp/tmad/logs_eemumu_mad/log_eemumu_mad_d_inl0_hrd0.txt 24 /data/avalassi/GPU2023/madgraph4gpuBis/epochX/cudacpp/tmad/logs_eemumu_mad/log_eemumu_mad_f_inl0_hrd0.txt 24 /data/avalassi/GPU2023/madgraph4gpuBis/epochX/cudacpp/tmad/logs_eemumu_mad/log_eemumu_mad_m_inl0_hrd0.txt 24 /data/avalassi/GPU2023/madgraph4gpuBis/epochX/cudacpp/tmad/logs_ggttggg_mad/log_ggttggg_mad_d_inl0_hrd0.txt 24 /data/avalassi/GPU2023/madgraph4gpuBis/epochX/cudacpp/tmad/logs_ggttggg_mad/log_ggttggg_mad_f_inl0_hrd0.txt 24 /data/avalassi/GPU2023/madgraph4gpuBis/epochX/cudacpp/tmad/logs_ggttggg_mad/log_ggttggg_mad_m_inl0_hrd0.txt 24 /data/avalassi/GPU2023/madgraph4gpuBis/epochX/cudacpp/tmad/logs_ggttgg_mad/log_ggttgg_mad_d_inl0_hrd0.txt 24 /data/avalassi/GPU2023/madgraph4gpuBis/epochX/cudacpp/tmad/logs_ggttgg_mad/log_ggttgg_mad_f_inl0_hrd0.txt 24 /data/avalassi/GPU2023/madgraph4gpuBis/epochX/cudacpp/tmad/logs_ggttgg_mad/log_ggttgg_mad_m_inl0_hrd0.txt 24 /data/avalassi/GPU2023/madgraph4gpuBis/epochX/cudacpp/tmad/logs_ggttg_mad/log_ggttg_mad_d_inl0_hrd0.txt 24 /data/avalassi/GPU2023/madgraph4gpuBis/epochX/cudacpp/tmad/logs_ggttg_mad/log_ggttg_mad_f_inl0_hrd0.txt 24 /data/avalassi/GPU2023/madgraph4gpuBis/epochX/cudacpp/tmad/logs_ggttg_mad/log_ggttg_mad_m_inl0_hrd0.txt 24 /data/avalassi/GPU2023/madgraph4gpuBis/epochX/cudacpp/tmad/logs_ggtt_mad/log_ggtt_mad_d_inl0_hrd0.txt 24 /data/avalassi/GPU2023/madgraph4gpuBis/epochX/cudacpp/tmad/logs_ggtt_mad/log_ggtt_mad_f_inl0_hrd0.txt 24 /data/avalassi/GPU2023/madgraph4gpuBis/epochX/cudacpp/tmad/logs_ggtt_mad/log_ggtt_mad_m_inl0_hrd0.txt 24 /data/avalassi/GPU2023/madgraph4gpuBis/epochX/cudacpp/tmad/logs_gqttq_mad/log_gqttq_mad_d_inl0_hrd0.txt 24 /data/avalassi/GPU2023/madgraph4gpuBis/epochX/cudacpp/tmad/logs_gqttq_mad/log_gqttq_mad_f_inl0_hrd0.txt 24 /data/avalassi/GPU2023/madgraph4gpuBis/epochX/cudacpp/tmad/logs_gqttq_mad/log_gqttq_mad_m_inl0_hrd0.txt 24 /data/avalassi/GPU2023/madgraph4gpuBis/epochX/cudacpp/tmad/logs_heftggbb_mad/log_heftggbb_mad_d_inl0_hrd0.txt 1 /data/avalassi/GPU2023/madgraph4gpuBis/epochX/cudacpp/tmad/logs_heftggbb_mad/log_heftggbb_mad_f_inl0_hrd0.txt 24 /data/avalassi/GPU2023/madgraph4gpuBis/epochX/cudacpp/tmad/logs_heftggbb_mad/log_heftggbb_mad_m_inl0_hrd0.txt 24 /data/avalassi/GPU2023/madgraph4gpuBis/epochX/cudacpp/tmad/logs_smeftggtttt_mad/log_smeftggtttt_mad_d_inl0_hrd0.txt 24 /data/avalassi/GPU2023/madgraph4gpuBis/epochX/cudacpp/tmad/logs_smeftggtttt_mad/log_smeftggtttt_mad_f_inl0_hrd0.txt 24 /data/avalassi/GPU2023/madgraph4gpuBis/epochX/cudacpp/tmad/logs_smeftggtttt_mad/log_smeftggtttt_mad_m_inl0_hrd0.txt 24 /data/avalassi/GPU2023/madgraph4gpuBis/epochX/cudacpp/tmad/logs_susyggt1t1_mad/log_susyggt1t1_mad_d_inl0_hrd0.txt 24 /data/avalassi/GPU2023/madgraph4gpuBis/epochX/cudacpp/tmad/logs_susyggt1t1_mad/log_susyggt1t1_mad_f_inl0_hrd0.txt 24 /data/avalassi/GPU2023/madgraph4gpuBis/epochX/cudacpp/tmad/logs_susyggt1t1_mad/log_susyggt1t1_mad_m_inl0_hrd0.txt 24 /data/avalassi/GPU2023/madgraph4gpuBis/epochX/cudacpp/tmad/logs_susyggtt_mad/log_susyggtt_mad_d_inl0_hrd0.txt 24 /data/avalassi/GPU2023/madgraph4gpuBis/epochX/cudacpp/tmad/logs_susyggtt_mad/log_susyggtt_mad_f_inl0_hrd0.txt 24 /data/avalassi/GPU2023/madgraph4gpuBis/epochX/cudacpp/tmad/logs_susyggtt_mad/log_susyggtt_mad_m_inl0_hrd0.txt

STARTED AT Sun Sep 15 09:30:58 AM CEST 2024 ./tput/teeThroughputX.sh -mix -hrd -makej -eemumu -ggtt -ggttg -ggttgg -gqttq -ggttggg -makeclean -cpponly ENDED(1) AT Sun Sep 15 09:51:56 AM CEST 2024 [Status=0] ./tput/teeThroughputX.sh -flt -hrd -makej -eemumu -ggtt -ggttgg -inlonly -makeclean -cpponly ENDED(2) AT Sun Sep 15 09:58:51 AM CEST 2024 [Status=0] ./tput/teeThroughputX.sh -makej -eemumu -ggtt -ggttg -gqttq -ggttgg -ggttggg -flt -bridge -makeclean -cpponly ENDED(3) AT Sun Sep 15 10:03:49 AM CEST 2024 [Status=0] ./tput/teeThroughputX.sh -eemumu -ggtt -ggttgg -flt -rmbhst -cpponly ENDED(4) AT Sun Sep 15 10:05:17 AM CEST 2024 [Status=0] SKIP './tput/teeThroughputX.sh -eemumu -ggtt -ggttgg -flt -common -cpponly' ENDED(5) AT Sun Sep 15 10:05:17 AM CEST 2024 [Status=0] ./tput/teeThroughputX.sh -eemumu -ggtt -ggttgg -flt -common -cpponly ENDED(6) AT Sun Sep 15 10:06:45 AM CEST 2024 [Status=0] ./tput/teeThroughputX.sh -mix -hrd -makej -susyggtt -susyggt1t1 -smeftggtttt -heftggbb -makeclean -cpponly ENDED(7) AT Sun Sep 15 10:17:34 AM CEST 2024 [Status=0]

STARTED AT Sun Sep 15 09:30:58 AM CEST 2024 ./tput/teeThroughputX.sh -mix -hrd -makej -eemumu -ggtt -ggttg -ggttgg -gqttq -ggttggg -makeclean -cpponly ENDED(1) AT Sun Sep 15 09:51:56 AM CEST 2024 [Status=0] ./tput/teeThroughputX.sh -flt -hrd -makej -eemumu -ggtt -ggttgg -inlonly -makeclean -cpponly ENDED(2) AT Sun Sep 15 09:58:51 AM CEST 2024 [Status=0] ./tput/teeThroughputX.sh -makej -eemumu -ggtt -ggttg -gqttq -ggttgg -ggttggg -flt -bridge -makeclean -cpponly ENDED(3) AT Sun Sep 15 10:03:49 AM CEST 2024 [Status=0] ./tput/teeThroughputX.sh -eemumu -ggtt -ggttgg -flt -rmbhst -cpponly ENDED(4) AT Sun Sep 15 10:05:17 AM CEST 2024 [Status=0] SKIP './tput/teeThroughputX.sh -eemumu -ggtt -ggttgg -flt -common -cpponly' ENDED(5) AT Sun Sep 15 10:05:17 AM CEST 2024 [Status=0] ./tput/teeThroughputX.sh -eemumu -ggtt -ggttgg -flt -common -cpponly ENDED(6) AT Sun Sep 15 10:06:45 AM CEST 2024 [Status=0] ./tput/teeThroughputX.sh -mix -hrd -makej -susyggtt -susyggt1t1 -smeftggtttt -heftggbb -makeclean -cpponly ENDED(7) AT Sun Sep 15 10:17:34 AM CEST 2024 [Status=0] Note: somewhere in this tests I found this modifications in param_card.inc (just a reshuffling of parameter order) I should check if this is something systematic or just a side effect of something I forgot - I will ignore it here modified: ee_mumu.mad/Source/param_card.inc modified: gg_tt.mad/Source/param_card.inc modified: gg_ttg.mad/Source/param_card.inc modified: gg_ttgg.mad/Source/param_card.inc modified: gg_ttggg.mad/Source/param_card.inc modified: gq_ttq.mad/Source/param_card.inc modified: heft_gg_bb.mad/Source/param_card.inc modified: smeft_gg_tttt.mad/Source/param_card.inc modified: susy_gg_t1t1.mad/Source/param_card.inc modified: susy_gg_tt.mad/Source/param_card.inc

Revert "[v360] rerun 30 tmad tests on itgold91 - all ok" This reverts commit 623a2c3. Revert "[v360] rerun 96 tput tests on itgold91 - all ok" This reverts commit 7f66b92.

valassi

Hi @oliviermattelaer thanks a lot again, I confirm that this is good!

I suggest two other merges, before merging this one - but I mark this as approved

First we merge mg5amcnlo/mg5amcnlo#140 into gpucpp in the mg5amcnlo repo (I approved the PR)
Then (or before 1, whatever) we merge #997 into your master_for360
Finally (after the above two) we merge this #992 into master

Let me know if you approve this, I can go aead and do the merges. (Or you do them, as you want)

valassi · 2024-09-15T16:14:52Z

Just for the record:

this PR 992 from Olivier includes Olivier's 'goodhel' work in fix patch to be compatible with mg5 branch gpucpp_goodhel #955, which I have now closed, to fix the pp_tt012j xsec issue Cross section mismatch in pp_tt012j (P2_gu_ttxgu) in CI tmad tests - reset_cumulative_variable was called twice in fortran and once in cudacpp #872
this PR 992 also includes my 'additional goodhel' work in Complete PR 955 for goodhel (resync to master, regenerate code) #986 (needed to fix conflicts in 955), which I have also closed
my proposal WIP add pp_tt to repo (plus obsolete fixes for bug 872 via reset_cumulative_variable, now fixed by Olivier via a single helicity filter) #935 to fix that bug 872 via reset_cumulative_variable is now obsolete: I kept 935 in WIP and might still merge it at some point, as it contains other tests and pp_tt (but the CODEGEN will be from this 992)
this PR 992 will also be complemented by my Additional fixes/tests over Olivier's master_for360 #997 with code generation and some tests
this PR 992 relies in mg5amcnlo on Gpucpp for360 mg5amcnlo/mg5amcnlo#140

oliviermattelaer · 2024-09-16T06:48:55Z

Yes we can move forward on this.

Great excelent, thanks

Additional fixes/tests over Olivier's master_for360 in PR 992

valassi · 2024-09-16T10:52:54Z

Yes we can move forward on this.

Great excelent, thanks

Thanks a lot to you Olivier!

I suggest two other merges, before merging this one - but I mark this as approved
1. First we merge [Gpucpp for360 mg5amcnlo/mg5amcnlo#140](https://github.com/mg5amcnlo/mg5amcnlo/pull/140) into gpucpp in the mg5amcnlo repo (I approved the PR)

This is merged

2. Then (or before 1, whatever) we merge [Additional fixes/tests over Olivier's master_for360 #997](https://github.com/madgraph5/madgraph4gpu/pull/997) into your master_for360

This is also merged

3. Finally (after the above two) we merge this [Master for360 #992](https://github.com/madgraph5/madgraph4gpu/pull/992) into master

This I will merge in 10 minutes. Just to be extra sure I will let the CI complete, should all be green. Then I will merge.

valassi · 2024-09-16T11:15:16Z

Ok all CI tests have passed. Merging

Thanks again Olivier... we did it :-)

oliviermattelaer and others added 30 commits August 6, 2024 20:59

fix patch to be compatible with mg5 branch gpucpp_goodhel

a826259

change mg5amc version to use

76ba27a

temporary fix to set limhel to 0 for cudacpp

df130b0

fixing a patch that was relying on imirror

b304cc9

random test

c448e89

[goodhel] regenerate gg_tt.mad using the current CODEGEN from upstrea…

763479d

…m/master_goodhel Many changes, also because the version number has moved from 3.5.3 to 3.6.0

[goodhel] regenerate gg_tt.sa just as a cross check: the only change …

b986a82

…is that 3.5.3 becomes 3.6.0, but the code is identical

[goodhel] update MG5AMC from ffb7a2e01 (gpucpp_goodhel) to 0c754d6d8 …

a08d91f

…(valassi_goodhel, i.e. gpucpp plus the merge of gpucpp_goodhel) I will soon merge master into this branch goodhel (which so far is essentially identical to master_goodhel)

[goodhel] move to upstream/master codegen logs of gg_tt for easier me…

d582f6c

…rging git checkout upstream/master gg_tt.mad/CODEGEN* gg_tt.sa/CODEGEN*

[goodhel] regenerate gg_tt.mad - check all is ok, no change

2cd6764

[goodhel] regenerate gg_tt.mad - add to the repo couplings3.f and PDF…

ae6652c

…/lep_densities, which I had previously forgotten

[goodhel] rerun tmad ggtt test - all ok (even if now reset_cumulative…

94f9f9b

…_variable is no longer called) There are some minor performance slowdowns - note however that the number of events processe is lower (eg 81920 instead of 90112) ./tmad/teeMadX.sh -ggtt -makeclean +10x

[goodhel] regenerate all processes - erase them and add them from scr…

016433b

…atch, because many things changed in 3.6.0 rm -rf $(git ls-tree --name-only HEAD *.mad *.sa) ./CODEGEN/allGenerateAndCompare.sh git add $(git ls-tree --name-only HEAD *.mad *.sa)

[goodhel+june24] update MG5AMC from 0c754d6d8 (valassi_goodhel) to 29…

fc8ddb9

…72a63ab (valassi_goodhel_june24, i.e. merge of valassi_goodhel into gpucpp, with two conflict-fix commits)

[goodhel+june24] move to CODEGEN logs from the latest upstream/master…

c175637

… for easier merging git checkout upstream/master $(git ls-tree --name-only upstream/master */CODEGEN*txt)

[goodhel+june24] move to tput and tmad logs from the latest upstream/…

585f94b

…master for easier merging git checkout upstream/master $(git ls-tree --name-only upstream/master tput/logs* tmad/logs*)

[goodhel+june24] move to generated processes (except gg_tt.mad) from …

f2f3fc2

…the latest upstream/master for easier merging git checkout upstream/master $(git ls-tree --name-only upstream/master *.mad | grep -v ^gg_tt.mad)

[goodhel+june24] regenerate gg_tt.mad with the latest CODEGEN patches…

be22055

…: a few comments have changed, but this is functionally equivalent (I do not like the comment style, but this will need to be changed upstream in mg5amcnlo: focus on minimising the patch size instead)

[goodhel+june24] rerun one tmad test for ggtt... the test fails with …

75a66c8

…a 1 per mille cross section mismatch?! #991 ./tmad/teeMadX.sh -ggtt -makeclean +10x

[goodhel+june24] update MG5AMC from 2972a63ab (old valassi_goodhel_ju…

c731a24

…ne24) to 61fdd0d8e (new valassi_goodhel_june24, including commits cherry-picked from ghav_gpucpp_june24 to try and fix fortran xsec issue #991)

[goodhel+june24] regenerate gg_tt.mad with the latest mg5amc: three i…

b4ede27

…nitialization lines appear in dsample.f, will this fix #991?

[goodhel+june24] rerun one tmad test for ggtt... the test continues t…

a97109b

…o fails with a 1 per mille cross section mismatch #991 ./tmad/teeMadX.sh -ggtt -makeclean +10x

oliviermattelaer marked this pull request as ready for review September 3, 2024 22:13

oliviermattelaer mentioned this pull request Sep 4, 2024

Complete PR 955 for goodhel (resync to master, regenerate code) #986

Closed

[v360] regenerate all processes on top of Olivier's upstream/master_f…

f4d716b

…or360 (which already includes the latest master)

valassi mentioned this pull request Sep 15, 2024

Additional fixes/tests over Olivier's master_for360 #997

Merged

valassi added 5 commits September 15, 2024 17:23

[v360] ** COMPLETE V360 ** go back to tput/tmad test logs on itscrd90

b10aad5

Revert "[v360] rerun 30 tmad tests on itgold91 - all ok" This reverts commit 623a2c3. Revert "[v360] rerun 96 tput tests on itgold91 - all ok" This reverts commit 7f66b92.

valassi mentioned this pull request Sep 15, 2024

Gpucpp for360 mg5amcnlo/mg5amcnlo#140

Merged

valassi self-requested a review September 15, 2024 15:46

valassi approved these changes Sep 15, 2024

View reviewed changes

valassi assigned valassi and oliviermattelaer Sep 15, 2024

valassi linked an issue Sep 15, 2024 that may be closed by this pull request

Permille cross section discrepancy fortran vs cudacpp (gg_tt.mad) after merging june24 and goodhel together #991

Closed

This was referenced Sep 15, 2024

Permille cross section discrepancy fortran vs cudacpp (gg_tt.mad) after merging june24 and goodhel together #991

Closed

Move LIMHEL=0 to madgraph4gpu only and add a runcard allowing LIMHEL=0 #950

Closed

This was linked to issues Sep 15, 2024

Cross section mismatch in pp_tt012j (P2_gu_ttxgu) in CI tmad tests - reset_cumulative_variable was called twice in fortran and once in cudacpp #872

Closed

Move LIMHEL=0 to madgraph4gpu only and add a runcard allowing LIMHEL=0 #950

Closed

This was referenced Sep 15, 2024

fix patch to be compatible with mg5 branch gpucpp_goodhel #955

Closed

WIP add pp_tt to repo (plus obsolete fixes for bug 872 via reset_cumulative_variable, now fixed by Olivier via a single helicity filter) #935

Draft

Merge pull request #997 from valassi/v360

a40ab80

Additional fixes/tests over Olivier's master_for360 in PR 992

valassi mentioned this pull request Sep 16, 2024

WIP merge june24/channelid functionality into gpucpp_goodhel mg5amcnlo/mg5amcnlo#139

Closed

valassi merged commit 0e5a454 into master Sep 16, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Master for360 #992

Master for360 #992

Uh oh!

oliviermattelaer commented Sep 3, 2024

Uh oh!

oliviermattelaer commented Sep 3, 2024

Uh oh!

valassi commented Sep 15, 2024 •

edited

Loading

Uh oh!

valassi left a comment

Uh oh!

valassi commented Sep 15, 2024

Uh oh!

oliviermattelaer commented Sep 16, 2024

Uh oh!

valassi commented Sep 16, 2024

Uh oh!

valassi commented Sep 16, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Master for360 #992

Master for360 #992

Uh oh!

Conversation

oliviermattelaer commented Sep 3, 2024

Uh oh!

oliviermattelaer commented Sep 3, 2024

Uh oh!

valassi commented Sep 15, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

valassi left a comment

Choose a reason for hiding this comment

Uh oh!

valassi commented Sep 15, 2024

Uh oh!

oliviermattelaer commented Sep 16, 2024

Uh oh!

valassi commented Sep 16, 2024

Uh oh!

valassi commented Sep 16, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

valassi commented Sep 15, 2024 •

edited

Loading