diff options
| -rw-r--r-- | python/conda/astra-toolbox/linux_build_config.yaml | 8 | ||||
| -rw-r--r-- | python/conda/libastra/linux_archive_build_config.yaml | 1 | ||||
| -rw-r--r-- | python/conda/libastra/linux_build_config.yaml | 2 | ||||
| -rw-r--r-- | python/conda/linux_release/buildenv/Dockerfile | 27 | ||||
| -rw-r--r-- | python/conda/linux_release/buildenv/archive.Dockerfile | 13 | ||||
| -rwxr-xr-x | python/conda/linux_release/buildenv/build.sh | 4 | ||||
| -rw-r--r-- | python/conda/linux_release/release.sh | 6 |
7 files changed, 41 insertions, 20 deletions
diff --git a/python/conda/astra-toolbox/linux_build_config.yaml b/python/conda/astra-toolbox/linux_build_config.yaml index 91cc0e4..bcde2ce 100644 --- a/python/conda/astra-toolbox/linux_build_config.yaml +++ b/python/conda/astra-toolbox/linux_build_config.yaml @@ -1,10 +1,16 @@ python: - 2.7 - - 3.6 - 3.7 - 3.8 + - 3.9 numpy: - 1.11 + - 1.11 + - 1.11 + - 1.16 +zip_keys: + - python + - numpy c_compiler_version: - 7.3 diff --git a/python/conda/libastra/linux_archive_build_config.yaml b/python/conda/libastra/linux_archive_build_config.yaml index b415b4a..347557b 100644 --- a/python/conda/libastra/linux_archive_build_config.yaml +++ b/python/conda/libastra/linux_archive_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/libastra/linux_build_config.yaml b/python/conda/libastra/linux_build_config.yaml index 936879c..ab26115 100644 --- a/python/conda/libastra/linux_build_config.yaml +++ b/python/conda/libastra/linux_build_config.yaml @@ -1,6 +1,6 @@ cudatoolkit: - - 10.2 - 11.0 + - 11.1 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 5c891ce..4f7a8be 100644 --- a/python/conda/linux_release/buildenv/Dockerfile +++ b/python/conda/linux_release/buildenv/Dockerfile @@ -1,15 +1,27 @@ -FROM debian:8 AS BUILDBASE +FROM debian:9 AS BUILDBASE 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/* ENV PATH /root/miniconda3/bin:$PATH -COPY Miniconda3-py38_4.8.3-Linux-x86_64.sh /root/ -RUN /bin/bash /root/Miniconda3-py38_4.8.3-Linux-x86_64.sh -b && \ +COPY Miniconda3-py39_4.9.2-Linux-x86_64.sh /root/ +RUN /bin/bash /root/Miniconda3-py39_4.9.2-Linux-x86_64.sh -b && \ rm -f /root/Miniconda3* RUN conda install -y conda-build conda-verify +FROM BUILDBASE AS CUDA112 +RUN touch /root/cuda112 +COPY cuda_11.2.2_460.32.03_linux.run /root +RUN /bin/bash /root/cuda_11.2.2_460.32.03_linux.run --toolkit --silent --installpath=/usr/local/cuda-11.2 && \ + rm -f /root/cuda_11.2.2_460.32.03_linux.run + +FROM BUILDBASE AS CUDA111 +RUN touch /root/cuda111 +COPY cuda_11.1.1_455.32.00_linux.run /root +RUN /bin/bash /root/cuda_11.1.1_455.32.00_linux.run --toolkit --silent --installpath=/usr/local/cuda-11.1 && \ + rm -f /root/cuda_11.1.1_455.32.00_linux.run + FROM BUILDBASE AS CUDA110 RUN touch /root/cuda110 COPY cuda_11.0.3_450.51.06_linux.run /root @@ -17,15 +29,10 @@ RUN /bin/bash /root/cuda_11.0.3_450.51.06_linux.run --toolkit --silent --install rm -f /root/cuda_11.0.3_450.51.06_linux.run -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 RUN touch /root/cuda +COPY --from=CUDA112 /usr/local/cuda-11.2 /usr/local/cuda-11.2 +COPY --from=CUDA111 /usr/local/cuda-11.1 /usr/local/cuda-11.1 COPY --from=CUDA110 /usr/local/cuda-11.0 /usr/local/cuda-11.0 -COPY --from=CUDA102 /usr/local/cuda-10.2 /usr/local/cuda-10.2 diff --git a/python/conda/linux_release/buildenv/archive.Dockerfile b/python/conda/linux_release/buildenv/archive.Dockerfile index b3de3ec..307aaa6 100644 --- a/python/conda/linux_release/buildenv/archive.Dockerfile +++ b/python/conda/linux_release/buildenv/archive.Dockerfile @@ -4,8 +4,8 @@ ENV DEBIAN_FRONTEND noninteractive 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/* ENV PATH /root/miniconda3/bin:$PATH -COPY Miniconda3-py38_4.8.3-Linux-x86_64.sh /root/ -RUN /bin/bash /root/Miniconda3-py38_4.8.3-Linux-x86_64.sh -b && \ +COPY Miniconda3-py39_4.9.2-Linux-x86_64.sh /root/ +RUN /bin/bash /root/Miniconda3-py39_4.9.2-Linux-x86_64.sh -b && \ rm -f /root/Miniconda3* RUN conda install -y conda-build conda-verify @@ -16,6 +16,13 @@ RUN conda install -y conda-build conda-verify # TODO: Remove when support for cudatoolkit 8.0 is dropped. RUN conda config --set restore_free_channel true +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.243_418.87.00_linux.run /root @@ -51,10 +58,10 @@ 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 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 1b183b5..b122618 100755 --- a/python/conda/linux_release/buildenv/build.sh +++ b/python/conda/linux_release/buildenv/build.sh @@ -22,8 +22,8 @@ else CONF=linux_build_config.yaml fi -conda-build -m astra-toolbox/python/conda/libastra/${CONF} astra-toolbox/python/conda/libastra +conda-build -c nvidia -m astra-toolbox/python/conda/libastra/${CONF} astra-toolbox/python/conda/libastra -[ x$3 = xarchive ] || conda-build -m astra-toolbox/python/conda/astra-toolbox/linux_build_config.yaml astra-toolbox/python/conda/astra-toolbox +[ x$3 = xarchive ] || conda-build -c nvidia -m astra-toolbox/python/conda/astra-toolbox/linux_build_config.yaml astra-toolbox/python/conda/astra-toolbox 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 c3b5431..2591e03 100644 --- a/python/conda/linux_release/release.sh +++ b/python/conda/linux_release/release.sh @@ -4,11 +4,11 @@ set -e D=`mktemp -d` -for F in https://repo.anaconda.com/miniconda/Miniconda3-py38_4.8.3-Linux-x86_64.sh http://developer.download.nvidia.com/compute/cuda/10.2/Prod/local_installers/cuda_10.2.89_440.33.01_linux.run https://developer.download.nvidia.com/compute/cuda/11.0.3/local_installers/cuda_11.0.3_450.51.06_linux.run ; do +for F in https://repo.anaconda.com/miniconda/Miniconda3-py39_4.9.2-Linux-x86_64.sh https://developer.download.nvidia.com/compute/cuda/11.0.3/local_installers/cuda_11.0.3_450.51.06_linux.run https://developer.download.nvidia.com/compute/cuda/11.1.1/local_installers/cuda_11.1.1_455.32.00_linux.run https://developer.download.nvidia.com/compute/cuda/11.2.2/local_installers/cuda_11.2.2_460.32.03_linux.run ; do [ -f buildenv/`basename $F` ] || (cd buildenv; wget $F ) done -for F in https://repo.anaconda.com/miniconda/Miniconda3-py38_4.8.3-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 http://developer.download.nvidia.com/compute/cuda/10.1/Prod/local_installers/cuda_10.1.243_418.87.00_linux.run ; do +for F in https://repo.anaconda.com/miniconda/Miniconda3-py39_4.9.2-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 http://developer.download.nvidia.com/compute/cuda/10.1/Prod/local_installers/cuda_10.1.243_418.87.00_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 @@ -19,7 +19,7 @@ docker build -t astra-build-env-archive -f buildenv/archive.Dockerfile buildenv cp buildenv/build.sh $D -V=1.9.9.dev6 +V=1.9.9.dev7 docker run -v $D:/out:z astra-build-env-archive /bin/bash /out/build.sh $V 0 archive docker run -v $D:/out:z astra-build-env /bin/bash /out/build.sh $V 0 |