From 1642ceef7cb622e530b30232536b31bb43ac7ed9 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>
Date: Mon, 30 Oct 2017 16:29:04 +0100
Subject: Add libastra/linux-64 conda package variants for cudatoolkit

Also upgrade the Docker-based linux release scripts to match.
---
 python/conda/astra-toolbox/build.sh                | 8 +++++++-
 python/conda/astra-toolbox/conda_build_config.yaml | 9 +++++++++
 python/conda/astra-toolbox/meta.yaml               | 8 +++-----
 3 files changed, 19 insertions(+), 6 deletions(-)
 create mode 100644 python/conda/astra-toolbox/conda_build_config.yaml

(limited to 'python/conda/astra-toolbox')

diff --git a/python/conda/astra-toolbox/build.sh b/python/conda/astra-toolbox/build.sh
index 951fd88..0468037 100644
--- a/python/conda/astra-toolbox/build.sh
+++ b/python/conda/astra-toolbox/build.sh
@@ -1,4 +1,10 @@
 #!/bin/sh
 
+case `uname` in
+  Darwin*)
+    CC="gcc -stdlib=libstdc++"
+    ;;
+esac
+
 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
+CPPFLAGS="-DASTRA_CUDA -DASTRA_PYTHON $CPPFLAGS -I$SRC_DIR/ -I$SRC_DIR/include" CC=$CC python ./builder.py build install
diff --git a/python/conda/astra-toolbox/conda_build_config.yaml b/python/conda/astra-toolbox/conda_build_config.yaml
new file mode 100644
index 0000000..bd38ac6
--- /dev/null
+++ b/python/conda/astra-toolbox/conda_build_config.yaml
@@ -0,0 +1,9 @@
+python:
+  - 2.7
+  - 3.5
+  - 3.6
+
+numpy:
+  - 1.11
+  - 1.12
+  - 1.13
diff --git a/python/conda/astra-toolbox/meta.yaml b/python/conda/astra-toolbox/meta.yaml
index 942397e..f3a39be 100644
--- a/python/conda/astra-toolbox/meta.yaml
+++ b/python/conda/astra-toolbox/meta.yaml
@@ -9,13 +9,11 @@ source:
 build:
   number: 0
   script_env:
-    - CC # [not win]
-    - CUDA_ROOT # [not win]
+    - CC # [linux]
 
 test:
   imports:
     - astra
-
   requires:
     # To avoid large downloads just for testing after build phase
     - nomkl # [not win]
@@ -25,14 +23,14 @@ requirements:
     - python
     - cython >=0.13
     - nomkl # [not win]
-    - numpy
+    - numpy {{ numpy }}
     - scipy
     - six
     - libastra ==1.8
 
   run:
     - python
-    - numpy x.x
+    - {{ pin_compatible('numpy', max_pin='x.x') }}
     - scipy
     - six
     - libastra ==1.8
-- 
cgit v1.2.3