From d9e02dcbc267b9de9b1e33488f309a3dd259846a Mon Sep 17 00:00:00 2001 From: Roberto Covarelli Date: Fri, 8 Nov 2024 15:49:35 +0100 Subject: [PATCH] remove scons options for the moment --- bin/Powheg/Templates/runGetSource_template.sh | 28 +++++++++---------- bin/Powheg/Utilities/helpers.py | 12 +++----- 2 files changed, 18 insertions(+), 22 deletions(-) diff --git a/bin/Powheg/Templates/runGetSource_template.sh b/bin/Powheg/Templates/runGetSource_template.sh index 04369e2b69e..1eb91de877a 100644 --- a/bin/Powheg/Templates/runGetSource_template.sh +++ b/bin/Powheg/Templates/runGetSource_template.sh @@ -195,20 +195,20 @@ sed -i -e "s#FPE[ \t]*=[ \t]*#\#FPE=#g" Makefile ## FOR OpenLoops, CHANGE FORTRAN OPTIONS AND REMOVE SILLY BINARY NUMBERS if [[ `grep OpenLoops Makefile` != "" ]]; then sed -i -e "s#proclib ;#proclib f77_flags=-fallow-invalid-boz,-std=legacy,-ffixed-line-length-none,-fno-range-check f90_flags=-fallow-invalid-boz,-std=legacy,-ffixed-line-length-none,-fno-range-check ;#g" Makefile - cd ../OpenLoopsStuff/OpenLoops/lib_src/openloops/ - sed -i -e "/case/ s=B\"00\"=0=g" */*.*90 - sed -i -e "/case/ s=B\"01\"=1=g" */*.*90 - sed -i -e "/case/ s=B\"10\"=2=g" */*.*90 - sed -i -e "/case/ s=B\"11\"=3=g" */*.*90 - sed -i -e "/case/ s=B\"1111\"=15=g" */*.*90 - sed -i -e "/case/ s=B\"0110\"=6=g" */*.*90 - sed -i -e "/case/ s=B\"0111\"=7=g" */*.*90 - sed -i -e "/case/ s=B\"1001\"=9=g" */*.*90 - sed -i -e "/case/ s=B\"1101\"=13=g" */*.*90 - sed -i -e "/case/ s=B\"1110\"=14=g" */*.*90 - sed -i -e "/case/ s=B\"1011\"=11=g" */*.*90 - sed -i -e "/case/ s=B\"1010\"=10=g" */*.*90 - sed -i -e "/case/ s=B\"0101\"=5=g" */*.*90 + cd ../OpenLoopsStuff/ + sed -i -e "/case/ s=B\"00\"=0=g" OpenLoop*/lib_src/openloops/*/*.*90 + sed -i -e "/case/ s=B\"01\"=1=g" OpenLoop*/lib_src/openloops/*/*.*90 + sed -i -e "/case/ s=B\"10\"=2=g" OpenLoop*/lib_src/openloops/*/*.*90 + sed -i -e "/case/ s=B\"11\"=3=g" OpenLoop*/lib_src/openloops/*/*.*90 + sed -i -e "/case/ s=B\"1111\"=15=g" OpenLoop*/lib_src/openloops/*/*.*90 + sed -i -e "/case/ s=B\"0110\"=6=g" OpenLoop*/lib_src/openloops/*/*.*90 + sed -i -e "/case/ s=B\"0111\"=7=g" OpenLoop*/lib_src/openloops/*/*.*90 + sed -i -e "/case/ s=B\"1001\"=9=g" OpenLoop*/lib_src/openloops/*/*.*90 + sed -i -e "/case/ s=B\"1101\"=13=g" OpenLoop*/lib_src/openloops/*/*.*90 + sed -i -e "/case/ s=B\"1110\"=14=g" OpenLoop*/lib_src/openloops/*/*.*90 + sed -i -e "/case/ s=B\"1011\"=11=g" OpenLoop*/lib_src/openloops/*/*.*90 + sed -i -e "/case/ s=B\"1010\"=10=g" OpenLoop*/lib_src/openloops/*/*.*90 + sed -i -e "/case/ s=B\"0101\"=5=g" OpenLoop*/lib_src/openloops/*/*.*90 cd - fi diff --git a/bin/Powheg/Utilities/helpers.py b/bin/Powheg/Utilities/helpers.py index d019d75f5f4..19aa8818a0e 100644 --- a/bin/Powheg/Utilities/helpers.py +++ b/bin/Powheg/Utilities/helpers.py @@ -144,38 +144,34 @@ def runGetSource_patch_4(process) : "bbH" : "# Use option O0 for bbH (O2 too long)\n \ sed -i -e \"s#O2#O0#g\" Makefile", "HW_ew" : "# fix fortran options/linking to OpenLoops/missing libraries in VH_ew\n \ -sed -i -e \"s#OL_process_src#OL_process_src f90_flags=-ffree-line-length-none#g\" Makefile\n \ sed -i -e \"s#\$(PWD)/\$(OBJ)#\$(OBJ)#g\" Makefile\n \ sed -i -e \"s#\$(OLPATH)/lib_src#lib_src#g\" Makefile\n \ -sed -i -e \"s#cd \$(OLPATH)#cp -r \$(OLPATH)/* .;sed -i -e \"s/python2/python3/g\" scons-local/scons.py;./scons#g\" Makefile\n \ +sed -i -e \"s#cd \$(OLPATH)#cp -r \$(OLPATH)/* .#g\" Makefile\n \ sed -i -e \"s#abspath(os.path.join(config#relpath(os.path.join(config#g\" ../OpenLoopsStuff/OpenLoops/SConstruct\n \ sed -i -e \"s#rpath=\$(PWD)/\$(OBJDIR) -L\$(PWD)/\$(OBJDIR)#rpath=\$(OBJDIR) -L\$(OBJDIR)#g\" Makefile\n \ sed -i -e \"s#PDFPACK=lhapdfif.o#PDFPACK=lhapdf6if.o lhapdf6ifcc.o#g\" Makefile\n \ cat ${patches_dir}/missing_lhapdf6.txt >> Makefile", "HZ_ew" : "# fix fortran options/linking to OpenLoops/missing libraries in VH_ew\n \ -sed -i -e \"s#OL_process_src#OL_process_src f90_flags=-ffree-line-length-none#g\" Makefile\n \ sed -i -e \"s#\$(PWD)/\$(OBJ)#\$(OBJ)#g\" Makefile\n \ sed -i -e \"s#\$(OLPATH)/lib_src#lib_src#g\" Makefile\n \ -sed -i -e \"s#cd \$(OLPATH)#cp -r \$(OLPATH)/* .;sed -i -e \"s/python2/python3/g\" scons-local/scons.py;./scons#g\" Makefile\n \ +sed -i -e \"s#cd \$(OLPATH)#cp -r \$(OLPATH)/* .#g\" Makefile\n \ sed -i -e \"s#abspath(os.path.join(config#relpath(os.path.join(config#g\" ../OpenLoopsStuff/OpenLoops/SConstruct\n \ sed -i -e \"s#rpath=\$(PWD)/\$(OBJDIR) -L\$(PWD)/\$(OBJDIR)#rpath=\$(OBJDIR) -L\$(OBJDIR)#g\" Makefile\n \ sed -i -e \"s#opencount.o#opencount.o sigequiv_hook.o#g\" Makefile\n \ sed -i -e \"s#PDFPACK=lhapdfif.o#PDFPACK=lhapdf6if.o lhapdf6ifcc.o#g\" Makefile\n \ cat ${patches_dir}/missing_lhapdf6.txt >> Makefile", "HZJ_ew" : "# fix fortran options/linking to OpenLoops/missing libraries in VH_ew\n \ -sed -i -e \"s#OL_process_src#OL_process_src f90_flags=-ffree-line-length-none#g\" Makefile\n \ sed -i -e \"s#\$(PWD)/\$(OBJ)#\$(OBJ)#g\" Makefile\n \ sed -i -e \"s#\$(OLPATH)/lib_src#lib_src#g\" Makefile\n \ -sed -i -e \"s#cd \$(OLPATH)#cp -r \$(OLPATH)/* .;sed -i -e \"s/python2/python3/g\" scons-local/scons.py;./scons#g\" Makefile\n \ +sed -i -e \"s#cd \$(OLPATH)#cp -r \$(OLPATH)/* .#g\" Makefile\n \ sed -i -e \"s#abspath(os.path.join(config#relpath(os.path.join(config#g\" ../OpenLoopsStuff/OpenLoops/SConstruct\n \ sed -i -e \"s#rpath=\$(PWD)/\$(OBJDIR) -L\$(PWD)/\$(OBJDIR)#rpath=\$(OBJDIR) -L\$(OBJDIR)#g\" Makefile\n \ sed -i -e \"s#OL_process_src#OL_process_src f90_flags=-ffree-line-length-none#g\" Makefile\n \ sed -i -e \"s#boostrot.o#boostrot.o boostrot4.o#g\" Makefile", "HWJ_ew" : "# fix fortran options/linking to OpenLoops/missing libraries in VH_ew\n \ -sed -i -e \"s#OL_process_src#OL_process_src f90_flags=-ffree-line-length-none#g\" Makefile\n \ sed -i -e \"s#\$(PWD)/\$(OBJ)#\$(OBJ)#g\" Makefile\n \ sed -i -e \"s#\$(OLPATH)/lib_src#lib_src#g\" Makefile\n \ -sed -i -e \"s#cd \$(OLPATH)#cp -r \$(OLPATH)/* .;sed -i -e \"s/python2/python3/g\" scons-local/scons.py;./scons#g\" Makefile\n \ +sed -i -e \"s#cd \$(OLPATH)#cp -r \$(OLPATH)/* .#g\" Makefile\n \ sed -i -e \"s#abspath(os.path.join(config#relpath(os.path.join(config#g\" ../OpenLoopsStuff/OpenLoops/SConstruct\n \ sed -i -e \"s#rpath=\$(PWD)/\$(OBJDIR) -L\$(PWD)/\$(OBJDIR)#rpath=\$(OBJDIR) -L\$(OBJDIR)#g\" Makefile\n \ sed -i -e \"s#opencount.o#opencount.o sigequiv_hook.o#g\" Makefile\n \