diff options
| author | Edoardo Pasca <edo.paskino@gmail.com> | 2017-08-23 14:56:08 +0100 |
|---|---|---|
| committer | Edoardo Pasca <edo.paskino@gmail.com> | 2017-10-11 15:48:33 +0100 |
| commit | c3b58791b906aa6a3b99f32fa5f69a09bb075527 (patch) | |
| tree | b42028634a608bb5c7cfca833b249ba2cd4cf635 | |
| parent | db45d96898f23c3bc97e4c19e834fa976ec301c8 (diff) | |
| download | regularization-c3b58791b906aa6a3b99f32fa5f69a09bb075527.tar.gz regularization-c3b58791b906aa6a3b99f32fa5f69a09bb075527.tar.bz2 regularization-c3b58791b906aa6a3b99f32fa5f69a09bb075527.tar.xz regularization-c3b58791b906aa6a3b99f32fa5f69a09bb075527.zip | |
module rename to cpu_regularizers
| -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 0468722..94467c4 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 |