From 99e5fec9999a5f00e31a567df7dd98cd69e30880 Mon Sep 17 00:00:00 2001
From: algol <dkazanc@hotmail.com>
Date: Thu, 22 Feb 2018 15:27:33 +0000
Subject: some changes

---
 Wrappers/Python/ccpi/reconstruction/algs.py | 2 +-
 Wrappers/Python/ccpi/reconstruction/ops.py  | 2 +-
 Wrappers/Python/conda-recipe/build.sh       | 2 +-
 Wrappers/Python/setup.py                    | 2 +-
 Wrappers/Python/test/DemoRecIP.py           | 6 +++---
 5 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'Wrappers/Python')

diff --git a/Wrappers/Python/ccpi/reconstruction/algs.py b/Wrappers/Python/ccpi/reconstruction/algs.py
index bfe9570..d957298 100644
--- a/Wrappers/Python/ccpi/reconstruction/algs.py
+++ b/Wrappers/Python/ccpi/reconstruction/algs.py
@@ -20,7 +20,7 @@
 import numpy
 import time
 
-from funcs import BaseFunction
+from ccpi.reconstruction.funcs import BaseFunction
 
 def FISTA(x_init, f=None, g=None, opt=None):
 
diff --git a/Wrappers/Python/ccpi/reconstruction/ops.py b/Wrappers/Python/ccpi/reconstruction/ops.py
index 00a4a3c..e20e78d 100644
--- a/Wrappers/Python/ccpi/reconstruction/ops.py
+++ b/Wrappers/Python/ccpi/reconstruction/ops.py
@@ -2,7 +2,7 @@
 import numpy as np
 import astra
 from scipy.sparse.linalg import svds
-from framework import DataSet, VolumeData, SinogramData, DataSetProcessor
+from ccpi.framework import DataSet, VolumeData, SinogramData, DataSetProcessor
 
 # Maybe operators need to know what types they take as inputs/outputs
 # to not just use generic DataSet
diff --git a/Wrappers/Python/conda-recipe/build.sh b/Wrappers/Python/conda-recipe/build.sh
index 0c6ad30..5dd97b0 100644
--- a/Wrappers/Python/conda-recipe/build.sh
+++ b/Wrappers/Python/conda-recipe/build.sh
@@ -5,5 +5,5 @@ fi
 mkdir ${SRC_DIR}/ccpi
 cp -r "${RECIPE_DIR}/../../../" ${SRC_DIR}/ccpi
 
-cd ${SRC_DIR}/ccpi/Wrappers/python
+cd ${SRC_DIR}/ccpi/Wrappers/Python
 $PYTHON setup.py install
diff --git a/Wrappers/Python/setup.py b/Wrappers/Python/setup.py
index 8ee6b58..bbd210f 100644
--- a/Wrappers/Python/setup.py
+++ b/Wrappers/Python/setup.py
@@ -35,7 +35,7 @@ if  cil_version == '':
 setup(
     name="ccpi-common",
     version=cil_version,
-    packages=['ccpi'],
+    packages=['ccpi' , 'ccpi.reconstruction'],
 
     # Project uses reStructuredText, so ensure that the docutils get
     # installed or upgraded on the target machine
diff --git a/Wrappers/Python/test/DemoRecIP.py b/Wrappers/Python/test/DemoRecIP.py
index 790e90e..483a202 100644
--- a/Wrappers/Python/test/DemoRecIP.py
+++ b/Wrappers/Python/test/DemoRecIP.py
@@ -8,13 +8,13 @@ import numpy as np
 import matplotlib.pyplot as plt
 
 import sys
-sys.path.append('../data/')
+#sys.path.append('../../../data/')
 from read_IPdata import read_IPdata
 
 from ccpi.reconstruction.astra_ops import AstraProjector
-from ccpi.reconstruction.funcs import Norm2sq
+from ccpi.reconstruction.funcs import Norm2sq , BaseFunction
 from ccpi.reconstruction.algs import FISTA
-from ccpi.reconstruction.ops import BaseFunction
+#from ccpi.reconstruction.funcs import BaseFunction
 
 from ccpi.framework import VolumeData, SinogramData
 
-- 
cgit v1.2.3