upgrade master MG5AMC to the latest gpucpp#897
Merged
oliviermattelaer merged 2 commits intomadgraph5:masterfrom Jul 16, 2024
Merged
upgrade master MG5AMC to the latest gpucpp#897oliviermattelaer merged 2 commits intomadgraph5:masterfrom
oliviermattelaer merged 2 commits intomadgraph5:masterfrom
Conversation
… 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)
Member
Author
|
This has the expected 6 failures. @oliviermattelaer Ready to be merged when approved. |
Member
|
Merged. Thanks, Olivier |
Member
Author
|
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
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.
This was referenced Jul 16, 2024
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
…h5#900 and submod madgraph5#897) into clang
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
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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