upgrade MG5AMC to latest gpucpp and regenerate processes#949
Merged
valassi merged 9 commits intomadgraph5:masterfrom Aug 2, 2024
Merged
upgrade MG5AMC to latest gpucpp and regenerate processes#949valassi merged 9 commits intomadgraph5:masterfrom
valassi merged 9 commits intomadgraph5:masterfrom
Conversation
…g GpuAbstraction.h and GpuRuntime.h madgraph5#947
…eleting GpuAbstraction.h and GpuRuntime.h madgraph5#947 ./CODEGEN/generateAndCompare.sh gg_tt --mad --nopatch git diff --no-ext-diff -R gg_tt.mad/Source/makefile gg_tt.mad/Source/dsample.f gg_tt.mad/Source/genps.inc gg_tt.mad/SubProcesses/makefile > CODEGEN/PLUGIN/CUDACPP_SA_OUTPUT/MG5aMC_patches/PROD/patch.common git diff --no-ext-diff -R gg_tt.mad/bin/internal/banner.py gg_tt.mad/bin/internal/gen_ximprove.py gg_tt.mad/bin/internal/madevent_interface.py >> CODEGEN/PLUGIN/CUDACPP_SA_OUTPUT/MG5aMC_patches/PROD/patch.common git diff --no-ext-diff -R gg_tt.mad/SubProcesses/P1_gg_ttx/auto_dsig1.f gg_tt.mad/SubProcesses/P1_gg_ttx/driver.f gg_tt.mad/SubProcesses/P1_gg_ttx/matrix1.f > CODEGEN/PLUGIN/CUDACPP_SA_OUTPUT/MG5aMC_patches/PROD/patch.P1 git checkout gg_tt.mad
…aph5#947 fix: do not delete G* if it is not a directory (e.g. GpuAbstraction.h)
…adgraph5#947 fix: do not delete G* if it is not a directory (e.g. GpuAbstraction.h)
…madgraph5#947 in madevent_interface.py (do not delete GpuAbstraction.h) via mg5amcnlo#125
…ing any python file* as suggested by Olivier, after moving the fix for madgraph5#947 to mg5amcnlo#125 Also remove Source/dsample.f from patch.common as this is no longer modified. The only files that still need to be patched are - 3 in patch.common: Source/makefile, Source/genps.inc, SubProcesses/makefile - 3 in patch.P1: auto_dsig1.f, driver.f, matrix1.f ./CODEGEN/generateAndCompare.sh gg_tt --mad --nopatch git diff --no-ext-diff -R gg_tt.mad/Source/makefile gg_tt.mad/Source/genps.inc gg_tt.mad/SubProcesses/makefile > CODEGEN/PLUGIN/CUDACPP_SA_OUTPUT/MG5aMC_patches/PROD/patch.common git diff --no-ext-diff -R gg_tt.mad/SubProcesses/P1_gg_ttx/auto_dsig1.f gg_tt.mad/SubProcesses/P1_gg_ttx/driver.f gg_tt.mad/SubProcesses/P1_gg_ttx/matrix1.f > CODEGEN/PLUGIN/CUDACPP_SA_OUTPUT/MG5aMC_patches/PROD/patch.P1 git checkout gg_tt.mad
…d a comment in the fix for madgraph5#947)
…gpucpp after merging/squashing mg5amcnlo#125 fixing madgraph5#947, with an additional fix by Olivier)
This was referenced Aug 2, 2024
Member
Author
|
The CI failed with the expected: 166 successful and 3 failing checks @oliviermattelaer , I will merge this now without waiting for explicit approval. You approved and merged mg5amcnlo/mg5amcnlo#125, this is doing nothing else than integrating the effect of that patch. At least it allows me to update a few other PRs (and it saves you time). Hope thats ok, thanks |
valassi
added a commit
to valassi/madgraph4gpu
that referenced
this pull request
Aug 2, 2024
…dgraph5#949 fixing madgraph5#947 via mg5amcnlo#125) into june24 Fix conflicts: epochX/cudacpp/CODEGEN/PLUGIN/CUDACPP_SA_OUTPUT/MG5aMC_patches/PROD/patch.common (keep the upstream/master version)
valassi
added a commit
to valassi/madgraph4gpu
that referenced
this pull request
Aug 2, 2024
…5#949 fixing madgraph5#947) into pptt Fix conflicts in epochX/cudacpp/pp_tt.mad/CODEGEN_mad_pp_tt_log.txt (git checkout pptt pp_tt.mad/CODEGEN_mad_pp_tt_log.txt)
valassi
added a commit
to valassi/madgraph4gpu
that referenced
this pull request
Aug 2, 2024
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
1 participant
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 is a simple PR to upgrade MG5AMC to the latest gpucpp, and regenerate processes.
It includes the fix for #947 in mg5amcnlo/mg5amcnlo#125
Can you please review? Just an upgrade of the submodule essentially
(I also regenerated patches adding a comment that no python files are there anymore and should be there anymore)
Thanks