Skip to content
New issue

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

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

Already on GitHub? # to your account

A few cudacpp plugin changes on the way to madevent integration #416

Merged
merged 33 commits into from
Apr 18, 2022

Conversation

valassi
Copy link
Member

@valassi valassi commented Apr 3, 2022

This is a WIP PR with a few changes to the cudacpp plugin, that are needed for the madevent integration (issue #400 et al, PR #401).

I am currently debugging issues in ggtt where I get different MEs in fortran and cudacpp for ggtt. I backported the changes from #401 in ggtt to codegen, so that I can try eemumu too. When all seems settled, I will first merge this PR standalone with all tests in cudacpp internally, before merging the madevent+cudacpp.

valassi added 19 commits April 3, 2022 17:58
…_cuda (was _cu)

In the madevent integration, this will seem more consistent with the 'cudacpp' plugin name?...
Fix conflicts:
	epochX/cudacpp/CODEGEN/PLUGIN/CUDACPP_SA_OUTPUT/madgraph/iolibs/template_files/gpu/Makefile
	epochX/cudacpp/ee_mumu.auto/CODEGEN_cudacpp_ee_mumu_log.txt
	epochX/cudacpp/ee_mumu.auto/SubProcesses/Makefile
	epochX/cudacpp/ee_mumu/SubProcesses/Makefile
	epochX/cudacpp/gg_tt.auto/CODEGEN_cudacpp_gg_tt_log.txt
	epochX/cudacpp/gg_tt.auto/SubProcesses/Makefile
	epochX/cudacpp/gg_tt/SubProcesses/Makefile
(Codegen logs from upstream/master)
…on for madevent, will change .mad generation in v311)
valassi added 6 commits April 12, 2022 12:09
…a few fluctuations

Note that the discrepancy between check.exe and fcheck.exe is now much lower after fixing the bug!
(I was previously comparing check on cpu to fgcheck on GPU, which of course gives different results)
@valassi valassi changed the title WIP: cudacpp plugin changes for madevent integration A few cudacpp plugin changes on the way to madevent integration Apr 18, 2022
@valassi valassi marked this pull request as ready for review April 18, 2022 19:10
@valassi
Copy link
Member Author

valassi commented Apr 18, 2022

I am about to merge this PR #416 as a standalone patch. There are very many other changes from myself, Stefan and Olivier that must be integrated, I must start somewhere...

The main changes in this PR are the following (git log upstream/master..cc4mad):

  • a workaround for Different order with/without me exporter oliviermattelaer/mg5amc_test#2 (which I will remove later on by moving to Olivier's revno 999), whose impact is changing the order of parameters in src/Parameters_sm.h/cc
  • the addition of THISMK in Makefiles to refer to the current Makefile (this will be needed when we have a cudacpp Makefile and a Fortran makefile)
  • some improvements in 'make clean'
  • renaming the libraries as _cpp and _cu (was _cxx and _cuda)
  • distinguishing in cxx_objects between cxx_objects_lib and cxx_objects_exe (and similarly for cu_objects)
  • dropping the INCDIR include directory
  • adding COMMON/TO_MEEXPORTER/MEEXPORTER_PBRIDGE in fbridge.inc (this is really only needed in the fortran integration)
  • adding optional debug printouts in CPPProcess.cc

@valassi
Copy link
Member Author

valassi commented Apr 18, 2022

All checks passed, I am self merging

@valassi valassi merged commit 591bb14 into madgraph5:master Apr 18, 2022
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant