Merge pull request #32 from dmpelt/split-conda

Split conda package into c++ lib and python parts

5 files changed, 43 insertions, 13 deletions

diff --git a/build/linux/Makefile.in b/build/linux/Makefile.in
index 951e9f0..a199bf6 100644
--- a/build/linux/Makefile.in
+++ b/build/linux/Makefile.in
@@ -150,6 +150,7 @@ BASE_OBJECTS=\
 	src/ParallelProjectionGeometry3D.lo \
 	src/ParallelVecProjectionGeometry3D.lo \
 	src/PlatformDepSystemCode.lo \
+	src/PluginAlgorithm.lo \
 	src/ProjectionGeometry2D.lo \
 	src/ProjectionGeometry3D.lo \
 	src/Projector2D.lo \
@@ -255,7 +256,6 @@ MATLAB_MEX=\
 	matlab/mex/astra_mex_direct_c.$(MEXSUFFIX)
 
 ifeq ($(python),yes)
-ALL_OBJECTS+=src/PluginAlgorithm.lo
 MATLAB_MEX+=matlab/mex/astra_mex_plugin_c.$(MEXSUFFIX)
 endif
 
diff --git a/python/conda/build.sh b/python/conda/build.sh
index 814ea7e..13ae3f8 100644
--- a/python/conda/build.sh
+++ b/python/conda/build.sh
@@ -5,12 +5,4 @@ if [ $MAKEOPTS == '<UNDEFINED>' ]
   then
     MAKEOPTS=""
 fi
-make $MAKEOPTS install-libraries
-make $MAKEOPTS python-root-install
-LIBPATH=lib
-if [ $ARCH == 64 ]
-  then
-    LIBPATH+=64
-fi
-cp -P $CUDA_ROOT/$LIBPATH/libcudart.so.* $PREFIX/lib
-cp -P $CUDA_ROOT/$LIBPATH/libcufft.so.* $PREFIX/lib
+make $MAKEOPTS python-root-install
\ No newline at end of file
diff --git a/python/conda/libastra/build.sh b/python/conda/libastra/build.sh
new file mode 100644
index 0000000..e1d9700
--- /dev/null
+++ b/python/conda/libastra/build.sh
@@ -0,0 +1,15 @@
+cd build/linux
+./autogen.sh
+./configure --with-cuda=$CUDA_ROOT --prefix=$PREFIX
+if [ $MAKEOPTS == '<UNDEFINED>' ]
+  then
+    MAKEOPTS=""
+fi
+make $MAKEOPTS install-libraries
+LIBPATH=lib
+if [ $ARCH == 64 ]
+  then
+    LIBPATH+=64
+fi
+cp -P $CUDA_ROOT/$LIBPATH/libcudart.so.* $PREFIX/lib
+cp -P $CUDA_ROOT/$LIBPATH/libcufft.so.* $PREFIX/lib
diff --git a/python/conda/libastra/meta.yaml b/python/conda/libastra/meta.yaml
new file mode 100644
index 0000000..73fa0d7
--- /dev/null
+++ b/python/conda/libastra/meta.yaml
@@ -0,0 +1,22 @@
+package:
+  name: libastra
+  version: '1.8b'
+
+source:
+  git_url: https://github.com/astra-toolbox/astra-toolbox.git
+  #git_tag: v1.7.1 # Change to 1.8 after release
+
+build:
+  number: 0
+  script_env:
+    - CUDA_ROOT
+    - MAKEOPTS
+
+about:
+  home: http://www.astra-toolbox.com
+  license: GPLv3
+  summary: 'The ASTRA Toolbox is a Python toolbox of high-performance GPU primitives for 2D and 3D tomography.'
+
+# See
+# http://docs.continuum.io/conda/build.html for
+# more information about meta.yaml
diff --git a/python/conda/meta.yaml b/python/conda/meta.yaml
index 7e4679b..e6a7f52 100644
--- a/python/conda/meta.yaml
+++ b/python/conda/meta.yaml
@@ -1,10 +1,10 @@
 package:
   name: astra-toolbox
-  version: '1.7.1'
+  version: '1.8b'
 
 source:
   git_url: https://github.com/astra-toolbox/astra-toolbox.git
-  git_tag: v1.7.1
+  #git_tag: v1.7.1 # Change to 1.8 after release
 
 build:
   number: 0
@@ -29,10 +29,11 @@ requirements:
     - numpy
     - scipy
     - six
+    - libastra ==1.8b
 
 
 about:
-  home: http://sourceforge.net/p/astra-toolbox/wiki/Home/
+  home: http://www.astra-toolbox.com
   license: GPLv3
   summary: 'The ASTRA Toolbox is a Python toolbox of high-performance GPU primitives for 2D and 3D tomography.'