Merge pull request #391 from valassi/v311

Use the upstream 3.1.1 branch for code generation (without picking up new features yet)

epochX/cudacpp/CODEGEN/MG5aMC_patches/3.1.1_lo_vectorization/revision.BZR

@@ -0,0 +1 @@
+990

epochX/cudacpp/CODEGEN/PLUGIN/CUDACPP_SA_OUTPUT/__init__.py

@@ -37,5 +37,5 @@
 __version__ = (1,0,0)
 minimal_mg5amcnlo_version = (2,9,5) 
 maximal_mg5amcnlo_version = (1000,1000,1000)
-latest_validated_version = (2,9,5)
+latest_validated_version = (3,1,1)
 

epochX/cudacpp/CODEGEN/generateAndCompare.sh

@@ -197,9 +197,11 @@ echo "proc=${proc}"
 if ! python3 --version >& /dev/null; then echo "ERROR! python3 is not installed"; exit 1; fi
 
 # Make sure that $MG5AMC_HOME exists
+###mg5amc_branch=2.7.0_gpu
+mg5amc_branch=3.1.1_lo_vectorization
 if [ "$MG5AMC_HOME" == "" ]; then
   echo "ERROR! MG5AMC_HOME is not defined"
-  echo "To download MG5AMC please run 'bzr branch lp:~maddevelopers/mg5amcnlo/2.7.0_gpu'"
+  echo "To download MG5AMC please run 'bzr branch lp:~maddevelopers/mg5amcnlo/${mg5amc_branch}'"
   exit 1
 fi
 echo -e "\nUsing MG5AMC_HOME=$MG5AMC_HOME on $(hostname)\n"
@@ -213,7 +215,7 @@ if bzr --version >& /dev/null; then
   echo -e "Using $(bzr --version | head -1)"
   echo -e "Retrieving bzr information about MG5AMC_HOME"
   if bzr info ${MG5AMC_HOME} > /dev/null; then
-    revno_patches=$(cat $SCRDIR/MG5aMC_patches/2.7.0_gpu/revision.BZR)
+    revno_patches=$(cat $SCRDIR/MG5aMC_patches/${mg5amc_branch}/revision.BZR)
     echo -e "MG5AMC patches in this plugin refer to bzr revno '${revno_patches}'"
     echo -e "Revert MG5AMC_HOME to bzr revno '${revno_patches}'"
     bzr revert ${MG5AMC_HOME} -r ${revno_patches}
@@ -230,14 +232,14 @@ else
 fi
 
 # Copy MG5AMC patches if any
-patches=$(cd $SCRDIR/MG5aMC_patches/2.7.0_gpu; find . -type f -name '*.py')
-echo -e "Copy MG5aMC_patches/2.7.0_gpu patches..."
+patches=$(cd $SCRDIR/MG5aMC_patches/${mg5amc_branch}; find . -type f -name '*.py')
+echo -e "Copy MG5aMC_patches/${mg5amc_branch} patches..."
 for patch in $patches; do
   patch=${patch#./}
-  echo cp -dpr $SCRDIR/MG5aMC_patches/2.7.0_gpu/$patch $MG5AMC_HOME/$patch
-  cp -dpr $SCRDIR/MG5aMC_patches/2.7.0_gpu/$patch $MG5AMC_HOME/$patch
+  echo cp -dpr $SCRDIR/MG5aMC_patches/${mg5amc_branch}/$patch $MG5AMC_HOME/$patch
+  cp -dpr $SCRDIR/MG5aMC_patches/${mg5amc_branch}/$patch $MG5AMC_HOME/$patch
 done
-echo -e "Copy MG5aMC_patches/2.7.0_gpu patches... done\n"
+echo -e "Copy MG5aMC_patches/${mg5amc_branch} patches... done\n"
 
 # Clean up before code generation
 cleanup_MG5AMC_HOME

epochX/cudacpp/ee_mumu.auto/CODEGEN_cudacpp_ee_mumu_log.txt

@@ -11,8 +11,8 @@ Running MG5 in debug mode
 *                   *        * *        *                  *
 *                 *                       *                *
 *                                                          *
-*         VERSION 2.9.5                 2021-08-22         *
-*         BZR 2.7.0_gpu                        371         *
+*         VERSION 3.3.1_lo_vect         2022-01-30         *
+*         BZR 3.1.1_lo_vectorization           990         *
 *                                                          *
 *    The MadGraph5_aMC@NLO Development Team - Find us at   *
 *    https://server06.fynu.ucl.ac.be/projects/madgraph     *
@@ -42,84 +42,90 @@ Note that you can still compile and run aMC@NLO with the built-in PDFs
 
 No valid eps viewer found. Please set in ./input/mg5_configuration.txt
 Using default web browser "firefox". Set another one in ./input/mg5_configuration.txt
-import /data/avalassi/GPU2020/MG5aMC/2.7.0_gpu/CODEGEN_cudacpp_ee_mumu.mg
+import /data/avalassi/GPU2020/MG5aMC/3.1.1_lo_vectorization/CODEGEN_cudacpp_ee_mumu.mg
 The import format was not given, so we guess it as command
 set stdout_level DEBUG
 set output information to level: 10
 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.006852626800537109 
+DEBUG: model prefixing  takes 0.006906986236572266 
 INFO: Restrict model sm with file models/sm/restrict_default.dat . 
 INFO: Change particles name to pass to MG5 convention 
-DEBUG:  True [misc.py at line 2192] 
 Defined multiparticle p = g u c d s u~ c~ d~ s~
 Defined multiparticle j = g u c d s u~ c~ d~ s~
 Defined multiparticle l+ = e+ mu+
 Defined multiparticle l- = e- mu-
 Defined multiparticle vl = ve vm vt
 Defined multiparticle vl~ = ve~ vm~ vt~
 Defined multiparticle all = g u c d s u~ c~ d~ s~ a ve vm vt e- mu- ve~ vm~ vt~ e+ mu+ t b t~ b~ z w+ h w- ta- ta+
-DEBUG:  True [misc.py at line 2192] 
 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.006 s
 Total: 1 processes with 2 diagrams
 output standalone_cudacpp CODEGEN_cudacpp_ee_mumu
+Plugin PLUGIN.CUDACPP_SA_OUTPUT has marked as NOT being validated with this version. 
+It has been validated for the last time with version: 3.1.1
 Output will be done with PLUGIN: CUDACPP_SA_OUTPUT
+DEBUG:  cformat =  plugin [export_cpp.py at line 2974] 
 DEBUG:  Entering PLUGIN_ProcessExporter.__init__ (initialise the exporter) [output.py at line 159] 
 DEBUG:  Entering PLUGIN_ProcessExporter.copy_template (initialise the directory) [output.py at line 164] 
-INFO: Creating subdirectories in directory /data/avalassi/GPU2020/MG5aMC/2.7.0_gpu/CODEGEN_cudacpp_ee_mumu 
+INFO: Creating subdirectories in directory /data/avalassi/GPU2020/MG5aMC/3.1.1_lo_vectorization/CODEGEN_cudacpp_ee_mumu 
 INFO: Organizing processes into subprocess groups 
 INFO: Generating Helas calls for process: e+ e- > mu+ mu- WEIGHTED<=4 @1 
 DEBUG:  keepordering (default): True [output.py at line 26] 
 INFO: Processing color information for process: e+ e- > mu+ mu- @1 
 DEBUG:  Entering PLUGIN_ProcessExporter.generate_subprocess_directory (create the directory) [output.py at line 169] 
 DEBUG:    type(subproc_group)=<class 'madgraph.core.helas_objects.HelasMatrixElement'> [output.py at line 170] 
 DEBUG:    type(fortran_model)=<class 'PLUGIN.CUDACPP_SA_OUTPUT.model_handling.PLUGIN_GPUFOHelasCallWriter'> [output.py at line 171] 
-INFO: Creating files in directory /data/avalassi/GPU2020/MG5aMC/2.7.0_gpu/CODEGEN_cudacpp_ee_mumu/SubProcesses/P1_Sigma_sm_epem_mupmum 
+INFO: Creating files in directory /data/avalassi/GPU2020/MG5aMC/3.1.1_lo_vectorization/CODEGEN_cudacpp_ee_mumu/SubProcesses/P1_Sigma_sm_epem_mupmum 
 DEBUG:  Entering PLUGIN_OneProcessExporter.generate_process_files [model_handling.py at line 1051] 
-FileWriter <class 'PLUGIN.CUDACPP_SA_OUTPUT.model_handling.PLUGIN_FileWriter'> for /data/avalassi/GPU2020/MG5aMC/2.7.0_gpu/CODEGEN_cudacpp_ee_mumu/SubProcesses/P1_Sigma_sm_epem_mupmum/./CPPProcess.h
+FileWriter <class 'PLUGIN.CUDACPP_SA_OUTPUT.model_handling.PLUGIN_FileWriter'> for /data/avalassi/GPU2020/MG5aMC/3.1.1_lo_vectorization/CODEGEN_cudacpp_ee_mumu/SubProcesses/P1_Sigma_sm_epem_mupmum/./CPPProcess.h
 DEBUG:  Entering PLUGIN_OneProcessExporter.write_process_h_file [model_handling.py at line 1117] 
-FileWriter <class 'PLUGIN.CUDACPP_SA_OUTPUT.model_handling.PLUGIN_FileWriter'> for /data/avalassi/GPU2020/MG5aMC/2.7.0_gpu/CODEGEN_cudacpp_ee_mumu/SubProcesses/P1_Sigma_sm_epem_mupmum/./CPPProcess.cc
+FileWriter <class 'PLUGIN.CUDACPP_SA_OUTPUT.model_handling.PLUGIN_FileWriter'> for /data/avalassi/GPU2020/MG5aMC/3.1.1_lo_vectorization/CODEGEN_cudacpp_ee_mumu/SubProcesses/P1_Sigma_sm_epem_mupmum/./CPPProcess.cc
 DEBUG:  Entering PLUGIN_OneProcessExporter.write_process_cc_file [model_handling.py at line 1139] 
 DEBUG: only one Matrix-element supported? 
-INFO: Created files CPPProcess.h and CPPProcess.cc in directory /data/avalassi/GPU2020/MG5aMC/2.7.0_gpu/CODEGEN_cudacpp_ee_mumu/SubProcesses/P1_Sigma_sm_epem_mupmum/. 
+INFO: Created files CPPProcess.h and CPPProcess.cc in directory /data/avalassi/GPU2020/MG5aMC/3.1.1_lo_vectorization/CODEGEN_cudacpp_ee_mumu/SubProcesses/P1_Sigma_sm_epem_mupmum/. 
 DEBUG:  Entering PLUGIN_OneProcessExporter.edit_check_sa [model_handling.py at line 1069] 
 DEBUG:  Entering PLUGIN_OneProcessExporter.edit_mgonGPU [model_handling.py at line 1086] 
 DEBUG:  Entering PLUGIN_OneProcessExporter.edit_processidfile [model_handling.py at line 1093] 
 DEBUG:  Entering PLUGIN_OneProcessExporter.edit_testxxx [model_handling.py at line 1105] 
-Generated helas calls for 1 subprocesses (2 diagrams) in 0.005 s
+Generated helas calls for 1 subprocesses (2 diagrams) in 0.006 s
 DEBUG:  Entering PLUGIN_ProcessExporter.convert_model (create the model) [output.py at line 176] 
-ALOHA: aloha creates routines (starting by FFV1)
+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 4 routines in  0.320 s
 <class 'aloha.create_aloha.AbstractRoutine'> FFV1
-DEBUG:  language =  <class 'PLUGIN.CUDACPP_SA_OUTPUT.model_handling.PLUGIN_ALOHAWriter'> [aloha_writers.py at line 2446] 
+DEBUG:  language =  <class 'PLUGIN.CUDACPP_SA_OUTPUT.model_handling.PLUGIN_ALOHAWriter'> [aloha_writers.py at line 2451] 
 <class 'aloha.create_aloha.AbstractRoutine'> FFV1
-DEBUG:  language =  <class 'PLUGIN.CUDACPP_SA_OUTPUT.model_handling.PLUGIN_ALOHAWriter'> [aloha_writers.py at line 2446] 
+DEBUG:  language =  <class 'PLUGIN.CUDACPP_SA_OUTPUT.model_handling.PLUGIN_ALOHAWriter'> [aloha_writers.py at line 2451] 
 <class 'aloha.create_aloha.AbstractRoutine'> FFV2
-DEBUG:  language =  <class 'PLUGIN.CUDACPP_SA_OUTPUT.model_handling.PLUGIN_ALOHAWriter'> [aloha_writers.py at line 2446] 
+DEBUG:  language =  <class 'PLUGIN.CUDACPP_SA_OUTPUT.model_handling.PLUGIN_ALOHAWriter'> [aloha_writers.py at line 2451] 
 <class 'aloha.create_aloha.AbstractRoutine'> FFV2
-DEBUG:  language =  <class 'PLUGIN.CUDACPP_SA_OUTPUT.model_handling.PLUGIN_ALOHAWriter'> [aloha_writers.py at line 2446] 
+DEBUG:  language =  <class 'PLUGIN.CUDACPP_SA_OUTPUT.model_handling.PLUGIN_ALOHAWriter'> [aloha_writers.py at line 2451] 
 <class 'aloha.create_aloha.AbstractRoutine'> FFV4
-DEBUG:  language =  <class 'PLUGIN.CUDACPP_SA_OUTPUT.model_handling.PLUGIN_ALOHAWriter'> [aloha_writers.py at line 2446] 
+DEBUG:  language =  <class 'PLUGIN.CUDACPP_SA_OUTPUT.model_handling.PLUGIN_ALOHAWriter'> [aloha_writers.py at line 2451] 
 <class 'aloha.create_aloha.AbstractRoutine'> FFV4
-DEBUG:  language =  <class 'PLUGIN.CUDACPP_SA_OUTPUT.model_handling.PLUGIN_ALOHAWriter'> [aloha_writers.py at line 2446] 
+DEBUG:  language =  <class 'PLUGIN.CUDACPP_SA_OUTPUT.model_handling.PLUGIN_ALOHAWriter'> [aloha_writers.py at line 2451] 
 <class 'aloha.create_aloha.AbstractRoutine'> FFV2_4
-DEBUG:  language =  <class 'PLUGIN.CUDACPP_SA_OUTPUT.model_handling.PLUGIN_ALOHAWriter'> [aloha_writers.py at line 2446] 
+DEBUG:  language =  <class 'PLUGIN.CUDACPP_SA_OUTPUT.model_handling.PLUGIN_ALOHAWriter'> [aloha_writers.py at line 2451] 
 <class 'aloha.create_aloha.AbstractRoutine'> FFV2_4
-DEBUG:  language =  <class 'PLUGIN.CUDACPP_SA_OUTPUT.model_handling.PLUGIN_ALOHAWriter'> [aloha_writers.py at line 2446] 
-FileWriter <class 'PLUGIN.CUDACPP_SA_OUTPUT.model_handling.PLUGIN_FileWriter'> for /data/avalassi/GPU2020/MG5aMC/2.7.0_gpu/CODEGEN_cudacpp_ee_mumu/src/./HelAmps_sm.h
-INFO: Created file HelAmps_sm.h in directory /data/avalassi/GPU2020/MG5aMC/2.7.0_gpu/CODEGEN_cudacpp_ee_mumu/src/. 
-FileWriter <class 'PLUGIN.CUDACPP_SA_OUTPUT.model_handling.PLUGIN_FileWriter'> for /data/avalassi/GPU2020/MG5aMC/2.7.0_gpu/CODEGEN_cudacpp_ee_mumu/src/./Parameters_sm.h
-FileWriter <class 'PLUGIN.CUDACPP_SA_OUTPUT.model_handling.PLUGIN_FileWriter'> for /data/avalassi/GPU2020/MG5aMC/2.7.0_gpu/CODEGEN_cudacpp_ee_mumu/src/./Parameters_sm.cc
+DEBUG:  language =  <class 'PLUGIN.CUDACPP_SA_OUTPUT.model_handling.PLUGIN_ALOHAWriter'> [aloha_writers.py at line 2451] 
+FileWriter <class 'PLUGIN.CUDACPP_SA_OUTPUT.model_handling.PLUGIN_FileWriter'> for /data/avalassi/GPU2020/MG5aMC/3.1.1_lo_vectorization/CODEGEN_cudacpp_ee_mumu/src/./HelAmps_sm.h
+INFO: Created file HelAmps_sm.h in directory /data/avalassi/GPU2020/MG5aMC/3.1.1_lo_vectorization/CODEGEN_cudacpp_ee_mumu/src/. 
+FileWriter <class 'PLUGIN.CUDACPP_SA_OUTPUT.model_handling.PLUGIN_FileWriter'> for /data/avalassi/GPU2020/MG5aMC/3.1.1_lo_vectorization/CODEGEN_cudacpp_ee_mumu/src/./Parameters_sm.h
+FileWriter <class 'PLUGIN.CUDACPP_SA_OUTPUT.model_handling.PLUGIN_FileWriter'> for /data/avalassi/GPU2020/MG5aMC/3.1.1_lo_vectorization/CODEGEN_cudacpp_ee_mumu/src/./Parameters_sm.cc
 INFO: Created files Parameters_sm.h and Parameters_sm.cc in directory 
-INFO: /data/avalassi/GPU2020/MG5aMC/2.7.0_gpu/CODEGEN_cudacpp_ee_mumu/src/. and /data/avalassi/GPU2020/MG5aMC/2.7.0_gpu/CODEGEN_cudacpp_ee_mumu/src/. 
+INFO: /data/avalassi/GPU2020/MG5aMC/3.1.1_lo_vectorization/CODEGEN_cudacpp_ee_mumu/src/. and /data/avalassi/GPU2020/MG5aMC/3.1.1_lo_vectorization/CODEGEN_cudacpp_ee_mumu/src/. 
 DEBUG:  Entering PLUGIN_ProcessExporter.finalize [output.py at line 185] 
 quit
 
-real	0m3.415s
-user	0m0.943s
-sys	0m0.129s
+real	0m1.119s
+user	0m0.906s
+sys	0m0.127s

epochX/cudacpp/ee_mumu.auto/SubProcesses/P1_Sigma_sm_epem_mupmum/CPPProcess.cc

@@ -1,6 +1,6 @@
 //==========================================================================
 // This file has been automatically generated for CUDA/C++ standalone by
-// MadGraph5_aMC@NLO v. 2.9.5, 2021-08-22
+// MadGraph5_aMC@NLO v. 3.3.1_lo_vect, 2022-01-30
 // By the MadGraph5_aMC@NLO Development Team
 // Visit launchpad.net/madgraph5 and amcatnlo.web.cern.ch
 //==========================================================================

epochX/cudacpp/ee_mumu.auto/SubProcesses/P1_Sigma_sm_epem_mupmum/CPPProcess.h

@@ -1,6 +1,6 @@
 //==========================================================================
 // This file has been automatically generated for CUDA/C++ standalone by
-// MadGraph5_aMC@NLO v. 2.9.5, 2021-08-22
+// MadGraph5_aMC@NLO v. 3.3.1_lo_vect, 2022-01-30
 // By the MadGraph5_aMC@NLO Development Team
 // Visit launchpad.net/madgraph5 and amcatnlo.web.cern.ch
 //==========================================================================

epochX/cudacpp/ee_mumu.auto/src/HelAmps_sm.h

@@ -1,6 +1,6 @@
 //==========================================================================
 // This file has been automatically generated for CUDA/C++ standalone by
-// MadGraph5_aMC@NLO v. 2.9.5, 2021-08-22
+// MadGraph5_aMC@NLO v. 3.3.1_lo_vect, 2022-01-30
 // By the MadGraph5_aMC@NLO Development Team
 // Visit launchpad.net/madgraph5 and amcatnlo.web.cern.ch
 //==========================================================================

epochX/cudacpp/ee_mumu.auto/src/Parameters_sm.cc

@@ -1,6 +1,6 @@
 //==========================================================================
 // This file has been automatically generated for CUDA/C++ standalone by
-// MadGraph5_aMC@NLO v. 2.9.5, 2021-08-22
+// MadGraph5_aMC@NLO v. 3.3.1_lo_vect, 2022-01-30
 // By the MadGraph5_aMC@NLO Development Team
 // Visit launchpad.net/madgraph5 and amcatnlo.web.cern.ch
 //==========================================================================

epochX/cudacpp/ee_mumu.auto/src/Parameters_sm.h

@@ -1,6 +1,6 @@
 //==========================================================================
 // This file has been automatically generated for CUDA/C++ standalone by
-// MadGraph5_aMC@NLO v. 2.9.5, 2021-08-22
+// MadGraph5_aMC@NLO v. 3.3.1_lo_vect, 2022-01-30
 // By the MadGraph5_aMC@NLO Development Team
 // Visit launchpad.net/madgraph5 and amcatnlo.web.cern.ch
 //==========================================================================

epochX/cudacpp/ee_mumu/SubProcesses/P1_Sigma_sm_epem_mupmum/CPPProcess.cc

@@ -1,6 +1,6 @@
 //==========================================================================
 // This file has been automatically generated for CUDA/C++ standalone by
-// MadGraph5_aMC@NLO v. 2.9.5, 2021-08-22
+// MadGraph5_aMC@NLO v. 3.3.1_lo_vect, 2022-01-30
 // By the MadGraph5_aMC@NLO Development Team
 // Visit launchpad.net/madgraph5 and amcatnlo.web.cern.ch
 //==========================================================================

epochX/cudacpp/ee_mumu/SubProcesses/P1_Sigma_sm_epem_mupmum/CPPProcess.h

@@ -1,6 +1,6 @@
 //==========================================================================
 // This file has been automatically generated for CUDA/C++ standalone by
-// MadGraph5_aMC@NLO v. 2.9.5, 2021-08-22
+// MadGraph5_aMC@NLO v. 3.3.1_lo_vect, 2022-01-30
 // By the MadGraph5_aMC@NLO Development Team
 // Visit launchpad.net/madgraph5 and amcatnlo.web.cern.ch
 //==========================================================================

epochX/cudacpp/ee_mumu/src/HelAmps_sm.h

@@ -1,6 +1,6 @@
 //==========================================================================
 // This file has been automatically generated for CUDA/C++ standalone by
-// MadGraph5_aMC@NLO v. 2.9.5, 2021-08-22
+// MadGraph5_aMC@NLO v. 3.3.1_lo_vect, 2022-01-30
 // By the MadGraph5_aMC@NLO Development Team
 // Visit launchpad.net/madgraph5 and amcatnlo.web.cern.ch
 //==========================================================================

epochX/cudacpp/ee_mumu/src/Parameters_sm.cc

@@ -1,6 +1,6 @@
 //==========================================================================
 // This file has been automatically generated for CUDA/C++ standalone by
-// MadGraph5_aMC@NLO v. 2.9.5, 2021-08-22
+// MadGraph5_aMC@NLO v. 3.3.1_lo_vect, 2022-01-30
 // By the MadGraph5_aMC@NLO Development Team
 // Visit launchpad.net/madgraph5 and amcatnlo.web.cern.ch
 //==========================================================================

epochX/cudacpp/ee_mumu/src/Parameters_sm.h

@@ -1,6 +1,6 @@
 //==========================================================================
 // This file has been automatically generated for CUDA/C++ standalone by
-// MadGraph5_aMC@NLO v. 2.9.5, 2021-08-22
+// MadGraph5_aMC@NLO v. 3.3.1_lo_vect, 2022-01-30
 // By the MadGraph5_aMC@NLO Development Team
 // Visit launchpad.net/madgraph5 and amcatnlo.web.cern.ch
 //==========================================================================