diff options
| -rw-r--r-- | python/conda/astra-toolbox/conda_build_config_py27.yaml | 10 | ||||
| -rw-r--r-- | python/conda/astra-toolbox/conda_build_config_py35.yaml (renamed from python/conda/astra-toolbox/conda_build_config.yaml) | 3 | ||||
| -rw-r--r-- | python/conda/astra-toolbox/conda_build_config_py36.yaml | 8 | ||||
| -rw-r--r-- | python/conda/astra-toolbox/conda_build_config_py37.yaml | 8 | ||||
| -rw-r--r-- | python/conda/libastra/linux_build_config.yaml | 4 | ||||
| -rw-r--r-- | python/conda/linux_release/buildenv/Dockerfile | 7 | ||||
| -rw-r--r-- | python/conda/linux_release/buildenv/build.sh | 9 | ||||
| -rw-r--r-- | python/conda/linux_release/release.sh | 4 |
8 files changed, 43 insertions, 10 deletions
diff --git a/python/conda/astra-toolbox/conda_build_config_py27.yaml b/python/conda/astra-toolbox/conda_build_config_py27.yaml new file mode 100644 index 0000000..f119b61 --- /dev/null +++ b/python/conda/astra-toolbox/conda_build_config_py27.yaml @@ -0,0 +1,10 @@ +python: + - 2.7 + +numpy: + - 1.11 + - 1.12 + - 1.13 + - 1.14 + - 1.15 + - 1.16 diff --git a/python/conda/astra-toolbox/conda_build_config.yaml b/python/conda/astra-toolbox/conda_build_config_py35.yaml index 62b3c76..e841047 100644 --- a/python/conda/astra-toolbox/conda_build_config.yaml +++ b/python/conda/astra-toolbox/conda_build_config_py35.yaml @@ -1,8 +1,5 @@ python: - - 2.7 - 3.5 - - 3.6 - - 3.7 numpy: - 1.11 diff --git a/python/conda/astra-toolbox/conda_build_config_py36.yaml b/python/conda/astra-toolbox/conda_build_config_py36.yaml new file mode 100644 index 0000000..a582533 --- /dev/null +++ b/python/conda/astra-toolbox/conda_build_config_py36.yaml @@ -0,0 +1,8 @@ +python: + - 3.6 + +numpy: + - 1.11 + - 1.14 + - 1.15 + - 1.16 diff --git a/python/conda/astra-toolbox/conda_build_config_py37.yaml b/python/conda/astra-toolbox/conda_build_config_py37.yaml new file mode 100644 index 0000000..ebbf44a --- /dev/null +++ b/python/conda/astra-toolbox/conda_build_config_py37.yaml @@ -0,0 +1,8 @@ +python: + - 3.7 + +numpy: + - 1.11 + - 1.14 + - 1.15 + - 1.16 diff --git a/python/conda/libastra/linux_build_config.yaml b/python/conda/libastra/linux_build_config.yaml index 0775133..2663094 100644 --- a/python/conda/libastra/linux_build_config.yaml +++ b/python/conda/libastra/linux_build_config.yaml @@ -1,8 +1,6 @@ cudatoolkit: - - 5.5 - - 6.0 - - 7.0 - 7.5 - 8.0 - 9.0 - 9.2 + - 10.0 diff --git a/python/conda/linux_release/buildenv/Dockerfile b/python/conda/linux_release/buildenv/Dockerfile index 532def4..35eec0c 100644 --- a/python/conda/linux_release/buildenv/Dockerfile +++ b/python/conda/linux_release/buildenv/Dockerfile @@ -2,6 +2,12 @@ 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 CUDA100 +RUN touch /root/cuda100 +COPY cuda_10.0.130_410.48_linux /root +RUN /bin/bash /root/cuda_10.0.130_410.48_linux --toolkit --silent && \ + rm -f /root/cuda_10.0.130_410.48_linux + FROM BUILDBASE AS CUDA92 RUN touch /root/cuda92 COPY cuda_9.2.148_396.37_linux /root @@ -54,6 +60,7 @@ RUN /bin/bash /root/cuda_5.5.22_linux_64.run -toolkit -silent && \ FROM BUILDBASE RUN touch /root/cuda +COPY --from=CUDA100 /usr/local/cuda-10.0 /usr/local/cuda-10.0 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 diff --git a/python/conda/linux_release/buildenv/build.sh b/python/conda/linux_release/buildenv/build.sh index 1cc0830..cc6dc31 100644 --- a/python/conda/linux_release/buildenv/build.sh +++ b/python/conda/linux_release/buildenv/build.sh @@ -5,9 +5,14 @@ export CXX=g++ cd /root git clone --depth 1 --branch master https://github.com/astra-toolbox/astra-toolbox -[ $# -eq 0 ] || perl -pi -e "s/^(\s*number:\s*)[0-9]+$/\${1}$1/" astra-toolbox/python/conda/libastra/meta.yaml astra-toolbox/python/conda/astra-toolbox/meta.yaml +[ $# -eq 0 ] || perl -pi -e "s/^(\s*version:\s*)[0-9a-z+\.']+$/\${1}'$1'/" astra-toolbox/python/conda/libastra/meta.yaml astra-toolbox/python/conda/astra-toolbox/meta.yaml +[ $# -eq 0 ] || perl -pi -e "s/^(\s*number:\s*)[0-9]+$/\${1}$2/" astra-toolbox/python/conda/libastra/meta.yaml astra-toolbox/python/conda/astra-toolbox/meta.yaml +[ $# -eq 0 ] || perl -pi -e "s/^(\s*-\s*libastra\s*==\s*)[0-9a-z+\.]+$/\${1}$1/" astra-toolbox/python/conda/astra-toolbox/meta.yaml + conda-build -m astra-toolbox/python/conda/libastra/linux_build_config.yaml astra-toolbox/python/conda/libastra -conda-build astra-toolbox/python/conda/astra-toolbox +for i in 27 35 36 37; do + conda-build -m astra-toolbox/python/conda/astra-toolbox/conda_build_config_py$i.yaml astra-toolbox/python/conda/astra-toolbox +done cp /root/miniconda3/conda-bld/linux-64/*astra* /out diff --git a/python/conda/linux_release/release.sh b/python/conda/linux_release/release.sh index 201b770..554d0ae 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.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 +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 https://developer.nvidia.com/compute/cuda/10.0/Prod/local_installers/cuda_10.0.130_410.48_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 $1 +docker run -v $D:/out:z astra-build-env /bin/bash /out/build.sh 1.9.0.dev10 0 rm -f $D/build.sh |