Changeset 663 for codes/icosagcm/devel/Python/src/unstructured.pyx

Timestamp:

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

Author:

dubos

Message:

devel/Python : fix numpy messing up OpenMP

File:

• codes/icosagcm/devel/Python/src/unstructured.pyx (modified) (3 diffs)

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):