[oct23av] in CODEGEN, improve formatting and add an optional CUDACPPRunCard, but this does not solve code generation

Author: valassi

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

@@ -23,22 +23,15 @@
     import madgraph.various.banner as banner_mod
 
 class CPPMEInterface(madevent_interface.MadEventCmdShell):
-    
     def compile(self, *args, **opts):
         """ """
-        
         import multiprocessing
         if not self.options['nb_core'] or self.options['nb_core'] == 'None':
             self.options['nb_core'] = multiprocessing.cpu_count()
-    
         if args and args[0][0] == 'madevent' and hasattr(self, 'run_card'):
             import pathlib
             import os
             pjoin = os.path.join
-            
-
-
-            
             cudacpp_backend = self.run_card['cudacpp_backend'].upper() # the default value is defined in banner.py
             logger.info("Building madevent in madevent_interface.py with '%s' matrix elements"%cudacpp_backend)
             if cudacpp_backend == 'FORTRAN':
@@ -54,15 +47,12 @@ def compile(self, *args, **opts):
             return misc.compile(nb_core=self.options['nb_core'], *args, **opts)
 
 class CPPRunCard(banner_mod.RunCardLO):
-
     def reset_simd(self, old_value, new_value, name):
         if not hasattr(self, 'path'):
             raise Exception
-
         if name == "vector_size" and new_value <= int(old_value):
             # code can handle the new size -> do not recompile
             return
-        
         Sourcedir = pjoin(os.path.dirname(os.path.dirname(self.path)), 'Source')
         subprocess.call(['make', 'cleanavx'], cwd=Sourcedir, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
 
@@ -72,33 +62,31 @@ def plugin_input(self, finput):
     def default_setup(self):
         super().default_setup()
         self.add_param('cudacpp_backend', 'CPP', include=False, hidden=False)
-        
 
     def write_one_include_file(self, output_dir, incname, output_file=None):
         """write one include file at the time"""
-
         if incname == "vector.inc" and 'vector_size' not in self.user_set:
             return
         super().write_one_include_file(output_dir, incname, output_file)
 
-
     def check_validity(self):
         """ensure that PLUGIN information are consistent"""
-        
         super().check_validity()
-
         if self['SDE_strategy'] != 1:
             logger.warning('SDE_strategy different of 1 is not supported with SMD/GPU mode')
             self['sde_strategy'] = 1
-
         if self['hel_recycling']:
             self['hel_recycling'] = False
 
 class GPURunCard(CPPRunCard):
-
     def default_setup(self):
         super(CPPRunCard, self).default_setup()
         self.add_param('cudacpp_backend', 'CUDA', include=False, hidden=False)
-        
+
+#class CUDACPPRunCard(CPPRunCard):
+#    def default_setup(self):
+#        super(CPPRunCard, self).default_setup()
+#        self.add_param('cudacpp_backend', 'CPP', include=False, hidden=False)
+
 MEINTERFACE = CPPMEInterface
 RunCard = CPPRunCard

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

@@ -272,11 +272,11 @@ def add_madevent_plugin_fct(self):
         plugin_path = os.path.dirname(os.path.realpath( __file__ ))
         ###files.cp(pjoin(plugin_path, 'plugin_interface.py'), pjoin(self.dir_path, 'bin', 'internal')) # AV FIXME (added by OM, but file is missing?)
         files.cp(pjoin(plugin_path, 'launch_plugin.py'), pjoin(self.dir_path, 'bin', 'internal'))
-        files.ln( pjoin(self.dir_path, 'lib'),  pjoin(self.dir_path, 'SubProcesses'))
+        files.ln(pjoin(self.dir_path, 'lib'),  pjoin(self.dir_path, 'SubProcesses'))
 
 #------------------------------------------------------------------------------------
-class SIMD_ProcessExporter(PLUGIN_ProcessExporter):
 
+class SIMD_ProcessExporter(PLUGIN_ProcessExporter):
     def change_output_args(args, cmd):
         """ """
         cmd._export_format = "madevent"
@@ -285,11 +285,10 @@ def change_output_args(args, cmd):
         if 'vector_size' not in ''.join(args):
             args.append('--vector_size=16')
         return args
-
-        
-    
-class GPU_ProcessExporter(PLUGIN_ProcessExporter):
 
+#------------------------------------------------------------------------------------
+
+class GPU_ProcessExporter(PLUGIN_ProcessExporter):    
     def change_output_args(args, cmd):
         """ """
         cmd._export_format = "madevent"
@@ -300,11 +299,12 @@ def change_output_args(args, cmd):
         return args
 
     def finalize(self, matrix_element, cmdhistory, MG5options, outputflag):
-
         misc.sprint("enter dedicated function")
         out = super().finalize(matrix_element, cmdhistory, MG5options, outputflag)
-        #change RunCard class to have default for GPU
+        # OM change RunCard class to have default for GPU
         text = open(pjoin(self.dir_path, 'bin', 'internal', 'launch_plugin.py'), 'r').read()
         text = text.replace('RunCard = CPPRunCard', 'RunCard = GPURunCard')
         open(pjoin(self.dir_path, 'bin', 'internal', 'launch_plugin.py'), 'w').write(text)
         return out
+
+#------------------------------------------------------------------------------------