diff options
| author | Edoardo Pasca <edo.paskino@gmail.com> | 2017-08-23 14:58:44 +0100 |
|---|---|---|
| committer | Edoardo Pasca <edo.paskino@gmail.com> | 2017-08-23 14:58:44 +0100 |
| commit | 111becf92752bf9b9cb6dfe5c3780953570b054c (patch) | |
| tree | dc429e55ce510e020413de63cd55a6a6ea74525f | |
| parent | 74e2b61d107f5871b8e78de3f3d0a503c494e64c (diff) | |
| parent | a15873ea24734c9a2a7c71eed4d106968b406a07 (diff) | |
| download | regularization-111becf92752bf9b9cb6dfe5c3780953570b054c.tar.gz regularization-111becf92752bf9b9cb6dfe5c3780953570b054c.tar.bz2 regularization-111becf92752bf9b9cb6dfe5c3780953570b054c.tar.xz regularization-111becf92752bf9b9cb6dfe5c3780953570b054c.zip | |
Merge branch 'pythonize' of https://github.com/vais-ral/CCPi-FISTA_Reconstruction into pythonize
| -rw-r--r-- | src/Python/setup.py | 4 | ||||
| -rw-r--r-- | src/Python/test_regularizers.py | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/Python/setup.py b/src/Python/setup.py index e6c2dc6..154f979 100644 --- a/src/Python/setup.py +++ b/src/Python/setup.py @@ -47,7 +47,7 @@ setup( description='CCPi Core Imaging Library - FISTA Reconstruction Module', version=cil_version, cmdclass = {'build_ext': build_ext}, - ext_modules = [Extension("regularizers", + ext_modules = [Extension("ccpi.imaging.cpu_regularizers", sources=["fista_module.cpp", "../../main_func/regularizers_CPU/FGP_TV_core.c", "../../main_func/regularizers_CPU/SplitBregman_TV_core.c", @@ -60,5 +60,5 @@ setup( ], zip_safe = False, - packages = {'ccpi','ccpi.reconstruction'}, + packages = {'ccpi','ccpi.fistareconstruction'}, ) diff --git a/src/Python/test_regularizers.py b/src/Python/test_regularizers.py index 5d25f02..755804a 100644 --- a/src/Python/test_regularizers.py +++ b/src/Python/test_regularizers.py @@ -14,7 +14,8 @@ import os from enum import Enum import timeit -from Regularizer import Regularizer +#from Regularizer import Regularizer +from ccpi.imaging.Regularizer import Regularizer ############################################################################### #https://stackoverflow.com/questions/13875989/comparing-image-in-url-to-image-in-filesystem-in-python/13884956#13884956 |