Skip to content

Commit 4e6b8a2

Browse files
committed
fixed cython interface
1 parent 4d74fc8 commit 4e6b8a2

File tree

8 files changed

+757
-734
lines changed

8 files changed

+757
-734
lines changed

Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ default:
1313
echo "making $@ in $$subdir"; \
1414
echo; (cd $$subdir && $(MAKE) TMR_DIR=${TMR_DIR}) || exit 1; \
1515
done
16-
${CXX} ${SO_LINK_FLAGS} ${TMR_OBJS} ${TMR_EXTERN_LIBS} -o ${TMR_DIR}/lib/libtmr.${SO_EXT}
16+
${CXX} ${SO_LINK_FLAGS} ${TMR_OBJS} ${TMR_EXTERN_LIBS} -o ${TMR_DIR}/lib/libtmr.${SO_EXT}
1717

1818
debug:
1919
echo "Building Real TMR"
@@ -24,7 +24,7 @@ debug:
2424
${CXX} ${SO_LINK_FLAGS} ${TMR_OBJS} ${TMR_EXTERN_LIBS} -o ${TMR_DIR}/lib/libtmr.${SO_EXT}
2525

2626
interface:
27-
${PYTHON} setup.py build_ext --inplace
27+
pip install -e .\[all\]
2828

2929
clean:
3030
${RM} lib/*.a lib/*.so

setup.py

+4-5
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,16 @@
22
from subprocess import check_output
33
import sys
44

5-
# Numpy/mpi4py must be installed prior to installing TACS
5+
# Numpy/mpi4py must be installed prior to installing
66
import numpy
77
import mpi4py
88

99
# Import distutils
10-
from setuptools import setup
10+
from setuptools import setup, find_packages
1111
from distutils.core import Extension as Ext
1212
from Cython.Build import cythonize
1313
from Cython.Compiler import Options
1414

15-
Options.embedsignature = True
1615
Options.docstrings = True
1716

1817

@@ -127,16 +126,16 @@ def get_mpi_flags():
127126

128127
for e in exts:
129128
e.cython_directives = {
130-
"language_level": "3",
131129
"embedsignature": True,
132130
"binding": True,
133131
}
134132

135133
setup(
136134
name="tmr",
137-
version=0.1,
135+
version=1.0,
138136
description="Parallel mesh generation utilities",
139137
author="Graeme J. Kennedy",
140138
author_email="[email protected]",
139+
packages=find_packages(include=["tmr*"]),
141140
ext_modules=cythonize(exts, include_path=inc_dirs),
142141
)

0 commit comments

Comments
 (0)