ENH: moved all declarations to pxd to workaround coverage bug

saullocastro · Jul 16, 2021 · 22b85af · 22b85af
1 parent a42c73a
commit 22b85af
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/composites/core.pxd b/composites/core.pxd
@@ -1,8 +1,17 @@
 cimport numpy as np
+from libcpp.vector cimport vector
 
 ctypedef np.int64_t cINT
 ctypedef np.double_t cDOUBLE
 
+cdef extern from "math.h":
+    double cos(double t) nogil
+    double sin(double t) nogil
+    double atan(double t) nogil
+
+cdef inline double deg2rad(double thetadeg) nogil:
+    return thetadeg*4*atan(1.)/180.
+
 cdef class LaminationParameters(object):
     cdef public double xiA1, xiA2, xiA3, xiA4
     cdef public double xiB1, xiB2, xiB3, xiB4

diff --git a/composites/core.pyx b/composites/core.pyx
@@ -11,20 +11,10 @@ Composites Core Module (:mod:`composites.core`)
 
 """
 import numpy as np
-cimport numpy as np
-from libcpp.vector cimport vector
 
 INT = np.int64
 DOUBLE = np.float64
 
-cdef extern from "math.h":
-    double cos(double t) nogil
-    double sin(double t) nogil
-    double atan(double t) nogil
-
-cdef double deg2rad(double thetadeg) nogil:
-    return thetadeg*4*atan(1.)/180.
-
 cdef class LaminationParameters(object):
     """Lamination parameters"""
     #xiA lamination parameters for extensional matrix A