From e02dfd18c15767d9728a6f1cd65ad72be9ed5c79 Mon Sep 17 00:00:00 2001 From: Andrea Valassi Date: Tue, 10 Sep 2024 18:27:07 +0200 Subject: [PATCH] [runcard] regenerate CODEGEN patch from gg_tt.mad after merging upstream/master (with june24) into runcard The only files that still need to be patched are - 2 in patch.common: Source/genps.inc, SubProcesses/makefile - 2 in patch.P1: driver.f, matrix1.f ./CODEGEN/generateAndCompare.sh gg_tt --mad --nopatch git diff --no-ext-diff -R gg_tt.mad/Source/genps.inc gg_tt.mad/SubProcesses/makefile > CODEGEN/PLUGIN/CUDACPP_SA_OUTPUT/MG5aMC_patches/PROD/patch.common git diff --no-ext-diff -R gg_tt.mad/SubProcesses/P1_gg_ttx/driver.f gg_tt.mad/SubProcesses/P1_gg_ttx/matrix1.f > CODEGEN/PLUGIN/CUDACPP_SA_OUTPUT/MG5aMC_patches/PROD/patch.P1 git checkout gg_tt.mad (Later regenerated gg_tt.mad and checked that all is ok) --- .../MG5aMC_patches/PROD/patch.common | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/epochX/cudacpp/CODEGEN/PLUGIN/CUDACPP_SA_OUTPUT/MG5aMC_patches/PROD/patch.common b/epochX/cudacpp/CODEGEN/PLUGIN/CUDACPP_SA_OUTPUT/MG5aMC_patches/PROD/patch.common index c0c8d522e..e62a186d4 100644 --- a/epochX/cudacpp/CODEGEN/PLUGIN/CUDACPP_SA_OUTPUT/MG5aMC_patches/PROD/patch.common +++ b/epochX/cudacpp/CODEGEN/PLUGIN/CUDACPP_SA_OUTPUT/MG5aMC_patches/PROD/patch.common @@ -13,7 +13,7 @@ index a59181c70..af7e0efbc 100644 PARAMETER(MAXTRIES=25) C To pass the helicity configuration chosen by the DiscreteSampler to diff --git b/epochX/cudacpp/gg_tt.mad/SubProcesses/makefile a/epochX/cudacpp/gg_tt.mad/SubProcesses/makefile -index 348c283be..504e41ea5 100644 +index 348c283be..205014f49 100644 --- b/epochX/cudacpp/gg_tt.mad/SubProcesses/makefile +++ a/epochX/cudacpp/gg_tt.mad/SubProcesses/makefile @@ -1,6 +1,40 @@ @@ -79,7 +79,7 @@ index 348c283be..504e41ea5 100644 LIBS = $(LIBDIR)libbias.$(libext) $(LIBDIR)libdhelas.$(libext) $(LIBDIR)libdsample.$(libext) $(LIBDIR)libgeneric.$(libext) $(LIBDIR)libpdf.$(libext) $(LIBDIR)libgammaUPC.$(libext) $(LIBDIR)libmodel.$(libext) $(LIBDIR)libcernlib.$(libext) $(MADLOOP_LIB) $(LOOP_LIBS) -@@ -43,41 +90,147 @@ ifeq ($(strip $(MATRIX_HEL)),) +@@ -43,41 +90,150 @@ ifeq ($(strip $(MATRIX_HEL)),) endif @@ -137,11 +137,12 @@ index 348c283be..504e41ea5 100644 +else +override OMPFLAGS = -fopenmp +endif - --$(LIBDIR)libgeneric.$(libext): ../../Cards/run_card.dat ++endif ++ +$(PROG)_fortran: $(PROCESS) $(DSIG) auto_dsig.o $(LIBS) $(MATRIX) counters.o ompnumthreads.o + $(FC) -o $(PROG)_fortran $(PROCESS) $(DSIG) auto_dsig.o $(MATRIX) $(LINKLIBS) $(BIASDEPENDENCIES) $(OMPFLAGS) counters.o ompnumthreads.o $(LDFLAGS) -+ + +-$(LIBDIR)libgeneric.$(libext): ../../Cards/run_card.dat +$(LIBS): .libs + +.libs: ../../Cards/param_card.dat ../../Cards/run_card.dat @@ -245,7 +246,7 @@ index 348c283be..504e41ea5 100644 # Dependencies -@@ -97,5 +250,80 @@ unwgt.o: genps.inc nexternal.inc symswap.inc cluster.inc run.inc message.inc \ +@@ -97,5 +253,80 @@ unwgt.o: genps.inc nexternal.inc symswap.inc cluster.inc run.inc message.inc \ run_config.inc initcluster.o: message.inc