Changeset 802 for codes/icosagcm/devel/Python/src

Timestamp:

01/21/19 11:34:04 (5 years ago)

Author:

dubos

Message:

devel/unstructured : reduced, configurable log output

Location:

codes/icosagcm/devel/Python/src

Files:

• cxios.pyx (modified) (3 diffs)
• unstructured.pyx (modified) (6 diffs)

codes/icosagcm/devel/Python/src/cxios.pyx

@@ -6 +6 @@
 c_void_pp=POINTER(c_void_p) # used in prototype
 c_void_p_byref=type(byref(c_void_p())) # used in py2c because byref creates an object of this type, not c_void_pp
+
+import getargs
+log_master, log_world = getargs.getLogger(__name__)
+INFO, DEBUG, ERROR = log_master.info, log_master.debug, log_world.error
+INFO_ALL, DEBUG_ALL = log_world.info, log_world.debug
 
 # ------------- Direct cython interfaces ----------------- #
@@ -44 +49 @@
     _fields_ = [(name, c_int) for name in ('year', 'month', 'day', 'hour', 'minute', 'second') ]
 
-print Duration.from_param
-
 for x in c_void_p_byref, Duration, Date : wrap.py2c[x]=wrap.noop # accept arguments of type (void*)&, Duration, ...
 
@@ -78 +81 @@
             else:
                 raise(TypeError)
-            print self.id+'.'+prefix+key, type(value), extra
+            DEBUG('%s.%s %s %s' % (self.id, prefix+key, type(value), extra) )
     def update_timestep(self):
         lib.update_calendar_timestep(self.handle)

codes/icosagcm/devel/Python/src/unstructured.pyx

@@ -9 +9 @@
 cimport numpy as np
 import numpy as np
+
+import getargs
+log_master, log_world = getargs.getLogger(__name__)
+INFO, DEBUG, ERROR = log_master.info, log_master.debug, log_world.error
+INFO_ALL, DEBUG_ALL = log_world.info, log_world.debug
 
 #--------------   choose precision of kernel computations  ------------#
@@ -58 +63 @@
 
 try:    
-    kernels = wrap.SharedLib(vars(ker), libicosa, check_args=check_args) 
-    setvar, setvars, getvar, getvars = kernels.setvar, kernels.setvars, kernels.getvar, kernels.getvars
+   kernels = wrap.SharedLib(vars(ker), libicosa, check_args=check_args) 
+   setvar, setvars, getvar, getvars = kernels.setvar, kernels.setvars, kernels.getvar, kernels.getvars
 except OSError:
-    print """
-Unable to load shared library 'libicosa.so' !
-    """
-    raise
+   ERROR("Unable to load shared library 'libicosa.so' !")
+   raise
 
 # providing a full prototype enables type-checking when calling
@@ -90 +93 @@
 
 kernels.addvars(
-    c_bool,'hydrostatic','debug_hevi_solver',
+    c_bool,'hydrostatic','debug_hevi_solver', 'is_mpi_master',
     c_int,'llm','nqdyn','primal_num','max_primal_deg',
     'dual_num','max_dual_deg','edge_num','max_trisk_deg',
-    'caldyn_thermo','caldyn_eta','nb_threads','dynamico_mpi_rank',
+    'caldyn_thermo','caldyn_eta','nb_threads',
     c_double,'elapsed',
     c_num, 'g', 'ptop', 'cpp', 'cppv',
@@ -119 +122 @@
     return data
 
-cdef check_ptr(name, num_ptr p, ndarray data):
-    if p != ptr(data) : print name, 'p <> ptr(data) !!'
-        
 cdef class Caldyn_step:
     # number of time steps to do at each invocation of advance()
@@ -300 +300 @@
               Ai, Av, fv, le_de, Riv2, wee):
 
-    print 'Types of Ai, Av, fv, le_de, Riv2, wee : ', Ai.dtype,Av.dtype,fv.dtype,le_de.dtype,Riv2.dtype,wee.dtype
+    DEBUG('Types of Ai, Av, fv, le_de, Riv2, wee : %s' % 
+          ((Ai.dtype,Av.dtype,fv.dtype,le_de.dtype,Riv2.dtype,wee.dtype),) )
     for var,varname in zip((Ai,Av,fv,le_de,Riv2,wee), ('Ai','Av','fv','le_de','Riv2','wee')):
         assert var.dtype == np.float64, '%s must be double precision'%varname
@@ -308 +309 @@
              (llm, nqdyn, edge_num, primal_num, dual_num, 
               max_trisk_deg, max_primal_deg, max_dual_deg) )        
-    print('init_mesh ...')
+    INFO('init_mesh ...')
     ker.dynamico_init_mesh(primal_nb,primal_edge,primal_ne,
               dual_nb,dual_edge,dual_ne,dual_vertex,
               left,right,down,up,trisk_deg,trisk)
-    print ('...done')
-    print('init_metric ...')
+    INFO('...done')
+    INFO('init_metric ...')
     ker.dynamico_init_metric(Ai,Av,fv,le_de,Riv2,wee)
-    print ('...done')
+    INFO('...done')
 
 #------------------------ Mesh partitioning ------------------------