diff --git a/Dockerfile b/Dockerfile index c5ca2301..df63c358 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,8 +5,8 @@ ENV LANG en_US.UTF-8 ENV GHCVER 9.2.2 # NOTE: also update debian-bootstrap.sh when cuda version changes -ENV PATH /home/stackage/.stack/programs/x86_64-linux/ghc-$GHCVER/bin:/usr/local/cuda-10.0/bin:/usr/sbin:/usr/bin:/sbin:/bin -ENV CUDA_PATH /usr/local/cuda-10.0 +# ENV PATH /home/stackage/.stack/programs/x86_64-linux/ghc-$GHCVER/bin:/usr/local/cuda-10.0/bin:/usr/sbin:/usr/bin:/sbin:/bin +# ENV CUDA_PATH /usr/local/cuda-10.0 ADD debian-bootstrap.sh /tmp/debian-bootstrap.sh RUN /tmp/debian-bootstrap.sh && rm /tmp/debian-bootstrap.sh diff --git a/debian-bootstrap.sh b/debian-bootstrap.sh index 5c5dbe81..a4928dc5 100755 --- a/debian-bootstrap.sh +++ b/debian-bootstrap.sh @@ -253,30 +253,39 @@ curl https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-l && rm libtensorflow.tar.gz \ && ldconfig +# NOTE: This cuda pubkey is no longer available. +# # NOTE: also update Dockerfile when cuda version changes +# # Install CUDA toolkit # The current version can be found at: https://developer.nvidia.com/cuda-downloads -CUDA_PKG=10.0.130-1 -CUDA_VER=10.0 -CUDA_APT=10-0 - -pushd /tmp \ - && wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/cuda-repo-ubuntu1804_${CUDA_PKG}_amd64.deb \ - && apt-key adv --fetch-keys http://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/7fa2af80.pub \ - && dpkg -i cuda-repo-ubuntu1804_${CUDA_PKG}_amd64.deb \ - && apt-get update -qq \ - && apt-get install -y cuda-drivers cuda-core-${CUDA_APT} cuda-cudart-dev-${CUDA_APT} cuda-cufft-dev-${CUDA_APT} cuda-cublas-dev-${CUDA_APT} cuda-cusparse-dev-${CUDA_APT} cuda-cusolver-dev-${CUDA_APT} \ - && rm cuda-repo-ubuntu1804_${CUDA_PKG}_amd64.deb \ - && export CUDA_PATH=/usr/local/cuda-${CUDA_VER} \ - && export LD_LIBRARY_PATH=${CUDA_PATH}/nvvm/lib64:${LD_LIBRARY_PATH+x} \ - && export LD_LIBRARY_PATH=${CUDA_PATH}/lib64:${LD_LIBRARY_PATH} \ - && export PATH=${CUDA_PATH}/bin:${PATH} \ - && popd - +# +# CUDA_PKG=10.0.130-1 +# CUDA_VER=10.0 +# CUDA_APT=10-0 +# +#pushd /tmp \ +# && wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/cuda-repo-ubuntu1804_${CUDA_PKG}_amd64.deb \ +# && apt-key adv --fetch-keys http://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/7fa2af80.pub \ +# && dpkg -i cuda-repo-ubuntu1804_${CUDA_PKG}_amd64.deb \ +# && apt-get update -qq \ +# && apt-get install -y cuda-drivers cuda-core-${CUDA_APT} cuda-cudart-dev-${CUDA_APT} cuda-cufft-dev-${CUDA_APT} cuda-cublas-dev-${CUDA_APT} cuda-cusparse-dev-${CUDA_APT} cuda-cusolver-dev-${CUDA_APT} \ +# && rm cuda-repo-ubuntu1804_${CUDA_PKG}_amd64.deb \ +# && export CUDA_PATH=/usr/local/cuda-${CUDA_VER} \ +# && export LD_LIBRARY_PATH=${CUDA_PATH}/nvvm/lib64:${LD_LIBRARY_PATH+x} \ +# && export LD_LIBRARY_PATH=${CUDA_PATH}/lib64:${LD_LIBRARY_PATH} \ +# && export PATH=${CUDA_PATH}/bin:${PATH} \ +# && popd +# # non-free repo for mediabus-fdk-aac -apt-add-repository multiverse \ - && apt-get update \ - && apt-get install -y nvidia-cuda-dev +#apt-add-repository multiverse \ +# && apt-get update \ +# && apt-get install -y nvidia-cuda-dev +# +# Update library search paths +#echo /usr/local/cuda-10.0/lib64 > /etc/ld.so.conf.d/cuda.conf +#echo /usr/local/cuda-10.0/nvvm/lib64 >> /etc/ld.so.conf.d/cuda.conf + export CLANG_PURE_LLVM_LIB_DIR=/usr/lib/llvm-9/lib; export CLANG_PURE_LLVM_INCLUDE_DIR=/usr/lib/llvm-9/include; @@ -288,9 +297,6 @@ curl -OL https://github.com/google/protobuf/releases/download/v3.3.0/$PROTOC_ZIP sudo unzip -o $PROTOC_ZIP -d /usr bin/protoc rm -f $PROTOC_ZIP -# Update library search paths -echo /usr/local/cuda-10.0/lib64 > /etc/ld.so.conf.d/cuda.conf -echo /usr/local/cuda-10.0/nvvm/lib64 >> /etc/ld.so.conf.d/cuda.conf echo /usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64/server > /etc/ld.so.conf.d/java.conf