fixed cython interface to import python module

smdogroup · Mar 7, 2024 · 429933a · 429933a
1 parent fe14705
commit 429933a
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 6 deletions.
diff --git a/tmr/TMR.pxd b/tmr/TMR.pxd
@@ -27,7 +27,6 @@ import numpy as np
 
 # Import TACS
 from tacs import TACS
-from tacs cimport TACS
 from tacs.TACS import Vec, VecInterp, Assembler, Mg, Element, Function, Pc
 from tacs.TACS cimport (
     Vec,

diff --git a/tmr/TMR.pyx b/tmr/TMR.pyx
@@ -43,6 +43,8 @@ from cpython cimport PyObject, Py_INCREF
 # Import all of the TMR header files
 from tmr.cpp_headers.TMR cimport *
 
+from tacs import TACS
+
 cdef tmr_init():
     if not TMRIsInitialized():
         TMRInitialize()

diff --git a/tmr/cpp_headers/TMR.pxd b/tmr/cpp_headers/TMR.pxd
@@ -30,11 +30,27 @@ from libc.stdint cimport int32_t, int16_t
 cimport numpy as np
 import numpy as np
 
-# Import TACS
-from paropt.cpp_headers.ParOpt cimport *
-from tacs.cpp_headers.TACS cimport *
-from tacs.cpp_headers.constitutive cimport *
-from egads4py.egads cimport *
+# Import the definitions from the headers
+from paropt.cpp_headers.ParOpt cimport ParOptScalar, ParOptVec, ParOptProblem
+from tacs.cpp_headers.TACS cimport (
+    TacsScalar,
+    TACSAssembler,
+    TACSElement,
+    TACSFunction,
+    TACSBVec,
+    TACSBVecInterp,
+    TACSMg,
+    OrderingType,
+    ElementType,
+    JDRecycleType,
+    JD_NUM_RECYCLE,
+)
+from tacs.cpp_headers.constitutive cimport (
+    TACSMaterialProperties,
+    TACSPlaneStressConstitutive,
+    TACSSolidConstitutive,
+)
+from egads4py.egads cimport ego
 
 cdef extern from "TMRBase.h":
     enum: