Changeset 932

Timestamp:

07/02/19 15:05:16 (5 years ago)

Author:

dubos

Message:

devel/Python : automatic inference of Numba spec - signature is now obsolete

Location:

codes/icosagcm/devel/Python/dynamico/dev

Files:

• meshes.py (modified) (1 diff)
• numba.py (modified) (1 diff)

codes/icosagcm/devel/Python/dynamico/dev/meshes.py

@@ -9 +9 @@
 
 class MeshData(numba.NumbaData):
-    signature=(int64,      'primal_num dual_num edge_num',
-               int32[:],   'primal_deg left right',
-               int32[:,:], 'primal_edge primal_ne',
-               float64[:], 'le_de le de lon_e lat_e lon_v lat_v Ai Av')
     def to_dynamico(self):
         max_primal_deg, max_dual_deg, max_trisk_deg = [x.shape[1] for x in self.primal_edge, self.dual_edge, self.trisk]

codes/icosagcm/devel/Python/dynamico/dev/numba.py

@@ -10 +10 @@
     def data(self):
         """Returns a jitclass instance containing attributes copied from self, using self.signature which is of the form type,names,type,names ... where names is a string 'attr1 attr2 attr3' containing space-separated names of attributes of self. Those attributes are declared to numba with the type preceding them. The result of data() can be used as argument to a @jit function."""
+        cls = self.__class__.__name__
         spec = []
-        for item in self.signature:
-            if isinstance(item,str): 
-                spec = spec + [(name,thetype) for name in item.split(' ')]
-            else:
-                thetype=item
+        for name in dir(self):
+            attr = getattr(self,name)
+            if not name.startswith('__') and not callable(attr):
+                tp = None
+                if isinstance(attr, int): tp=int64
+                if isinstance(attr, float): tp=float64
+                if isinstance(attr, np.ndarray):
+                    dtype=attr.dtype
+                    if dtype == np.int32 : dtype=int32
+                    elif dtype == np.float64 : dtype=float64
+                    else: dtype=None
+                    if dtype is None: print('Unknown dtype ', attr.dtype)
+                        
+                    if   len(attr.shape)==1 : tp = dtype[:]
+                    elif len(attr.shape)==2 : tp = dtype[:,:]
+                    elif len(attr.shape)==3 : tp = dtype[:,:,:]
+                    else: print('%s.%s is a numpy array with unsupported rank >3'%(cls,name))
+                        
+                if tp is None:
+                    print('Type of attribute %s.%s is not recognized'%(cls,name), type(attr))
+                else:
+                    spec.append( (name, tp) )
+        
         @numba.jitclass(spec)
         class JitClass(object):
             def __init__(self): pass
+
         data=JitClass()
         for name,thetype in spec: 
-            print( 'Copying to %s.%s : '%(self.__class__.__name__, name), type(getattr(self,name)))
+            print( 'Making %s.%s available @jit functions : '%(self.__class__.__name__, name), type(getattr(self,name)))
             setattr(data, name, getattr(self,name))
         return data