CI fix: move from gfortran-11 to gfortran-14 on Mac github-hosted runners#974
Merged
valassi merged 1 commit intomadgraph5:masterfrom Aug 21, 2024
Merged
CI fix: move from gfortran-11 to gfortran-14 on Mac github-hosted runners#974valassi merged 1 commit intomadgraph5:masterfrom
valassi merged 1 commit intomadgraph5:masterfrom
Conversation
…an-14 on Mac githib-hosted runners (fix madgraph5#971)
Member
Author
|
Hi @oliviermattelaer this seems to work. Should be non controversial, and it makes it possible to test MAC on all other PRs. So I am self merging this (before I start merging anything else) |
Member
Author
|
Ok this has the usual three pptt012j errors Self merging now |
valassi
added a commit
to valassi/madgraph4gpu
that referenced
this pull request
Aug 21, 2024
… mac madgraph5#974, nvcc madgraph5#966) into june24 Fix conflicts: epochX/cudacpp/CODEGEN/PLUGIN/CUDACPP_SA_OUTPUT/MG5aMC_patches/PROD/patch.P1 epochX/cudacpp/CODEGEN/PLUGIN/CUDACPP_SA_OUTPUT/madgraph/iolibs/template_files/gpu/counters.cc epochX/cudacpp/CODEGEN/PLUGIN/CUDACPP_SA_OUTPUT/madgraph/iolibs/template_files/gpu/fbridge.cc epochX/cudacpp/gg_tt.mad/SubProcesses/P1_gg_ttx/auto_dsig1.f epochX/cudacpp/gg_tt.mad/SubProcesses/counters.cc epochX/cudacpp/gg_tt.mad/SubProcesses/fbridge.cc NB: here I essentially fixed gg_tt.mad, not CODEGEN, which will need to be adjusted a posteriori with a backport In particular: - Note1: patch.P1 is now taken from june24, but will need to be recomputed git checkout HEAD CODEGEN/PLUGIN/CUDACPP_SA_OUTPUT/MG5aMC_patches/PROD/patch.P1 - Note2: I need to manually port some upstream/master changes in auto_dsig1.f to smatrix_multi.f, which did not yet exist
valassi
added a commit
to valassi/madgraph4gpu
that referenced
this pull request
Aug 21, 2024
… mac madgraph5#974, nvcc madgraph5#966) into pptt Fix conflicts: epochX/cudacpp/CODEGEN/PLUGIN/CUDACPP_SA_OUTPUT/MG5aMC_patches/PROD/patch.P1 (take HEAD version, must recompute) epochX/cudacpp/gg_tt.mad/SubProcesses/P1_gg_ttx/auto_dsig1.f (fix manually)
valassi
added a commit
to valassi/madgraph4gpu
that referenced
this pull request
Aug 21, 2024
… mac madgraph5#974, nvcc madgraph5#966) into prof
valassi
added a commit
to valassi/madgraph4gpu
that referenced
this pull request
Aug 22, 2024
… mac madgraph5#974, nvcc madgraph5#966) into grid
valassi
added a commit
to valassi/madgraph4gpu
that referenced
this pull request
Aug 22, 2024
…dgraph5#960, mac madgraph5#974, nvcc madgraph5#966) into cmsdy Fix conflict in tlau/fromgridpacks/parseGridpackLogs.sh (use the currenmt cmsdy version: git checkout b125b65 tlau/fromgridpacks/parseGridpackLogs.sh)
valassi
added a commit
to valassi/madgraph4gpu
that referenced
this pull request
Aug 22, 2024
…rge with hel madgraph5#960, mac madgraph5#974, nvcc madgraph5#966) into cmsdyps
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.
CI fix: move from gfortran-11 to gfortran-14 on Mac github-hosted runners
This is a possible fix for #971