Update upstream mg5amcnlo, including vecsizeFIX rollback and patches for CMS Drell Yan

epochX/cudacpp/CODEGEN/MG5aMC_patches/PROD/commit.GIT

@@ -1 +1 @@
-dc912b9a7
+6d2182cc1

epochX/cudacpp/CODEGEN/MG5aMC_patches/PROD/patch.P1

@@ -1,8 +1,8 @@
 diff --git b/epochX/cudacpp/gg_tt.mad/SubProcesses/P1_gg_ttx/auto_dsig1.f a/epochX/cudacpp/gg_tt.mad/SubProcesses/P1_gg_ttx/auto_dsig1.f
-index c22933391..807daaacf 100644
+index 48eb2d573..cbcedf384 100644
 --- b/epochX/cudacpp/gg_tt.mad/SubProcesses/P1_gg_ttx/auto_dsig1.f
 +++ a/epochX/cudacpp/gg_tt.mad/SubProcesses/P1_gg_ttx/auto_dsig1.f
-@@ -469,23 +469,140 @@ C
+@@ -467,23 +467,140 @@ C
        INTEGER VECSIZE_USED
 
        INTEGER IVEC
@@ -157,12 +157,12 @@ index c22933391..807daaacf 100644
        END
 
 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 7d4427a6e..9d698418b 100644
+index a76de8ec5..aae7286d2 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,7 +74,13 @@ c      common/to_colstats/ncols,ncolflow,ncolalt,ic
-       INCLUDE 'vector.inc'  ! defines VECSIZE_MEMMAX
-       INCLUDE 'coupl.inc'  ! defines VECSIZE_MEMMAX_COUPL
+@@ -74,13 +74,54 @@ c      common/to_colstats/ncols,ncolflow,ncolalt,ic
+       include 'vector.inc' ! needed by coupl.inc (defines VECSIZE_MEMMAX)
+       include 'coupl.inc'
        INTEGER VECSIZE_USED
 -      DATA VECSIZE_USED/VECSIZE_MEMMAX/ ! can be changed at runtime
 +      DATA VECSIZE_USED/VECSIZE_MEMMAX/ ! initial value
@@ -175,10 +175,10 @@ index 7d4427a6e..9d698418b 100644
 
  C-----
  C  BEGIN CODE
-@@ -89,6 +95,40 @@ c Sanity check (see https://github.com/madgraph5/madgraph4gpu/issues/629)
-         WRITE(6,*) 'ERROR! VECSIZE_MEMMAX_COUPL =', VECSIZE_MEMMAX_COUPL
-       ENDIF
- 
+ C----- 
+       call cpu_time(t_before)
+       CUMULATED_TIMING = t_before
++
 +#ifdef _OPENMP
 +      CALL OMPNUMTHREADS_NOT_SET_MEANS_ONE_THREAD()
 +#endif
@@ -216,17 +216,7 @@ index 7d4427a6e..9d698418b 100644
  c
  c     Read process number
  c
-@@ -143,7 +183,8 @@ c   If CKKW-type matching, read IS Sudakov grid
-           exit
-  30       issgridfile='../'//issgridfile
-           if(i.eq.5)then
--            print *,'ERROR: No Sudakov grid file found in lib with ickkw=2'
-+            print *,
-+     &        'ERROR: No Sudakov grid file found in lib with ickkw=2'
-             stop
-           endif
-         enddo
-@@ -210,8 +251,33 @@ c      call sample_result(xsec,xerr)
+@@ -202,8 +243,33 @@ c      call sample_result(xsec,xerr)
  c      write(*,*) 'Final xsec: ',xsec
 
        rewind(lun)
@@ -261,7 +251,7 @@ index 7d4427a6e..9d698418b 100644
        end
 
  c     $B$ get_user_params $B$ ! tag for MadWeight
-@@ -389,7 +455,7 @@ c
+@@ -381,7 +447,7 @@ c
        fopened=.false.
        tempname=filename 	 
        fine=index(tempname,' ') 	 
@@ -271,7 +261,7 @@ index 7d4427a6e..9d698418b 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 9d84acc5e..4749b375d 100644
+index 5e888278c..2d9ce6ff3 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
 @@ -72,7 +72,10 @@ C

epochX/cudacpp/CODEGEN/patchMad.sh

@@ -97,7 +97,7 @@ done
 cd ${dir}/Source/MODEL > /dev/null
 gcs=$(cat coupl_write.inc | awk '{if($1=="WRITE(*,2)") print $NF}') # different printouts for scalar/vector couplings #456
 for gc in $gcs; do
-  if grep -q "$gc(VECSIZE_MEMMAX_COUPL)" coupl.inc; then
+  if grep -q "$gc(VECSIZE_MEMMAX)" coupl.inc; then
     ###echo "DEBUG: Coupling $gc is a vector"
     cat coupl_write.inc | awk -vgc=$gc '{if($1=="WRITE(*,2)" && $NF==gc) print $0"(1)"; else print $0}' > coupl_write.inc.new
     \mv coupl_write.inc.new coupl_write.inc

epochX/cudacpp/ee_mumu.mad/CODEGEN_mad_ee_mumu_log.txt

@@ -62,7 +62,7 @@ generate e+ e- > mu+ mu-
 No model currently active, so we import the Standard Model
 INFO: load particles 
 INFO: load vertices 
-DEBUG: model prefixing  takes 0.0062563419342041016 
+DEBUG: model prefixing  takes 0.0050487518310546875 
 INFO: Restrict model sm with file models/sm/restrict_default.dat . 
 DEBUG: Simplifying conditional expressions 
 DEBUG: remove interactions: u s w+ at order: QED=1 
@@ -154,7 +154,7 @@ INFO: Checking for minimal orders which gives processes.
 INFO: Please specify coupling orders to bypass this step. 
 INFO: Trying process: e+ e- > mu+ mu- WEIGHTED<=4 @1  
 INFO: Process has 2 diagrams 
-1 processes with 2 diagrams generated in 0.005 s
+1 processes with 2 diagrams generated in 0.004 s
 Total: 1 processes with 2 diagrams
 output madevent CODEGEN_mad_ee_mumu --hel_recycling=False --vector_size=16384 --me_exporter=standalone_cudacpp
 Load PLUGIN.CUDACPP_SA_OUTPUT
@@ -176,7 +176,7 @@ INFO: Creating files in directory P1_epem_mupmum
 DEBUG:  Entering PLUGIN_OneProcessExporter.__init__ [model_handling.py at line 1027] 
 DEBUG:  kwargs[prefix] = 0 [model_handling.py at line 1028] 
 DEBUG:  proc_id =  1 [model_handling.py at line 1033] 
-DEBUG:  process_exporter_cpp =  <PLUGIN.CUDACPP_SA_OUTPUT.model_handling.PLUGIN_OneProcessExporter object at 0x7fc379e3e8e0> [export_v4.py at line 6163] 
+DEBUG:  process_exporter_cpp =  <PLUGIN.CUDACPP_SA_OUTPUT.model_handling.PLUGIN_OneProcessExporter object at 0x7fdac9022430> [export_v4.py at line 6163] 
 INFO: Creating files in directory . 
 DEBUG:  Entering PLUGIN_OneProcessExporter.generate_process_files [model_handling.py at line 1272] 
 DEBUG:  self.include_multi_channel is already defined: this is madevent+second_exporter mode [model_handling.py at line 1274] 
@@ -209,19 +209,19 @@ INFO: Created files CPPProcess.h and CPPProcess.cc in directory ./.
 INFO: Generating Feynman diagrams for Process: e+ e- > mu+ mu- WEIGHTED<=4 @1 
 INFO: Finding symmetric diagrams for subprocess group epem_mupmum 
 Generated helas calls for 1 subprocesses (2 diagrams) in 0.004 s
-Wrote files for 8 helas calls in 0.104 s
+Wrote files for 8 helas calls in 0.088 s
 ALOHA: aloha starts to compute helicity amplitudes
 ALOHA: aloha creates FFV1 routines
 ALOHA: aloha creates FFV2 routines
 ALOHA: aloha creates FFV4 routines
-ALOHA: aloha creates 3 routines in  0.213 s
+ALOHA: aloha creates 3 routines in  0.174 s
 DEBUG:  Entering PLUGIN_ProcessExporter.convert_model (create the model) [output.py at line 187] 
 ALOHA: aloha starts to compute helicity amplitudes
 ALOHA: aloha creates FFV1 routines
 ALOHA: aloha creates FFV2 routines
 ALOHA: aloha creates FFV4 routines
 ALOHA: aloha creates FFV2_4 routines
-ALOHA: aloha creates 7 routines in  0.273 s
+ALOHA: aloha creates 7 routines in  0.221 s
 <class 'aloha.create_aloha.AbstractRoutine'> FFV1
 <class 'aloha.create_aloha.AbstractRoutine'> FFV1
 <class 'aloha.create_aloha.AbstractRoutine'> FFV2
@@ -259,6 +259,6 @@ Type "launch" to generate events from this process, or see
 Run "open index.html" to see more information about this process.
 quit
 
-real	0m2.012s
-user	0m1.745s
-sys	0m0.219s
+real	0m1.765s
+user	0m1.544s
+sys	0m0.209s

epochX/cudacpp/ee_mumu.mad/Source/MODEL/coupl.inc

@@ -3,24 +3,17 @@ c      written by the UFO converter
 ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc
 
 C     
-C     NB: VECSIZE_MEMMAX is defined in vector.inc, but this is not
-C     included in coupl.inc because Fortran has no include guards
+C     NB: VECSIZE_MEMMAX is defined in vector.inc
+C     NB: vector.inc must be included before coupl.inc
 C     
-C     NB: therefore coupl.inc introduces the definition of a separate
-C     variable VECSIZE_MEMMAX_COUPL, whose value must be the same as
-C     that of VECSIZE_MEMMAX (this is cross-checked in PROGRAM DRIVER)
-C     
-
-      INTEGER VECSIZE_MEMMAX_COUPL
-      PARAMETER (VECSIZE_MEMMAX_COUPL=16384)
 
-      DOUBLE PRECISION G, ALL_G(VECSIZE_MEMMAX_COUPL)
+      DOUBLE PRECISION G, ALL_G(VECSIZE_MEMMAX)
       COMMON/STRONG/ G, ALL_G
 
       DOUBLE COMPLEX GAL(2)
       COMMON/WEAK/ GAL
 
-      DOUBLE PRECISION MU_R, ALL_MU_R(VECSIZE_MEMMAX_COUPL)
+      DOUBLE PRECISION MU_R, ALL_MU_R(VECSIZE_MEMMAX)
       COMMON/RSCALE/ MU_R, ALL_MU_R
 
       DOUBLE PRECISION NF

epochX/cudacpp/ee_mumu.mad/Source/MODEL/couplings.f

@@ -13,6 +13,7 @@ SUBROUTINE COUP()
       LOGICAL UPDATELOOP
       COMMON /TO_UPDATELOOP/UPDATELOOP
       INCLUDE 'input.inc'
+      INCLUDE '../vector.inc'
       INCLUDE 'coupl.inc'
       READLHA = .TRUE.
       INCLUDE 'intparam_definition.inc'
@@ -52,6 +53,7 @@ SUBROUTINE UPDATE_AS_PARAM(VECID)
       EXTERNAL ALPHAS
 
       INCLUDE 'input.inc'
+      INCLUDE '../vector.inc'
       INCLUDE 'coupl.inc'
       READLHA = .FALSE.
 
@@ -78,6 +80,7 @@ SUBROUTINE UPDATE_AS_PARAM2(MU_R2,AS2 ,VECID)
       INTEGER VECID
       INCLUDE 'model_functions.inc'
       INCLUDE 'input.inc'
+      INCLUDE '../vector.inc'
       INCLUDE 'coupl.inc'
       DOUBLE PRECISION MODEL_SCALE
       COMMON /MODEL_SCALE/MODEL_SCALE

epochX/cudacpp/ee_mumu.mad/Source/MODEL/couplings1.f

@@ -12,6 +12,7 @@ SUBROUTINE COUP1( )
       PARAMETER  (PI=3.141592653589793D0)
       PARAMETER  (ZERO=0D0)
       INCLUDE 'input.inc'
+      INCLUDE '../vector.inc'
       INCLUDE 'coupl.inc'
       GC_3 = -(MDL_EE*MDL_COMPLEXI)
       GC_50 = -(MDL_CW*MDL_EE*MDL_COMPLEXI)/(2.000000D+00*MDL_SW)

epochX/cudacpp/ee_mumu.mad/Source/MODEL/couplings2.f

@@ -12,5 +12,6 @@ SUBROUTINE COUP2( VECID)
       PARAMETER  (PI=3.141592653589793D0)
       PARAMETER  (ZERO=0D0)
       INCLUDE 'input.inc'
+      INCLUDE '../vector.inc'
       INCLUDE 'coupl.inc'
       END

epochX/cudacpp/ee_mumu.mad/Source/MODEL/printout.f

@@ -9,7 +9,8 @@
       subroutine printout
       implicit none
 
-      include 'coupl.inc'
+      include '../vector.inc' ! defines VECSIZE_MEMMAX
+      include 'coupl.inc' ! needs VECSIZE_MEMMAX (defined in vector.inc)
       include 'input.inc'
 
       include 'formats.inc'

epochX/cudacpp/ee_mumu.mad/Source/MODEL/rw_para.f

@@ -12,6 +12,7 @@ subroutine setpara(param_name)
       character*(*) param_name
       logical readlha
 
+      include '../vector.inc'
       include 'coupl.inc'
       include 'input.inc'
       include 'model_functions.inc'

epochX/cudacpp/ee_mumu.mad/Source/PDF/ElectroweakFlux.inc

@@ -46,7 +46,8 @@ c     /* ********************************************************* *
 	parameter (eva_pi   = 3.141592653589793d0)
 	parameter (eva_sqr2 = 1.414213562373095d0)
 
-	include '../MODEL/coupl.inc'
+	include '../vector.inc' ! defines VECSIZE_MEMMAX
+	include '../MODEL/coupl.inc' ! needs VECSIZE_MEMMAX (defined in vector.inc)
 
 	logical first
 	data first /.true./

epochX/cudacpp/ee_mumu.mad/Source/dsample.f

@@ -17,7 +17,7 @@ subroutine sample_full(ndim,ncall,itmax,itmin,dsig,ninvar,nconfigs,VECSIZE_USED)
 c**************************************************************************
       implicit none
       include 'genps.inc'
-      include 'vector.inc'
+      include 'vector.inc' ! defines VECSIZE_MEMMAX
 c     
 c Arguments
 c
@@ -667,7 +667,7 @@ subroutine sample_init(p1, p2, p3, p4, p5, VECSIZE_USED)
       include 'genps.inc'
       include 'maxconfigs.inc'
       include 'run.inc'
-      include 'vector.inc'
+      include 'vector.inc' ! defines VECSIZE_MEMMAX
 c
 c     Arguments
 c

epochX/cudacpp/ee_mumu.mad/Source/setrun.f

@@ -15,7 +15,8 @@ subroutine setrun
       include 'PDF/pdf.inc'
       include 'run.inc'
       include 'alfas.inc'
-      include 'MODEL/coupl.inc'
+      include 'vector.inc' ! defines VECSIZE_MEMMAX
+      include 'MODEL/coupl.inc' ! needs VECSIZE_MEMMAX (defined in vector.inc)
 
       double precision D
       common/to_dj/D

epochX/cudacpp/ee_mumu.mad/SubProcesses/P1_epem_mupmum/auto_dsig.f

@@ -255,6 +255,11 @@ SUBROUTINE DSIG_VEC(ALL_P,ALL_WGT,ALL_XBK,ALL_Q2FACT,ALL_CM_RAP
       INTEGER CONFSUB(MAXSPROC,LMAXCONFIGS)
       INCLUDE 'config_subproc_map.inc'
 
+C     SUBDIAG is vector of diagram numbers for this config
+C     IB gives which beam is which (for mirror processes)
+      INTEGER SUBDIAG(MAXSPROC),IB(2)
+      COMMON/TO_SUB_DIAG/SUBDIAG,IB
+
       INTEGER MAPCONFIG(0:LMAXCONFIGS), ICONFIG
       COMMON/TO_MCONFIGS/MAPCONFIG, ICONFIG
 
@@ -298,7 +303,10 @@ SUBROUTINE DSIG_VEC(ALL_P,ALL_WGT,ALL_XBK,ALL_Q2FACT,ALL_CM_RAP
       GROUPED_MC_GRID_STATUS = DS_GET_DIM_STATUS('grouped_processes')
       IMIRROR_GLOBAL = IMIRROR
       IPROC_GLOBAL = IPROC
-      ICONFIG = ICONF
+      ICONFIG=SYMCONF(ICONF)
+      DO I=1,MAXSPROC
+        SUBDIAG(I) = CONFSUB(I,SYMCONF(ICONF))
+      ENDDO
 
 C     set the running scale 
 C     and update the couplings accordingly
@@ -430,7 +438,8 @@ DOUBLE PRECISION FUNCTION DSIG(PP,WGT,IMODE)
       DATA  NB_SPIN_STATE /2,2/
       COMMON /NB_HEL_STATE/ NB_SPIN_STATE
 
-      INCLUDE 'coupl.inc'
+      INCLUDE 'vector.inc'  ! defines VECSIZE_MEMMAX
+      INCLUDE 'coupl.inc'  ! needs VECSIZE_MEMMAX (defined in vector.inc)
       INCLUDE 'run.inc'
 C     ICONFIG has this config number
       INTEGER MAPCONFIG(0:LMAXCONFIGS), ICONFIG
@@ -773,9 +782,9 @@ FUNCTION DSIGPROC(PP,ICONF,IPROC,IMIRROR,SYMCONF,CONFSUB,WGT
       INCLUDE 'maxconfigs.inc'
       INCLUDE 'nexternal.inc'
       INCLUDE 'maxamps.inc'
-      INCLUDE 'coupl.inc'
+      INCLUDE 'vector.inc'  ! defines VECSIZE_MEMMAX
+      INCLUDE 'coupl.inc'  ! needs VECSIZE_MEMMAX (defined in vector.inc)
       INCLUDE 'run.inc'
-      INCLUDE 'vector.inc'
 C     
 C     ARGUMENTS 
 C     
@@ -913,9 +922,9 @@ SUBROUTINE DSIGPROC_VEC(ALL_P,ALL_XBK,ALL_Q2FACT,ALL_CM_RAP
       INCLUDE 'maxconfigs.inc'
       INCLUDE 'nexternal.inc'
       INCLUDE 'maxamps.inc'
-      INCLUDE 'coupl.inc'
+      INCLUDE 'vector.inc'  ! defines VECSIZE_MEMMAX
+      INCLUDE 'coupl.inc'  ! needs VECSIZE_MEMMAX (defined in vector.inc)
       INCLUDE 'run.inc'
-      INCLUDE '../../Source/vector.inc'
 C     
 C     ARGUMENTS 
 C