From 0a676373d38d1c5304577372666a94dc1af38081 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>
Date: Wed, 23 Nov 2016 17:08:00 +0100
Subject: Fix conda build.sh

---
 python/conda/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'python/conda')

diff --git a/python/conda/build.sh b/python/conda/build.sh
index 13ae3f8..fb3760c 100644
--- a/python/conda/build.sh
+++ b/python/conda/build.sh
@@ -5,4 +5,4 @@ if [ $MAKEOPTS == '<UNDEFINED>' ]
   then
     MAKEOPTS=""
 fi
-make $MAKEOPTS python-root-install
\ No newline at end of file
+make $MAKEOPTS install
-- 
cgit v1.2.3


From eeffd2d9748b8912b384a5764b808f5bfc850ade Mon Sep 17 00:00:00 2001
From: Holger Kohr <h.kohr@cwi.nl>
Date: Wed, 23 Nov 2016 10:21:55 +0100
Subject: Separate C++ and python builds & make conda work nicely

- make builder (= advanced user or us ourselves) choose compilers
  and CUDA
- add a check for the C++11 flag for nvcc to work around the
  infamous boost bug if necessary
- use conda boost to build the C++ library
- simplify python bindings conda recipe to only build the bindings;
  the C++ library is now a build and runtime dependency
- add runtime dependencies to python bindings recipe
- some small adjustments to builder.py
---
 python/conda/build.sh           | 12 ++++--------
 python/conda/libastra/build.sh  | 28 ++++++++++++++++++----------
 python/conda/libastra/meta.yaml | 10 ++++++++--
 python/conda/meta.yaml          | 13 ++++++++++---
 4 files changed, 40 insertions(+), 23 deletions(-)

(limited to 'python/conda')

diff --git a/python/conda/build.sh b/python/conda/build.sh
index fb3760c..951fd88 100644
--- a/python/conda/build.sh
+++ b/python/conda/build.sh
@@ -1,8 +1,4 @@
-cd build/linux
-./autogen.sh
-./configure --with-python --with-cuda=$CUDA_ROOT --prefix=$PREFIX
-if [ $MAKEOPTS == '<UNDEFINED>' ]
-  then
-    MAKEOPTS=""
-fi
-make $MAKEOPTS install
+#!/bin/sh
+
+cd $SRC_DIR/python/
+CPPFLAGS="-DASTRA_CUDA -DASTRA_PYTHON $CPPFLAGS -I$SRC_DIR/ -I$SRC_DIR/include -I$CUDA_ROOT/include" CC=$CC python ./builder.py build install
diff --git a/python/conda/libastra/build.sh b/python/conda/libastra/build.sh
index e1d9700..5807697 100644
--- a/python/conda/libastra/build.sh
+++ b/python/conda/libastra/build.sh
@@ -1,15 +1,23 @@
-cd build/linux
-./autogen.sh
-./configure --with-cuda=$CUDA_ROOT --prefix=$PREFIX
-if [ $MAKEOPTS == '<UNDEFINED>' ]
-  then
-    MAKEOPTS=""
-fi
-make $MAKEOPTS install-libraries
+#!/bin/sh
+
+cd $SRC_DIR/build/linux
+
+$SRC_DIR/build/linux/autogen.sh
+
+# Add C++11 to compiler flags if nvcc supports it, mostly to work around a boost bug
+NVCC=$CUDA_ROOT/bin/nvcc
+echo "int main(){return 0;}" > $CONDA_PREFIX/test.cu
+$NVCC $CONDA_PREFIX/test.cu -ccbin $CC --std=c++11 -o $CONDA_PREFIX/test.out > /dev/null && EXTRA_NVCCFLAGS="--std=c++11" || /bin/true
+rm -f $CONDA_PREFIX/test.out
+
+$SRC_DIR/build/linux/configure --with-install-type=prefix --with-cuda=$CUDA_ROOT --prefix=$CONDA_PREFIX NVCCFLAGS="-ccbin $CC $EXTRA_NVCCFLAGS" CC=$CC CXX=$CXX CFLAGS="-I$CONDA_PREFIX/include/boost" CXXFLAGS="-I$CONDA_PREFIX/include/boost"
+
+make 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
+cp -P $CUDA_ROOT/$LIBPATH/libcudart.so.* $CONDA_PREFIX/lib
+cp -P $CUDA_ROOT/$LIBPATH/libcufft.so.* $CONDA_PREFIX/lib
diff --git a/python/conda/libastra/meta.yaml b/python/conda/libastra/meta.yaml
index 73fa0d7..7c92e04 100644
--- a/python/conda/libastra/meta.yaml
+++ b/python/conda/libastra/meta.yaml
@@ -4,13 +4,19 @@ package:
 
 source:
   git_url: https://github.com/astra-toolbox/astra-toolbox.git
-  #git_tag: v1.7.1 # Change to 1.8 after release
+  git_rev: master  # for testing
+  # git_tag: 1.8  # TODO: change to this for next release
 
 build:
   number: 0
   script_env:
+    - CC
+    - CXX
     - CUDA_ROOT
-    - MAKEOPTS
+
+requirements:
+  build:
+    - boost
 
 about:
   home: http://www.astra-toolbox.com
diff --git a/python/conda/meta.yaml b/python/conda/meta.yaml
index e6a7f52..94ce12f 100644
--- a/python/conda/meta.yaml
+++ b/python/conda/meta.yaml
@@ -4,32 +4,39 @@ package:
 
 source:
   git_url: https://github.com/astra-toolbox/astra-toolbox.git
-  #git_tag: v1.7.1 # Change to 1.8 after release
+  git_rev: master  # for testing
+  # git_tag: 1.8  # TODO: change to this for next release
 
 build:
   number: 0
   script_env:
+    - CC
     - CUDA_ROOT
-    - MAKEOPTS
 
 test:
   imports:
     - astra
 
+  requires:
+    # To avoid large downloads just for testing after build phase
+    - nomkl # [not win]
+
 requirements:
   build:
     - python
     - cython >=0.13
+    - nomkl # [not win]
     - numpy
     - scipy
     - six
+    - libastra ==1.8b  # TODO: change to release version
 
   run:
     - python
     - numpy
     - scipy
     - six
-    - libastra ==1.8b
+    - libastra ==1.8b  # TODO: change to release version
 
 
 about:
-- 
cgit v1.2.3


From 5d9b7b00267e99baefcfba2d53dbfc312daa84eb Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>
Date: Mon, 28 Nov 2016 16:37:08 +0100
Subject: Add scripts for building conda packages using Docker

---
 python/conda/linux_release/README.txt          |  2 ++
 python/conda/linux_release/buildenv/Dockerfile | 15 +++++++++++++++
 python/conda/linux_release/builder/Dockerfile  |  8 ++++++++
 python/conda/linux_release/release.sh          | 19 +++++++++++++++++++
 4 files changed, 44 insertions(+)
 create mode 100644 python/conda/linux_release/README.txt
 create mode 100644 python/conda/linux_release/buildenv/Dockerfile
 create mode 100644 python/conda/linux_release/builder/Dockerfile
 create mode 100644 python/conda/linux_release/release.sh

(limited to 'python/conda')

diff --git a/python/conda/linux_release/README.txt b/python/conda/linux_release/README.txt
new file mode 100644
index 0000000..12cfcbb
--- /dev/null
+++ b/python/conda/linux_release/README.txt
@@ -0,0 +1,2 @@
+This directory contains a Docker container based environment for building linux release packages for conda.
+
diff --git a/python/conda/linux_release/buildenv/Dockerfile b/python/conda/linux_release/buildenv/Dockerfile
new file mode 100644
index 0000000..c73e4b9
--- /dev/null
+++ b/python/conda/linux_release/buildenv/Dockerfile
@@ -0,0 +1,15 @@
+FROM debian:7
+ENV PATH /root/miniconda3/bin:$PATH
+ENV DEBIAN_FRONTEND noninteractive
+# http://developer.download.nvidia.com/compute/cuda/5_5/rel/installers/cuda_5.5.22_linux_64.run
+ADD cuda_5.5.22_linux_64.run /root/
+# https://repo.continuum.io/miniconda/Miniconda3-4.2.12-Linux-x86_64.sh
+ADD Miniconda3-4.2.12-Linux-x86_64.sh /root/
+RUN apt-get update
+RUN apt-get install -y perl-modules build-essential autoconf libtool automake libboost-dev git
+RUN /bin/bash /root/Miniconda3-4.2.12-Linux-x86_64.sh -b
+RUN /bin/bash /root/cuda_5.5.22_linux_64.run -toolkit -silent
+RUN conda install -y conda-build
+ENV CUDA_ROOT /usr/local/cuda
+ENV CC gcc
+ENV CXX g++
diff --git a/python/conda/linux_release/builder/Dockerfile b/python/conda/linux_release/builder/Dockerfile
new file mode 100644
index 0000000..6acef62
--- /dev/null
+++ b/python/conda/linux_release/builder/Dockerfile
@@ -0,0 +1,8 @@
+FROM astra-build-env
+ARG BUILD_NUMBER=
+WORKDIR /root
+RUN git clone -b conda_release https://github.com/astra-toolbox/astra-toolbox
+RUN [ -z $BUILD_NUMBER ] || perl -pi -e "s/^(\s*number:\s*)[0-9]+$/\${1}$BUILD_NUMBER/" astra-toolbox/python/conda/libastra/meta.yaml astra-toolbox/python/conda//meta.yaml
+RUN conda-build --python=3.5 astra-toolbox/python/conda/libastra
+RUN conda-build --python=3.5 astra-toolbox/python/conda
+RUN conda-build --python=2.7 astra-toolbox/python/conda
diff --git a/python/conda/linux_release/release.sh b/python/conda/linux_release/release.sh
new file mode 100644
index 0000000..35cbdd0
--- /dev/null
+++ b/python/conda/linux_release/release.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+D=`mktemp -d`
+
+[ -f buildenv/cuda_5.5.22_linux_64.run ] || (cd buildenv; wget http://developer.download.nvidia.com/compute/cuda/5_5/rel/installers/cuda_5.5.22_linux_64.run )
+[ -f buildenv/Miniconda3-4.2.12-Linux-x86_64.sh ] || (cd buildenv; wget https://repo.continuum.io/miniconda/Miniconda3-4.2.12-Linux-x86_64.sh )
+
+docker build -t astra-build-env buildenv
+docker build --no-cache -t astra-builder builder
+
+docker run --name astra-build-cnt -v $D:/out:z astra-builder /bin/bash -c "cp /root/miniconda3/conda-bld/linux-64/*astra* /out"
+
+mkdir -p pkgs
+mv $D/* pkgs
+rmdir $D
+
+docker rm astra-build-cnt
+docker rmi astra-builder
+
-- 
cgit v1.2.3


From 93d14a3424d4bdc980eeab3f02e250c07e6c37b6 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>
Date: Mon, 28 Nov 2016 16:37:53 +0100
Subject: Add conda build scripts for win-64/py35

---
 python/conda/bld.bat            | 35 +++++++++++++++++++++++++++++++++++
 python/conda/libastra/bld.bat   | 33 +++++++++++++++++++++++++++++++++
 python/conda/libastra/meta.yaml | 12 ++++++++----
 python/conda/meta.yaml          |  5 +++--
 4 files changed, 79 insertions(+), 6 deletions(-)
 create mode 100644 python/conda/bld.bat
 create mode 100644 python/conda/libastra/bld.bat

(limited to 'python/conda')

diff --git a/python/conda/bld.bat b/python/conda/bld.bat
new file mode 100644
index 0000000..9da8cd4
--- /dev/null
+++ b/python/conda/bld.bat
@@ -0,0 +1,35 @@
+@echo off
+
+set R=%SRC_DIR%%
+
+set B_VC=C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\amd64
+call "%B_VC%\vcvars64.bat"
+
+cd /D %R%
+
+set B_BV=1_61
+
+mkdir "%R%\lib\x64"
+mkdir "%R%\bin\x64\Release_CUDA"
+
+cd /D %CONDA_PREFIX%\Library\lib
+
+
+copy boost_unit_test_framework-vc140-mt-%B_BV%.lib %R%\lib\x64
+copy libboost_chrono-vc140-mt-%B_BV%.lib %R%\lib\x64
+copy libboost_date_time-vc140-mt-%B_BV%.lib %R%\lib\x64
+copy libboost_system-vc140-mt-%B_BV%.lib %R%\lib\x64
+copy libboost_thread-vc140-mt-%B_BV%.lib %R%\lib\x64
+
+cd /D %CONDA_PREFIX%\Library\include
+
+xcopy /i /e /q boost "%R%\lib\include\boost"
+
+cd /D %R%
+
+cd python
+
+set VS90COMNTOOLS=%VS140COMNTOOLS%
+set CL=/DASTRA_CUDA /DASTRA_PYTHON "/I%R%\include" "/I%R%\lib\include" "/I%CUDA_PATH%\include"
+copy %CONDA_PREFIX%\Library\lib\AstraCuda64.lib astra.lib
+python builder.py build_ext --compiler=msvc install
diff --git a/python/conda/libastra/bld.bat b/python/conda/libastra/bld.bat
new file mode 100644
index 0000000..bb7329a
--- /dev/null
+++ b/python/conda/libastra/bld.bat
@@ -0,0 +1,33 @@
+@echo off
+
+set B_VC=C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\amd64
+
+call "%B_VC%\vcvars64.bat"
+
+set R=%SRC_DIR%
+set B_BV=1_61
+
+mkdir "%R%\lib\x64"
+mkdir "%R%\bin\x64\Release_CUDA"
+
+cd /D %CONDA_PREFIX%\Library\lib
+
+
+copy boost_unit_test_framework-vc140-mt-%B_BV%.lib %R%\lib\x64
+copy libboost_chrono-vc140-mt-%B_BV%.lib %R%\lib\x64
+copy libboost_date_time-vc140-mt-%B_BV%.lib %R%\lib\x64
+copy libboost_system-vc140-mt-%B_BV%.lib %R%\lib\x64
+copy libboost_thread-vc140-mt-%B_BV%.lib %R%\lib\x64
+
+cd /D %CONDA_PREFIX%\Library\include
+
+xcopy /i /e /q boost "%R%\lib\include\boost"
+
+cd /D %R%
+
+msbuild astra_vc14.sln /p:Configuration=Release_CUDA /p:Platform=x64 /t:astra_vc14
+
+copy bin\x64\Release_CUDA\AstraCuda64.dll "%CONDA_PREFIX%\Library\bin"
+copy bin\x64\Release_CUDA\AstraCuda64.lib "%CONDA_PREFIX%\Library\lib"
+copy "%CUDA_PATH%\bin\cudart64_80.dll" "%CONDA_PREFIX%\Library\bin"
+copy "%CUDA_PATH%\bin\cufft64_80.dll" "%CONDA_PREFIX%\Library\bin"
diff --git a/python/conda/libastra/meta.yaml b/python/conda/libastra/meta.yaml
index 7c92e04..c9135ab 100644
--- a/python/conda/libastra/meta.yaml
+++ b/python/conda/libastra/meta.yaml
@@ -10,13 +10,17 @@ source:
 build:
   number: 0
   script_env:
-    - CC
-    - CXX
-    - CUDA_ROOT
+    - CC # [not win]
+    - CXX # [not win]
+    - CUDA_ROOT # [not win]
 
 requirements:
   build:
-    - boost
+    - boost ==1.61 # [win]
+    - vs2015_runtime # [win]
+
+  run:
+    - vs2015_runtime # [win]
 
 about:
   home: http://www.astra-toolbox.com
diff --git a/python/conda/meta.yaml b/python/conda/meta.yaml
index 94ce12f..738489a 100644
--- a/python/conda/meta.yaml
+++ b/python/conda/meta.yaml
@@ -10,8 +10,8 @@ source:
 build:
   number: 0
   script_env:
-    - CC
-    - CUDA_ROOT
+    - CC # [not win]
+    - CUDA_ROOT # [not win]
 
 test:
   imports:
@@ -24,6 +24,7 @@ test:
 requirements:
   build:
     - python
+    - boost ==1.61 # [win]
     - cython >=0.13
     - nomkl # [not win]
     - numpy
-- 
cgit v1.2.3


From 7017618690b66e99773355b82afe26ac869d6aa8 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>
Date: Mon, 28 Nov 2016 15:34:50 +0100
Subject: Add astra.__version__ (PEP396)

---
 python/conda/libastra/meta.yaml | 2 +-
 python/conda/meta.yaml          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'python/conda')

diff --git a/python/conda/libastra/meta.yaml b/python/conda/libastra/meta.yaml
index c9135ab..25da269 100644
--- a/python/conda/libastra/meta.yaml
+++ b/python/conda/libastra/meta.yaml
@@ -1,6 +1,6 @@
 package:
   name: libastra
-  version: '1.8b'
+  version: '1.8rc1'
 
 source:
   git_url: https://github.com/astra-toolbox/astra-toolbox.git
diff --git a/python/conda/meta.yaml b/python/conda/meta.yaml
index 738489a..84054c1 100644
--- a/python/conda/meta.yaml
+++ b/python/conda/meta.yaml
@@ -1,6 +1,6 @@
 package:
   name: astra-toolbox
-  version: '1.8b'
+  version: '1.8rc1'
 
 source:
   git_url: https://github.com/astra-toolbox/astra-toolbox.git
-- 
cgit v1.2.3


From 70bc6ff9d036239c6d2810437e5b78cf95c04dce Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn <wjp@usecode.org>
Date: Fri, 2 Dec 2016 01:04:35 +0100
Subject: Update versions for 1.8rc1 conda package

---
 python/conda/linux_release/builder/Dockerfile | 2 +-
 python/conda/meta.yaml                        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'python/conda')

diff --git a/python/conda/linux_release/builder/Dockerfile b/python/conda/linux_release/builder/Dockerfile
index 6acef62..d09a9d7 100644
--- a/python/conda/linux_release/builder/Dockerfile
+++ b/python/conda/linux_release/builder/Dockerfile
@@ -1,7 +1,7 @@
 FROM astra-build-env
 ARG BUILD_NUMBER=
 WORKDIR /root
-RUN git clone -b conda_release https://github.com/astra-toolbox/astra-toolbox
+RUN git clone -b master https://github.com/astra-toolbox/astra-toolbox
 RUN [ -z $BUILD_NUMBER ] || perl -pi -e "s/^(\s*number:\s*)[0-9]+$/\${1}$BUILD_NUMBER/" astra-toolbox/python/conda/libastra/meta.yaml astra-toolbox/python/conda//meta.yaml
 RUN conda-build --python=3.5 astra-toolbox/python/conda/libastra
 RUN conda-build --python=3.5 astra-toolbox/python/conda
diff --git a/python/conda/meta.yaml b/python/conda/meta.yaml
index 84054c1..88c01d1 100644
--- a/python/conda/meta.yaml
+++ b/python/conda/meta.yaml
@@ -30,14 +30,14 @@ requirements:
     - numpy
     - scipy
     - six
-    - libastra ==1.8b  # TODO: change to release version
+    - libastra ==1.8rc1  # TODO: change to release version
 
   run:
     - python
     - numpy
     - scipy
     - six
-    - libastra ==1.8b  # TODO: change to release version
+    - libastra ==1.8rc1  # TODO: change to release version
 
 
 about:
-- 
cgit v1.2.3


From 77f2cedaac088da5107dcfb37ae62d8f3a56f335 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>
Date: Mon, 5 Dec 2016 14:44:09 +0100
Subject: Update version to 1.8

---
 python/conda/libastra/meta.yaml | 5 ++---
 python/conda/meta.yaml          | 9 ++++-----
 2 files changed, 6 insertions(+), 8 deletions(-)

(limited to 'python/conda')

diff --git a/python/conda/libastra/meta.yaml b/python/conda/libastra/meta.yaml
index 25da269..007cba9 100644
--- a/python/conda/libastra/meta.yaml
+++ b/python/conda/libastra/meta.yaml
@@ -1,11 +1,10 @@
 package:
   name: libastra
-  version: '1.8rc1'
+  version: '1.8'
 
 source:
   git_url: https://github.com/astra-toolbox/astra-toolbox.git
-  git_rev: master  # for testing
-  # git_tag: 1.8  # TODO: change to this for next release
+  git_tag: v1.8
 
 build:
   number: 0
diff --git a/python/conda/meta.yaml b/python/conda/meta.yaml
index 88c01d1..162103f 100644
--- a/python/conda/meta.yaml
+++ b/python/conda/meta.yaml
@@ -1,11 +1,10 @@
 package:
   name: astra-toolbox
-  version: '1.8rc1'
+  version: '1.8'
 
 source:
   git_url: https://github.com/astra-toolbox/astra-toolbox.git
-  git_rev: master  # for testing
-  # git_tag: 1.8  # TODO: change to this for next release
+  git_tag: v1.8
 
 build:
   number: 0
@@ -30,14 +29,14 @@ requirements:
     - numpy
     - scipy
     - six
-    - libastra ==1.8rc1  # TODO: change to release version
+    - libastra ==1.8
 
   run:
     - python
     - numpy
     - scipy
     - six
-    - libastra ==1.8rc1  # TODO: change to release version
+    - libastra ==1.8
 
 
 about:
-- 
cgit v1.2.3


From 461fd85b60165aa20c76f68e2adf4f4cd717641b Mon Sep 17 00:00:00 2001
From: "Daniel M. Pelt" <dmpelt@lbl.gov>
Date: Thu, 8 Dec 2016 17:50:14 -0800
Subject: Use specific numpy version in conda package

---
 python/conda/meta.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'python/conda')

diff --git a/python/conda/meta.yaml b/python/conda/meta.yaml
index 162103f..8194d04 100644
--- a/python/conda/meta.yaml
+++ b/python/conda/meta.yaml
@@ -33,7 +33,7 @@ requirements:
 
   run:
     - python
-    - numpy
+    - numpy x.x
     - scipy
     - six
     - libastra ==1.8
-- 
cgit v1.2.3


From 25f38c8ac5275ff88cc1245ab475510864543ceb Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn <wjp@usecode.org>
Date: Fri, 9 Dec 2016 11:37:26 +0100
Subject: Build conda packages for multiple conda versions

---
 python/conda/linux_release/builder/Dockerfile | 13 +++++++++----
 python/conda/linux_release/release.sh         |  1 +
 2 files changed, 10 insertions(+), 4 deletions(-)

(limited to 'python/conda')

diff --git a/python/conda/linux_release/builder/Dockerfile b/python/conda/linux_release/builder/Dockerfile
index d09a9d7..12bde50 100644
--- a/python/conda/linux_release/builder/Dockerfile
+++ b/python/conda/linux_release/builder/Dockerfile
@@ -1,8 +1,13 @@
 FROM astra-build-env
 ARG BUILD_NUMBER=
 WORKDIR /root
-RUN git clone -b master https://github.com/astra-toolbox/astra-toolbox
-RUN [ -z $BUILD_NUMBER ] || perl -pi -e "s/^(\s*number:\s*)[0-9]+$/\${1}$BUILD_NUMBER/" astra-toolbox/python/conda/libastra/meta.yaml astra-toolbox/python/conda//meta.yaml
+RUN git clone --depth 1 https://github.com/astra-toolbox/astra-toolbox
+RUN [ -z $BUILD_NUMBER ] || perl -pi -e "s/^(\s*number:\s*)[0-9]+$/\${1}$BUILD_NUMBER/" astra-toolbox/python/conda/libastra/meta.yaml astra-toolbox/python/conda/meta.yaml
 RUN conda-build --python=3.5 astra-toolbox/python/conda/libastra
-RUN conda-build --python=3.5 astra-toolbox/python/conda
-RUN conda-build --python=2.7 astra-toolbox/python/conda
+RUN conda-build --python 2.7 --numpy 1.8 astra-toolbox/python/conda
+RUN conda-build --python 2.7 --numpy 1.9 astra-toolbox/python/conda
+RUN conda-build --python 2.7 --numpy 1.10 astra-toolbox/python/conda
+RUN conda-build --python 2.7 --numpy 1.11 astra-toolbox/python/conda
+RUN conda-build --python 3.5 --numpy 1.9 astra-toolbox/python/conda
+RUN conda-build --python 3.5 --numpy 1.10 astra-toolbox/python/conda
+RUN conda-build --python 3.5 --numpy 1.11 astra-toolbox/python/conda
diff --git a/python/conda/linux_release/release.sh b/python/conda/linux_release/release.sh
index 35cbdd0..cf62bd5 100644
--- a/python/conda/linux_release/release.sh
+++ b/python/conda/linux_release/release.sh
@@ -6,6 +6,7 @@ D=`mktemp -d`
 [ -f buildenv/Miniconda3-4.2.12-Linux-x86_64.sh ] || (cd buildenv; wget https://repo.continuum.io/miniconda/Miniconda3-4.2.12-Linux-x86_64.sh )
 
 docker build -t astra-build-env buildenv
+#docker build --no-cache --build-arg=BUILD_NUMBER=0 -t astra-builder builder
 docker build --no-cache -t astra-builder builder
 
 docker run --name astra-build-cnt -v $D:/out:z astra-builder /bin/bash -c "cp /root/miniconda3/conda-bld/linux-64/*astra* /out"
-- 
cgit v1.2.3


From 3d080e9bd80714c65818feb31cdba131b36b6a3b Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>
Date: Fri, 9 Dec 2016 15:39:57 +0100
Subject: Use external boost for conda/win-64

This enables py27 conda packages for win-64.
---
 python/conda/bld.bat            | 14 ++++++--------
 python/conda/libastra/bld.bat   | 14 +++++++-------
 python/conda/libastra/meta.yaml |  1 -
 python/conda/meta.yaml          |  1 -
 4 files changed, 13 insertions(+), 17 deletions(-)

(limited to 'python/conda')

diff --git a/python/conda/bld.bat b/python/conda/bld.bat
index 9da8cd4..15777ce 100644
--- a/python/conda/bld.bat
+++ b/python/conda/bld.bat
@@ -1,27 +1,25 @@
 @echo off
 
-set R=%SRC_DIR%%
+set R=%SRC_DIR%
 
 set B_VC=C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\amd64
 call "%B_VC%\vcvars64.bat"
 
-cd /D %R%
+set B_BV=1_62
+set B_BOOST=D:\wjp\boost_%B_BV%_0
 
-set B_BV=1_61
+cd /D "%B_BOOST%\lib64-msvc-14.0"
 
 mkdir "%R%\lib\x64"
 mkdir "%R%\bin\x64\Release_CUDA"
 
-cd /D %CONDA_PREFIX%\Library\lib
-
-
 copy boost_unit_test_framework-vc140-mt-%B_BV%.lib %R%\lib\x64
 copy libboost_chrono-vc140-mt-%B_BV%.lib %R%\lib\x64
 copy libboost_date_time-vc140-mt-%B_BV%.lib %R%\lib\x64
 copy libboost_system-vc140-mt-%B_BV%.lib %R%\lib\x64
 copy libboost_thread-vc140-mt-%B_BV%.lib %R%\lib\x64
 
-cd /D %CONDA_PREFIX%\Library\include
+cd %B_BOOST%
 
 xcopy /i /e /q boost "%R%\lib\include\boost"
 
@@ -31,5 +29,5 @@ cd python
 
 set VS90COMNTOOLS=%VS140COMNTOOLS%
 set CL=/DASTRA_CUDA /DASTRA_PYTHON "/I%R%\include" "/I%R%\lib\include" "/I%CUDA_PATH%\include"
-copy %CONDA_PREFIX%\Library\lib\AstraCuda64.lib astra.lib
+copy "%CONDA_PREFIX%\Library\lib\AstraCuda64.lib" astra.lib
 python builder.py build_ext --compiler=msvc install
diff --git a/python/conda/libastra/bld.bat b/python/conda/libastra/bld.bat
index bb7329a..29b894a 100644
--- a/python/conda/libastra/bld.bat
+++ b/python/conda/libastra/bld.bat
@@ -1,25 +1,25 @@
 @echo off
 
-set B_VC=C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\amd64
+set R=%SRC_DIR%
 
+set B_VC=C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\amd64
 call "%B_VC%\vcvars64.bat"
 
-set R=%SRC_DIR%
-set B_BV=1_61
+set B_BV=1_62
+set B_BOOST=D:\wjp\boost_%B_BV%_0
+
+cd /D "%B_BOOST%\lib64-msvc-14.0"
 
 mkdir "%R%\lib\x64"
 mkdir "%R%\bin\x64\Release_CUDA"
 
-cd /D %CONDA_PREFIX%\Library\lib
-
-
 copy boost_unit_test_framework-vc140-mt-%B_BV%.lib %R%\lib\x64
 copy libboost_chrono-vc140-mt-%B_BV%.lib %R%\lib\x64
 copy libboost_date_time-vc140-mt-%B_BV%.lib %R%\lib\x64
 copy libboost_system-vc140-mt-%B_BV%.lib %R%\lib\x64
 copy libboost_thread-vc140-mt-%B_BV%.lib %R%\lib\x64
 
-cd /D %CONDA_PREFIX%\Library\include
+cd %B_BOOST%
 
 xcopy /i /e /q boost "%R%\lib\include\boost"
 
diff --git a/python/conda/libastra/meta.yaml b/python/conda/libastra/meta.yaml
index 007cba9..c05a466 100644
--- a/python/conda/libastra/meta.yaml
+++ b/python/conda/libastra/meta.yaml
@@ -15,7 +15,6 @@ build:
 
 requirements:
   build:
-    - boost ==1.61 # [win]
     - vs2015_runtime # [win]
 
   run:
diff --git a/python/conda/meta.yaml b/python/conda/meta.yaml
index 8194d04..942397e 100644
--- a/python/conda/meta.yaml
+++ b/python/conda/meta.yaml
@@ -23,7 +23,6 @@ test:
 requirements:
   build:
     - python
-    - boost ==1.61 # [win]
     - cython >=0.13
     - nomkl # [not win]
     - numpy
-- 
cgit v1.2.3


From 67ad5142d08fa7708f2f7fc7db5e011e4e54e1d4 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>
Date: Mon, 2 Jan 2017 18:07:32 +0100
Subject: Build conda packages for linux-64/np111/py36

---
 python/conda/linux_release/builder/Dockerfile | 1 +
 1 file changed, 1 insertion(+)

(limited to 'python/conda')

diff --git a/python/conda/linux_release/builder/Dockerfile b/python/conda/linux_release/builder/Dockerfile
index 12bde50..208e3ad 100644
--- a/python/conda/linux_release/builder/Dockerfile
+++ b/python/conda/linux_release/builder/Dockerfile
@@ -11,3 +11,4 @@ RUN conda-build --python 2.7 --numpy 1.11 astra-toolbox/python/conda
 RUN conda-build --python 3.5 --numpy 1.9 astra-toolbox/python/conda
 RUN conda-build --python 3.5 --numpy 1.10 astra-toolbox/python/conda
 RUN conda-build --python 3.5 --numpy 1.11 astra-toolbox/python/conda
+RUN conda-build --python 3.6 --numpy 1.11 astra-toolbox/python/conda
-- 
cgit v1.2.3


From ef26db6ab96e050acf808029a23184bfcb860237 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>
Date: Fri, 24 Feb 2017 12:15:05 +0100
Subject: Add np112 to conda build script

---
 python/conda/linux_release/builder/Dockerfile | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'python/conda')

diff --git a/python/conda/linux_release/builder/Dockerfile b/python/conda/linux_release/builder/Dockerfile
index 208e3ad..8be05b8 100644
--- a/python/conda/linux_release/builder/Dockerfile
+++ b/python/conda/linux_release/builder/Dockerfile
@@ -8,7 +8,10 @@ RUN conda-build --python 2.7 --numpy 1.8 astra-toolbox/python/conda
 RUN conda-build --python 2.7 --numpy 1.9 astra-toolbox/python/conda
 RUN conda-build --python 2.7 --numpy 1.10 astra-toolbox/python/conda
 RUN conda-build --python 2.7 --numpy 1.11 astra-toolbox/python/conda
+RUN conda-build --python 2.7 --numpy 1.12 astra-toolbox/python/conda
 RUN conda-build --python 3.5 --numpy 1.9 astra-toolbox/python/conda
 RUN conda-build --python 3.5 --numpy 1.10 astra-toolbox/python/conda
 RUN conda-build --python 3.5 --numpy 1.11 astra-toolbox/python/conda
+RUN conda-build --python 3.5 --numpy 1.12 astra-toolbox/python/conda
 RUN conda-build --python 3.6 --numpy 1.11 astra-toolbox/python/conda
+RUN conda-build --python 3.6 --numpy 1.12 astra-toolbox/python/conda
-- 
cgit v1.2.3


From f0888d0cb90e3eef2cb31a4e1b183876a0bc3f42 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>
Date: Mon, 23 Jan 2017 12:01:24 +0100
Subject: Use true instead of /bin/true

It's in /usr/bin/ on macOS.
---
 python/conda/libastra/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'python/conda')

diff --git a/python/conda/libastra/build.sh b/python/conda/libastra/build.sh
index 5807697..46736c4 100644
--- a/python/conda/libastra/build.sh
+++ b/python/conda/libastra/build.sh
@@ -7,7 +7,7 @@ $SRC_DIR/build/linux/autogen.sh
 # Add C++11 to compiler flags if nvcc supports it, mostly to work around a boost bug
 NVCC=$CUDA_ROOT/bin/nvcc
 echo "int main(){return 0;}" > $CONDA_PREFIX/test.cu
-$NVCC $CONDA_PREFIX/test.cu -ccbin $CC --std=c++11 -o $CONDA_PREFIX/test.out > /dev/null && EXTRA_NVCCFLAGS="--std=c++11" || /bin/true
+$NVCC $CONDA_PREFIX/test.cu -ccbin $CC --std=c++11 -o $CONDA_PREFIX/test.out > /dev/null && EXTRA_NVCCFLAGS="--std=c++11" || true
 rm -f $CONDA_PREFIX/test.out
 
 $SRC_DIR/build/linux/configure --with-install-type=prefix --with-cuda=$CUDA_ROOT --prefix=$CONDA_PREFIX NVCCFLAGS="-ccbin $CC $EXTRA_NVCCFLAGS" CC=$CC CXX=$CXX CFLAGS="-I$CONDA_PREFIX/include/boost" CXXFLAGS="-I$CONDA_PREFIX/include/boost"
-- 
cgit v1.2.3


From 4203c3132484cc669bd6f92d180c0623f85f569e Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>
Date: Mon, 23 Jan 2017 12:10:38 +0100
Subject: Fix conda boost include flags

---
 python/conda/libastra/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'python/conda')

diff --git a/python/conda/libastra/build.sh b/python/conda/libastra/build.sh
index 46736c4..36c3eba 100644
--- a/python/conda/libastra/build.sh
+++ b/python/conda/libastra/build.sh
@@ -10,7 +10,7 @@ echo "int main(){return 0;}" > $CONDA_PREFIX/test.cu
 $NVCC $CONDA_PREFIX/test.cu -ccbin $CC --std=c++11 -o $CONDA_PREFIX/test.out > /dev/null && EXTRA_NVCCFLAGS="--std=c++11" || true
 rm -f $CONDA_PREFIX/test.out
 
-$SRC_DIR/build/linux/configure --with-install-type=prefix --with-cuda=$CUDA_ROOT --prefix=$CONDA_PREFIX NVCCFLAGS="-ccbin $CC $EXTRA_NVCCFLAGS" CC=$CC CXX=$CXX CFLAGS="-I$CONDA_PREFIX/include/boost" CXXFLAGS="-I$CONDA_PREFIX/include/boost"
+$SRC_DIR/build/linux/configure --with-install-type=prefix --with-cuda=$CUDA_ROOT --prefix=$CONDA_PREFIX NVCCFLAGS="-ccbin $CC -I$CONDA_PREFIX/include $EXTRA_NVCCFLAGS" CC=$CC CXX=$CXX CPPFLAGS="-I$CONDA_PREFIX/include"
 
 make install-libraries
 
-- 
cgit v1.2.3


From 0f6c2fdc899b19000c3fcfa3f4e2129dd16a44ce Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>
Date: Mon, 23 Jan 2017 12:32:10 +0100
Subject: Change lib/lib64 logic

macOS CUDA uses lib even on 64 bit
---
 python/conda/libastra/build.sh | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

(limited to 'python/conda')

diff --git a/python/conda/libastra/build.sh b/python/conda/libastra/build.sh
index 36c3eba..50d2ae5 100644
--- a/python/conda/libastra/build.sh
+++ b/python/conda/libastra/build.sh
@@ -14,10 +14,15 @@ $SRC_DIR/build/linux/configure --with-install-type=prefix --with-cuda=$CUDA_ROOT
 
 make install-libraries
 
-LIBPATH=lib
-if [ $ARCH == 64 ]
-  then
-    LIBPATH+=64
-fi
-cp -P $CUDA_ROOT/$LIBPATH/libcudart.so.* $CONDA_PREFIX/lib
-cp -P $CUDA_ROOT/$LIBPATH/libcufft.so.* $CONDA_PREFIX/lib
+
+test -d $CUDA_ROOT/lib64 && LIBPATH="$CUDA_ROOT/lib64" || LIBPATH="$CUDA_ROOT/lib"
+
+case `uname` in
+  Darwin*)
+    cp -P $LIBPATH/libcudart.*.dylib $CONDA_PREFIX/lib
+    cp -P $LIBPATH/libcufft.*.dylib $CONDA_PREFIX/lib
+  *)
+    cp -P $LIBPATH/libcudart.so.* $CONDA_PREFIX/lib
+    cp -P $LIBPATH/libcufft.so.* $CONDA_PREFIX/lib
+    ;;
+esac
-- 
cgit v1.2.3


From 76bd01e47e4fc76b16d65d9cfc0216347951c518 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>
Date: Mon, 23 Jan 2017 14:13:22 +0100
Subject: Silence errors from nvcc test run

---
 python/conda/libastra/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'python/conda')

diff --git a/python/conda/libastra/build.sh b/python/conda/libastra/build.sh
index 50d2ae5..98220f5 100644
--- a/python/conda/libastra/build.sh
+++ b/python/conda/libastra/build.sh
@@ -7,7 +7,7 @@ $SRC_DIR/build/linux/autogen.sh
 # Add C++11 to compiler flags if nvcc supports it, mostly to work around a boost bug
 NVCC=$CUDA_ROOT/bin/nvcc
 echo "int main(){return 0;}" > $CONDA_PREFIX/test.cu
-$NVCC $CONDA_PREFIX/test.cu -ccbin $CC --std=c++11 -o $CONDA_PREFIX/test.out > /dev/null && EXTRA_NVCCFLAGS="--std=c++11" || true
+$NVCC $CONDA_PREFIX/test.cu -ccbin $CC --std=c++11 -o $CONDA_PREFIX/test.out > /dev/null 2>&1 && EXTRA_NVCCFLAGS="--std=c++11" || true
 rm -f $CONDA_PREFIX/test.out
 
 $SRC_DIR/build/linux/configure --with-install-type=prefix --with-cuda=$CUDA_ROOT --prefix=$CONDA_PREFIX NVCCFLAGS="-ccbin $CC -I$CONDA_PREFIX/include $EXTRA_NVCCFLAGS" CC=$CC CXX=$CXX CPPFLAGS="-I$CONDA_PREFIX/include"
-- 
cgit v1.2.3


From d70274581443afd30d8347dae737c419142c88da Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>
Date: Mon, 23 Jan 2017 14:13:53 +0100
Subject: Add autotools and boost to macOS conda libastra dependencies

---
 python/conda/libastra/meta.yaml | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'python/conda')

diff --git a/python/conda/libastra/meta.yaml b/python/conda/libastra/meta.yaml
index c05a466..68cf47a 100644
--- a/python/conda/libastra/meta.yaml
+++ b/python/conda/libastra/meta.yaml
@@ -16,6 +16,10 @@ build:
 requirements:
   build:
     - vs2015_runtime # [win]
+    - boost # [osx]
+    - automake # [osx]
+    - autoconf # [osx]
+    - libtool # [osx]
 
   run:
     - vs2015_runtime # [win]
-- 
cgit v1.2.3


From 9f3f78472f7be84694baef8e67fec382febce639 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>
Date: Tue, 24 Jan 2017 16:44:18 +0100
Subject: Move conda astra-toolbox package files to own subdirectory

Recent versions of conda-build (2.1.1 at least) seem to automatically build
packages in subdirectories (after the main directory).
---
 python/conda/astra-toolbox/bld.bat            | 33 ++++++++++++++++++
 python/conda/astra-toolbox/build.sh           |  4 +++
 python/conda/astra-toolbox/meta.yaml          | 48 +++++++++++++++++++++++++++
 python/conda/bld.bat                          | 33 ------------------
 python/conda/build.sh                         |  4 ---
 python/conda/linux_release/builder/Dockerfile | 24 +++++++-------
 python/conda/meta.yaml                        | 48 ---------------------------
 7 files changed, 97 insertions(+), 97 deletions(-)
 create mode 100644 python/conda/astra-toolbox/bld.bat
 create mode 100644 python/conda/astra-toolbox/build.sh
 create mode 100644 python/conda/astra-toolbox/meta.yaml
 delete mode 100644 python/conda/bld.bat
 delete mode 100644 python/conda/build.sh
 delete mode 100644 python/conda/meta.yaml

(limited to 'python/conda')

diff --git a/python/conda/astra-toolbox/bld.bat b/python/conda/astra-toolbox/bld.bat
new file mode 100644
index 0000000..15777ce
--- /dev/null
+++ b/python/conda/astra-toolbox/bld.bat
@@ -0,0 +1,33 @@
+@echo off
+
+set R=%SRC_DIR%
+
+set B_VC=C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\amd64
+call "%B_VC%\vcvars64.bat"
+
+set B_BV=1_62
+set B_BOOST=D:\wjp\boost_%B_BV%_0
+
+cd /D "%B_BOOST%\lib64-msvc-14.0"
+
+mkdir "%R%\lib\x64"
+mkdir "%R%\bin\x64\Release_CUDA"
+
+copy boost_unit_test_framework-vc140-mt-%B_BV%.lib %R%\lib\x64
+copy libboost_chrono-vc140-mt-%B_BV%.lib %R%\lib\x64
+copy libboost_date_time-vc140-mt-%B_BV%.lib %R%\lib\x64
+copy libboost_system-vc140-mt-%B_BV%.lib %R%\lib\x64
+copy libboost_thread-vc140-mt-%B_BV%.lib %R%\lib\x64
+
+cd %B_BOOST%
+
+xcopy /i /e /q boost "%R%\lib\include\boost"
+
+cd /D %R%
+
+cd python
+
+set VS90COMNTOOLS=%VS140COMNTOOLS%
+set CL=/DASTRA_CUDA /DASTRA_PYTHON "/I%R%\include" "/I%R%\lib\include" "/I%CUDA_PATH%\include"
+copy "%CONDA_PREFIX%\Library\lib\AstraCuda64.lib" astra.lib
+python builder.py build_ext --compiler=msvc install
diff --git a/python/conda/astra-toolbox/build.sh b/python/conda/astra-toolbox/build.sh
new file mode 100644
index 0000000..951fd88
--- /dev/null
+++ b/python/conda/astra-toolbox/build.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+cd $SRC_DIR/python/
+CPPFLAGS="-DASTRA_CUDA -DASTRA_PYTHON $CPPFLAGS -I$SRC_DIR/ -I$SRC_DIR/include -I$CUDA_ROOT/include" CC=$CC python ./builder.py build install
diff --git a/python/conda/astra-toolbox/meta.yaml b/python/conda/astra-toolbox/meta.yaml
new file mode 100644
index 0000000..942397e
--- /dev/null
+++ b/python/conda/astra-toolbox/meta.yaml
@@ -0,0 +1,48 @@
+package:
+  name: astra-toolbox
+  version: '1.8'
+
+source:
+  git_url: https://github.com/astra-toolbox/astra-toolbox.git
+  git_tag: v1.8
+
+build:
+  number: 0
+  script_env:
+    - CC # [not win]
+    - CUDA_ROOT # [not win]
+
+test:
+  imports:
+    - astra
+
+  requires:
+    # To avoid large downloads just for testing after build phase
+    - nomkl # [not win]
+
+requirements:
+  build:
+    - python
+    - cython >=0.13
+    - nomkl # [not win]
+    - numpy
+    - scipy
+    - six
+    - libastra ==1.8
+
+  run:
+    - python
+    - numpy x.x
+    - scipy
+    - six
+    - libastra ==1.8
+
+
+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/bld.bat b/python/conda/bld.bat
deleted file mode 100644
index 15777ce..0000000
--- a/python/conda/bld.bat
+++ /dev/null
@@ -1,33 +0,0 @@
-@echo off
-
-set R=%SRC_DIR%
-
-set B_VC=C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\amd64
-call "%B_VC%\vcvars64.bat"
-
-set B_BV=1_62
-set B_BOOST=D:\wjp\boost_%B_BV%_0
-
-cd /D "%B_BOOST%\lib64-msvc-14.0"
-
-mkdir "%R%\lib\x64"
-mkdir "%R%\bin\x64\Release_CUDA"
-
-copy boost_unit_test_framework-vc140-mt-%B_BV%.lib %R%\lib\x64
-copy libboost_chrono-vc140-mt-%B_BV%.lib %R%\lib\x64
-copy libboost_date_time-vc140-mt-%B_BV%.lib %R%\lib\x64
-copy libboost_system-vc140-mt-%B_BV%.lib %R%\lib\x64
-copy libboost_thread-vc140-mt-%B_BV%.lib %R%\lib\x64
-
-cd %B_BOOST%
-
-xcopy /i /e /q boost "%R%\lib\include\boost"
-
-cd /D %R%
-
-cd python
-
-set VS90COMNTOOLS=%VS140COMNTOOLS%
-set CL=/DASTRA_CUDA /DASTRA_PYTHON "/I%R%\include" "/I%R%\lib\include" "/I%CUDA_PATH%\include"
-copy "%CONDA_PREFIX%\Library\lib\AstraCuda64.lib" astra.lib
-python builder.py build_ext --compiler=msvc install
diff --git a/python/conda/build.sh b/python/conda/build.sh
deleted file mode 100644
index 951fd88..0000000
--- a/python/conda/build.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-cd $SRC_DIR/python/
-CPPFLAGS="-DASTRA_CUDA -DASTRA_PYTHON $CPPFLAGS -I$SRC_DIR/ -I$SRC_DIR/include -I$CUDA_ROOT/include" CC=$CC python ./builder.py build install
diff --git a/python/conda/linux_release/builder/Dockerfile b/python/conda/linux_release/builder/Dockerfile
index 8be05b8..2404609 100644
--- a/python/conda/linux_release/builder/Dockerfile
+++ b/python/conda/linux_release/builder/Dockerfile
@@ -2,16 +2,16 @@ FROM astra-build-env
 ARG BUILD_NUMBER=
 WORKDIR /root
 RUN git clone --depth 1 https://github.com/astra-toolbox/astra-toolbox
-RUN [ -z $BUILD_NUMBER ] || perl -pi -e "s/^(\s*number:\s*)[0-9]+$/\${1}$BUILD_NUMBER/" astra-toolbox/python/conda/libastra/meta.yaml astra-toolbox/python/conda/meta.yaml
+RUN [ -z $BUILD_NUMBER ] || perl -pi -e "s/^(\s*number:\s*)[0-9]+$/\${1}$BUILD_NUMBER/" astra-toolbox/python/conda/libastra/meta.yaml astra-toolbox/python/conda/astra-toolbox/meta.yaml
 RUN conda-build --python=3.5 astra-toolbox/python/conda/libastra
-RUN conda-build --python 2.7 --numpy 1.8 astra-toolbox/python/conda
-RUN conda-build --python 2.7 --numpy 1.9 astra-toolbox/python/conda
-RUN conda-build --python 2.7 --numpy 1.10 astra-toolbox/python/conda
-RUN conda-build --python 2.7 --numpy 1.11 astra-toolbox/python/conda
-RUN conda-build --python 2.7 --numpy 1.12 astra-toolbox/python/conda
-RUN conda-build --python 3.5 --numpy 1.9 astra-toolbox/python/conda
-RUN conda-build --python 3.5 --numpy 1.10 astra-toolbox/python/conda
-RUN conda-build --python 3.5 --numpy 1.11 astra-toolbox/python/conda
-RUN conda-build --python 3.5 --numpy 1.12 astra-toolbox/python/conda
-RUN conda-build --python 3.6 --numpy 1.11 astra-toolbox/python/conda
-RUN conda-build --python 3.6 --numpy 1.12 astra-toolbox/python/conda
+RUN conda-build --python 2.7 --numpy 1.8 astra-toolbox/python/conda/astra-toolbox
+RUN conda-build --python 2.7 --numpy 1.9 astra-toolbox/python/conda/astra-toolbox
+RUN conda-build --python 2.7 --numpy 1.10 astra-toolbox/python/conda/astra-toolbox
+RUN conda-build --python 2.7 --numpy 1.11 astra-toolbox/python/conda/astra-toolbox
+RUN conda-build --python 2.7 --numpy 1.12 astra-toolbox/python/conda/astra-toolbox
+RUN conda-build --python 3.5 --numpy 1.9 astra-toolbox/python/conda/astra-toolbox
+RUN conda-build --python 3.5 --numpy 1.10 astra-toolbox/python/conda/astra-toolbox
+RUN conda-build --python 3.5 --numpy 1.11 astra-toolbox/python/conda/astra-toolbox
+RUN conda-build --python 3.5 --numpy 1.12 astra-toolbox/python/conda/astra-toolbox
+RUN conda-build --python 3.6 --numpy 1.11 astra-toolbox/python/conda/astra-toolbox
+RUN conda-build --python 3.6 --numpy 1.12 astra-toolbox/python/conda/astra-toolbox
diff --git a/python/conda/meta.yaml b/python/conda/meta.yaml
deleted file mode 100644
index 942397e..0000000
--- a/python/conda/meta.yaml
+++ /dev/null
@@ -1,48 +0,0 @@
-package:
-  name: astra-toolbox
-  version: '1.8'
-
-source:
-  git_url: https://github.com/astra-toolbox/astra-toolbox.git
-  git_tag: v1.8
-
-build:
-  number: 0
-  script_env:
-    - CC # [not win]
-    - CUDA_ROOT # [not win]
-
-test:
-  imports:
-    - astra
-
-  requires:
-    # To avoid large downloads just for testing after build phase
-    - nomkl # [not win]
-
-requirements:
-  build:
-    - python
-    - cython >=0.13
-    - nomkl # [not win]
-    - numpy
-    - scipy
-    - six
-    - libastra ==1.8
-
-  run:
-    - python
-    - numpy x.x
-    - scipy
-    - six
-    - libastra ==1.8
-
-
-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
-- 
cgit v1.2.3


From c9f11161191729046eb91cc038d815ee8bd1e225 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>
Date: Wed, 29 Mar 2017 21:37:02 +0200
Subject: Fix conda build

---
 python/conda/libastra/build.sh | 1 +
 1 file changed, 1 insertion(+)

(limited to 'python/conda')

diff --git a/python/conda/libastra/build.sh b/python/conda/libastra/build.sh
index 98220f5..304c053 100644
--- a/python/conda/libastra/build.sh
+++ b/python/conda/libastra/build.sh
@@ -21,6 +21,7 @@ case `uname` in
   Darwin*)
     cp -P $LIBPATH/libcudart.*.dylib $CONDA_PREFIX/lib
     cp -P $LIBPATH/libcufft.*.dylib $CONDA_PREFIX/lib
+    ;;
   *)
     cp -P $LIBPATH/libcudart.so.* $CONDA_PREFIX/lib
     cp -P $LIBPATH/libcufft.so.* $CONDA_PREFIX/lib
-- 
cgit v1.2.3