cython 3 compatibility fixes (smdogroup#231)

* cython 3 fixes * Fixing minor omissions * Fixing issue w/ int in rbe2 wrapper * Bumping cython build lower bound to 3.0.0 * Update cython req in conda meta.yaml * Moving smeared composite header to cython header files * Remove debug printing for smeared composite test --------- Co-authored-by: Graeme Kennedy <[email protected]>
bburke38 · Jul 28, 2023 · 15804d0 · 15804d0
1 parent 2ca603e
commit 15804d0
Show file tree

Hide file tree

Showing 18 changed files with 1,539 additions and 1,440 deletions.
diff --git a/Makefile b/Makefile
@@ -35,11 +35,11 @@ default:
  fi
  ${CXX} ${SO_LINK_FLAGS} ${TACS_OBJS} ${TACS_EXTERN_LIBS} -o ${TACS_DIR}/lib/libtacs.${SO_EXT}
  @if [ "${TACS_IS_COMPLEX}" = "true" ]; then \
- echo "ctypedef complex TacsScalar" > tacs/TacsTypedefs.pxi; \
+ echo "ctypedef complex TacsScalar" > tacs/cpp_headers/TacsTypedefs.pxi; \
  echo "TACS_NPY_SCALAR = np.NPY_CDOUBLE" > tacs/TacsDefs.pxi; \
  echo "dtype = complex" >> tacs/TacsDefs.pxi; \
  else \
- echo "ctypedef double TacsScalar" > tacs/TacsTypedefs.pxi; \
+ echo "ctypedef double TacsScalar" > tacs/cpp_headers/TacsTypedefs.pxi; \
  echo "TACS_NPY_SCALAR = np.NPY_DOUBLE" > tacs/TacsDefs.pxi; \
  echo "dtype = np.double" >> tacs/TacsDefs.pxi; \
  fi
@@ -60,11 +60,11 @@ debug:
  fi
  ${CXX} ${SO_LINK_FLAGS} ${TACS_OBJS} ${TACS_EXTERN_LIBS} -o ${TACS_DIR}/lib/libtacs.${SO_EXT}
  @if [ "${TACS_IS_COMPLEX}" = "true" ]; then \
- echo "ctypedef complex TacsScalar" > tacs/TacsTypedefs.pxi; \
+ echo "ctypedef complex TacsScalar" > tacs/cpp_headers/TacsTypedefs.pxi; \
  echo "TACS_NPY_SCALAR = np.NPY_CDOUBLE" > tacs/TacsDefs.pxi; \
  echo "dtype = complex" >> tacs/TacsDefs.pxi; \
  else \
- echo "ctypedef double TacsScalar" > tacs/TacsTypedefs.pxi; \
+ echo "ctypedef double TacsScalar" > tacs/cpp_headers/TacsTypedefs.pxi; \
  echo "TACS_NPY_SCALAR = np.NPY_DOUBLE" > tacs/TacsDefs.pxi; \
  echo "dtype = np.double" >> tacs/TacsDefs.pxi; \
  fi

diff --git a/conda/meta.yaml b/conda/meta.yaml
@@ -57,7 +57,7 @@ requirements:
  - metis ==5.1.0
  - tecio
  - mpi4py
- - cython >=0.29,<3.0
+ - cython >=3.0.0
  - setuptools
 
  run:

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,7 +1,7 @@
 #pyproject.toml
 [build-system]
 # Minimum requirements for the build system to execute.
-requires = ['setuptools>=45.0', 'wheel', 'cython>=0.29,<3.0', 'oldest-supported-numpy',
+requires = ['setuptools>=45.0', 'wheel', 'cython>=3.0.0', 'oldest-supported-numpy',
  # Build against an old version (3.1.1) of mpi4py for forward compatibility
  "mpi4py==3.1.1; python_version<'3.11'",
  # Python 3.11 requires 3.1.4+