Changeset 663

Timestamp:

01/19/18 23:43:11 (6 years ago)

Author:

dubos

Message:

devel/Python : fix numpy messing up OpenMP

Location:

codes/icosagcm/devel

Files:

• Python/dynamico/__init__.py (modified) (1 diff)
• Python/dynamico/wrap.py (modified) (1 diff)
• Python/src/unstructured.pyx (modified) (3 diffs)
• Python/src/xios.pyx (modified) (2 diffs)
• Python/test/py/test_xios.py (modified) (2 diffs)
• src/unstructured/data_unstructured.F90 (modified) (1 diff)

codes/icosagcm/devel/Python/dynamico/__init__.py

@@ -1 @@
-# import NetCDF before other modules
-import netCDF4
+# import openmp before NetCDF4 numpy because it uses numpy hence MKL and messes up OMP_NUM_PROCS
+import sys
+if 'numpy' in sys.modules:
+    raise ImportError('Module dynamico must be imported before NetCDF/numpy because numpy may mess up OpenMP')
+import libs
+libs.libicosa.dynamico_show_openmp()

codes/icosagcm/devel/Python/dynamico/wrap.py

@@ -38 +38 @@
 
 class SharedLib:
-    def __init__(self,vardict,name,check_args=True, prefix_so='',prefix_py=''):
+    def __init__(self,vardict,lib,check_args=True, prefix_so='',prefix_py=''):
         self.vardict, self.check_args = vardict, check_args
         self.prefix_so, self.prefix_py = prefix_so, prefix_py
-        self.lib=cdll.LoadLibrary(name)
+        self.lib=lib
         self.vars={}
     def import_funs(self,prototypes,prefix=''):

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

@@ -1 +1 @@
 import time
 import math
-import numpy as np
-cimport numpy as np
 import dynamico.wrap as wrap
+from dynamico.libs import libicosa
+
 from ctypes import c_void_p, c_int, c_double, c_bool
 
 #from libc.time cimport time as ctime, time_t
 from numpy cimport ndarray
+cimport numpy as np
 
 #------------- direct Cython interface to DYNAMICO routines -------------#
@@ -39 +40 @@
 
 try:    
-    kernels = wrap.SharedLib(vars(ker), 'libicosa.so', check_args=check_args) 
+    kernels = wrap.SharedLib(vars(ker), libicosa, check_args=check_args) 
     setvar, setvars, getvar, getvars = kernels.setvar, kernels.setvars, kernels.getvar, kernels.getvars
 except OSError:
@@ -291 +292 @@
 # i.e. index[start:end] with start=vtxdist[cell], end=vtxdist[cell+1] lists the edges of cell 'cell'
 
+import numpy as np
+
 def list_stencil(degree, stencil, cond=lambda x:True):
     for i in range(degree.size):

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

@@ +1 @@
+from dynamico.libs import libxios
+import dynamico.wrap as wrap
 import numpy as np
-import dynamico.wrap as wrap
+
 from ctypes import c_int, c_double, c_bool, c_void_p, c_char_p, byref, POINTER, Structure
 c_void_pp=POINTER(c_void_p) # used in prototype
@@ -35 +37 @@
 
 lib=wrap.Struct()
-cxios = wrap.SharedLib(vars(lib), "libxios.so", prefix_so='cxios_')
+cxios = wrap.SharedLib(vars(lib), libxios, prefix_so='cxios_')
 
 class Duration(Structure):

codes/icosagcm/devel/Python/test/py/test_xios.py

@@ +1 @@
+#print 'import dynamico'
+#import dynamico
+print 'import dynamico.unstructured'
+import dynamico.unstructured as unst
+print 'import dynamico.xios'
+import dynamico.xios as xios
+print 'Done.'
+from dynamico.meshes import MPAS_Mesh as Mesh, radian
+
 from mpi4py import MPI
 comm = MPI.COMM_WORLD
@@ -5 +14 @@
 
 import numpy as np
-print 'import dynamico.unstructured'
-import dynamico.unstructured as unst
-print 'import dynamico.xios'
-import dynamico.xios as xios
-print 'Done.'
-from dynamico.meshes import MPAS_Mesh as Mesh, radian
 
 def boundaries(degree,points,lon,lat):

codes/icosagcm/devel/src/unstructured/data_unstructured.F90

@@ -188 +188 @@
     PRINT *,' ... Done.'
     IF(nb_threads==0) nb_threads=OMP_GET_MAX_THREADS()
-    PRINT *,'OpenMP : max_threads, num_procs, nb_threads', OMP_GET_MAX_THREADS(), omp_get_num_procs(), nb_threads
-
+    PRINT *,'OpenMP : max_threads, num_procs, nb_threads', OMP_GET_MAX_THREADS(), OMP_GET_NUM_PROCS(), nb_threads
   END SUBROUTINE init_metric
+  !
+  SUBROUTINE show_openmp() BINDC(show_openmp)
+    PRINT *,'OpenMP : max_threads, num_procs', OMP_GET_MAX_THREADS(), OMP_GET_NUM_PROCS()
+  END SUBROUTINE show_openmp
   !
   SUBROUTINE init_params() BINDC(init_params)