Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
225 commits
Select commit Hold shift + click to select a range
8775b2d
[fpe] in ggtt.sa tests, add comments about how to run a single test i…
valassi Jul 14, 2023
ea07a20
[fpe] in ggtt.sa, add copyright header when dumping new reference fil…
valassi Jul 14, 2023
d75e426
[fpe] in ggttsa cudacpp.mk, try to debug #701 IEEE_DIVIDE_BY_ZERO (se…
valassi Jul 14, 2023
6fc09d8
[fpe] revert addition of -ffpe flags in ggttsa cudacpp.mk
valassi Jul 14, 2023
8efb726
[fpe] in ggtt.sa testxxx.cc, enable FPE floating point exception sign…
valassi Jul 14, 2023
22bd10d
[fpe] in ggtt.sa testxxx.cc, add a very simple signal handler for FPE…
valassi Jul 14, 2023
f64590a
[fpe] in ggtt.sa testxxx.cc, add some context information to the FPE …
valassi Jul 14, 2023
b35b772
[fpe] in ggtt.sa testxxx.cc, disable FPE if environment variable CUDA…
valassi Jul 17, 2023
f2598e0
[fpe] in ggtt.sa testxxx.cc, turn on event by event debugging
valassi Jul 14, 2023
46b6a0f
[fpe] in ggtt.sa testxxx.cc, cleanup (remove an unnecessary reinterpr…
valassi Jul 14, 2023
5c1470a
[fpe] in ggtt.sa testxxx.cc, add prepareTest (and improve FPE signal …
valassi Jul 14, 2023
7674824
[fpe] in ggtt.sa HelAmps_sm.h, first (OLD!) attempt of BUG FIX FOR #7…
valassi Jul 14, 2023
fdacc5e
[fpe] in ggtt.sa HelAmps_sm.h, add some debugging printouts for ixxxxx
valassi Jul 17, 2023
0372e2e
[fpe] revert the last two changes in ggtt.sa HelAmps_sm.h ixxxxx, wil…
valassi Jul 17, 2023
f607906
[fpe] in ggtt.sa mgOnGpuVectors.h, add maskand function
valassi Jul 17, 2023
7d1336b
[fpe] in ggtt.sa testmisc.ss, remove maskand function as it exists in…
valassi Jul 17, 2023
b0fca94
[fpe] in ggtt.sa testxxx.cc, add more debugging printouts
valassi Jul 14, 2023
8745a98
[fpe] in ggtt.sa mgOnGpuVectors.h, add constructor "cxtype_v( const f…
valassi Jul 17, 2023
68d787f
[fpe] in ggtt.sa HelAmps_sm.h, new BUG FIX FOR #701 in function ixxxxx
valassi Jul 17, 2023
7e91a0e
[fpe] in ggtt.sa testxxx.cc, reenable resetHstMomentaToPar0 at the be…
valassi Jul 17, 2023
de6492c
[fpe] in ggtt.sa testxxx.cc, ensure that ipzxxx handles SIMD vectors …
valassi Jul 14, 2023
18dd262
[fpe] in ggtt.sa HelAmps_sm.h, new BUG FIX FOR #701 in function vxxxxx
valassi Jul 17, 2023
709ec5d
[fpe] in ggtt.sa cudacpp makefiles, add gcov target
valassi Jul 17, 2023
eb5594d
[fpe] in ggt.sa .gitignore, add gcov suffixes to gitignore
valassi Jul 17, 2023
e4957d5
[fpe] revert the previous change: will instead remove gcov files in '…
valassi Jul 17, 2023
fc120fa
[fpe] in ggtt.sa cudacpp makefiles, remove files with gcov suffixes i…
valassi Jul 17, 2023
e372403
[fpe] in gggtt.sa cudaccp makefiles, remove all gcov attempts - what …
valassi Jul 17, 2023
4380121
[fpe] in ggtt.sa HelAmps_sm.h, new BUG FIX FOR #701 in function oxxxxx
valassi Jul 17, 2023
0bd0980
[fpe] in ggtt.sa HelAmps_sm.h, partial fix for my new bug in oxxxxx
valassi Jul 17, 2023
4cc392d
[fpe] in ggtt.sa HelAmps_sa.h, remove old code with old comments
valassi Jul 17, 2023
6ec612c
[fpe] in ggtt.sa HelAmps_sm.h, partial fix for my new bug in oxxxxx: …
valassi Jul 17, 2023
06aac19
[fpe] in ggtt.sa HelAmps_sm.h, partial fix for my new bug in oxxxxx: …
valassi Jul 17, 2023
0240749
[fpe] in ggtt.sa HelAmps_sm.h, add a comment about ip/im in the new i…
valassi Jul 17, 2023
940c0c4
[fpe] in ggtt.sa testxxx.cc, ensure that opzxxx handles SIMD vectors …
valassi Jul 17, 2023
e025512
[fpe] in ggtt.sa testxxx.cc, use the same trick as for ipz/opzxxx als…
valassi Jul 17, 2023
c658021
[fpe] in ggtt.sa HelAmps_sm.h, make a minor cosmetic change in the ne…
valassi Jul 17, 2023
278190d
[fpe] in ggtt.sa testxxx.cc, use the same trick as for ipz/opzxxx for…
valassi Jul 17, 2023
2d653b2
[fpe] in ggtt.sa testmisc.cc, install a simpler FPE handler
valassi Jul 17, 2023
8d31349
[fpe] revert the previous change - will disable the FPE signals inste…
valassi Jul 17, 2023
8c468a3
[fpe] in ggtt.sa testxxx.cc, disable FPE handlers at the end of the test
valassi Jul 17, 2023
550f3af
[fpe] in ggtt.sa testxxx.cc, reshuffle tests to have 16 with m==0 and…
valassi Jul 17, 2023
8ca5144
[fpe] in ggtt.sa, replace newly dumped testxxx_cc_ref.txt (and disabl…
valassi Jul 17, 2023
a683a5c
[fpe] in ggtt.sa testxxx.cc, disable the trick for all functions but …
valassi Jul 17, 2023
f154998
[fpe] in ggtt.sa HelAmps_sm.h, DISABLE AUTO-VECTORIZATION on the whol…
valassi Jul 17, 2023
ff3b0b9
[fpe] in ggtt.sa HelAmps_sm.h, add a first fix for my fix of #701 (em…
valassi Jul 17, 2023
93a4912
[fpe] in ggtt.sa HelAmps_sm.h, DISABLE AUTO-VECTORIZATION on the whol…
valassi Jul 17, 2023
8680f94
[fpe] in ggtt.sa HelAmps_sm.h, DISABLE AUTO-VECTORIZATION on the whol…
valassi Jul 17, 2023
71e6f01
[fpe] in ggtt.sa HelAmps_sm.h, fix builds for AVX=none... the tests s…
valassi Jul 17, 2023
f7f0252
[fpe] in ggtt.sa mgOnGpuVectors.h, add maskand function also for CUDA
valassi Jul 17, 2023
13df781
[fpe] in ggtt.sa HelAmps_sm.h, fix builds for FPTYPE=f with SIMD
valassi Jul 17, 2023
c83a836
[fpe] in ggtt.sa cudacpp makefiles, remove -DDEBUG2 and add back -lin…
valassi Jul 18, 2023
377baa1
[fpe] in ggtt.sa cudacpp makefiles, remove -lineinfo again from debug…
valassi Jul 18, 2023
10ef191
[fpe] in ggtt.sa cudacpp_src makefile, add -march=x86-64 to AVX=none …
valassi Jul 18, 2023
5a6a297
[fpe] rerun tput ggtt.mad test as a reference now
valassi Jul 18, 2023
9f24960
[namespace] in ggtt.sa, start separation of cpu/gpu namespaces: first…
valassi Jul 19, 2023
cb90519
[namespace] in ggtt.sa, start separation of cpu/gpu namespaces: first…
valassi Jul 19, 2023
7de23d5
[namespace] in ggtt.sa, start separation of cpu/gpu namespaces: furth…
valassi Jul 19, 2023
5d4de00
[namespace] in ggtt.sa, start separation of cpu/gpu namespaces: furth…
valassi Jul 19, 2023
3844169
[namespace] in ggtt.sa, start separation of cpu/gpu namespaces: furth…
valassi Jul 19, 2023
811da80
[namespace] in ggtt.sa, start separation of cpu/gpu namespaces: furth…
valassi Jul 19, 2023
6d7994f
[namespace] in ggtt.sa, start separation of cpu/gpu namespaces: furth…
valassi Jul 19, 2023
103e7a8
[namespace] in ggtt.sa, start separation of cpu/gpu namespaces: furth…
valassi Jul 19, 2023
b714142
[namespace] in ggtt.sa, first fixes for cpu/gpu namespace in Paramete…
valassi Jul 19, 2023
0ae9b56
[namespace] in ggtt.sa mgOnGpuFptypes.h, move fpsqrt and other functi…
valassi Jul 19, 2023
edaf3da
[namespace] in ggtt.sa mgOnGpuCxtypes.h, move nx2 back to the common …
valassi Jul 19, 2023
52431dc
[namespace] in ggtt.sa MemoryAccessMomenta.h, move the class into the…
valassi Jul 19, 2023
4db9f23
[namespace] in ggtt.sa Bridge.h, remove cpu/gpu namespace qualifiers …
valassi Jul 19, 2023
4643f37
[namespace] in six ggtt.sa MemoryXXX.h, move the class into the cpu/g…
valassi Jul 19, 2023
c7d0349
[namespace] in ggtt.sa BridgeKernels.cc, fix namespaces for CPPProcess
valassi Jul 19, 2023
337cc8e
[namespace] in ggtt.sa, further fix for cpu/gpu namespace in Paramete…
valassi Jul 19, 2023
7e44ef6
[namespace] in ggtt.sa, add gParameters_sm.cu and buiold it with CUDA…
valassi Jul 19, 2023
97a28da
[namespace] in ggtt.sa, further fix for cpu/gpu namespace in mgOnGpuC…
valassi Jul 19, 2023
a219873
[fpe] cherry-pick the last commit from the namespace branch and fix a…
valassi Jul 19, 2023
8a5d3b1
[fpe] rerun tput for ggtt.sa and copy the log: there is a big perform…
valassi Jul 19, 2023
be4a0cb
[fpe] in ggtt.sa HelAmps_sm.h, REENABLE AUTO-VECTORIZATION on the who…
valassi Jul 19, 2023
6e9e253
[fpe] in ggtt.sa HelAmps_sm.h, add a printout that clearly shows the …
valassi Jul 19, 2023
88e4303
[fpe] in ggtt.sa HelAmps_sm.h, try to prevent vectorization in ixxxxx…
valassi Jul 19, 2023
5a005cc
[fpe] in ggtt.sa HelAmps_sm.h, try to prevent vectorization in ixxxxx…
valassi Jul 19, 2023
f3c331e
[fpe] in ggtt.sa HelAmps_sm.h, try to prevent vectorization in ixxxxx…
valassi Jul 19, 2023
b2e71e5
[fpe] in ggtt.sa HelAmps_sm.h, try to prevent FPEs in ixxxxx by using…
valassi Jul 19, 2023
98e664a
[fpe] in ggtt.sa HelAmps_sm.h, finally succeed in preventing the FPE …
valassi Jul 19, 2023
a7e952c
[fpe] in ggtt.sa HelAmps_sm.h, clean up ixxxx implementation by remov…
valassi Jul 19, 2023
106789b
[fpe] in ggtt.sa HelAmps_sm.h, add a printout that clearly shows the …
valassi Jul 19, 2023
3ae5087
[fpe] in ggtt.sa HelAmps_sm.h, try to avoid the FPE in vxxxxx using t…
valassi Jul 19, 2023
8194f15
[fpe] in ggtt.sa HelAmps_sm.h, printing out denom for each ieppV woul…
valassi Jul 19, 2023
6ed2c0d
[fpe] in ggtt.sa HelAmps_sm.h, avoid the FPE in vxxxxx using the same…
valassi Jul 19, 2023
dbd4e91
[fpe] in ggtt.sa HelAmps_sm.h, clean up vxxxx implementation by remov…
valassi Jul 19, 2023
e70f2ae
[fpe] in ggtt.sa HelAmps_sm.h, add a printout that clearly shows the …
valassi Jul 19, 2023
5437ca8
[fpe] in ggtt.sa HelAmps_sm.h, avoid the FPE in oxxxxx using the same…
valassi Jul 19, 2023
57ee968
[fpe] in ggtt.sa HelAmps_sm.h, add a printout that clearly shows the …
valassi Jul 19, 2023
39232c5
[fpe] == MAJOR CHANGE OF STRATEGY!!! == in ggtt.sa HelAmps_sm.h, move…
valassi Jul 19, 2023
04e0085
[fpe] == COMPLETE MAJOR CHANGE OF STRATEGY!!! == in ggtt.sa HelAmps_s…
valassi Jul 19, 2023
c7f194c
[fpe] rerun tput for ggtt.sa and copy the log: recover the previous p…
valassi Jul 19, 2023
b677c21
[fpe] revert to the ggtt tput performance log from upstream/master fo…
valassi Jul 19, 2023
a7a1d35
[namespace] in ggtt.sa, remove gParameters_sm.cu symlink in src, inst…
valassi Jul 19, 2023
6cb7578
[fpe] progress in backport from ggtt.sa to CODEGEN - test classes
valassi Jul 19, 2023
c0d4fa2
[fpe] clang-format CODEGEN for ggtt.sa test*.cc (also in ggtt.sa)
valassi Jul 19, 2023
f5b0cdb
[fpe] progress in backport from ggtt.sa to CODEGEN - Memory* files
valassi Jul 19, 2023
ea860ce
[fpe] clang-format CODEGEN for Memory* (also in ggtt.sa)
valassi Jul 19, 2023
85c8295
[fpe] progress in backport from ggtt.sa to CODEGEN - src/mgOnGpu*
valassi Jul 19, 2023
863f302
[fpe] clang-format CODEGEN for mgOnGpu* (also in ggtt.sa)
valassi Jul 19, 2023
5b19df7
[fpe] progress in backport from ggtt.sa to CODEGEN - Bridge*
valassi Jul 19, 2023
26eb6b6
[fpe] clang-format CODEGEN for Bridge* (also in ggtt.sa)
valassi Jul 19, 2023
0ef9448
[fpe] progress in backport from ggtt.sa to CODEGEN - makefiles
valassi Jul 19, 2023
9a95a74
[fpe] progress in backport from ggtt.sa to CODEGEN - Parameters.cc
valassi Jul 19, 2023
d9d4902
[fpe] progress in backport from ggtt.sa to CODEGEN - Parameters.h
valassi Jul 19, 2023
4b9bc3f
[fpe] in ggtt.sa, fix cudacpp.mk to remove clang14 warning on alma9 (…
valassi Jul 20, 2023
b02dd23
[fpe] in ggtt.sa HelAmps_sm.h, add a printout that clearly shows the …
valassi Jul 20, 2023
81de612
[fpe] in ggtt.sa HelAmps_sm.h, adding more printouts in ixxxxx bypass…
valassi Jul 20, 2023
bf505c6
[fpe] in ggtt.sa HelAmps_sm.h, remove some printouts in ixxxxx, the F…
valassi Jul 20, 2023
240a080
[fpe] in ggtt.sa HelAmps_sm.h, first attempt to use the 'volatile' ke…
valassi Jul 20, 2023
4be246b
[fpe] in ggtt.sa HelAmps_sm.h, finally(?) fix the FPE issue using the…
valassi Jul 20, 2023
163d71b
[fpe] in ggtt.sa HelAmps_sm.h, clean up comments about FPE and volati…
valassi Jul 20, 2023
60a5d9a
[fpe] in ggtt.sa HelAmps_sm.h, COMPLETE the addition of volatile to a…
valassi Jul 20, 2023
8ac0041
[fpe] in ggtt.sa cudacpp.mk, fix build flags for nvcc using icpx in d…
valassi Jul 20, 2023
3b91f0b
[fpe] in ggtt.sa testxxx.cc, turn off debug printouts at last! the FP…
valassi Jul 20, 2023
4eed3c3
[fpe] progress in backport from ggtt.sa to CODEGEN - new versions of …
valassi Jul 20, 2023
aba2ee2
[fpe] progress in backport from ggtt.sa to CODEGEN - fix spacing of w…
valassi Jul 20, 2023
8894774
[fpe] progress in backport from ggtt.sa to CODEGEN - fix spacing of w…
valassi Jul 20, 2023
85f560f
[fpe] in ggtt.sa HelAmps_sm.h, fix formatting with clang-format befor…
valassi Jul 20, 2023
43f7dfb
[fpe] in ggtt.sa Parameters_sm.h, improve structure and fix formattin…
valassi Jul 20, 2023
46ec689
[fpe] in CODEGEN, adapt cpp_model_parameters_h.inc template from ggtt…
valassi Jul 20, 2023
d51fc2f
[fpe] progress in backport from ggtt.sa to CODEGEN - fix spacing of a…
valassi Jul 20, 2023
9115b1d
[fpe] in CODEGEN, BACKPORT THE FPE FIX FOR #701! This completes the b…
valassi Jul 20, 2023
e34f94b
[fpe] regenerate ggtt.sa - all ok, stable
valassi Jul 20, 2023
690a2ce
[fpe] in CODEGEN, add the ALOHA copyright line where appropriate
valassi Jul 20, 2023
1bed1ba
[fpe] regenerate ggtt.sa - all ok, stable
valassi Jul 20, 2023
2269181
[fpe] in CODEGEN, fix spacing (clang formatting) in EFT Parameters.h
valassi Jul 20, 2023
89ea5d3
[fpe] regenerate heft_gg_h.sa - all ok, stable (and formatting is now…
valassi Jul 20, 2023
d32b85b
[fpe] regenerate ggtt.sa again - all ok, stable
valassi Jul 20, 2023
9c76fc1
[fpe] in CODEGEN, fix parameter handling for SUSY (move code from pri…
valassi Jul 20, 2023
1b31e83
[fpe] in CODEGEN, fix spacing (clang formatting) for SUSY in Paramete…
valassi Jul 20, 2023
32365c9
[fpe] in CODEGEN, fix spacing (clang formatting) for nobm_pp_ttW
valassi Jul 20, 2023
62c5347
[fpe] in CODEGEN, fix spacing (clang formatting) for smeft_gg_tttt
valassi Jul 20, 2023
2aec131
[fpe] regenerate ggtt and heft_h_gg sa again - all ok, stable
valassi Jul 20, 2023
671ff9c
[fpe] in CODEGEN, fix spacing (clang formatting) for ee_mumu
valassi Jul 20, 2023
6901bb6
[fpe] regenerate ggtt and heft_h_gg sa again - all ok, stable
valassi Jul 20, 2023
3cd4e17
[fpe] regenerate the other 5 processes SA - clang formatting is ok
valassi Jul 20, 2023
a5588bf
[fpe] regenerate all seven processes mad, at last
valassi Jul 20, 2023
223adc2
[namespace/fpe] in ggtt.mad, fix cpu/gpu namespaces in MemoryAccessNu…
valassi Jul 20, 2023
dcb6610
[namespace/fpe] backport MemoryAccessNumerators/Denominators changes …
valassi Jul 20, 2023
dd264f5
[fpe] regenerate ggtt.mad, all ok
valassi Jul 20, 2023
d01ba9d
[fpe] manually copy the two fixed files to the other 6 mad and 7 sa p…
valassi Jul 20, 2023
4bf1160
[fpe] rerun tput test for eemumu and ggtt - all looks ok
valassi Jul 20, 2023
41c6a6d
[fpe] rerun tput test also for ggttg* - all looks ok
valassi Jul 20, 2023
9a68868
[fpe] rerun 78 tput alltees, all ok
valassi Jul 21, 2023
9212960
[fpe] rerun 15 tmad - ggttgg tests fail again #655 as expected
valassi Jul 21, 2023
3658f3f
[fpe] Revert to upstream/master performance logs in tput and tmad for…
valassi Jul 21, 2023
bf5727b
[fpe] in ggtt.sa, remove feenableexcept on MacOS where it is not defi…
valassi Jul 21, 2023
e93ba8a
[fpe] backport workaround for #730 on MacOS to CODEGEN from ggtt.sa
valassi Jul 21, 2023
324581d
[namespace/fpe] in ggtt.sa makefiles, add 'export CUFLAGS' in SubProc…
valassi Jul 21, 2023
a1d5983
[namespace/fpe] backport fix for #731 (HRDCOD=1 builds in cuda of non…
valassi Jul 21, 2023
66b8cfe
[fpe] regenerate gg_tt and heft_gg_h sa - all ok, differences as expe…
valassi Jul 21, 2023
838e59a
[fpe] regenerate the other 5 processes sa with fixes for #730 and #731
valassi Jul 21, 2023
49f9d3f
[fpe] ** COMPLETE FPE ** regenerate all 7 processes mad with fixes fo…
valassi Jul 21, 2023
39de7b3
Merge pull request #723 from valassi/fpe
valassi Jul 21, 2023
9f254a1
[icx] add tools scripts for clang 16.0.3
valassi Jul 24, 2023
cba58d0
[icx] rerun 78 tput alltees with the latest icx 2023.2 - there are so…
valassi Jul 25, 2023
a249107
[icx] rerun 15 tmad alltees with icx2023.2 on itscrd90
valassi Jul 25, 2023
91cd253
[icx] in gg_tt.mad MadgraphTest.h, increase momentum tolerance from 3…
valassi Jul 25, 2023
901ddab
[icx] in gg_tt.mad cudacpp.mk, switch on -g (while keeping -O3) to de…
valassi Jul 25, 2023
11eaf06
[icx] in gg_tt.mad testxxx.cc, protect a mass squared with "volatile"…
valassi Jul 25, 2023
4b5ee51
[icx] in gg_tt.mad cudacpp.mk, switch off -g again
valassi Jul 25, 2023
2812fd9
[icx] in CODEGEN, backport testxxx.cc change from ggtt.mad with "vola…
valassi Jul 25, 2023
f30a905
[icx] in CODEGEN, backport MadgraphTest.h change from ggtt.mad with t…
valassi Jul 25, 2023
7685880
[icx] in CODEGEN, cosmetic fixes in MadgraphTest.h to respect clang f…
valassi Jul 25, 2023
623610f
[icx] regenerate ggtt.mad - all ok (with cosmetic changes for clang f…
valassi Jul 25, 2023
b5b8d61
[icx] regenerate the pther 6 processes mad
valassi Jul 25, 2023
011c197
[icx] regenerate 7 processes sa
valassi Jul 25, 2023
ee8875b
[jthip] go back to pre-HIP changes in all 6 mad (except ggttgg) and 7…
valassi Jul 25, 2023
6b9552e
Merge remote-tracking branch 'upstream/master' into jthip
valassi Jul 25, 2023
ef615f5
[jthip] regenerate ggttgg.mad - all looks ok! so CODEGEN is in sync w…
valassi Jul 25, 2023
70c884a
[jthip] in ggttgg.mad cudacpp_src.mk, use GPUCC instead of NVCC as im…
valassi Jul 25, 2023
a912fc5
[jthip/namespace] in ggttgg.mad, manually check and fix the pending _…
valassi Jul 25, 2023
af0f0d4
[jthip/namespace] backport latest changes from ggttgg.mad to CODEGEN
valassi Jul 25, 2023
1eb284a
[jthip] in CODEGEN, backport also cudacpp_src.mk using GPUCC instead …
valassi Jul 25, 2023
8206a29
[jthip] regenerate ggttgg.mad, all ok
valassi Jul 25, 2023
858eacf
[icx] rerun 78 tput alltees with the latest icx 2023.2 after fixing #…
valassi Jul 25, 2023
264b3cc
[icx] in eemumu.mad testxxx.cc, ensure that FPEs do not go undetected…
valassi Jul 25, 2023
3696213
[icx] ensure that runTest failures in tput scripts do not go undetect…
valassi Jul 25, 2023
4c223a3
[icx] in CODEGEN (backport eemumu.mad) testxxx.cc, ensure that FPEs d…
valassi Jul 25, 2023
3491fc5
[icx] regenerate eemumu mad, all ok
valassi Jul 25, 2023
ba7f6d5
[icx] propagate "exit 1" fix manually to the other 13 processes
valassi Jul 25, 2023
9a5a5bc
[icx] in gg_tt.mad cudacpp.mk, switch on -g (while keeping -O3) to de…
valassi Jul 25, 2023
e620e94
[icx] in ggtt.mad HelAmps_sm.h, try to avoid the ixxxxx FPE, but this…
valassi Jul 25, 2023
2c2b32a
[icx] in ggtt.mad HelAmps_sm.h, fix FPEs #736 in ixxxxx for icx with …
valassi Jul 25, 2023
73e05d2
[icx] in ggtt.mad HelAmps_sm.h, fix FPEs #736 in vxxxxx for icx with …
valassi Jul 25, 2023
9f3d864
[icx] in ggtt.mad HelAmps_sm.h, fix FPEs #736 in oxxxxx for icx with …
valassi Jul 25, 2023
fe1a28f
[icx] in ggtt.mad HelAmps_sm.h, fix another FPEs #736 in ixxxxx for i…
valassi Jul 25, 2023
d791783
[icx] in ggtt.mad HelAmps_sm.h, fix FPEs #736 in ixxxxx for icx with …
valassi Jul 25, 2023
a273f13
[icx] in ggtt.mad HelAmps_sm.h, fix FPEs #736 in vxxxxx for icx with …
valassi Jul 25, 2023
6fa785f
[icx] in ggtt.mad HelAmps_sm.h, fix another FPEs #736 in oxxxxx for i…
valassi Jul 25, 2023
9812a79
[icx] in ggtt.mad HelAmps_sm.h, fix another FPEs #736 in oxxxxx for i…
valassi Jul 25, 2023
c8f9e9b
[icx] in CODEGEN cudacpp_test.mk, use a compiler-specific build direc…
valassi Jul 25, 2023
1c30d69
[icx] modify CODEGEN cudacpp_test.mk and ggtt.mad cudacpp.mk to coord…
valassi Jul 25, 2023
cbab8e3
[icx] in ggtt.mad HelAmps_sm.h, fix a bug in my previous patches (fix…
valassi Jul 25, 2023
b94f8b0
[icx] in gg_tt.mad cudacpp.mk, switch off -g again
valassi Jul 25, 2023
fbdc488
[icx] backport to CODEGEN the latest ggtt.mad changes for #736 etc
valassi Jul 25, 2023
db61265
[icx] regenerate ggtt.mad, all ok - note that gg_tt.mad/test/cudacpp_…
valassi Jul 25, 2023
e864477
[icx] rerun tput tee for ggtt... there are still FPEs in float sse4...
valassi Jul 25, 2023
e3af119
[icx] in gg_tt.mad cudacpp.mk, switch on -g (while keeping -O3) to de…
valassi Jul 25, 2023
961e71d
[icx] in ggtt.mad testxxx.cc, avoid an FPE #736 in a sqrt (I do nt un…
valassi Jul 25, 2023
82132e2
[icx] in ggtt.mad mgOnGpuVectors.h, avoid an FPE #736 in a sqrt (I do…
valassi Jul 25, 2023
0aca3cb
[icx] rerun tput tee for ggtt... an dthis finally succeeds with no FPEs!
valassi Jul 25, 2023
ee7cc15
[icx] in gg_tt.mad cudacpp.mk, switch off -g again
valassi Jul 25, 2023
4c3de7a
[icx] backport to CODEGEN the latest ggtt.mad changes for #736 etc - …
valassi Jul 25, 2023
1a25785
[icx] regenerate ggtt.mad, all ok with formatting fixes
valassi Jul 25, 2023
80e3c9b
[icx] regenerate 6 other processes mad
valassi Jul 25, 2023
7a1c398
[icx] regenerate 7 processes sa
valassi Jul 25, 2023
661ac02
[icx] rerun 78 tput alltees - finally all ok again, all "Floating Poi…
valassi Jul 26, 2023
b170d0c
[icx] rerun 15 tmad alltees - all ok
valassi Jul 26, 2023
6c8c316
[icx] go back to upstream/master logs for tput and tmad for easier me…
valassi Jul 26, 2023
3c31895
[icx] modify ggtt.mad cudacpp.mk and CODEGEN (and ggtt.mad) cudacpp_t…
valassi Jul 26, 2023
be6093a
[icx] backport to CODEGEN cudacpp.mk from ggtt.mad
valassi Jul 26, 2023
a4f1fda
[icx] regenerate ggtt.mad, all ok
valassi Jul 26, 2023
b38bea0
[icx] ** COMPLETE ICX ** manually copy the latest makefiles with epoc…
valassi Jul 26, 2023
a4b9d6b
Merge pull request #737 from valassi/icx
valassi Jul 26, 2023
e32e8ba
[jthip] go back to origin/fpe ggttgg.mad codegen log for easier mergi…
valassi Jul 26, 2023
e467cd4
Merge remote-tracking branch 'upstream/master' into jthip
valassi Jul 26, 2023
9d5b6d9
[jthip] regenerate ggttgg.mad after merging upstream/master - all ok …
valassi Jul 26, 2023
e55d57b
[jthip] revert the ggttgg codegen log for easier merging later on
valassi Jul 26, 2023
cad35cc
Merge remote-tracking branch 'andrea/jthip' into gpu_abstraction
Jooorgen Aug 9, 2023
e89ae42
[CODEGEN] Regenerated all .sa and .mad processes with new HIP compila…
Jooorgen Aug 9, 2023
b79fe00
Reverted changes to FC env variable
Jooorgen Aug 9, 2023
fafcb95
Merge branch 'gpu_abstraction' of github.com:Jooorgen/madgraph4gpu in…
Jooorgen Aug 9, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
10 changes: 4 additions & 6 deletions .github/workflows/c-cpp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ jobs:
env:
CUDA_HOME: /usr/local/cuda/
REQUIRE_CUDA: 1
FC: gfortran
strategy:
matrix:
folder: [ epochX/cudacpp/ee_mumu.sa/SubProcesses/P1_Sigma_sm_epem_mupmum,
Expand All @@ -79,11 +80,8 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: make info
run: FC=`which gfortran`;
make FPTYPE=${{ matrix.precision }} -C ${{ matrix.folder }} info
run: make FPTYPE=${{ matrix.precision }} -C ${{ matrix.folder }} info
- name: make
run: FC=`which gfortran`;
make FPTYPE=${{ matrix.precision }} -C ${{ matrix.folder }}
run: make FPTYPE=${{ matrix.precision }} -C ${{ matrix.folder }}
- name: make check
run: FC=`which gfortran`;
make FPTYPE=${{ matrix.precision }} -C ${{ matrix.folder }} check
run: make FPTYPE=${{ matrix.precision }} -C ${{ matrix.folder }} check
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
! Copyright (C) 2010 The ALOHA Development team and Contributors.
! Copyright (C) 2010 The MadGraph5_aMC@NLO development team and contributors.
! Created by: J. Alwall (Sep 2010) for the MG5aMC CPP backend.
!==========================================================================
Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@
#include <iomanip>
#include <iostream>

#ifdef MGONGPUCPP_GPUIMPL
using namespace mg5amcGpu;
#else
using namespace mg5amcCpu;
#endif

#ifndef MGONGPU_HARDCODE_PARAM

// Initialize static instance
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,175 +24,194 @@

#include "read_slha.h"

class Parameters_%(model_name)s
// NB: namespaces mg5amcGpu and mg5amcCpu includes types which are defined in different ways for CPU and GPU builds (see #318 and #725)
#ifdef MGONGPUCPP_GPUIMPL
namespace mg5amcGpu
#else
namespace mg5amcCpu
#endif
{
public:
class Parameters_%(model_name)s
{
public:

static Parameters_%(model_name)s* getInstance();

static Parameters_%(model_name)s* getInstance();
// Define "zero"
double zero, ZERO;

// Define "zero"
double zero, ZERO;
%(independent_parameters)s

%(independent_parameters)s
%(independent_couplings)s

%(independent_couplings)s
%(dependent_parameters)s

%(dependent_parameters)s
%(dependent_couplings)s

%(dependent_couplings)s
// Set parameters that are unchanged during the run
void setIndependentParameters( SLHAReader& slha );

// Set parameters that are unchanged during the run
void setIndependentParameters( SLHAReader& slha );
// Set couplings that are unchanged during the run
void setIndependentCouplings();

// Set couplings that are unchanged during the run
void setIndependentCouplings();
// Set parameters that are changed event by event
//void setDependentParameters(); // now computed event-by-event (running alphas #373)

// Set parameters that are changed event by event
//void setDependentParameters(); // now computed event-by-event (running alphas #373)
// Set couplings that are changed event by event
//void setDependentCouplings(); // now computed event-by-event (running alphas #373)

// Set couplings that are changed event by event
//void setDependentCouplings(); // now computed event-by-event (running alphas #373)
// Print parameters that are unchanged during the run
void printIndependentParameters();

// Print parameters that are unchanged during the run
void printIndependentParameters();
// Print couplings that are unchanged during the run
void printIndependentCouplings();

// Print couplings that are unchanged during the run
void printIndependentCouplings();
// Print parameters that are changed event by event
//void printDependentParameters(); // now computed event-by-event (running alphas #373)

// Print parameters that are changed event by event
//void printDependentParameters(); // now computed event-by-event (running alphas #373)
// Print couplings that are changed event by event
//void printDependentCouplings(); // now computed event-by-event (running alphas #373)

// Print couplings that are changed event by event
//void printDependentCouplings(); // now computed event-by-event (running alphas #373)
private:

private:
static Parameters_%(model_name)s* instance;
};

static Parameters_%(model_name)s* instance;
};
} // end namespace mg5amcGpu/mg5amcCpu

#else

#include <cassert>
#include <limits>

// Hardcoded constexpr physics parameters
namespace Parameters_%(model_name)s // keep the same name rather than HardcodedParameters_%(model_name)s for simplicity
// NB: namespaces mg5amcGpu and mg5amcCpu includes types which are defined in different ways for CPU and GPU builds (see #318 and #725)
#ifdef MGONGPUCPP_GPUIMPL
namespace mg5amcGpu
#else
namespace mg5amcCpu
#endif
{
// Constexpr implementation of sqrt (see https://stackoverflow.com/a/34134071)
double constexpr sqrtNewtonRaphson( double x, double curr, double prev )
{
return curr == prev ? curr : sqrtNewtonRaphson( x, 0.5 * ( curr + x / curr ), curr );
}
double constexpr constexpr_sqrt( double x )
// Hardcoded constexpr physics parameters
namespace Parameters_%(model_name)s // keep the same name rather than HardcodedParameters_%(model_name)s for simplicity
{
return x >= 0 // && x < std::numeric_limits<double>::infinity() // avoid -Wtautological-constant-compare warning in fast math
? sqrtNewtonRaphson( x, x, 0 )
: std::numeric_limits<double>::quiet_NaN();
}
// Constexpr implementation of sqrt (see https://stackoverflow.com/a/34134071)
double constexpr sqrtNewtonRaphson( double x, double curr, double prev )
{
return curr == prev ? curr : sqrtNewtonRaphson( x, 0.5 * ( curr + x / curr ), curr );
}
double constexpr constexpr_sqrt( double x )
{
return x >= 0 // && x < std::numeric_limits<double>::infinity() // avoid -Wtautological-constant-compare warning in fast math
? sqrtNewtonRaphson( x, x, 0 )
: std::numeric_limits<double>::quiet_NaN();
}

// Constexpr implementation of floor (see https://stackoverflow.com/a/66146159)
constexpr int constexpr_floor( double d )
{
const int i = static_cast<int>( d );
return d < i ? i - 1 : i;
}
// Constexpr implementation of floor (see https://stackoverflow.com/a/66146159)
constexpr int constexpr_floor( double d )
{
const int i = static_cast<int>( d );
return d < i ? i - 1 : i;
}

// Constexpr implementation of pow
constexpr double constexpr_pow( double base, double exp )
{
// NB(1): this implementation of constexpr_pow requires exponent >= 0
assert( exp >= 0 ); // NB would fail at compile time with "error: call to non-‘constexpr’ function ‘void __assert_fail'"
// NB(2): this implementation of constexpr_pow requires an integer exponent
const int iexp = constexpr_floor( exp );
assert( static_cast<double>( iexp ) == exp ); // NB would fail at compile time with "error: call to non-‘constexpr’ function ‘void __assert_fail'"
// Iterative implementation of pow if exp is a non negative integer
return iexp == 0 ? 1 : base * constexpr_pow( base, iexp - 1 );
// Constexpr implementation of pow
constexpr double constexpr_pow( double base, double exp )
{
// NB(1): this implementation of constexpr_pow requires exponent >= 0
assert( exp >= 0 ); // NB would fail at compile time with "error: call to non-‘constexpr’ function ‘void __assert_fail'"
// NB(2): this implementation of constexpr_pow requires an integer exponent
const int iexp = constexpr_floor( exp );
assert( static_cast<double>( iexp ) == exp ); // NB would fail at compile time with "error: call to non-‘constexpr’ function ‘void __assert_fail'"
// Iterative implementation of pow if exp is a non negative integer
return iexp == 0 ? 1 : base * constexpr_pow( base, iexp - 1 );
}

// Model parameters independent of aS
constexpr double zero = 0;
constexpr double ZERO = 0;
%(hardcoded_independent_parameters)s
// Model couplings independent of aS
%(hardcoded_independent_couplings)s
// Model parameters dependent on aS
%(hardcoded_dependent_parameters)s
// Model couplings dependent on aS
%(hardcoded_dependent_couplings)s
// Print parameters that are unchanged during the run
void printIndependentParameters();

// Print couplings that are unchanged during the run
void printIndependentCouplings();

// Print parameters that are changed event by event
//void printDependentParameters(); // now computed event-by-event (running alphas #373)

// Print couplings that are changed event by event
//void printDependentCouplings(); // now computed event-by-event (running alphas #373)
}

// Model parameters independent of aS
constexpr double zero = 0;
constexpr double ZERO = 0;
%(hardcoded_independent_parameters)s
// Model couplings independent of aS
%(hardcoded_independent_couplings)s
// Model parameters dependent on aS
%(hardcoded_dependent_parameters)s
// Model couplings dependent on aS
%(hardcoded_dependent_couplings)s
// Print parameters that are unchanged during the run
void printIndependentParameters();

// Print couplings that are unchanged during the run
void printIndependentCouplings();

// Print parameters that are changed event by event
//void printDependentParameters(); // now computed event-by-event (running alphas #373)

// Print couplings that are changed event by event
//void printDependentCouplings(); // now computed event-by-event (running alphas #373)
}
} // end namespace mg5amcGpu/mg5amcCpu

#endif

//==========================================================================

namespace Parameters_%(model_name)s_dependentCouplings
// NB: namespaces mg5amcGpu and mg5amcCpu includes types which are defined in different ways for CPU and GPU builds (see #318 and #725)
#ifdef MGONGPUCPP_GPUIMPL
namespace mg5amcGpu
#else
namespace mg5amcCpu
#endif
{
constexpr size_t ndcoup = %(ndcoup)d; // #couplings that vary event by event because they depend on the running alphas QCD
%(idcoup)s
struct DependentCouplings_sv
namespace Parameters_%(model_name)s_dependentCouplings
{
constexpr size_t ndcoup = %(ndcoup)d; // #couplings that vary event by event because they depend on the running alphas QCD
%(idcoup)s
struct DependentCouplings_sv
{
%(dcoupdecl)s
};
};
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-variable" // e.g. <<warning: unused variable ‘mdl_G__exp__2’ [-Wunused-variable]>>
#pragma GCC diagnostic ignored "-Wunused-parameter" // e.g. <<warning: unused parameter ‘G’ [-Wunused-parameter]>>
#ifdef MGONGPUCPP_GPUIMPL
#pragma nv_diagnostic push
#pragma nv_diag_suppress 177 // e.g. <<warning #177-D: variable "mdl_G__exp__2" was declared but never referenced>>
#endif
__host__ __device__ inline const DependentCouplings_sv computeDependentCouplings_fromG( const fptype_sv& G_sv )
{
__host__ __device__ inline const DependentCouplings_sv computeDependentCouplings_fromG( const fptype_sv& G_sv )
{
#ifdef MGONGPU_HARDCODE_PARAM
using namespace Parameters_%(model_name)s;
using namespace Parameters_%(model_name)s;
#endif
// NB: hardcode cxtype cI(0,1) instead of cxtype (or hardcoded cxsmpl) mdl_complexi (which exists in Parameters_%(model_name)s) because:
// (1) mdl_complexi is always (0,1); (2) mdl_complexi is undefined in device code; (3) need cxsmpl conversion to cxtype in code below
const cxtype cI( 0., 1. );
DependentCouplings_sv out;
// NB: hardcode cxtype cI(0,1) instead of cxtype (or hardcoded cxsmpl) mdl_complexi (which exists in Parameters_%(model_name)s) because:
// (1) mdl_complexi is always (0,1); (2) mdl_complexi is undefined in device code; (3) need cxsmpl conversion to cxtype in code below
const cxtype cI( 0., 1. );
DependentCouplings_sv out;
%(eftspecial1)s
{
const fptype_sv& G = G_sv;
// Model parameters dependent on aS
{
const fptype_sv& G = G_sv;
// Model parameters dependent on aS
%(dcoupsetdpar)s
// Model couplings dependent on aS
// Model couplings dependent on aS
%(dcoupsetdcoup)s
}
}
%(eftspecial2)s
return out;
}
return out;
}
#ifdef MGONGPUCPP_GPUIMPL
#pragma GCC diagnostic pop
#pragma nv_diagnostic pop
#endif
}
}

//==========================================================================
//==========================================================================

namespace Parameters_%(model_name)s_independentCouplings
{
constexpr size_t nicoup = %(nicoup)d; // #couplings that are fixed for all events because they do not depend on the running alphas QCD
namespace Parameters_%(model_name)s_independentCouplings
{
constexpr size_t nicoup = %(nicoup)d; // #couplings that are fixed for all events because they do not depend on the running alphas QCD
%(iicoup)s
}
}

//==========================================================================
//==========================================================================

#ifdef MGONGPUCPP_GPUIMPL
namespace mg5amcGpu
#else
namespace mg5amcCpu
#endif
{
#pragma GCC diagnostic push
#ifndef __clang__
#pragma GCC diagnostic ignored "-Wunused-but-set-variable" // e.g. <<warning: variable ‘couplings_sv’ set but not used [-Wunused-but-set-variable]>>
Expand All @@ -212,7 +231,8 @@ namespace mg5amcCpu
return;
}
#pragma GCC diagnostic pop
}

} // end namespace mg5amcGpu/mg5amcCpu

//==========================================================================

Expand Down
Loading