From a15873ea24734c9a2a7c71eed4d106968b406a07 Mon Sep 17 00:00:00 2001
From: Edoardo Pasca <edo.paskino@gmail.com>
Date: Wed, 23 Aug 2017 14:56:08 +0100
Subject: module rename to cpu_regularizers
---
src/Python/setup.py | 4 ++--
src/Python/test_regularizers.py | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
(limited to 'src')
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
--
cgit v1.2.3