Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
130 commits
Select commit Hold shift + click to select a range
792080e
Moved compilation of CUDA to seperate cuda target
Jooorgen Aug 21, 2023
c945deb
Fixed indentation in the makefile
Jooorgen Aug 21, 2023
36a5fa7
Removed all unneccessary NVCC ifneq and redid indentation
Jooorgen Aug 21, 2023
0b95fb7
Convert all spaces to tabs in cudacpp.mk file
Jooorgen Aug 21, 2023
360d908
Revert "Convert all spaces to tabs in cudacpp.mk file"
Jooorgen Aug 21, 2023
575840c
Changed line to be interpreted in bash into spaces
Jooorgen Aug 21, 2023
19911fb
Changed indentation again
Jooorgen Aug 21, 2023
f4366a9
Fixed indentation in start of CUDA compilation
Jooorgen Aug 21, 2023
b819498
Fixed indentation in fcheck compilation
Jooorgen Aug 21, 2023
9082da0
Changed indentation of ifndef in CUDA compilation
Jooorgen Aug 21, 2023
bfd4301
Changed indentation back to tabs again for some lines
Jooorgen Aug 21, 2023
529318c
Changed indentation again to fix endif error
Jooorgen Aug 21, 2023
fc549ca
Revert back cudacpp.mk to original state
Jooorgen Aug 21, 2023
bd0df54
Added cuda target
Jooorgen Aug 21, 2023
df98ffa
Added usage target if user doesent speficy target when invoking makef…
Jooorgen Aug 21, 2023
f822e93
Added .DEFAULT_GOAL so usage target will be run correctly
Jooorgen Aug 21, 2023
63bb3b5
Added targets to cpp build
Jooorgen Aug 21, 2023
b5758b0
Added correct cpp targets
Jooorgen Aug 21, 2023
eb3a706
Added $(MAKECMDGOALS) ifeq to CUDA compiler configuration
Jooorgen Aug 22, 2023
b23ada0
Removed automatic configuration of AVX level
Jooorgen Aug 25, 2023
683e641
Fixed correct AVX level depending on C++ compiler
Jooorgen Aug 25, 2023
fca0b73
Reworked configuration of setting AVX level
Jooorgen Aug 25, 2023
489c453
Fixed missing endif and removed AVX configuration in cuda compilation
Jooorgen Aug 25, 2023
01b7da3
Fixed AVX not being properly set
Jooorgen Aug 25, 2023
e734f49
Fixed cuda compilation in cudacpp_src.mk and fixed trailing whitespac…
Jooorgen Aug 25, 2023
35d6aee
Added else case in AVX configuration
Jooorgen Aug 28, 2023
b611e9e
Port changes to BUILDDIRTAG to cudacpp_src.mk
Jooorgen Aug 28, 2023
fbdb45a
Added build specific clean targets in cudacpp.mk and cudacpp_src.mk
Jooorgen Aug 28, 2023
b86bf3c
Fixed cleanall with new clean targets
Jooorgen Aug 28, 2023
8b22e9a
Fixed indentations in the recipie of the targets
Jooorgen Aug 29, 2023
f81f91f
Redid the detection of multiple BUILDDIRS when user runs clean
Jooorgen Aug 29, 2023
ea4c807
Fixed indentation mistake
Jooorgen Aug 29, 2023
b39d75b
Fixed intendation again in cudacpp_src.mk cleanall
Jooorgen Aug 29, 2023
578e5b4
First iteration of changes to makefile.mk
Jooorgen Sep 4, 2023
f755f8a
Added more clean targets
Jooorgen Sep 4, 2023
38beccc
Removed warning using MAKECMDGOAL
Jooorgen Sep 5, 2023
e7e85e9
Removed recursiveness in target
Jooorgen Sep 5, 2023
97c38e2
Fixed cleanall bug
Jooorgen Sep 5, 2023
f2eb850
Fixed error with clean not detecting the build directories
Jooorgen Sep 6, 2023
b41069f
Fixed indentation in clean target
Jooorgen Sep 6, 2023
f2c9c45
Fixed edgecase where target is madevent_* and the actual target varia…
Jooorgen Sep 6, 2023
db55dcc
Fixed cudacpp_src.mk indentation in target
Jooorgen Sep 6, 2023
df70200
Fixed typo in makefile
Jooorgen Sep 12, 2023
c890fc0
make clean and make cleanavx/cuda now correctly cleans
Jooorgen Sep 12, 2023
dc77630
Fixed cleandir in cudacpp.mk calling cleannone in cudacpp_src.mk
Jooorgen Sep 13, 2023
b680cae
Added removing the lockfile in make clean
Jooorgen Sep 13, 2023
8583d62
Fixed syntax in make clean logic, now corectly cleans lockfile
Jooorgen Sep 14, 2023
3826d16
Added ifeq if no directories are found in make clean
Jooorgen Sep 14, 2023
ccc49ed
Fixed extraction of avx level in make clean
Jooorgen Sep 14, 2023
c9af7a8
Fixed lib directory not getting properly cleaned
Jooorgen Sep 14, 2023
dbbb795
Reworked targets to allow for compilation using ALL target
Jooorgen Sep 19, 2023
bfc7739
Absorbed the initial target calling cudacpp.mk into each seperate avx…
Jooorgen Sep 21, 2023
4d4866b
Fixed madevent_avx/cuda_link targets
Jooorgen Sep 21, 2023
3fa5b76
ALL target now calls the makefile itself for compiling avx/cuda targets
Jooorgen Sep 21, 2023
83bacca
Last revision of targets
Jooorgen Sep 21, 2023
f1a2704
Did some refactoring of the makefile to remove recurring lines
Jooorgen Sep 22, 2023
6cc72f7
Code cleanup
Jooorgen Sep 22, 2023
cd39261
Reverted change to Source makefile, no patch needed now
Jooorgen Sep 25, 2023
7d15b06
Fixed lockfiles not getting cleaned properly
Jooorgen Sep 25, 2023
752d336
Fixed indentation
Jooorgen Sep 25, 2023
c121b0d
Fixed indentation in cudacpp_src.mk
Jooorgen Sep 25, 2023
7511431
gCheck and check are now to seperate targets for use in CI
Jooorgen Sep 25, 2023
328c921
NVCC now gets properly configured when doing various tests
Jooorgen Sep 26, 2023
df04597
Removed the creation of lockfiles
Jooorgen Sep 27, 2023
51828ef
Added cpp target for testing
Jooorgen Sep 27, 2023
aace762
[CODEGEN] Ported changes in gg_tt.mad to codegen
Jooorgen Sep 27, 2023
66d0191
[CODEGEN] Added patch to makefile to patch.common in codegen
Jooorgen Sep 28, 2023
892f21c
Readded cleaning of build directories in cleanall
Jooorgen Sep 28, 2023
b0f52b5
[CODEGEN] Fixed indentation in cudacpp.mk in codegen
Jooorgen Sep 28, 2023
fd3f74d
Fixed indentation in cudacpp.mk in gg_tt.mad
Jooorgen Sep 28, 2023
f48ab5a
[CODEGEN] Removed prior patch to makefile in patch.common
Jooorgen Sep 28, 2023
92bd1e7
Revert "[CODEGEN] Removed prior patch to makefile in patch.common"
Jooorgen Sep 28, 2023
dd01050
[CODEGEN] Fixed patch not applying because string does not exist in f…
Jooorgen Sep 28, 2023
e75ca38
[CODEGEN] Fixed mismatch in patch.common
Jooorgen Sep 28, 2023
191e112
Sets correct cppavx dependency for compiling madevent_cpp
Jooorgen Sep 28, 2023
67dd776
Fixed unneccessary & in CUDACPP_BUILDDIR assignment
Jooorgen Sep 28, 2023
9e974c0
[CODEGEN] Add the dependency on cppavx target when compiling madevent…
Jooorgen Sep 28, 2023
564682a
[CODEGEN] Now sets correct target for linking with cppavx target in r…
Jooorgen Sep 28, 2023
6382b5a
[CODEGEN] Fixed patch.commen to have correct intervals in git diff
Jooorgen Sep 28, 2023
6092d6a
[CODEGEN] Correctly assigns CPPTARGET in compiling madevent_cpp
Jooorgen Sep 28, 2023
bedb79c
[CODEGEN] Correctly sets dependencies for madevent_cpp
Jooorgen Sep 28, 2023
cf1b21b
[CODEGEN] Correctly sets target if madevent is in $MAKECMDGOALS
Jooorgen Sep 28, 2023
75c5be6
[CODEGEN] Regenerated all .sa/.mad processes
Jooorgen Sep 29, 2023
8368afc
Add reference file for uux->ttgg tests.
hageboeck Aug 18, 2023
fa18d55
Remove epoch1/2 from CI, add epochX/pptt012j instead.
hageboeck Aug 17, 2023
cf0fafa
[pp->tt012j] Start refactoring the Makefiles.
hageboeck Aug 17, 2023
91f1b61
Fix a signed-unsigned warning.
hageboeck Aug 18, 2023
0212f8b
Protect clang-specific pragmas from other compilers.
hageboeck Sep 8, 2023
434774b
Remove force override of OMPFLAGS.
hageboeck Sep 19, 2023
d2182de
[gg_ttgg] Remove force override of OMPFLAGS.
hageboeck Sep 19, 2023
938fab6
[pp_tt012j] Remove a hardcoded path to non-existing madgraph
hageboeck Oct 19, 2023
c1020b6
[pp_tt012j] Completely overhaul Makefiles
hageboeck Nov 17, 2023
e9f18a7
Remove conditional compilation after Makefile overhaul.
hageboeck Nov 17, 2023
2a56e6d
[misc.py] Fix a few typos.
hageboeck Nov 21, 2023
3be8de7
Merge remote-tracking branch 'madgraph/master' into refactorMakefile
hageboeck Nov 22, 2023
d8bfd81
Adapt old CI to new Makefile workflow.
hageboeck Nov 22, 2023
4a5447e
[pp_tt012j] More Makefile tweaks.
hageboeck Nov 23, 2023
4ac7d3c
[pp_tt012j] Reactivate GLOBAL_FLAG to work with new Makefiles.
hageboeck Nov 27, 2023
8ecef5b
[pp_tt012j] Even more Makefile tweaks.
hageboeck Nov 27, 2023
ee768b4
[CODEGEN] Port makefile overhaul to CODEGEN.
hageboeck Nov 24, 2023
8715ca3
[CODEGEN] Fix compiler warnings.
hageboeck Nov 24, 2023
58b3ab6
[CODEGEN] Protect clang-specific pragmas from other compilers.
hageboeck Sep 8, 2023
a2093c6
[CODEGEN] Fix MatrixElementKernelDevice::setGrid()
hageboeck Nov 24, 2023
eec9d56
[CODEGEN] Instantiate madgraph test cases also for CUDA builds.
hageboeck Nov 28, 2023
7452bbe
[CODEGEN] Apply clang-format to runTest.cc
hageboeck Nov 28, 2023
99c2758
[CODEGEN] Remove level 0 pre-patches from generateAndCompare
hageboeck Nov 30, 2023
c85de5d
[CODEGEN] Make mixed-precision computations the default.
hageboeck Dec 13, 2023
23d6470
[CODEGEN] Refine clean targets.
hageboeck Dec 13, 2023
1904d74
Regenerate all *.mad processes.
hageboeck Nov 28, 2023
5773856
[CI] Fix Mac build targets for CI runs.
hageboeck Nov 29, 2023
629d5aa
[CI] Update debug build configuration.
hageboeck Nov 29, 2023
b3c44fe
[refactorMakefile] in codegen, protect runTest.cc with clang-format-o…
valassi Dec 14, 2023
8f65910
[refactorMakefile] attempt a fix for codegen on itscrd80: regenerate …
valassi Dec 14, 2023
5473f65
[refactorMakefile] attempt an additional fix for codegen: move back f…
valassi Dec 14, 2023
1961815
[refactorMakefile] in codegen, attempt to fix the failure of patchMad…
valassi Dec 14, 2023
9b7062a
[refactorMakefile] attempt a fix for patchMad.sh failure on itscrd90:…
valassi Dec 14, 2023
0ce8acc
[refactorMakefile] in codegen regenerate patch.common
valassi Dec 14, 2023
1399cf4
[refactorMakefile] in ggtt.mad SubProcesses/makefile, disable ccache …
valassi Dec 14, 2023
69db1a1
[refactorMakefile] in codegen regenerate patch.common
valassi Dec 14, 2023
b8fd2a9
[refactorMakefile] in CODEGEN/allGenerateAndCompare.sh add --mad and …
valassi Dec 14, 2023
31087b6
[refactorMakefile] regenerate all mad processes
valassi Dec 14, 2023
5563789
[refactorMakefile] in gg_tt.mad, fix 'make clean' when there is no bu…
valassi Dec 14, 2023
a3a0ee8
[refactorMakefile] in gg_tt.mad, improve comments in SubProcesses/mak…
valassi Dec 14, 2023
746064f
[refactorMakefile] in gg_tt.mad, improve dependency on discretesample…
valassi Dec 14, 2023
597325b
[refactorMakefile] in gg_tt.mad, rename cppavx512y/z as cpp512y/z in …
valassi Dec 14, 2023
3e6728f
[refactorMakefile] in gg_tt.mad SubProcesses/makefile, remove the 'cl…
valassi Dec 14, 2023
eaa3bfb
[refactorMakefile] in gg_tt.mad makefiles, rename AVX as BACKEND
valassi Dec 14, 2023
06ec67a
wip
valassi Dec 14, 2023
9ace5b8
Revert "wip"
valassi Dec 14, 2023
1298de1
Revert "[refactorMakefile] in gg_tt.mad makefiles, rename AVX as BACK…
valassi Dec 14, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 20 additions & 14 deletions .github/workflows/c-cpp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,29 +9,35 @@ on:
jobs:
debug_builds:
runs-on: ubuntu-latest
env:
FCFLAGS: -O0 -g
CXXFLAGS: -O0 -g
NVCCFLAGS: -O0 -g -G
strategy:
matrix:
folder: [ epochX/cudacpp/ee_mumu.sa/SubProcesses/P1_Sigma_sm_epem_mupmum , epoch1/cuda/ee_mumu/SubProcesses/P1_Sigma_sm_epem_mupmum , epoch2/cuda/ee_mumu/SubProcesses/P1_Sigma_sm_epem_mupmum ]
folder: [ epochX/cudacpp/ee_mumu.sa/SubProcesses/P1_Sigma_sm_epem_mupmum , epochX/cudacpp/pp_tt012j.mad/SubProcesses/P0_gg_ttx , epochX/cudacpp/pp_tt012j.mad/SubProcesses/P2_uux_ttxgg ]
fail-fast: false
steps:
- uses: actions/checkout@v2
- name: make debug
run: make -C ${{ matrix.folder }} debug
run: make -C ${{ matrix.folder }}
- name: make check
run: make -C ${{ matrix.folder }} check
CPU:
runs-on: ubuntu-latest
strategy:
matrix:
folder: [ epochX/cudacpp/ee_mumu.mad/SubProcesses/P1_epem_mupmum , epochX/cudacpp/gg_ttgg.mad/SubProcesses/P1_gg_ttxgg ]
folder: [ epochX/cudacpp/ee_mumu.mad/SubProcesses/P1_epem_mupmum , epochX/cudacpp/gg_ttgg.mad/SubProcesses/P1_gg_ttxgg , epochX/cudacpp/pp_tt012j.mad/SubProcesses/P0_gg_ttx ]
precision: [ d , f , m ]
fail-fast: false
steps:
- uses: actions/checkout@v2
- name: make info
run: make FPTYPE=${{ matrix.precision }} -C ${{ matrix.folder }} -f cudacpp.mk info
run: make FPTYPE=${{ matrix.precision }} -C ${{ matrix.folder }} info
- name: make
run: make FPTYPE=${{ matrix.precision }} -C ${{ matrix.folder }}
- name: make check
run: make FPTYPE=${{ matrix.precision }} -C ${{ matrix.folder }} -f cudacpp.mk check
run: make FPTYPE=${{ matrix.precision }} -C ${{ matrix.folder }} check
CPU_MAC:
runs-on: macos-latest
env:
Expand All @@ -44,11 +50,11 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: make info
run: make AVX=none OMPFLAGS= FPTYPE=${{ matrix.precision }} -C ${{ matrix.folder }} -f cudacpp.mk info
run: make OMPFLAGS= FPTYPE=${{ matrix.precision }} -C ${{ matrix.folder }} info
- name: make
run: make AVX=none OMPFLAGS= FPTYPE=${{ matrix.precision }} -C ${{ matrix.folder }}
run: make OMPFLAGS= FPTYPE=${{ matrix.precision }} -C ${{ matrix.folder }} cppnative
- name: make check
run: make AVX=none OMPFLAGS= FPTYPE=${{ matrix.precision }} -C ${{ matrix.folder }} -f cudacpp.mk check
run: make OMPFLAGS= FPTYPE=${{ matrix.precision }} -C ${{ matrix.folder }} check
GPU:
runs-on: self-hosted
env:
Expand All @@ -57,16 +63,16 @@ jobs:
REQUIRE_CUDA: 1
strategy:
matrix:
folder: [ epochX/cudacpp/ee_mumu.mad/SubProcesses/P1_epem_mupmum , epochX/cudacpp/gg_ttgg.mad/SubProcesses/P1_gg_ttxgg ]
folder: [ epochX/cudacpp/ee_mumu.mad/SubProcesses/P1_epem_mupmum , epochX/cudacpp/gg_ttgg.mad/SubProcesses/P1_gg_ttxgg , epochX/cudacpp/pp_tt012j.mad/SubProcesses/P0_gg_ttx , epochX/cudacpp/pp_tt012j.mad/SubProcesses/P2_uux_ttxgg ]
precision: [ d , f , m ]
fail-fast: false
steps:
- uses: actions/checkout@v2
- name: path
run: echo "PATH=$PATH"
- name: make info
run: make FPTYPE=${{ matrix.precision }} -C ${{ matrix.folder }} -f cudacpp.mk info
- name: make
run: make FPTYPE=${{ matrix.precision }} -C ${{ matrix.folder }}
- name: make check
run: make FPTYPE=${{ matrix.precision }} -C ${{ matrix.folder }} -f cudacpp.mk check
run: make FPTYPE=${{ matrix.precision }} -C ${{ matrix.folder }} info
- name: make cuda
run: make FPTYPE=${{ matrix.precision }} -C ${{ matrix.folder }} cuda
- name: make gcheck
run: make FPTYPE=${{ matrix.precision }} -C ${{ matrix.folder }} gcheck
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ extern "C"
case +0: return "CudaCpp"; break;
default: assert( false ); break;
}

return 0;
}

static mgOnGpu::Timer<TIMERTYPE> program_timer;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git b/epochX/cudacpp/gg_tt.mad/SubProcesses/P1_gg_ttx/auto_dsig1.f a/epochX/cudacpp/gg_tt.mad/SubProcesses/P1_gg_ttx/auto_dsig1.f
index 880769442..5a3da931f 100644
index 0a3dfa449..9346ee4c6 100644
--- b/epochX/cudacpp/gg_tt.mad/SubProcesses/P1_gg_ttx/auto_dsig1.f
+++ a/epochX/cudacpp/gg_tt.mad/SubProcesses/P1_gg_ttx/auto_dsig1.f
@@ -484,23 +484,140 @@ C
Expand Down Expand Up @@ -284,7 +284,7 @@ index 71fbf2b25..0f1d199fc 100644
open(unit=lun,file=tempname,status='old',ERR=20)
fopened=.true.
diff --git b/epochX/cudacpp/gg_tt.mad/SubProcesses/P1_gg_ttx/matrix1.f a/epochX/cudacpp/gg_tt.mad/SubProcesses/P1_gg_ttx/matrix1.f
index 3ac962688..daea73a6d 100644
index 817af778b..0c2ce6ec4 100644
--- b/epochX/cudacpp/gg_tt.mad/SubProcesses/P1_gg_ttx/matrix1.f
+++ a/epochX/cudacpp/gg_tt.mad/SubProcesses/P1_gg_ttx/matrix1.f
@@ -72,7 +72,10 @@ C
Expand Down
Loading