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

gtsam_unstable as a separate package

release/4.3a0
Matthew Broadway 2019-02-08 15:34:09 +00:00
parent f6af989e67
commit a62197ec6e
5 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cython/CMakeLists.txt
View File

@ -22,19 +22,16 @@ if (GTSAM_INSTALL_CYTHON_TOOLBOX)
set(GTSAM_UNSTABLE_IMPORT "from .gtsam_unstable import *") set(GTSAM_UNSTABLE_IMPORT "from .gtsam_unstable import *")
wrap_and_install_library_cython("../gtsam_unstable/gtsam_unstable.h" # interface_header wrap_and_install_library_cython("../gtsam_unstable/gtsam_unstable.h" # interface_header
"from gtsam.gtsam cimport *" # extra imports "from gtsam.gtsam cimport *" # extra imports
"${GTSAM_CYTHON_INSTALL_PATH}/gtsam" # install path "${GTSAM_CYTHON_INSTALL_PATH}/gtsam_unstable" # install path
gtsam_unstable # library to link with gtsam_unstable # library to link with
"gtsam_unstable;gtsam_unstable_header;cythonize_gtsam" # dependencies to be built before wrapping "gtsam_unstable;gtsam_unstable_header;cythonize_gtsam" # dependencies to be built before wrapping
) )
# for some reasons cython gtsam_unstable can't find gtsam/gtsam.pxd without doing this
file(WRITE ${PROJECT_BINARY_DIR}/cython/gtsam_unstable/__init__.py "")
endif() endif()
# Install the custom-generated __init__.py # Install the custom-generated __init__.py
# This is to make the build/cython/gtsam folder a python package, so gtsam can be found while wrapping gtsam_unstable # This is to make the build/cython/gtsam folder a python package, so gtsam can be found while wrapping gtsam_unstable
configure_file(${PROJECT_SOURCE_DIR}/cython/gtsam/__init__.py.in ${PROJECT_BINARY_DIR}/cython/gtsam/__init__.py)
configure_file(${PROJECT_SOURCE_DIR}/cython/setup.py.in ${PROJECT_BINARY_DIR}/cython/setup.py) configure_file(${PROJECT_SOURCE_DIR}/cython/setup.py.in ${PROJECT_BINARY_DIR}/cython/setup.py)
install_cython_files("${PROJECT_BINARY_DIR}/cython/gtsam/__init__.py" "${GTSAM_CYTHON_INSTALL_PATH}/gtsam") install_cython_files("${PROJECT_BINARY_DIR}/cython/setup.py" "${GTSAM_CYTHON_INSTALL_PATH}/")
# install scripts and tests # install scripts and tests
install_cython_scripts("${PROJECT_SOURCE_DIR}/cython/gtsam" "${GTSAM_CYTHON_INSTALL_PATH}" "*.py") install_cython_scripts("${PROJECT_SOURCE_DIR}/cython/gtsam" "${GTSAM_CYTHON_INSTALL_PATH}" "*.py")

1
cython/gtsam/__init__.py Normal file
View File

@ -0,0 +1 @@
from .gtsam import *

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

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

2
cython/gtsam_unstable/__init__.py Normal file
View File

@ -0,0 +1,2 @@
from .gtsam_unstable import *

10
cython/setup.py.in
View File

@ -1,18 +1,14 @@
import os import os
try: try:
from setuptools import setup from setuptools import setup, find_packages
except ImportError: except ImportError:
from distutils.core import setup from distutils.core import setup, find_packages
packages = ['gtsam', 'gtsam_eigency'] packages = find_packages()
if ${GTSAM_BUILD_UNSTABLE}:
packages += 'gtsam_unstable'
setup( setup(
name='gtsam', name='gtsam',
description='Georgia Tech Smoothing And Mapping library', description='Georgia Tech Smoothing And Mapping library',
url='https://bitbucket.org/gtborg/gtsam', url='https://bitbucket.org/gtborg/gtsam',
version='${GTSAM_VERSION_STRING}', # https://www.python.org/dev/peps/pep-0440/ version='${GTSAM_VERSION_STRING}', # https://www.python.org/dev/peps/pep-0440/