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

Include mg5amcnlo in madgraph4gpu as a git submodule #752

Merged
merged 19 commits into from
Aug 16, 2023

Commits on Aug 15, 2023

  1. [submod] add a git submodule mg5amcnlo in the top level MG5aMC

    mkdir <top>/MG5aMC
    cd <top>/MG5aMC
    git submodule add https://github.com/mg5amcnlo/mg5amcnlo
    valassi committed Aug 15, 2023
    Configuration menu
    Copy the full SHA
    f78315b View commit details
    Browse the repository at this point in the history
  2. [submod] switch to branch gpucpp for mg5amcnlo

    cd <top>
    git submodule set-branch --branch gpucpp MG5AMC/mg5amcnlo
    
    (NB: the module name is MG5AMC/mg5amcnlo, you should not run this command with argument mg5amcnlo from directory MG5AMC)
    (NB: 'git config -l' shows no difference)
    valassi committed Aug 15, 2023
    Configuration menu
    Copy the full SHA
    e308c38 View commit details
    Browse the repository at this point in the history
  3. [submod] update module MG5aMC/mg5amcnlo to use the HEAD of gpucpp

    git submodule update --remote
    Submodule path 'MG5aMC/mg5amcnlo': checked out '941832b9b03213da8ab994427add396673820799'
    valassi committed Aug 15, 2023
    Configuration menu
    Copy the full SHA
    b145ba4 View commit details
    Browse the repository at this point in the history
  4. [submod] modify CODEGEN/generateAndCompare.sh to use MG5AMC_HOME from…

    … the mg5amcnlo submodule in this repo
    valassi committed Aug 15, 2023
    Configuration menu
    Copy the full SHA
    47cc558 View commit details
    Browse the repository at this point in the history

Commits on Aug 16, 2023

  1. [submod] in CODEGEN/generateAndCompare.sh, move code-generated direct…

    …ories to $MG5AMC_HOME/../TMPOUT
    valassi committed Aug 16, 2023
    Configuration menu
    Copy the full SHA
    d310065 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    9a1e9db View commit details
    Browse the repository at this point in the history
  3. [submod] in CODEGEN/generateAndCompare.sh, add back the cleanup of mg…

    …5amcnlo/PLUGINS after code generation
    valassi committed Aug 16, 2023
    Configuration menu
    Copy the full SHA
    a060a17 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    195e07c View commit details
    Browse the repository at this point in the history
  5. [submod] regenerate ggtt.mad - changes only in codegen log and in oth…

    …er files showing directory names
    
    In proc_card_mg5.dat
    -output madevent CODEGEN_mad_gg_tt ...
    +output madevent ../TMPOUT/CODEGEN_mad_gg_tt ...
    
    In me5_configuration.txt
    -#mg5_path = /data/avalassi/GPU2023/MG5aMC/ghav-mg5amcnlo
    +#mg5_path = /data/avalassi/GPU2023/madgraph4gpuMOD/MG5aMC/mg5amcnlo
    
    In py3_model.pkl
    (binary files differ)
    
    NOTE: I also added gg_tt.mad/bin/internal/plugin_run_card which seems to be a new file?
    This is probably something added by OLivier after last week's discussions, it contains
    {'name':'cudacpp_backend', 'value':'CPP', 'include':False, 'hidden':False}
    valassi committed Aug 16, 2023
    Configuration menu
    Copy the full SHA
    80ad75c View commit details
    Browse the repository at this point in the history
  6. [submod] finally retire files branch.GIT and commit.GIT, now replaced…

    … by git submodules
    
    Note: they were pointing to
    branch.GIT = gpucpp
    commit.GIT = 941832b9b
    
    Note: 'git show b145ba4' gives
    Submodule MG5aMC/mg5amcnlo 1a13d8f53..941832b9b:
    That is to say, the submodule points to the same commit (by default in detached HEAD state, unless users checkout a specific branch)
    valassi committed Aug 16, 2023
    Configuration menu
    Copy the full SHA
    cd2023a View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    0fb5452 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    b198086 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    36d5f66 View commit details
    Browse the repository at this point in the history
  10. [submod] in CODEGEN, configure renaming of CUDACCP_SA_OUTPUT as CUDAC…

    …PP_OUTPUT when copying to mg5amcnlo
    valassi committed Aug 16, 2023
    Configuration menu
    Copy the full SHA
    7b68beb View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    f44100f View commit details
    Browse the repository at this point in the history
  12. [submod] regenerate ggtt.sa after renaming plugin as CUDACPP_OUTPUT -…

    … all ok, no change except log
    valassi committed Aug 16, 2023
    Configuration menu
    Copy the full SHA
    b3ae790 View commit details
    Browse the repository at this point in the history
  13. [submod] regenerate ggtt.mad after renaming plugin as CUDACPP_OUTPUT …

    …- all ok, no change except log
    valassi committed Aug 16, 2023
    Configuration menu
    Copy the full SHA
    2b0097d View commit details
    Browse the repository at this point in the history
  14. [submod] regenerate all other 6 sa after renaming plugin as CUDACPP_O…

    …UTPUT - all ok, no change except log
    valassi committed Aug 16, 2023
    Configuration menu
    Copy the full SHA
    9010836 View commit details
    Browse the repository at this point in the history
  15. [submod] ** COMPLETE SUBMOD ** regenerate all other 7 mad after renam…

    …ing plugin as CUDACPP_OUTPUT - all ok, no change except log
    valassi committed Aug 16, 2023
    Configuration menu
    Copy the full SHA
    e33fe84 View commit details
    Browse the repository at this point in the history