Build for new cuda/python/numpy versions

4 files changed, 23 insertions, 5 deletions

diff --git a/python/conda/astra-toolbox/conda_build_config.yaml b/python/conda/astra-toolbox/conda_build_config.yaml
index edb3052..510e3ae 100644
--- a/python/conda/astra-toolbox/conda_build_config.yaml
+++ b/python/conda/astra-toolbox/conda_build_config.yaml
@@ -2,9 +2,11 @@ python:
   - 2.7
   - 3.5
   - 3.6
+  - 3.7
 
 numpy:
   - 1.11
   - 1.12
   - 1.13
   - 1.14
+  - 1.15
diff --git a/python/conda/libastra/linux_build_config.yaml b/python/conda/libastra/linux_build_config.yaml
index c5d2319..0775133 100644
--- a/python/conda/libastra/linux_build_config.yaml
+++ b/python/conda/libastra/linux_build_config.yaml
@@ -4,3 +4,5 @@ cudatoolkit:
   - 7.0
   - 7.5
   - 8.0
+  - 9.0
+  - 9.2
diff --git a/python/conda/linux_release/buildenv/Dockerfile b/python/conda/linux_release/buildenv/Dockerfile
index 17e9c5b..532def4 100644
--- a/python/conda/linux_release/buildenv/Dockerfile
+++ b/python/conda/linux_release/buildenv/Dockerfile
@@ -2,6 +2,18 @@ FROM debian:7 AS BUILDBASE
 ENV DEBIAN_FRONTEND noninteractive
 RUN apt-get update && apt-get install -y perl-modules build-essential autoconf libtool automake libboost-dev git && rm -rf /var/lib/apt/lists/*
 
+FROM BUILDBASE AS CUDA92
+RUN touch /root/cuda92
+COPY cuda_9.2.148_396.37_linux /root
+RUN /bin/bash /root/cuda_9.2.148_396.37_linux --toolkit --silent && \
+	rm -f /root/cuda_9.2.148_396.37_linux
+
+FROM BUILDBASE AS CUDA90
+RUN touch /root/cuda90
+COPY cuda_9.0.176_384.81_linux-run /root
+RUN /bin/bash /root/cuda_9.0.176_384.81_linux-run --toolkit --silent && \
+	rm -f /root/cuda_9.0.176_384.81_linux-run
+
 FROM BUILDBASE AS CUDA80
 RUN touch /root/cuda80
 COPY cuda_8.0.61_375.26_linux-run /root
@@ -42,6 +54,8 @@ RUN /bin/bash /root/cuda_5.5.22_linux_64.run -toolkit -silent && \
 
 FROM BUILDBASE
 RUN touch /root/cuda
+COPY --from=CUDA92 /usr/local/cuda-9.2 /usr/local/cuda-9.2
+COPY --from=CUDA90 /usr/local/cuda-9.0 /usr/local/cuda-9.0
 COPY --from=CUDA80 /usr/local/cuda-8.0 /usr/local/cuda-8.0
 COPY --from=CUDA75 /usr/local/cuda-7.5 /usr/local/cuda-7.5
 COPY --from=CUDA70 /usr/local/cuda-7.0 /usr/local/cuda-7.0
@@ -49,7 +63,7 @@ COPY --from=CUDA60 /usr/local/cuda-6.0 /usr/local/cuda-6.0
 COPY --from=CUDA55 /usr/local/cuda-5.5 /usr/local/cuda-5.5
 
 ENV PATH /root/miniconda3/bin:$PATH
-COPY Miniconda3-4.3.27.1-Linux-x86_64.sh /root/
-RUN /bin/bash /root/Miniconda3-4.3.27.1-Linux-x86_64.sh -b && \
+COPY Miniconda3-4.5.4-Linux-x86_64.sh /root/
+RUN /bin/bash /root/Miniconda3-4.5.4-Linux-x86_64.sh -b && \
 	rm -f /root/Miniconda3*
-RUN conda install -y conda-build
+RUN conda install -y conda-build conda-verify
diff --git a/python/conda/linux_release/release.sh b/python/conda/linux_release/release.sh
index 91c13e4..201b770 100644
--- a/python/conda/linux_release/release.sh
+++ b/python/conda/linux_release/release.sh
@@ -2,7 +2,7 @@
 
 D=`mktemp -d`
 
-for F in https://repo.continuum.io/miniconda/Miniconda3-4.2.12-Linux-x86_64.sh  http://developer.download.nvidia.com/compute/cuda/5_5/rel/installers/cuda_5.5.22_linux_64.run http://developer.download.nvidia.com/compute/cuda/6_0/rel/installers/cuda_6.0.37_linux_64.run  http://developer.download.nvidia.com/compute/cuda/7_0/Prod/local_installers/cuda_7.0.28_linux.run http://developer.download.nvidia.com/compute/cuda/7_0/Prod/cufft_update/cufft_patch_linux.tar.gz http://developer.download.nvidia.com/compute/cuda/7.5/Prod/local_installers/cuda_7.5.18_linux.run https://developer.nvidia.com/compute/cuda/8.0/Prod2/local_installers/cuda_8.0.61_375.26_linux-run https://developer.nvidia.com/compute/cuda/8.0/Prod2/patches/2/cuda_8.0.61.2_linux-run; do
+for F in https://repo.continuum.io/miniconda/Miniconda3-4.5.4-Linux-x86_64.sh  http://developer.download.nvidia.com/compute/cuda/5_5/rel/installers/cuda_5.5.22_linux_64.run http://developer.download.nvidia.com/compute/cuda/6_0/rel/installers/cuda_6.0.37_linux_64.run  http://developer.download.nvidia.com/compute/cuda/7_0/Prod/local_installers/cuda_7.0.28_linux.run http://developer.download.nvidia.com/compute/cuda/7_0/Prod/cufft_update/cufft_patch_linux.tar.gz http://developer.download.nvidia.com/compute/cuda/7.5/Prod/local_installers/cuda_7.5.18_linux.run https://developer.nvidia.com/compute/cuda/8.0/Prod2/local_installers/cuda_8.0.61_375.26_linux-run https://developer.nvidia.com/compute/cuda/8.0/Prod2/patches/2/cuda_8.0.61.2_linux-run https://developer.nvidia.com/compute/cuda/9.0/Prod/local_installers/cuda_9.0.176_384.81_linux-run https://developer.nvidia.com/compute/cuda/9.2/Prod2/local_installers/cuda_9.2.148_396.37_linux; do
 	[ -f buildenv/`basename $F` ] || (cd buildenv; wget $F )
 done
 
@@ -10,7 +10,7 @@ docker build -t astra-build-env buildenv
 
 cp buildenv/build.sh $D
 
-docker run -v $D:/out:z astra-build-env /bin/bash /out/build.sh
+docker run -v $D:/out:z astra-build-env /bin/bash /out/build.sh $1
 
 rm -f $D/build.sh