Regenerate code for 849#939
Merged
valassi merged 461 commits intomadgraph5:less_patchfrom Jul 29, 2024
Merged
Conversation
…in gg_ttgg tmad tests (LHE color mismatch madgraph5#856?)
…of known issues (e.g. remove rotxxx crashes): enable bypasses, tests should succeed
…ng of tmad known issues, the CI will fail, signaling these issues are pending
Fix SIGFPE crash (855) in rotxxx by adding volatile in aloha_functions.f
…p and gpucpp_826, to allow cherry-picking Olivier's fix_826 changes (later on, will include Olivier's gpucpp_826 change into gpucpp directly) Revert "[tmad] update mg5amcnlo to f274cab55, adding volatile to prevent madgraph5#855 crashes in rotxxx (move this upstream as suggested by Olivier)" This reverts commit 720ae02. Revert "[valgrind] upgrade MG5AMC to include the merge of PR madgraph5#110 and PR madgraph5#112 into the gpucpp branch" This reverts commit 7d3dc34. Revert "[valgrind] upgrade MG5AMC to include the workaround for uninitialised values mg5amcnlo/mg5amcnlo#111" This reverts commit f355965. Revert "[valgrind] upgrade MG5AMC to include the fix for memory leak mg5amcnlo/mg5amcnlo#109" This reverts commit 7bb4142.
… now including Olivier's extra commit previously in gpucpp_826 This should complete the merge in madgraph4gpu master of the gpucpp_826 and gpucpp branches of MG5AMC. It should now be possible to remove the gpucpp_826 branch from MG5AMC.
… in Olivier's patch PR madgraph5#852 for issue madgraph5#826 in susy_gg_t1t1
…y branch (WIP PR madgraph5#853) to allow cherry-picking the next commit git checkout 335d6d2 susy_gg_t1t1.mad/CODEGEN_mad_susy_gg_t1t1_log.txt
…rt (just check that the merge so far was ok)
Revert "[color] temporarely regenerate susy_gg_t1t1.mad, no change, will revert (just check that the merge so far was ok)" This reverts commit dbfb3bc.
…rangely, clang formatting was not complaining?)
…clang formatting was not complaining?)
…files checked with clang formatting
… comma is allowed in the std::map initializer list
… allowed in the std::map initializer >
Note: cuda compilation 'make -j BACKEND=cuda' fails with coloramps.h(14): error: dynamic initialization is not supported for a __device__ variable
…p as constexpr, this fails with a different error
ccache /usr/local/cuda-12.0/bin/nvcc -I. -I../../src -Xcompiler -O3 -gencode arch=compute_70,code=compute_70 -gencode arch=compute_70,code=sm_70 -lineinfo -use_fast_math -I/usr/local/cuda-12.0/include/ -DUSE_NVTX -std=c++17 -ccbin /usr/lib64/ccache/g++ -DMGONGPU_FPTYPE_DOUBLE -DMGONGPU_FPTYPE2_DOUBLE -Xcompiler -fPIC -c -x cu CPPProcess.cc -o CPPProcess_cuda.o
coloramps.h(14): error: expression must have a constant value
coloramps.h(14): note #2703-D: cannot call non-constexpr function "std::map<_Key, _Tp, _Compare, _Alloc>::map(std::initializer_list<std::map<_Key, _Tp, _Compare, _Alloc>::value_type>, const _Compare &, const std::map<_Key, _Tp, _Compare, _Alloc>::allocator_type &) [with _Key=int, _Tp=int, _Compare=std::less<int>, _Alloc=std::allocator<std::pair<const int, int>>]"
/usr/include/c++/11/bits/stl_map.h(228): here
coloramps.h(14): error: a constexpr variable must have a literal type or a reference type
CPPProcess.cc(1012): error: no operator "[]" matches these operands
operand types are: const std::map<int, int, std::less<int>, std::allocator<std::pair<const int, int>>> [ const unsigned int ]
3 errors detected in the compilation of "CPPProcess.cc".
…making the map constexpr Revert "[susy] in susy_gg_t1t1.mad, try to fix coloramps.h by defining the map as constexpr, this fails with a different error" This reverts commit 38b3afd.
…p into a constexpr int array
…constexpr int array
…ncludes clang format fixes) This code now compiles... but it does not seem to fix the empty cross section problem
…graph5#826 is NOT fixed) after Olivier's first two commits in PR madgraph5#852 ./tmad/teeMadX.sh -susyggt1t1 +10x -makeclean (PS: it is NOW quite obvious to me that PR madgraph5#852 should be tested against different issues like ggttgg madgraph5#856, NOT against susy madgraph5#826) (PS: will now therefore slowly move to different tests - first, however, recover my coloramps.h proposal in susy and Olivier's later changes)
…is ok - will revert
…n and tmad logs Revert "[color] temporarely regenerate susy_gg_t1t1 again, just to check all is ok - will revert" This reverts commit 28a0177. Revert "[color] rerun tmad test for susy_gg_t1t1: still no cross section (madgraph5#826 is NOT fixed) after Olivier's first two commits in PR madgraph5#852" This reverts commit 6baf004.
… channelId and iconfig in F and C (madgraph5#826 and $852)
… to allow merging his next commits git checkout 1585a75 CODEGEN/PLUGIN/
…aster with OMP madgraph5#900 and submod madgraph5#897) into gtest Fix conflicts in epochX/cudacpp/gg_tt.mad/CODEGEN_mad_gg_tt_log.txt git checkout clang gg_tt.mad/CODEGEN_mad_gg_tt_log.txt Note: MG5AMC has been updated including mg5amcnlo#107
…s from the latest upstream/master for easier merging git checkout upstream/master $(git ls-tree --name-only HEAD */CODEGEN*txt)
Fix clang16 and clang17 builds
…aster with clang madgraph5#905, OMP madgraph5#900 and submod madgraph5#897) into gtest Fix conflicts in epochX/cudacpp/gg_tt.mad/CODEGEN_mad_gg_tt_log.txt git checkout clang gg_tt.mad/CODEGEN_mad_gg_tt_log.txt Note: MG5AMC has been updated including mg5amcnlo#107
…ogs from the latest upstream/master for easier merging git checkout upstream/master $(git ls-tree --name-only HEAD */CODEGEN*txt)
Fix segfault from constexpr_math.h and adapt testmisc.cc to higher tolerances when running through valgrind
Fix runTest segfault (remove cudaDeviceReset) and simplify googletest template usage
…ne gg_tt "new ci" test while debugging madgraph5#937
…test CI issue madgraph5#937 and add debug printouts
…' by 'ECHO' alias to leave a blank line (workaround for github issue)
…adgraph5#927 Revert "[actions] in .github/workflows, TEMPORARELY reduce CI tests to only one gg_tt "new ci" test while debugging madgraph5#937" This reverts commit 5b71191.
Fix issues in the new CI (tput_test was not executed)
… into patchMadsh (current upstream/master) Fix conflicts in MG5aMC/mg5amcnlo (use upstream/master version)
…Olivier's patch in PR madgraph5#849 No c++/frtran code changes: only the two gen_ximprove.py and madevent_interface.py are modified in .mad directories
oliviermattelaer
approved these changes
Jul 29, 2024
Member
oliviermattelaer
left a comment
oliviermattelaer
left a comment
There was a problem hiding this comment.
Yes, this is good to go for me.
Thanks,
Olivier
Member
Author
Thanks Olivier :-) I had forgotten that 849 has conflicts, fixed here. So I changed this to be merged into less_patch for 849, then I will merge 849 into master. Merging now. |
valassi
added a commit
to valassi/madgraph4gpu
that referenced
this pull request
Jul 29, 2024
…ch PRs madgraph5#849 and madgraph5#939) into susy2
valassi
added a commit
to valassi/madgraph4gpu
that referenced
this pull request
Jul 29, 2024
…erging madgraph5#849 and madgraph5#939 - no change in code, only in codegen logs
valassi
added a commit
to valassi/madgraph4gpu
that referenced
this pull request
Jul 29, 2024
…rder madgraph5#918, and smaller patch madgraph5#939 and madgraph5#849) into susy2 Note: there is no change with respect to the previous origin/susy2 after this merge (no need to rerun the CI)
valassi
added a commit
to valassi/madgraph4gpu
that referenced
this pull request
Jul 29, 2024
…rder madgraph5#918 and madgraph5#934, and smaller patch madgraph5#939 and madgraph5#849) into pptt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Hi @oliviermattelaer this is just regenerating code for your #849.
Ok for me (as long as you want 849 - I trust you on that)
Can you please review? Thanks
Andrea