Merge remote-tracking branch 'origin/gpucpp' (including gpucpp_fixci mg5amcnlo#132) into valassi_gpucpp_june24

Fix conflicts: madgraph/various/banner.py (keep a debug printout in get_value_from_include)

Author: valassi

.gitignore

@@ -11,6 +11,7 @@ ptest*
 *.pkl
 p_ME_*
 *.log
+.DS_Store
 input/default_run_card_lo.dat
 input/default_run_card_nlo.dat
 input/mg5_configuration.txt

madgraph/interface/madgraph_interface.py

@@ -1534,7 +1534,7 @@ def check_set(self, args, log=True):
 
         if args[0] in ['group_subprocesses']:
             if args[1].lower() not in ['false', 'true', 'auto', 'gpu']:
-                raise self.InvalidCmd('%s needs argument False, True or Auto, got %s' % \
+                raise self.InvalidCmd('%s needs argument False, True, gpu or Auto, got %s' % \
                                       (args[0], args[1]))
         if args[0] in ['ignore_six_quark_processes']:
             if args[1] not in list(self._multiparticles.keys()) and args[1].lower() != 'false':
@@ -2596,11 +2596,13 @@ def complete_set(self, text, line, begidx, endidx):
             return self.list_completion(text, opts)
 
         if len(args) == 2:
-            if args[1] in ['group_subprocesses', 'complex_mass_scheme',\
+            if args[1] in ['complex_mass_scheme',\
                            'loop_optimized_output', 'loop_color_flows',\
                            'include_lepton_initiated_processes',\
                            'low_mem_multicore_nlo_generation', 'nlo_mixed_expansion']:
                 return self.list_completion(text, ['False', 'True', 'default'])
+            elif args[1] in ['group_subprocesses']:
+                return self.list_completion(text, ['False', 'True', 'Auto', 'gpu', 'nlo'])
             elif args[1] in ['ignore_six_quark_processes']:
                 return self.list_completion(text, list(self._multiparticles.keys()))
             elif args[1].lower() == 'ewscheme':

madgraph/iolibs/export_v4.py

@@ -359,9 +359,7 @@ def copy_template(self, model):
                                                               MG_version['version'])
 
         # add the makefile in Source directory 
-        filename = pjoin(self.dir_path,'Source','makefile')
-        self.write_source_makefile(writers.FileWriter(filename))
-
+        # now moved to finalize
 
         self.write_vector_size(writers.FortranWriter('vector.inc'))
 
@@ -476,7 +474,14 @@ def pass_information_from_cmd(self, cmd):
     #===========================================================================
     def finalize(self, matrix_elements, history='', mg5options={}, flaglist=[], second_exporter=None):
         """Function to finalize v4 directory, for inheritance.""" 
-        
+
+        filename = pjoin(self.dir_path,'Source','makefile')
+        if not second_exporter:
+            self.write_source_makefile(writers.FileWriter(filename))
+        else:
+           replace_dict = self.write_source_makefile(None)
+           second_exporter.write_source_makefile(writers.FileWriter(filename), default=replace_dict)  
+
         if second_exporter:
             self.has_second_exporter = second_exporter
 
@@ -725,17 +730,18 @@ def write_source_makefile(self, writer):
         path = pjoin(_file_path,'iolibs','template_files','madevent_makefile_source')
         set_of_lib = ' '.join(['$(LIBRARIES)']+self.get_source_libraries_list())
         if self.opt['model'] == 'mssm' or self.opt['model'].startswith('mssm-'):
-            model_line='''$(LIBDIR)libmodel.$(libext): MODEL param_card.inc\n\tcd MODEL; make
+            model_line='''$(LIBDIR)libmodel.$(libext): MODEL param_card.inc vector.inc\n\tcd MODEL; make
 MODEL/MG5_param.dat: ../Cards/param_card.dat\n\t../bin/madevent treatcards param
 param_card.inc: MODEL/MG5_param.dat\n\t../bin/madevent treatcards param\n'''
         else:
-            model_line='''$(LIBDIR)libmodel.$(libext): MODEL param_card.inc\n\tcd MODEL; make    
+            model_line='''$(LIBDIR)libmodel.$(libext): MODEL param_card.inc vector.inc\n\tcd MODEL; make    
 param_card.inc: ../Cards/param_card.dat\n\t../bin/madevent treatcards param\n'''
 
         replace_dict= {'libraries': set_of_lib, 
                        'model':model_line,
                        'additional_dsample': '',
                        'additional_dependencies':'',
+                       'additional_clean':'',
                        'running': ''} 
 
         if self.opt['running']:
@@ -3024,6 +3030,7 @@ def write_source_makefile(self, writer, model):
                        'model':model_line,
                        'additional_dsample': '',
                        'additional_dependencies':'',
+                       'additional_clean':'',
                        'running': running_line} 
 
         text = open(path).read() % replace_dict
@@ -6308,7 +6315,6 @@ def generate_subprocess_directory(self, subproc_group,
 
             if second_exporter:
                 process_exporter_cpp = second_exporter.oneprocessclass(matrix_element,second_helas, prefix=ime)
-                misc.sprint(process_exporter_cpp)
                 dirpath = '.'
                 with misc.chdir(dirpath):
                     logger.info('Creating files in directory %s' % dirpath)
@@ -6845,7 +6851,15 @@ def finalize(self,*args, second_exporter=None, **opts):
             self.has_second_exporter = second_exporter
         super(ProcessExporterFortranMEGroup, self).finalize(*args, second_exporter=None, **opts)
         #ensure that the grouping information is on the correct value
-        self.proc_characteristic['grouped_matrix'] = True        
+        self.proc_characteristic['grouped_matrix'] = True
+
+        filename = pjoin(self.dir_path,'Source','makefile')
+        if not second_exporter:
+            self.write_source_makefile(writers.FileWriter(filename))
+        else:
+           replace_dict = self.write_source_makefile(None)
+           second_exporter.write_source_makefile(writers.FileWriter(filename), default=replace_dict)  
+
         if second_exporter:
             second_exporter.finalize(*args, **opts)
 

madgraph/iolibs/template_files/madevent_makefile_source

@@ -68,15 +68,14 @@ $(BINDIR)gensudgrid: $(GENSUDGRID) $(LIBDIR)libpdf.$(libext) $(LIBDIR)libgammaUP
 
 # Dependencies
 
-dsample.o: DiscreteSampler.o dsample.f genps.inc StringCast.o
+dsample.o: DiscreteSampler.o dsample.f genps.inc StringCast.o vector.inc
 DiscreteSampler.o: StringCast.o
 invarients.o: invarients.f genps.inc
-setrun.o: setrun.f nexternal.inc leshouche.inc genps.inc
-gen_ximprove.o: gen_ximprove.f run_config.inc run_card.inc
+gen_ximprove.o: gen_ximprove.f run_config.inc run_card.inc 
 #combine_events.o: combine_events.f run_config.inc run_card.inc
 combine_runs.o: combine_runs.f run_config.inc run_card.inc
 select_events.o: select_events.f run_config.inc
-setrun.o: setrun.f nexternal.inc leshouche.inc run_card.inc run_config.inc
+setrun.o: setrun.f nexternal.inc leshouche.inc run_card.inc run_config.inc genps.inc vector.inc
 rw_events.o: rw_events.f run_config.inc
 %(additional_dependencies)s
 run_card.inc: ../Cards/run_card.dat
@@ -116,7 +115,7 @@ $(LIBDIR)libiregi.a: $(IREGIDIR)
 	cd $(IREGIDIR); make
 	ln -sf ../Source/$(IREGIDIR)libiregi.a $(LIBDIR)libiregi.a
 
-clean:
+cleanSource: # Clean builds: fortran in this Source
 	$(RM) *.o $(LIBRARIES) $(BINARIES)
 	cd PDF; make clean; cd ..
 	cd PDF/gammaUPC; make clean; cd ../../
@@ -128,4 +127,8 @@ clean:
 	cd BIAS/ptj_bias; make clean; cd ../..
 	if [ -d $(CUTTOOLSDIR) ]; then cd $(CUTTOOLSDIR); make clean; cd ..; fi
 	if [ -d $(IREGIDIR) ]; then cd $(IREGIDIR); make clean; cd ..; fi
+
+clean: cleanSource # Clean builds: fortran in this Source and in all P*
 	for i in `ls -d ../SubProcesses/P*`; do cd $$i; make clean; cd -; done;
+
+%(additional_clean)s

madgraph/various/banner.py

@@ -3166,13 +3166,9 @@ def get_value_from_include(self, path, list_of_params, output_dir):
         with open(pjoin(output_dir,path), 'r') as fsock:
             text = fsock.read()
 
-        for name in list_of_params:
-            misc.sprint(name, name in self.fortran_name)
-            misc.sprint(self.fortran_name[name] if name in self.fortran_name[name] else name)
         to_track = [self.fortran_name[name] if name in self.fortran_name else name for name in list_of_params]
         pattern = re.compile(r"\(?(%(names)s)\s?=\s?([^)]*)\)?" % {'names':'|'.join(to_track)}, re.I)
         out =  dict(pattern.findall(text))
-        misc.sprint(out)
         for name in list_of_params:
             if name in self.fortran_name:
                 value = out[self.fortran_name[name]]

models/template_files/fortran/makefile_madevent

@@ -41,10 +41,11 @@ $(LIBDIR)$(LIBRARY): $(MODEL)
 clean: 
 	$(RM) *.o $(LIBDIR)$(LIBRARY)
 
-couplings.f: ../maxparticles.inc ../run.inc
+couplings.o: ../maxparticles.inc ../run.inc ../vector.inc
+couplings2.o: ../vector.inc
 
 ../run.inc:
 	touch ../run.inc
 
 ../maxparticles.inc:
-	touch ../maxparticles.inc
+	touch ../maxparticles.inc

models/template_files/fortran/makefile_standalone

@@ -35,7 +35,8 @@ $(LIBDIR)$(LIBRARY): $(MODEL)
 clean: 
 	$(RM) *.o $(LIBDIR)$(LIBRARY)
 
-couplings.f: ../maxparticles.inc ../run.inc ../cuts.inc
+couplings.o: ../maxparticles.inc ../run.inc ../cuts.inc ../vector.inc
+
 
 ../maxparticles.inc:
 	touch ../maxparticles.inc
@@ -47,4 +48,4 @@ couplings.f: ../maxparticles.inc ../run.inc ../cuts.inc
 	echo "        logical fixed_extra_scale" > ../cuts.inc
 	echo "        integer maxjetflavor" >> ../cuts.inc
 	echo "        double precision mue_ref_fixed, mue_over_ref" >> ../cuts.inc
-	
+