Skip to content

Commit

Permalink
[color] revert the last two commits - go back to cleanly regenerated …
Browse files Browse the repository at this point in the history
…processes, will now start large scale manual tests

Revert "[color] in P1_gu_ttxu, disable OMP and retry debugging madgraph5#845, now it seems to fail all the time (not just intermittently)"
This reverts commit f1e0d42.

Revert "[color] in gq_ttq.mad, add -g to make_opts and cudacpp.mk to debug madgraph5#845"
This reverts commit d88b6d3.
  • Loading branch information
valassi committed Jun 28, 2024
1 parent f1e0d42 commit d288ab7
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
2 changes: 1 addition & 1 deletion epochX/cudacpp/gq_ttq.mad/Source/make_opts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
DEFAULT_CPP_COMPILER=g++
DEFAULT_F2PY_COMPILER=f2py3
DEFAULT_F_COMPILER=gfortran
GLOBAL_FLAG=-O3 -ffast-math -fbounds-check -g
GLOBAL_FLAG=-O3 -ffast-math -fbounds-check
MACFLAG=
MG5AMC_VERSION=SpecifiedByMG5aMCAtRunTime
PYTHIA8_PATH=NotInstalled
Expand Down
5 changes: 1 addition & 4 deletions epochX/cudacpp/gq_ttq.mad/SubProcesses/cudacpp.mk
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ ifeq ($(shell $(CXX) --version | grep ^nvc++),)
CXXFLAGS += -ffast-math # see issue #117
endif
###CXXFLAGS+= -Ofast # performance is not different from --fast-math
CXXFLAGS+= -g # FOR DEBUGGING ONLY
###CXXFLAGS+= -g # FOR DEBUGGING ONLY

# Optionally add debug flags to display the full list of flags (eg on Darwin)
###CXXFLAGS+= -v
Expand Down Expand Up @@ -387,9 +387,6 @@ else
###override OMPFLAGS = # disable OpenMP MT on all other platforms (default before #575)
endif

# Optionally disable OMP
override OMPFLAGS =

#-------------------------------------------------------------------------------

#=== Configure defaults and check if user-defined choices exist for RNDGEN (legacy!), HASCURAND, HASHIPRAND
Expand Down

0 comments on commit d288ab7

Please sign in to comment.