madgraph5 / madgraph4gpu

GPU development for the Madgraph5_aMC@NLO event generator software package
28 stars 33 forks source link

master_june24 does not use gpucpp_june24 (and upgrading fails codegen) #886

Open valassi opened 6 days ago

valassi commented 6 days ago

Another issue introduced in #830 and being reviewed in #882.

Hi @oliviermattelaer this is a question related to the WIP #882 merge of master into master_june24

I have noticed that master_june24 currently uses this commit

git log --oneline HEAD
eef200f94 (HEAD) Merge remote-tracking branch 'upstream/gpucpp_826' into gpucpp_wrap
57e617cf3 Merge branch 'gpucpp' into gpucpp_wrap
10378b3c0 allow for second exporter to have access to all variable used in the fortran exporter
f9f957918 Fix validity time check for UFO pickle (#97)
8a8622b26 update py8 test

Conversely gpucpp_june24 is more recent (which as you see is also more recent than gpucpp_wrap, which is more recent than eef200f94)

git log --oneline origin/gpucpp_june24
def7fa691 (origin/gpucpp_june24) sync gpuccp_june24 with gpucpp
1e2aa4bc3 remove FIXME associated to goodjet and add appropriate code for proper debugging
09c96dd17 allow for second exporter to have access to all variable used in the fortran exporter
9abf6a3ad Merge pull request #113 from valassi/valassi_volatile
f274cab55 Workaround for SIGFPE crashes in function rotxxx (madgraph5/madgraph4gpu#855): add 'volatile' to prevent optimizations
0b8678984 Merge pull request #112 from valassi/valassi_uninitialised111
18696c1cf Merge pull request #110 from valassi/valassi_leak109
4f8fbb7f3 Workaround for issue #111 reported by valgrind (initialise goodjet array in function setclscales in reweight.f)
f6d90fa58 Fix memory leak #109 in madevent_driver.f (close file dname.mg)
37d18713d fix change in cpp template within the test (spaces)
0e5e483d4 fixing pythia8 iotest
849194f00 fix some tests (template changed)
1a9e6dd4f fixing an issue in the fortran side if no vector size
e2e790051 add a possibility to have multiple type of factorization (no actual code change at this stage)
942dab7c1 secure the code
45f8410e7 (origin/gpucpp_fix_scan_vector) Merge branch 'gpucpp_june24' into gpucpp_fix_scan_vector
0959edf96 Merge branch 'gpucpp_wrap' into gpucpp_june24
63d2d396c (origin/gpucpp_wrap) remove useless file + debug statement
ecb0a03fb add gpu in the autocompletion for group_subproceses
82f078bdc change makefile to recompile code as needed if vector size is changed
10378b3c0 allow for second exporter to have access to all variable used in the fortran exporter
f9f957918 Fix validity time check for UFO pickle (#97)
8a8622b26 update py8 test

That is to say gpucpp_june24 > gpucpp_wrap > eef200f94

I have tried to upgrade master_june24 to use gpucpp_june24 (in https://github.com/madgraph5/madgraph4gpu/pull/882/commits/eba31fde7e5ba4d86dfae8341719e77a12362cf2 in #882), but this fails codegen

Command "import /data/avalassi/GPU2023/madgraph4gpuX/MG5aMC/TMPOUT/CODEGEN_mad_ee_mumu.mg" interrupted in sub-command:
"output madevent_simd ../TMPOUT/CODEGEN_mad_ee_mumu --hel_recycling=False --vector_size=32" with error:
AttributeError : 'SIMD_ProcessExporter' object has no attribute 'write_source_makefile'
Please report this bug on https://bugs.launchpad.net/mg5amcnlo
More information is found in 'MG5_debug'.
Please attach this file to your report.

Can you please clarify? Can we start getting rid of some of these branches, to simplify the situation? (eg gpucpp_wrap can be removed if it is already superseded by gpucpp_june24?)

Note: for the moment for merging master_june24 and master I will work on merging gpucpp into eef200f94 but I will not touch gpucpp_june24. Let me know how that sounds...

Thanks Andrea