Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Additional fixes/tests over Olivier's master_for360 #997

Merged
merged 6 commits into from
Sep 16, 2024
Merged

Additional fixes/tests over Olivier's master_for360 #997

merged 6 commits into from
Sep 16, 2024

Conversation

valassi
Copy link
Member

@valassi valassi commented Sep 15, 2024

This is a WIP PR with additional fixes/tests over @oliviermattelaer 's master_for360 in #992.

The work by Olivier was already so good/complete that there may be almost nothing to do in addition.

Here I have just regenerated all processes, so that I can launch my manual tests and the CI.

Tomorrow I will have a more detailed look.

@valassi
[v360] regenerate all processes on top of Olivier's upstream/master_f…
f4d716b 
…or360 (which already includes the latest master)
@valassi valassi self-assigned this Sep 15, 2024
@valassi valassi marked this pull request as draft September 15, 2024 07:26
@valassi
[v360] rerun 102 tput tests on itscrd90 (including Olivier's master_f…
b009067 
…or360 madgraph5#992, which includes his/my goodhel madgraph5#955 and madgraph5#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]
@valassi
[v360] rerun 30 tmad tests on itscrd90 (including Olivier's master_fo…
8e9739a 
…r360 madgraph5#992, which includes his/my goodhel madgraph5#955 and madgraph5#986) - all ok

NB: with respect to my goodhel madgraph5#986, the xsec mismatch madgraph5#991 in ggtt is now fixed (by Olivier's additional commit 7d0a553 I assume)

The only failure is the expected LHE mismatch madgraph5#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
@valassi
[v360] rerun 96 tput tests on itgold91 - all ok
7f66b92 
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]
@valassi
[v360] rerun 30 tmad tests on itgold91 - all ok
623a2c3 
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
@valassi
[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 valassi mentioned this pull request Sep 15, 2024
Merged
@valassi valassi marked this pull request as ready for review September 15, 2024 15:41
@valassi
Copy link
Member Author

valassi commented Sep 15, 2024

All checks have passed in the CI against master
image

I will now change this to target Olivier's master_for360 instead

@valassi valassi changed the base branch from master to master_for360 September 15, 2024 15:43
@valassi
Copy link
Member Author

valassi commented Sep 15, 2024

Hi @oliviermattelaer this is ready for review.

I changed the base to be your master_for360. So I suggest that we merge the whole chain

  1. First we merge Gpucpp for360 mg5amcnlo/mg5amcnlo#140 into gpucpp in th emg5amcnlo repo (I approved the PR)
  2. Then (or before 1, whatever) we merge this Additional fixes/tests over Olivier's master_for360 #997 into your master_for360
  3. Finally (after the above two) we merge your Master for360 #992 into master

Can I go ahead with merging this one into your master_v360?

@valassi valassi mentioned this pull request Sep 15, 2024
Merged
@valassi
Copy link
Member Author

valassi commented Sep 15, 2024

NB Just to document this: in addition to #992, this ONLY does the following

  • regenerate all processes in the madgraph4gpu repo
  • rerun some tests
  • it does NOT change CODEGEN or mg5amc

oliviermattelaer
oliviermattelaer approved these changes Sep 16, 2024
View reviewed changes
Copy link
Member

@oliviermattelaer oliviermattelaer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Perfect, this can be merge as soon as you want

@valassi
Copy link
Member Author

valassi commented Sep 16, 2024

Thanks Olivier! Merging now

@valassi valassi merged commit a40ab80 into madgraph5:master_for360 Sep 16, 2024
169 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@oliviermattelaer oliviermattelaer oliviermattelaer approved these changes

Assignees

@valassi valassi

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@valassi @oliviermattelaer