diff options
| author | Daniil Kazantsev <dkazanc3@googlemail.com> | 2018-04-06 11:08:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-06 11:08:52 +0100 |
| commit | 2e9d7e5df33c3c042b2a55ae4c9fe23b15f95019 (patch) | |
| tree | ec24c21edd374246f2fa762337fa7f612d158885 /Wrappers | |
| parent | 1f30c56fa1de2f38ded54d3c2bd988645cdb2ea5 (diff) | |
| parent | 99d84e408cdf0905996fb3632b7d006c6e6da805 (diff) | |
| download | regularization-2e9d7e5df33c3c042b2a55ae4c9fe23b15f95019.tar.gz regularization-2e9d7e5df33c3c042b2a55ae4c9fe23b15f95019.tar.bz2 regularization-2e9d7e5df33c3c042b2a55ae4c9fe23b15f95019.tar.xz regularization-2e9d7e5df33c3c042b2a55ae4c9fe23b15f95019.zip | |
Merge pull request #45 from vais-ral/remove_boost
Remove boost
Diffstat (limited to 'Wrappers')
| -rw-r--r-- | Wrappers/Python/CMakeLists.txt | 36 | ||||
| -rw-r--r-- | Wrappers/Python/conda-recipe/meta.yaml | 6 | ||||
| -rw-r--r-- | Wrappers/Python/setup-regularizers.py.in | 23 |
3 files changed, 6 insertions, 59 deletions
diff --git a/Wrappers/Python/CMakeLists.txt b/Wrappers/Python/CMakeLists.txt index 16a2137..eb3bac7 100644 --- a/Wrappers/Python/CMakeLists.txt +++ b/Wrappers/Python/CMakeLists.txt @@ -24,15 +24,6 @@ if (PYTHONINTERP_FOUND) endif() endif() -find_package(Boost REQUIRED - COMPONENTS ${BOOST_PYTHON} ${BOOST_NUMPY}) - -if (Boost_FOUND) - message("Boost version " ${Boost_VERSION}) - message("Boost include dir " ${Boost_INCLUDE_DIRS}) - message("Boost library dir " ${Boost_LIBRARY_DIRS}) - message("Boost libraries " ${Boost_LIBRARIES}) -endif() ## Build the regularizers package as a library message("Creating Regularizers as shared library") @@ -46,7 +37,7 @@ if(WIN32) set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /NODEFAULTLIB:MSVCRT.lib") set (EXTRA_LIBRARIES - ${Boost_LIBRARIES} + #${Boost_LIBRARIES} #"tiff" ) @@ -55,35 +46,12 @@ if(WIN32) elseif(UNIX) set (FLAGS "-fopenmp -O2 -funsigned-char -Wall -Wl,--no-undefined -DCCPiReconstructionIterative_EXPORTS -std=c++0x") set (EXTRA_LIBRARIES - ${Boost_LIBRARIES} + #${Boost_LIBRARIES} #"tiff" "gomp" ) endif() - -if (WIN32) - list(GET Boost_LIBRARIES 0 place ) - get_filename_component(BOOST_PYTHON_LIB ${place} NAME_WE ) - list(GET Boost_LIBRARIES 1 place ) - get_filename_component(BOOST_NUMPY_LIB ${place} NAME_WE ) -else() - # on linux the library looks like libboost_numpy3.so: - # we need to get rid of the lib at the beginning - list(GET Boost_LIBRARIES 0 place ) - get_filename_component(place2 ${place} NAME_WE ) - string(REGEX REPLACE "^lib(.*)" "\\1" BOOST_PYTHON_LIB "${place2}") - - list(GET Boost_LIBRARIES 1 place ) - get_filename_component(place2 ${place} NAME_WE ) - string(REGEX REPLACE "^lib(.*)" "\\1" BOOST_NUMPY_LIB "${place2}") -endif() - -message ("found " ${BOOST_PYTHON_LIB}) -message ("found " ${BOOST_NUMPY_LIB}) - - - # GPU Regularizers find_package(CUDA) diff --git a/Wrappers/Python/conda-recipe/meta.yaml b/Wrappers/Python/conda-recipe/meta.yaml index fb88ab8..f4cb471 100644 --- a/Wrappers/Python/conda-recipe/meta.yaml +++ b/Wrappers/Python/conda-recipe/meta.yaml @@ -14,8 +14,8 @@ requirements: - python - numpy x.x - setuptools - - boost ==1.64.0 - - boost-cpp ==1.64.0 + #- boost ==1.64.0 + #- boost-cpp ==1.64.0 - cython - cil_regularizer - vc 14 # [win and py35] @@ -25,7 +25,7 @@ requirements: run: - python - numpy x.x - - boost ==1.64 + #- boost ==1.64 - cil_regularizer - vc 14 # [win and py35] - vc 9 # [win and py27] diff --git a/Wrappers/Python/setup-regularizers.py.in b/Wrappers/Python/setup-regularizers.py.in index 8655a2e..0811372 100644 --- a/Wrappers/Python/setup-regularizers.py.in +++ b/Wrappers/Python/setup-regularizers.py.in @@ -34,8 +34,7 @@ extra_libraries = ['cilreg'] extra_include_dirs += [os.path.join(".." , ".." , "Core"), os.path.join(".." , ".." , "Core", "regularizers_CPU"), - os.path.join(".." , ".." , "Core", "regularizers_GPU" , "Diffus_HO" ) , - os.path.join(".." , ".." , "Core", "regularizers_GPU" , "NL_Regul" ) , + os.path.join(".." , ".." , "Core", "regularizers_GPU" , "TV_FGP" ) , os.path.join(".." , ".." , "Core", "regularizers_GPU" , "TV_ROF" ) , "."] @@ -45,26 +44,6 @@ else: extra_compile_args = ['-fopenmp','-O2', '-funsigned-char', '-Wall', '-std=c++0x'] extra_libraries += [@EXTRA_OMP_LIB@] -extra_libraries += ["@BOOST_PYTHON_LIB@", "@BOOST_NUMPY_LIB@"] - - -setup( - name='ccpi', - description='CCPi Core Imaging Library - Image Regularizers', - version=cil_version, - cmdclass = {'build_ext': build_ext}, - ext_modules = [Extension("ccpi.filters.cpu_regularizers_boost", - sources=[os.path.join("." , "src", "cpu_regularizers.cpp" )], - include_dirs=extra_include_dirs, - library_dirs=extra_library_dirs, - extra_compile_args=extra_compile_args, - libraries=extra_libraries ), - - ], - zip_safe = False, - packages = {'ccpi','ccpi.filters'}, -) - setup( name='ccpi', description='CCPi Core Imaging Library - Image Regularizers', |