Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
137 commits
Select commit Hold shift + click to select a range
e0f1fec
[oct23av] rerun 78 tput alltees, all ok (itscrd90 Silver4216 el9 VM, …
valassi Oct 25, 2023
319f035
[oct23av] rerun 18 tmad alltees, all ok (itscrd90 Silver4216 el9 VM, …
valassi Oct 25, 2023
ed1cd75
[oct23av] (TEMPORARY TESTS ON PLATINUM) rerun 78 tput alltees, all ok…
valassi Oct 26, 2023
93f2978
[oct23av] (TEMPORARY TESTS ON PLATINUM) rerun 18 tmad alltees, all ok…
valassi Oct 26, 2023
ca18b76
[oct23av] go back to performance baseline logs on itscrd90 (REVERT TE…
valassi Oct 26, 2023
b20257a
[oct23av] regenerate 8 processes mad (move from itscrd80 to itscrd90)
valassi Oct 26, 2023
ae5498a
[oct23av] regenerate 7 processes sa (move from itscrd80 to itscrd90) …
valassi Oct 26, 2023
50ad9b7
Merge commit 'a6731bd9ead2f378b5e1a61624a55f5753a1139b' into oct23av
valassi Oct 26, 2023
2a67667
[oct23av] regenerate 7 processes mad (all but pp012j) and all 7 sa, o…
valassi Oct 26, 2023
1903d30
[oct23av] regenerate 7 pp_tt012j.mad, there are two issues: clang for…
valassi Oct 26, 2023
8641b29
fixing issue of stefan with nprocesses>1
oliviermattelaer Aug 31, 2023
8a34ba1
[oct23av] regenerate pp_tt012j.mad after cherry-picking Olivier's fix…
valassi Oct 26, 2023
ec4c8b5
[oct23av] in CODEGEN, improve comments to generated code for mirror p…
valassi Oct 26, 2023
6e6dcbf
[oct23av] regenerate pp_tt012j.mad with my own changes to code comments
valassi Oct 26, 2023
45ebd42
[oct23av] regenerate all other 7 processes mad and 7 sa, no code chan…
valassi Oct 26, 2023
4597ecf
Merge commit '6bf4a658edbd9b3f3f0d3969ba38832e6e002d63' into oct23av
valassi Oct 26, 2023
6a4192a
[oct23av] regenerate 7 processes mad and 6 sa (all except ee_mumu) af…
valassi Oct 26, 2023
7964ff9
[oct23av] rerun gq_ttq tmad tests after Stefan's PR #757 - gqttq xsec…
valassi Oct 26, 2023
34cf1c7
[oct23av] rerun 8 tput tests for gqttq - now runTest fails (I guess t…
valassi Oct 26, 2023
7e57228
[oct23av] in CODEGEN, update gqttq ref file for runTest after fixing …
valassi Oct 26, 2023
4eaa091
[oct23av] regenerate gqttq sa and mad with the correct ref file for r…
valassi Oct 26, 2023
77cd619
[oct23av] rerun 8 tput tests for gqttq - now all ok after fixing the …
valassi Oct 26, 2023
b9d336e
Merge commit 'd64423586' into oct23av
valassi Oct 26, 2023
69c4090
Merge commit '9fc9873d0' into oct23av
valassi Oct 26, 2023
c01ca6f
[oct23av] in CODEGEN MatrixElementKernels.cc, fix clang-format after …
valassi Oct 26, 2023
d883478
[oct23av] TEMPORARELY UNDO Olivier's changes to CODEGEN in 9fc9873d0 …
valassi Oct 26, 2023
88f45f2
[oct23av] regenerate 7 processes mad and 6 sa (all except 2x eemumu) …
valassi Oct 26, 2023
6d449e9
[oct23av] reapply previous patches by Olivier, otherwise the followin…
valassi Oct 26, 2023
cdd0251
Merge commit '5b22a9201' into oct23av
valassi Oct 26, 2023
6fa765d
Merge commit '3fbf7b10c' into oct23av
valassi Oct 26, 2023
d5b9d55
[oct23av] in CODEGEN, try to recover my 'tmad mode' in patchMad.sh, a…
valassi Oct 27, 2023
5720491
[oct23av] regenerate 7 mad and 6 sa processes (all but 2x eemumu wher…
valassi Oct 27, 2023
2389f74
Merge commit 'a062c0fbd' into oct23av
valassi Oct 27, 2023
99f0008
[oct23av] in CODEGEN, minor improvements in comments and verbosity of…
valassi Oct 27, 2023
b7122bf
[oct23av] regenerate 7 mad and 6 sa processes (all but eemumu) after …
valassi Oct 27, 2023
328b18e
[oct23av] in 8 mad directories (copy it manually also for eemumu), ad…
valassi Oct 27, 2023
eeab712
[oct23av] in 8 mad directories (create it manually also for eemumu), …
valassi Oct 27, 2023
739f8d3
Merge commit '216ed1833' into oct23av
valassi Oct 27, 2023
a298ba0
[oct23av] regenerate 7 mad and 6 sa processes (all but eemumu) after …
valassi Oct 27, 2023
80c98f3
Merge commit '8e34ccae3' into oct23av
valassi Oct 27, 2023
2037678
[oct23av] regenerate all 8 mad and 7 sa processes (now including eemu…
valassi Oct 27, 2023
9fb2a07
[oct23av] fix clang format in eemumu after Olivier's "Ccoeff" patch f…
valassi Oct 27, 2023
fbba1a8
[oct23av] regenerate all 8 mad and 7 sa processes (including eemumu)
valassi Oct 27, 2023
7677a74
Merge commit 'c586208a9' into oct23av
valassi Oct 27, 2023
408955d
[oct23av] add copyright and license to Stephan's runCodegen.sh script
valassi Oct 27, 2023
ba4a19e
[oct23AV] in CODEGEN/generateAndCompare.sh, add file mg5.in in each g…
valassi Oct 27, 2023
71e46f1
[oct23av] in CODEGEN, fix build warning in counters.cc (improve Steph…
valassi Oct 27, 2023
216db39
[oct23av] in CODEGEN/generateAndCompare.sh, minor fix for code genera…
valassi Oct 27, 2023
8a0c4d7
[oct23av] regenerate all 8 mad and 7 sa processes after including Ste…
valassi Oct 27, 2023
cd444c6
[oct23av] temporarely move to c586208a9 generated code to avoid confl…
valassi Oct 27, 2023
5c76ed5
Merge commit 'f1244bf14' into oct23av
valassi Oct 27, 2023
39e7519
[oct23av] go back to the latest 8 mad and 7 sa generated processes (u…
valassi Oct 27, 2023
f3d4ef7
Merge commit 'f75e99418' into oct23av
valassi Oct 27, 2023
73a5f23
[oct23av] in CODEGEN/generateAndCompare.sh, remove py3_model.pkl duri…
valassi Oct 27, 2023
06d970e
[oct23av] regenerate all 8 mad and 7 sa processes again, removing py3…
valassi Oct 27, 2023
bcec0af
Merge commit 'fbdacbd54' into oct23av
valassi Oct 27, 2023
0af6151
[oct23av] in CODEGEN, fix a silly issue in my previous conflict resol…
valassi Oct 27, 2023
f237f9f
[oct23av] in CODEGEN, ensure that patchMad.sh stdout/stderr are alway…
valassi Oct 27, 2023
b940731
[oct23av] in CODEGEN, add copyright and license to launch_plugin.py
valassi Oct 27, 2023
a30fd57
[oct23av] in CODEGEN, improve formatting and add an optional CUDACPPR…
valassi Oct 27, 2023
2fa4830
[oct23av] in CODEGEN move tmadmode steps (SDE config, runcard/paramca…
valassi Oct 27, 2023
e8031f4
[oct23av] in CODEGEN launch_plugin.py, make the exception in reset_si…
valassi Oct 27, 2023
226ac3f
[oct23av] in CODEGEN, add a workaround for the exception thrown by re…
valassi Oct 27, 2023
70b770c
[oct23av] regenerate all 8 mad and 7 sa processes after merging and p…
valassi Oct 27, 2023
540f369
Merge commit 'a3d3490b8' into oct23av
valassi Oct 27, 2023
5ed0e4b
[oct23av] in CODEGEN/generateAndCompare.sh, no longer copy or clean u…
valassi Oct 27, 2023
f87854e
[oct23av] in CODEGEN, fix clang format for 'COUPs[ndcoup+0]' from one…
valassi Oct 27, 2023
759e60c
[oct23av] regenerate all 8 mad and 7 sa processes after completing th…
valassi Oct 27, 2023
2d57c0d
Merge commit '6771781ae' into oct23av
valassi Oct 27, 2023
b3badbf
[oct23av] regenerate all 8 mad and 7 sa processes after completing th…
valassi Oct 27, 2023
fad8a92
[oct23av] in eemumu mgOnGpuCxtypes.h, add missing function 'cxsmpl<fl…
valassi Oct 28, 2023
bfa2f9f
[oct23av] in CODEGEN mgOnGpuCxtypes.h, add missing function 'cxsmpl<f…
valassi Oct 28, 2023
a71881e
[oct23av] regenerate eemumu.mad after copying mgOnGpuCxtypes.h to COD…
valassi Oct 28, 2023
ee83b62
[oct23av] rerun 78 tput tests - gqttq runTest failures, NaNs have dis…
valassi Oct 28, 2023
536ad49
[oct23av] rerun 18 tmad tests - failures in ggttggg (madevent crashes…
valassi Oct 28, 2023
973349d
[oct23av] in ggtt.mad, fix all build errors and warnings for macOS on…
valassi Oct 29, 2023
2065bb9
[oct23av] in CODEGEN, backport from gg_tt.mad the fixes for macOS bui…
valassi Oct 29, 2023
84ddaf8
[oct23av] in CODEGEN, regenerate patch.P1 and patch.common from gg_tt…
valassi Oct 29, 2023
2902dfb
[oct23av] regenerate ggtt.mad after updating CODEGEN with macOS patch…
valassi Oct 29, 2023
2cbd4aa
[oct23av] regenerate all other 7 mad and 7 sa processes after updatin…
valassi Oct 29, 2023
b525447
[oct23av] in github workflows, switch CI tests from .sa to .mad direc…
valassi Oct 29, 2023
0605140
[oct23av] fix issues in my previous patch in the CI configuration
valassi Oct 29, 2023
4cb6d11
Merge remote-tracking branch 'roiser/preserve_coupling_order' into oc…
valassi Oct 29, 2023
1594914
[oct23av] regenerate all 8 mad and 7 sa processes after merging Stefa…
valassi Oct 29, 2023
36080e0
[oct23av] rerun 8 tput tests for gqttq - now all ok again after inclu…
valassi Oct 29, 2023
ab05eb4
[oct23av] rerun 3 tmad tests for gqttq - now all ok again after inclu…
valassi Oct 29, 2023
f5dea39
Merge remote-tracking branch 'upstream/master' into ghav_oct23av
valassi Oct 29, 2023
5a140d2
[oct23av] rerun all 78 tput tests - now all of them succed including …
valassi Oct 29, 2023
6ddb1d3
[oct23av] rerun 18 tmad tests - still failures in ggttggg (madevent c…
valassi Oct 29, 2023
aea8b17
[oct23av] add to the repo heft_gg_h.sa/mg5.in which I had forgotten
valassi Oct 29, 2023
ce9892d
[oct23av] in CODEGEN fix cudacpp_src.mk for non SM processes (fix bug…
valassi Oct 29, 2023
904d688
[oct23av/nobm] in CODEGEN check_sa.cc, enable FPEs in check_sa.cc to …
valassi Oct 29, 2023
354d511
[oct23av] "regenerate" all processes with the new check_sa.cc that op…
valassi Oct 29, 2023
b6cdb02
[oct23av] in tput tests, enable FPEs in check.exe by default (unless …
valassi Oct 29, 2023
2a82105
[oct23av] rerun 78 tput tests, with FPEs enabled in the check executa…
valassi Oct 30, 2023
dd6fefe
[oct23av] rerun 18 tmad tests (while rerunning also tput with FPEs en…
valassi Oct 30, 2023
8caf257
[oct23av] in CODEGEN patchMad.sh, reorder leading make_ops lines befo…
valassi Oct 30, 2023
134b57f
[oct23av] in CODEGEN, add a quieter (-q) option to generateAndCompare.sh
valassi Oct 30, 2023
87c43d6
[oct23av] in CODEGEN, minor improvements in generateAndCompare.sh (ni…
valassi Oct 30, 2023
8f96c0a
[oct23av] in tput/throughputX.sh, BUG FIX (remove the build of topdir…
valassi Oct 30, 2023
7929623
[oct23av] in CODEGEN, add target gtestlibs in cudacpp.mk to allow the…
valassi Oct 30, 2023
cc11757
[oct23av] in CODEGEN finally add allGenerateAndCompare.sh to generate…
valassi Oct 30, 2023
3e2af01
[oct23av] in tput/throughputX.sh, improve the bug fix to build gtestl…
valassi Oct 30, 2023
1ab6b78
[oct23av] regenerate all 8 mad and 7 sa processes with latest CODEGEN…
valassi Oct 30, 2023
6c12785
[oct23av] in tput/throughputX.sh, further improve the bug fix to buil…
valassi Oct 30, 2023
30fbebb
[oct23av] rerun 78 tput tests, with FPEs enabled in the check executa…
valassi Oct 31, 2023
201f880
[oct23av] rerun 18 tmad tests (while rerunning also tput with FPEs en…
valassi Oct 31, 2023
e4768a4
[oct23av] in CODEGEN output.py, modify a few comments as suggested in…
valassi Nov 1, 2023
5bf9589
[oct23av] in CODEGEN output.py, move 'tmadmode' patches from patchMad…
valassi Nov 1, 2023
a2149a2
[oct23av] in CODEGEN output.py, try to reenable exception in CPPRunCa…
valassi Nov 1, 2023
efc1b0c
[oct23av] in CODEGEN output.py, disable again the exception in CPPRun…
valassi Nov 1, 2023
07b1090
[oct23av] (complete oct23av?) regenerate all 15 processes, no changes…
valassi Nov 1, 2023
355b9bb
Merge remote-tracking branch 'upstream/master' into oct23av
valassi Nov 1, 2023
a39aa0b
[oct23av] (complete oct23av?) regenerate all 15 processes including t…
valassi Nov 1, 2023
51a2e03
remove all monkeypatch method
oliviermattelaer Nov 1, 2023
3a73803
force flag also for GCC on mac
oliviermattelaer Nov 1, 2023
b46724e
put back the make_opts as required for consistency with MG5aMC practi…
oliviermattelaer Nov 1, 2023
4e1dccb
forbid openmp on mac
oliviermattelaer Nov 1, 2023
d4452f5
[oct23av] upgrade back mg5amcnlo to the latest gpucpp (Olivier downgr…
valassi Nov 2, 2023
d69bd0b
[oct23av] in CODEGEN cudacpp.mk, only include Source/make_opts if Sou…
valassi Nov 2, 2023
75fbc33
[oct23av] regenerate ggtt.mad including Olivier's patches - 'make cle…
valassi Nov 3, 2023
707065e
[oct23av] in ggtt.mad cudacpp.mk, add some debug printouts to show ho…
valassi Nov 3, 2023
c92ec8e
[oct23av] in ggtt.mad cudacpp.mk, try to fix the CUDACPP_MAKEFILE iss…
valassi Nov 3, 2023
113d332
[oct23av] in ggtt.mad cudacpp.mk, use ':=' to set CUDACPP_MAKEFILE on…
valassi Nov 3, 2023
784f37c
[oct23av] in ggtt.mad cudacpp.mk, add override on top of ':=' to ensu…
valassi Nov 3, 2023
418c8b1
[oct23av] in ggtt.mad cudacpp.mk, remove debug printouts - 'make clea…
valassi Nov 3, 2023
b13ae49
[oct23av] in CODEGEN, backport the fixes in cudacpp.mk for make_opts …
valassi Nov 3, 2023
6b39fcb
[oct23av] regenerate all processes including the last changes to make…
valassi Nov 3, 2023
c4d2e9e
[oct23av] rerun 78 tput tests, with FPEs enabled in the check executa…
valassi Nov 3, 2023
5d28956
[oct23av] rerun 18 tmad tests (while rerunning also tput with FPEs en…
valassi Nov 3, 2023
c492e2c
[oct23av] in CODEGEN, fix BUG in Olivier's 4e1dccb44 for OpenMP on Ma…
valassi Nov 3, 2023
b647330
[oct23av] regenerate all processes including the last changes to make…
valassi Nov 3, 2023
5418ed5
[oct23av] in ggttmad cudacpp.mk, fix one third error for openmp on Ma…
valassi Nov 3, 2023
1b3ea52
[oct23av] in CODEGEN, backport the third bug fix in openmp for mac fr…
valassi Nov 3, 2023
08a7a7d
[oct23av] regenerate all processes including the third bug fix in mak…
valassi Nov 3, 2023
4351daa
[oct23av] rerun 78 tput tests, with FPEs enabled in the check executa…
valassi Nov 3, 2023
f53166d
[oct23av] ** COMPLETE OCT23AV ** rerun 18 tmad tests (while rerunning…
valassi Nov 3, 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
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,8 @@ override OMPFLAGS = -fopenmp
else ifneq ($(shell $(CXX) --version | egrep '^(Apple clang)'),)
override OMPFLAGS = # AV disable OpenMP MT on Apple clang (builds fail in the CI #578)
###override OMPFLAGS = -fopenmp # OM reenable OpenMP MT on Apple clang? (AV Oct 2023: this still fails in the CI)
else ifneq ($(UNAME), 'Darwin')
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@oliviermattelaer I just realised there are two bugs here

  • It should be ifeq not ifneq
  • It should be UNAME_S not UNAME
    That is it should read else ifeq ($(UNAME_S), 'Darwin')
    The way it is done now disables OpenMP on Mac AND ALSO on Linux (except icpx and clang)
    I will fix this

Copy link
Copy Markdown
Member Author

@valassi valassi Nov 3, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ouf. There were three errors (I noticed because the CI for b647330 failed). No quotes needed. It should read else ifeq ($(UNAME_S),Darwin). Fixing this again

override OMPFLAGS = # AV disable OpenMP MT on mac
else
override OMPFLAGS = -fopenmp
###override OMPFLAGS = # disable OpenMP MT (default before #575)
Expand Down Expand Up @@ -722,7 +724,7 @@ ifneq ($(shell which flock 2>/dev/null),)
@if [ ! -d $(BUILDDIR) ]; then echo "mkdir -p $(BUILDDIR)"; mkdir -p $(BUILDDIR); fi
flock $(BUILDDIR)/.make_test.lock $(MAKE) -C $(TESTDIR)
else
$(MAKE) -C $(TESTDIR)
if [ -d $(TESTDIR) ]; then $(MAKE) -C $(TESTDIR); fi
endif

#-------------------------------------------------------------------------------
Expand Down