Skip to content

Commit 6565670

Browse files
committed
Merge branch 'valassi_goodhel' into valassi_goodhel_june24
[gpucpp/june24 + goodhel] (starting from gpucpp with june24 included) Fix conflicts: - madgraph/iolibs/file_writers.py - tests/unit_tests/iolibs/test_file_writers.py
2 parents 8f331a1 + 0c754d6 commit 6565670

File tree

1,116 files changed

+131454
-3146
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,116 files changed

+131454
-3146
lines changed

.github/workflows/acceptancetest.yml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ on:
2020
env:
2121
commitmsg: ${{ github.event.head_commit.message }}
2222

23+
concurrency:
24+
group: ${{ github.workflow }}-${{ github.ref }}
25+
cancel-in-progress: true
26+
2327
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
2428
jobs:
2529
# This workflow contains a single job called "build"
@@ -1941,3 +1945,24 @@ jobs:
19411945
echo "lhapdf-config = /home/runner/work/mg5amcnlo/mg5amcnlo/HEPTools/lhapdf6_py3/bin/lhapdf-config" >> input/mg5_configuration.txt
19421946
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/home/runner/work/mg5amcnlo/mg5amcnlo/HEPTools/lhapdf6_py3//lib
19431947
./tests/test_manager.py test_nlo_reweighting -pA -t0 -l INFO
1948+
1949+
1950+
acceptancetest_ewsudakov:
1951+
# The type of runner that the job will run on
1952+
runs-on: ubuntu-latest
1953+
1954+
# Steps represent a sequence of tasks that will be executed as part of the job
1955+
steps:
1956+
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
1957+
- uses: actions/checkout@v2
1958+
1959+
# Runs a set of commands using the runners shell
1960+
- name: test one of the test test_tt_ewsudakov
1961+
run: |
1962+
cd $GITHUB_WORKSPACE
1963+
cp input/.mg5_configuration_default.txt input/mg5_configuration.txt
1964+
sudo pip install numpy
1965+
which f2py
1966+
echo "f2py_compiler = $(which f2py)" >> input/mg5_configuration.txt
1967+
cp Template/LO/Source/.make_opts Template/LO/Source/make_opts
1968+
./tests/test_manager.py test_ttbar_ewsudakov -pA -t0 -l INFO

.github/workflows/aloha.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,11 @@ on:
2020
env:
2121
commitmsg: ${{ github.event.head_commit.message }}
2222

23+
concurrency:
24+
group: ${{ github.workflow }}-${{ github.ref }}
25+
cancel-in-progress: true
26+
27+
2328
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
2429
jobs:
2530
# This workflow contains a single job called "build"

.github/workflows/unittest.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,11 @@ on:
2020
env:
2121
commitmsg: ${{ github.event.head_commit.message }}
2222

23+
concurrency:
24+
group: ${{ github.workflow }}-${{ github.ref }}
25+
cancel-in-progress: true
26+
27+
2328
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
2429
jobs:
2530
# This workflow contains a single job called "build"

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,5 @@ tests/input_files/*/*.pkl
7070
vendor/StdHEP/log.*
7171
tmp
7272
check_sa_born_splitOrders.f
73-
models/*/
7473
models/*.tgz
7574
nsqso_born.inc

0 commit comments

Comments
 (0)