diff options
| author | Edoardo Pasca <edo.paskino@gmail.com> | 2018-04-04 12:18:32 +0100 |
|---|---|---|
| committer | Edoardo Pasca <edo.paskino@gmail.com> | 2018-04-04 12:18:32 +0100 |
| commit | 5cf5f284a8fe001c08cdbffb466130dfe4e22882 (patch) | |
| tree | 0625b4452cf6f2b898661342e05c8e6f0369d4e9 /Wrappers/Python | |
| parent | d7daee3a30e7550e5220040736c96d088beef644 (diff) | |
| download | regularization-5cf5f284a8fe001c08cdbffb466130dfe4e22882.tar.gz regularization-5cf5f284a8fe001c08cdbffb466130dfe4e22882.tar.bz2 regularization-5cf5f284a8fe001c08cdbffb466130dfe4e22882.tar.xz regularization-5cf5f284a8fe001c08cdbffb466130dfe4e22882.zip | |
Fixed GPU regularizer includes, remove boost dependency
Diffstat (limited to 'Wrappers/Python')
| -rw-r--r-- | Wrappers/Python/setup-regularizers.py.in | 20 |
1 files changed, 1 insertions, 19 deletions
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, |