Changeset 401

Timestamp:

Aug 26, 2014, 4:11:33 PM (10 years ago)

Author:

cfuguet

Message:

genmap: importing dynamically the applications module

• Adding option in the genmap script to only generate the hard_config.h file.

• Importing dynamically the applications module to avoid errors when these modules are not needed and then not defined.

Location:

soft/giet_vm

Files:

• convol/convol.py (modified) (1 diff)
• giet_python/genmap (modified) (5 diffs)

soft/giet_vm/convol/convol.py

@@ -99 +99 @@
             for p in xrange( procs_max ):
                 trdid = (((x * y_size) + y) * procs_max) + p
-                mapping.addTask( vspace, 'sort_%d_%d_%d' % (x,y,p), trdid, x, y, p,
+                mapping.addTask( vspace, 'conv_%d_%d_%d' % (x,y,p), trdid, x, y, p,
                                  'conv_stack_%d_%d_%d' % (x,y,p),
                                  'conv_heap_%d_%d' % (x,y), 0 )

soft/giet_vm/giet_python/genmap

@@ -32 +32 @@
 
 from optparse import OptionParser
-
 from mapping import *
-
-from transpose import *
-from sort import *
-from convol import *
 
 import sys
@@ -75 +70 @@
                    help = 'define pathname for the map.bin & vsegs.ld file ' )
 
+parser.add_option( '--hard', type = 'string', dest = 'hard_path',
+                   help = 'define pathname for the hard_config.h file ' )
+
 parser.add_option( '--xml', type = 'string', dest = 'xml_path', 
                    help = 'define pathname for the map.xml file' )
@@ -107 +105 @@
 almos_path    = options.almos_path  # path for arch.bib file
 giet_path     = options.giet_path   # path for map.bin & vsegs.ld files
+hard_path     = options.hard_path   # path for the hard_config.h file
 
 arch_path     = options.arch_path   # path to selected architecture
@@ -138 +137 @@
 ######################################################################################
 
-if ( map_transpose ): 
-    transpose( mapping )
+if ( map_transpose ):
+    app = __import__( 'transpose' )
+    app.transpose( mapping )
     print '[genmap] application "transpose" loaded'
 
 if ( map_sort ):      
-    sort( mapping )
+    app = __import__( 'sort' )
+    app.sort( mapping )
     print '[genmap] application "sort" loaded'
 
 if ( map_convol ):      
-    convol( mapping )
+    app = __import__( 'convol' )
+    app.convol( mapping )
     print '[genmap] application "convol" loaded'
 
@@ -205 +207 @@
     print '[genmap] %s generated for giet_vm' % pathname
 
+######################################################################################
+#   Generate hard_config.h file if required.
+######################################################################################
+
+if ( hard_path != None ):
+
+    pathname = hard_path + '/hard_config.h'
+    f = open ( pathname, 'w' )
+    f.write( mapping.hard_config() )
+    print '[genmap] %s generated for %s' % (pathname, arch_path)
+