diff options
| -rw-r--r-- | Core/CMakeLists.txt | 24 | ||||
| -rw-r--r-- | Wrappers/Python/setup-regularizers.py.in | 20 |
2 files changed, 12 insertions, 32 deletions
diff --git a/Core/CMakeLists.txt b/Core/CMakeLists.txt index 4e85002..3f1087c 100644 --- a/Core/CMakeLists.txt +++ b/Core/CMakeLists.txt @@ -24,15 +24,15 @@ 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() +#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() find_package(OpenMP) if (OPENMP_FOUND) @@ -55,7 +55,7 @@ if(WIN32) set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /NODEFAULTLIB:MSVCRT.lib") set (EXTRA_LIBRARIES - ${Boost_LIBRARIES} + #${Boost_LIBRARIES} #"tiff" ) @@ -67,7 +67,7 @@ elseif(UNIX) set (CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS} ${FLAGS}") set (EXTRA_LIBRARIES - ${Boost_LIBRARIES} + #${Boost_LIBRARIES} #"tiff" "gomp" "m" @@ -127,8 +127,6 @@ if (CUDA_FOUND) set(CUDA_NVCC_FLAGS "-Xcompiler -fPIC -shared -D_FORCE_INLINES") message("CUDA FLAGS ${CUDA_NVCC_FLAGS}") CUDA_ADD_LIBRARY(cilregcuda SHARED - ${CMAKE_CURRENT_SOURCE_DIR}/regularizers_GPU/Diffus_HO/Diff4th_GPU_kernel.cu - ${CMAKE_CURRENT_SOURCE_DIR}/regularizers_GPU/NL_Regul/NLM_GPU_kernel.cu ${CMAKE_CURRENT_SOURCE_DIR}/regularizers_GPU/TV_ROF/TV_ROF_GPU_core.cu ${CMAKE_CURRENT_SOURCE_DIR}/regularizers_GPU/TV_FGP/TV_FGP_GPU_core.cu ) diff --git a/Wrappers/Python/setup-regularizers.py.in b/Wrappers/Python/setup-regularizers.py.in index 8655a2e..6e27e08 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" ) , "."] @@ -53,23 +52,6 @@ setup( 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', - version=cil_version, - cmdclass = {'build_ext': build_ext}, ext_modules = [Extension("ccpi.filters.cpu_regularizers_cython", sources=[os.path.join("." , "src", "cpu_regularizers.pyx" ) ], include_dirs=extra_include_dirs, |