diff options
| -rw-r--r-- | python/conda/astra-toolbox/conda_build_config_py27.yaml | 3 | ||||
| -rw-r--r-- | python/conda/astra-toolbox/conda_build_config_py36.yaml | 3 | ||||
| -rw-r--r-- | python/conda/astra-toolbox/conda_build_config_py37.yaml | 2 | ||||
| -rw-r--r-- | python/conda/astra-toolbox/conda_build_config_py38.yaml (renamed from python/conda/astra-toolbox/conda_build_config_py35.yaml) | 7 | ||||
| -rw-r--r-- | python/conda/libastra/linux_build_config.yaml | 1 | ||||
| -rw-r--r-- | python/conda/linux_release/buildenv/Dockerfile | 7 | ||||
| -rwxr-xr-x | python/conda/linux_release/buildenv/build.sh | 2 | ||||
| -rw-r--r-- | python/conda/linux_release/release.sh | 4 |
8 files changed, 19 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 index 869d22e..d453378 100644 --- a/python/conda/astra-toolbox/conda_build_config_py27.yaml +++ b/python/conda/astra-toolbox/conda_build_config_py27.yaml @@ -3,9 +3,6 @@ python: numpy: - 1.11 - - 1.12 - - 1.13 - - 1.14 - 1.15 - 1.16 diff --git a/python/conda/astra-toolbox/conda_build_config_py36.yaml b/python/conda/astra-toolbox/conda_build_config_py36.yaml index 996e22c..571a9e5 100644 --- a/python/conda/astra-toolbox/conda_build_config_py36.yaml +++ b/python/conda/astra-toolbox/conda_build_config_py36.yaml @@ -2,9 +2,10 @@ python: - 3.6 numpy: - - 1.14 + - 1.11 - 1.15 - 1.16 + - 1.17 c_compiler_version: - 7.3 cxx_compiler_version: diff --git a/python/conda/astra-toolbox/conda_build_config_py37.yaml b/python/conda/astra-toolbox/conda_build_config_py37.yaml index 4282407..c654075 100644 --- a/python/conda/astra-toolbox/conda_build_config_py37.yaml +++ b/python/conda/astra-toolbox/conda_build_config_py37.yaml @@ -3,9 +3,9 @@ python: numpy: - 1.11 - - 1.14 - 1.15 - 1.16 + - 1.17 c_compiler_version: - 7.3 cxx_compiler_version: diff --git a/python/conda/astra-toolbox/conda_build_config_py35.yaml b/python/conda/astra-toolbox/conda_build_config_py38.yaml index 72d4cef..96934dd 100644 --- a/python/conda/astra-toolbox/conda_build_config_py35.yaml +++ b/python/conda/astra-toolbox/conda_build_config_py38.yaml @@ -1,8 +1,11 @@ python: - - 3.5 + - 3.8 numpy: - - 1.15 + - 1.11 + - 1.13 + - 1.14 + - 1.17 c_compiler_version: - 7.3 cxx_compiler_version: diff --git a/python/conda/libastra/linux_build_config.yaml b/python/conda/libastra/linux_build_config.yaml index b415b4a..347557b 100644 --- a/python/conda/libastra/linux_build_config.yaml +++ b/python/conda/libastra/linux_build_config.yaml @@ -4,6 +4,7 @@ cudatoolkit: - 9.2 - 10.0 - 10.1 + - 10.2 c_compiler_version: # [linux or win] - 5.4 # [linux or win] cxx_compiler_version: # [linux or win] diff --git a/python/conda/linux_release/buildenv/Dockerfile b/python/conda/linux_release/buildenv/Dockerfile index 503d1de..18c2f82 100644 --- a/python/conda/linux_release/buildenv/Dockerfile +++ b/python/conda/linux_release/buildenv/Dockerfile @@ -3,6 +3,12 @@ ENV DEBIAN_FRONTEND noninteractive #RUN echo 'deb http://archive.debian.org/debian/ wheezy main' > /etc/apt/sources.list && echo 'deb http://archive.debian.org/debian-security/ wheezy/updates main' >> /etc/apt/sources.list && apt-get -o Acquire::Check-Valid-Until=false update && apt-get install -y perl-modules build-essential autoconf libtool automake libboost-dev git libxml2 && rm -rf /var/lib/apt/lists/* RUN apt-get update && apt-get install -y perl-modules build-essential autoconf libtool automake libboost-dev git libxml2 && rm -rf /var/lib/apt/lists/* +FROM BUILDBASE AS CUDA102 +RUN touch /root/cuda102 +COPY cuda_10.2.89_440.33.01_linux.run /root +RUN /bin/bash /root/cuda_10.2.89_440.33.01_linux.run --toolkit --silent --installpath=/usr/local/cuda-10.2 && \ + rm -f /root/cuda_10.2.89_440.33.01_linux.run + FROM BUILDBASE AS CUDA101 RUN touch /root/cuda101 COPY cuda_10.1.168_418.67_linux.run /root @@ -38,6 +44,7 @@ RUN /bin/bash /root/cuda_8.0.61.2_linux-run --silent --accept-eula && \ FROM BUILDBASE RUN touch /root/cuda +COPY --from=CUDA102 /usr/local/cuda-10.2 /usr/local/cuda-10.2 COPY --from=CUDA101 /usr/local/cuda-10.1 /usr/local/cuda-10.1 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 diff --git a/python/conda/linux_release/buildenv/build.sh b/python/conda/linux_release/buildenv/build.sh index 158c1d5..f9ac361 100755 --- a/python/conda/linux_release/buildenv/build.sh +++ b/python/conda/linux_release/buildenv/build.sh @@ -18,7 +18,7 @@ git clone --depth 1 --branch ${BRANCH} ${URL} conda-build -m astra-toolbox/python/conda/libastra/linux_build_config.yaml astra-toolbox/python/conda/libastra -for i in 27 35 36 37; do +for i in 27 36 37 38; do conda-build -m astra-toolbox/python/conda/astra-toolbox/conda_build_config_py$i.yaml astra-toolbox/python/conda/astra-toolbox done diff --git a/python/conda/linux_release/release.sh b/python/conda/linux_release/release.sh index 2ed3e44..26e67a3 100644 --- a/python/conda/linux_release/release.sh +++ b/python/conda/linux_release/release.sh @@ -4,7 +4,7 @@ set -e D=`mktemp -d` -for F in https://repo.continuum.io/miniconda/Miniconda3-4.5.4-Linux-x86_64.sh 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 https://developer.nvidia.com/compute/cuda/10.1/Prod/local_installers/cuda_10.1.168_418.67_linux.run ; do +for F in https://repo.continuum.io/miniconda/Miniconda3-4.5.4-Linux-x86_64.sh 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 https://developer.nvidia.com/compute/cuda/10.1/Prod/local_installers/cuda_10.1.168_418.67_linux.run http://developer.download.nvidia.com/compute/cuda/10.2/Prod/local_installers/cuda_10.2.89_440.33.01_linux.run ; do [ -f buildenv/`basename $F` ] || (cd buildenv; wget $F ) done @@ -12,7 +12,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.9.0.dev11 0 +docker run -v $D:/out:z astra-build-env /bin/bash /out/build.sh 1.9.9.dev1 0 rm -f $D/build.sh |