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

Remove hardcoded MG5AMC_patches from code generation #491

Closed
valassi opened this issue Jun 16, 2022 · 2 comments · Fixed by #559
Closed

Remove hardcoded MG5AMC_patches from code generation #491

valassi opened this issue Jun 16, 2022 · 2 comments · Fixed by #559
Assignees
@valassi

Comments

@valassi
Copy link
Member

valassi commented Jun 16, 2022

I have noticed that I am presently still using hardcoded files from MG5AMC_patches for code generation. This means that whenever Olivier updates the upstream, I see no change. (Luckily, this does not include export_cpp.py or export_v4.py, but still...).

I need to change this in one of two ways:

  • contribute oatches upstream, if they are in a reasonable shape
  • otherwise, prepare diffs and use them for the 'patch' command pre-generation as I am doing on generated code post-generation

This is a mechanism that I introduced long ago, but I was not using it for a long time (the directory is empty). I moved back to this in the context of the vector.inc changes. I have prepared a patch some time ago in oliviermattelaer/mg5amc_test#16. Probably better prepare a PR now that we are in github?
@valassi
Copy link
Member Author

valassi commented Jun 17, 2022

Linked to mg5amcnlo/mg5amcnlo#7

@valassi valassi mentioned this issue Dec 7, 2022
Merged
@valassi valassi self-assigned this Dec 9, 2022
@valassi valassi linked a pull request Dec 9, 2022 that will close this issue
First set of lhe patches (towards random color/helicity): upgrade upstream MG5aMC to vecMLM and port my vector.inc patches upstream #559
Merged
valassi added a commit to valassi/madgraph4gpu that referenced this issue Dec 9, 2022
@valassi
[lhe] madgraph5#491 improve handling of hardcoded patches, skip top l…
c443692 
…evel directory
valassi added a commit to valassi/madgraph4gpu that referenced this issue Dec 9, 2022
@valassi
[lhe] madgraph5#491 in gg_tt.mad make changes to be more consistent w…
1317579 
…ith the latest upstream vecsize branch

In practice, accept many files generated out-of-the-box from
./CODEGEN/generateAndCompare.sh gg_tt --mad --upstream
valassi added a commit to valassi/madgraph4gpu that referenced this issue Dec 9, 2022
@valassi
[lhe] madgraph5#491 in CODEGEN delete all replacement patches for ups…
8fc98b1 
…tream MG5AMC templates

Delete the following files:
  Template/LO/Source/PDF/makefile
  Template/LO/Source/rw_events.f
  Template/LO/Source/setrun.f
  Template/LO/SubProcesses/cluster.f
  Template/LO/SubProcesses/cuts.f
  Template/LO/SubProcesses/genps.f
  Template/LO/SubProcesses/idenparts.f
  Template/LO/SubProcesses/myamp.f
  Template/LO/SubProcesses/reweight.f
  Template/LO/SubProcesses/setcuts.f
  Template/LO/SubProcesses/setscales.f
  madgraph/iolibs/template_files/madevent_symmetry.f
  models/template_files/fortran/makefile_madevent
  models/template_files/fortran/printout.f
valassi added a commit to valassi/madgraph4gpu that referenced this issue Dec 9, 2022
@valassi
[lhe] ** COMPLETE LHE PART 1 ** regenerate gg_tt.mad and check all is…
11e1d5d 
… stable

This completes the first part of the "lhe" patches (towards random color/helicity in lhe files)
- moved to a more recent upstream based on "vecMLM", including Olivier's changes for random hel/col
- adapted the cudacpp machinery accordingly so that tests still succeed (with dummy col/hel)
- moved to my own upstream "vecsize" branch based on vecMLM, where I ported many of my patches
- renamed NB_PAGE_MAX as VECSIZE_MEMMAX and NB_PAGE_LOOP as VECSIZE_USED as discussed
- simplified my patching strategy over the upstream, now that many patches are backported upstream
- in particular, remove the MG5AMC_patches template replacements madgraph5#491
- regenerated 5 processes mad and 6 processes sa (but only run a few ggtt.mad tests)
Second step will be to update the upstream further to clarify VECSIZE_USED if used as function argumen
Next step will to be work on the actual random color/helicity
@valassi valassi mentioned this issue Dec 9, 2022
Merged
@valassi
Copy link
Member Author

valassi commented Dec 9, 2022

This will be closed in #559, which is based on the upstream mg5amcnlo/mg5amcnlo#23

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@valassi valassi

Labels
None yet
Projects
None yet
Milestone
No milestone
1 participant
@valassi