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.

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

upgrade master MG5AMC to the latest gpucpp #897

Merged
merged 2 commits into from
Jul 16, 2024

Conversation

valassi
Copy link
Member

@valassi valassi commented Jul 8, 2024

Hi @oliviermattelaer this should be non controversial.

I just updated MG5AMC submodule to your latest gpucpp after your merging mg5amcnlo/mg5amcnlo#118

Then I regenerated the code. The only difference comes from @Qubitol 's restore_data work on mg5amcnlo/mg5amcnlo#107

Can you please review and approve? Thanks

… to the latest gpucpp ff76bb24b (after merging icolamp mg5amcnlo#118 and gridpack mg5amcnlo#107)
…ODEGEN logs, the only differences are in restore_data (mg5amcnlo#107)
@valassi valassi self-assigned this Jul 9, 2024
@valassi
Copy link
Member Author

valassi commented Jul 9, 2024

This has the expected 6 failures.

@oliviermattelaer Ready to be merged when approved.

@oliviermattelaer oliviermattelaer merged commit f0670ea into madgraph5:master Jul 16, 2024
163 of 169 checks passed
@oliviermattelaer
Copy link
Member

Merged.

Thanks,

Olivier

@valassi
Copy link
Member Author

valassi commented Jul 16, 2024

Thanks Olivier! As discussed privately, I very much prefer NOT to squash MRs into individual commits. I am reverting this and will re-merge it without squashing.

valassi added a commit that referenced this pull request Jul 16, 2024
valassi added a commit to valassi/madgraph4gpu that referenced this pull request Jul 16, 2024
…cussed with Olivier: will re-merge without squashing

Revert "upgrade master MG5AMC to the latest gpucpp (madgraph5#897)"
This reverts commit f0670ea.
valassi added a commit that referenced this pull request Jul 16, 2024
upgrade master MG5AMC to the latest gpucpp (re-merge #897 without squashing)
valassi added a commit to valassi/madgraph4gpu that referenced this pull request Jul 16, 2024
valassi added a commit to valassi/madgraph4gpu that referenced this pull request Jul 16, 2024
…aster with OMP madgraph5#900 and submod madgraph5#897) into gtest

Fix conflicts in epochX/cudacpp/gg_tt.mad/CODEGEN_mad_gg_tt_log.txt
  git checkout clang gg_tt.mad/CODEGEN_mad_gg_tt_log.txt

Note: MG5AMC has been updated including mg5amcnlo#107
valassi added a commit to valassi/madgraph4gpu that referenced this pull request Jul 16, 2024
…aster with clang madgraph5#905, OMP madgraph5#900 and submod madgraph5#897) into gtest

Fix conflicts in epochX/cudacpp/gg_tt.mad/CODEGEN_mad_gg_tt_log.txt
  git checkout clang gg_tt.mad/CODEGEN_mad_gg_tt_log.txt

Note: MG5AMC has been updated including mg5amcnlo#107
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants