Skip to content

Commit

Permalink
[grid] regenerate CODEGEN patch from gg_tt.mad after merging the late…
Browse files Browse the repository at this point in the history
…st v1.00.00 and fixing SubProcesses/makefile madgraph5#700

The only files that still need to be patched are
- 1 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/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)
  • Loading branch information
valassi committed Oct 6, 2024
1 parent e43ecbb commit cde2517
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 12 deletions.
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git b/epochX/cudacpp/gg_tt.mad/SubProcesses/P1_gg_ttx/driver.f a/epochX/cudacpp/gg_tt.mad/SubProcesses/P1_gg_ttx/driver.f
index 1124a9164..27a6e4674 100644
index ecd11b239..ec5722702 100644
--- b/epochX/cudacpp/gg_tt.mad/SubProcesses/P1_gg_ttx/driver.f
+++ a/epochX/cudacpp/gg_tt.mad/SubProcesses/P1_gg_ttx/driver.f
@@ -74,13 +74,77 @@ c common/to_colstats/ncols,ncolflow,ncolalt,ic
@@ -76,13 +76,77 @@ c common/to_colstats/ncols,ncolflow,ncolalt,ic

include 'coupl.inc' ! needs VECSIZE_MEMMAX (defined in vector.inc)
INTEGER VECSIZE_USED
Expand Down Expand Up @@ -81,7 +81,7 @@ index 1124a9164..27a6e4674 100644
c
c Read process number
c
@@ -208,8 +272,33 @@ c call sample_result(xsec,xerr)
@@ -216,8 +280,33 @@ c call sample_result(xsec,xerr)
c write(*,*) 'Final xsec: ',xsec

rewind(lun)
Expand Down Expand Up @@ -116,7 +116,7 @@ index 1124a9164..27a6e4674 100644
end

c $B$ get_user_params $B$ ! tag for MadWeight
@@ -387,7 +476,7 @@ c
@@ -400,7 +489,7 @@ c
fopened=.false.
tempname=filename
fine=index(tempname,' ')
Expand All @@ -126,7 +126,7 @@ index 1124a9164..27a6e4674 100644
open(unit=lun,file=tempname,status='old',ERR=20)
fopened=.true.
diff --git b/epochX/cudacpp/gg_tt.mad/SubProcesses/P1_gg_ttx/matrix1.f a/epochX/cudacpp/gg_tt.mad/SubProcesses/P1_gg_ttx/matrix1.f
index 1acba8200..069c74ef4 100644
index bf488e4b0..707ea4032 100644
--- b/epochX/cudacpp/gg_tt.mad/SubProcesses/P1_gg_ttx/matrix1.f
+++ a/epochX/cudacpp/gg_tt.mad/SubProcesses/P1_gg_ttx/matrix1.f
@@ -71,7 +71,10 @@ C
Expand All @@ -141,7 +141,7 @@ index 1acba8200..069c74ef4 100644
C
C This is just to temporarily store the reference grid for
C helicity of the DiscreteSampler so as to obtain its number of
@@ -211,6 +214,17 @@ C ----------
@@ -224,6 +227,17 @@ C update.
ENDIF
IF(NTRY(1).EQ.MAXTRIES)THEN
ISHEL=MIN(ISUM_HEL,NGOOD)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
diff --git b/epochX/cudacpp/gg_tt.mad/SubProcesses/makefile a/epochX/cudacpp/gg_tt.mad/SubProcesses/makefile
index 348c283be..205014f49 100644
index 348c283be..2e5bff046 100644
--- b/epochX/cudacpp/gg_tt.mad/SubProcesses/makefile
+++ a/epochX/cudacpp/gg_tt.mad/SubProcesses/makefile
@@ -1,6 +1,40 @@
@@ -1,6 +1,42 @@
+SHELL := /bin/bash
+
include ../../Source/make_opts
+
+# Export the relevant settings from make_opts to builds using the cudacpp makefile
+# Export the relevant settings from make_opts to builds using the cudacpp makefile (#700)
+export FPTYPE
+export HELINL
+export HRDCOD
+
+# Determine CUDACPP_BUILDDIR based on the user-defined choices of BACKEND, FPTYPE, HELINL, HRDCOD and USEBUILDDIR (#829)
+# Stop with an error if BACKEND=cuda and nvcc is missing or if BACKEND=hip and hipcc is missing
Expand Down Expand Up @@ -43,7 +45,7 @@ index 348c283be..205014f49 100644
# Load additional dependencies of the bias module, if present
ifeq (,$(wildcard ../bias_dependencies))
BIASDEPENDENCIES =
@@ -24,7 +58,20 @@ else
@@ -24,7 +60,20 @@ else
MADLOOP_LIB =
endif

Expand All @@ -65,7 +67,7 @@ index 348c283be..205014f49 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,150 @@ ifeq ($(strip $(MATRIX_HEL)),)
@@ -43,41 +92,150 @@ ifeq ($(strip $(MATRIX_HEL)),)
endif


Expand Down Expand Up @@ -232,7 +234,7 @@ index 348c283be..205014f49 100644

# Dependencies

@@ -97,5 +253,80 @@ unwgt.o: genps.inc nexternal.inc symswap.inc cluster.inc run.inc message.inc \
@@ -97,5 +255,80 @@ unwgt.o: genps.inc nexternal.inc symswap.inc cluster.inc run.inc message.inc \
run_config.inc
initcluster.o: message.inc

Expand Down

0 comments on commit cde2517

Please sign in to comment.