Closed
Conversation
…ec now match in the former (madgraph5#825 is fixed), but there is still no xsec in the latter (madgraph5#826 is not fixed) ./tmad/teeMadX.sh -susyggtt -susyggt1t1 +10x
…aph5#850 - note that HelAmps.h changes in (almost?) all processes! (NB it is HelAmps.h that changes and not Parameters.h as I wrote elsewhere by mistake)
…h launch PR madgraph5#851 git checkout upstream/master $(git ls-tree --name-only HEAD */CODE*txt)
…graph5#851 patches - only codelogs change anyway
…to global flags to fix a SIGFPE in Fortran rotxx (see madgraph5#826)
… global flags to fix a SIGFPE in Fortran rotxx (see madgraph5#826) (NB: if you run bin/generate_events, the runcard value supersedes that in make_opts!)
…o -O2 in global_flags to fix all SIGFPEs in Frtran (madgraph5#826)
…ags to debug SIGFPEs in Frtran (madgraph5#826)
…o -O1 in global_flags to fix all SIGFPEs in Frtran (madgraph5#826)
…ph5#851 for bin/madevent and .gitignore) into susy
…susy_gg_t1t1.mad run_card.dat and make_opts Revert "[susy] in susy_gg_t1t1.mad runcard and make_opts, try to change -O2 to -O1 in global_flags to fix all SIGFPEs in Frtran (madgraph5#826)" This reverts commit 7b160e8. Revert "[susy] in susy_gg_t1t1.mad runcard and make_opts, add -g in global_flags to debug SIGFPEs in Frtran (madgraph5#826)" This reverts commit dd4df95. Revert "[susy] in susy_gg_t1t1.mad runcard and make_opts, try to change -O3 to -O2 in global_flags to fix all SIGFPEs in Frtran (madgraph5#826)" This reverts commit 40ef953. Revert "[susy] in susy_gg_t1t1.mad runcard, try to add -fno-tree-vectorize to global flags to fix a SIGFPE in Fortran rotxx (see madgraph5#826)" This reverts commit 6d3ebbc. Revert "[susy] in susy_gg_t1t1.mad make_opts, try to add -fno-tree-vectorize to global flags to fix a SIGFPE in Fortran rotxx (see madgraph5#826)" This reverts commit b010198.
… merge Olivier's fix
…h5#852 for susy_gg_t1t1 issue madgraph5#826) into susy
… in Olivier's patch PR madgraph5#852 for issue madgraph5#826 in susy_gg_t1t1
…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
…t channelId for susy_gg_t1t1 (fix issue madgraph5#826)
…ot channelId (and note that iconfig=1 is ok)
…g_t1t1 (will give zero cross section madgraph5#826)
… channelId and iconfig in F and C (madgraph5#826 and $852)
…s section (madgraph5#826) ./tmad/teeMadX.sh -susyggt1t1 +10x
This was referenced Jun 2, 2024
…raph5#850 and madgraph5#860 for xsec mismatch madgraph5#825) into susy Fix conflicts: epochX/cudacpp/CODEGEN/generateAndCompare.sh
git checkout upstream/master $(git ls-tree --name-only HEAD */CODEGEN*txt)
…ing my two recent changes in gpucpp
Member
Author
|
FWIW I upgraded this to the latest upstream/master. In any case I think that this will not be merged as such. Rather, what will be merged to fix the iconfig-channel mapping issue will be a variation of pieces of Olivier's #852 and of piecese of this one. FIRST I want to merge #857 for rotxxx however. |
…and valgrind fixes madgraph5#869) into susy Fix conflicts in MG5aMC/mg5amcnlo (keep the latest gpucpp_826 version including the recent gpucpp changes)
… test a different iconfig In particular: the following triggers a SIGFPE reported in madgraph5#855 (crash in rotxxx that can be fixed adding volatile?) ./tmad/madX.sh -ggttgg -iconfig 104 -makeclean This also triggers a similar SIGFPE (initially reported in madgraph5#826) ./tmad/madX.sh -susyggt1t1 -iconfig 2 -makeclean
…syggt1t1 to test madgraph5#855 fix while still exposing madgraph5#826 and madgraph5#856
git checkout 32a5b40 tmad/logs_susyggt*
…ing the 'volatile' fix for rotxxx crashes
…ng rotxxx crashes) into susy Fix conflicts in MG5aMC/mg5amcnlo (keep the latest gpucpp_826 version including the recent gpucpp changes)
Member
Author
|
FWIW I upgraded this to the latest upstream/master. But again this will not be merged. |
valassi
added a commit
to valassi/madgraph4gpu
that referenced
this pull request
Jun 28, 2024
…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
valassi
added a commit
to valassi/madgraph4gpu
that referenced
this pull request
Jun 28, 2024
…Formatting.sh ** NB: the code is now at the same level as Olivier's PR madgraph5#852, but also includes my relevant commit history from PR madgraph5#853 ** ** NB: in particular, susy_gg_t1t1.mad includes my proposal for the coloramps.h mappings ** Revert "[susy] in CODEGEN/checkFormatting.sh, add coloramps.h to the list of files checked with clang formatting" This reverts commit 08f4ab2.
Member
Author
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.
This is a WIP PR with various tests for issue #826. This includes in particular Olivier's PR #850 and #852.
Presently not meant for merging... issue #826 is not fixed.