12345qiupeng
/
gtsam
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

improved cython wrapper python3 support

release/4.3a0
Matthew Broadway 2019-01-08 10:28:19 +00:00
parent 435762ca81
commit 5670c73158
4 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/FindCython.cmake
View File

@ -32,7 +32,7 @@
find_package( PythonInterp ) find_package( PythonInterp )
if ( PYTHONINTERP_FOUND ) if ( PYTHONINTERP_FOUND )
execute_process( COMMAND "${PYTHON_EXECUTABLE}" "-c" execute_process( COMMAND "${PYTHON_EXECUTABLE}" "-c"
"import Cython; print Cython.__path__" "import Cython; print(Cython.__path__[0])"
RESULT_VARIABLE RESULT RESULT_VARIABLE RESULT
OUTPUT_VARIABLE CYTHON_PATH OUTPUT_VARIABLE CYTHON_PATH
OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_STRIP_TRAILING_WHITESPACE
@ -51,7 +51,7 @@ endif ()
# RESULT=0 means ok # RESULT=0 means ok
if ( NOT RESULT ) if ( NOT RESULT )
execute_process( COMMAND "${PYTHON_EXECUTABLE}" "-c" execute_process( COMMAND "${PYTHON_EXECUTABLE}" "-c"
"import Cython; print Cython.__version__" "import Cython; print(Cython.__version__)"
RESULT_VARIABLE RESULT RESULT_VARIABLE RESULT
OUTPUT_VARIABLE CYTHON_VAR_OUTPUT OUTPUT_VARIABLE CYTHON_VAR_OUTPUT
ERROR_VARIABLE CYTHON_VAR_OUTPUT ERROR_VARIABLE CYTHON_VAR_OUTPUT

2
cython/gtsam/__init__.py.in
View File

@ -1,2 +1,2 @@
from gtsam import * from .gtsam import *
${GTSAM_UNSTABLE_IMPORT} ${GTSAM_UNSTABLE_IMPORT}

4
wrap/Module.cpp
View File

@ -394,6 +394,10 @@ void Module::emit_cython_pxd(FileWriter& pxdFile) const {
/* ************************************************************************* */ /* ************************************************************************* */
void Module::emit_cython_pyx(FileWriter& pyxFile) const { void Module::emit_cython_pyx(FileWriter& pyxFile) const {
// directives...
// allow str to automatically coerce to std::string and back (for python3)
pyxFile.oss << "# cython: c_string_type=str, c_string_encoding=ascii\n\n";
// headers... // headers...
string pxdHeader = name; string pxdHeader = name;
pyxFile.oss << "cimport numpy as np\n" pyxFile.oss << "cimport numpy as np\n"

2
wrap/tests/expected-cython/geometry.pyx
View File

@ -1,3 +1,5 @@
# cython: c_string_type=str, c_string_encoding=ascii
cimport numpy as np cimport numpy as np
import numpy as npp import numpy as npp
cimport geometry cimport geometry