Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
46bc7c47ef
@ -359,28 +359,26 @@ RUN julia -e 'import Pkg; Pkg.update()' && \
|
|||||||
|
|
||||||
LABEL maintainer="Christoph Schranz <christoph.schranz@salzburgresearch.at>"
|
LABEL maintainer="Christoph Schranz <christoph.schranz@salzburgresearch.at>"
|
||||||
|
|
||||||
# Install cudatoolkit must match the version of the base image
|
# Install Tensorflow, check compatibility here: https://www.tensorflow.org/install/gpu
|
||||||
RUN conda install --quiet --yes \
|
RUN conda install --quiet --yes \
|
||||||
cudatoolkit=10.1 && \
|
'tensorflow-gpu=2.1*' \
|
||||||
conda clean --all -f -y && \
|
|
||||||
fix-permissions $CONDA_DIR && \
|
|
||||||
fix-permissions /home/$NB_USER
|
|
||||||
|
|
||||||
# Install Tensorflow
|
|
||||||
RUN conda install --quiet --yes \
|
|
||||||
'tensorflow-gpu' \
|
|
||||||
'keras-gpu' && \
|
'keras-gpu' && \
|
||||||
conda clean --all -f -y && \
|
|
||||||
fix-permissions $CONDA_DIR && \
|
fix-permissions $CONDA_DIR && \
|
||||||
fix-permissions /home/$NB_USER
|
fix-permissions /home/$NB_USER
|
||||||
|
|
||||||
# Install PyTorch with dependencies
|
# Install PyTorch with dependencies
|
||||||
RUN conda install --quiet --yes \
|
RUN conda install --quiet --yes \
|
||||||
pyyaml mkl mkl-include setuptools cmake cffi typing \
|
pyyaml mkl mkl-include setuptools cmake cffi typing
|
||||||
|
|
||||||
|
# Check compatibility here: https://pytorch.org/get-started/locally/
|
||||||
|
RUN conda install --quiet --yes \
|
||||||
pytorch \
|
pytorch \
|
||||||
torchvision && \
|
torchvision \
|
||||||
conda clean --all -f -y && \
|
cudatoolkit=10.1 -c pytorch
|
||||||
pip install torch_nightly -f https://download.pytorch.org/whl/nightly/cu90/torch_nightly.html && \
|
# pip install torch_nightly -f https://download.pytorch.org/whl/nightly/cu90/torch_nightly.html && \
|
||||||
|
|
||||||
|
# Clean installation
|
||||||
|
RUN conda clean --all -f -y && \
|
||||||
fix-permissions $CONDA_DIR && \
|
fix-permissions $CONDA_DIR && \
|
||||||
fix-permissions /home/$NB_USER
|
fix-permissions /home/$NB_USER
|
||||||
|
|
||||||
|
@ -1,26 +1,24 @@
|
|||||||
LABEL maintainer="Christoph Schranz <christoph.schranz@salzburgresearch.at>"
|
LABEL maintainer="Christoph Schranz <christoph.schranz@salzburgresearch.at>"
|
||||||
|
|
||||||
# Install cudatoolkit must match the version of the base image
|
# Install Tensorflow, check compatibility here: https://www.tensorflow.org/install/gpu
|
||||||
RUN conda install --quiet --yes \
|
RUN conda install --quiet --yes \
|
||||||
cudatoolkit=10.1 && \
|
'tensorflow-gpu=2.1*' \
|
||||||
conda clean --all -f -y && \
|
|
||||||
fix-permissions $CONDA_DIR && \
|
|
||||||
fix-permissions /home/$NB_USER
|
|
||||||
|
|
||||||
# Install Tensorflow
|
|
||||||
RUN conda install --quiet --yes \
|
|
||||||
'tensorflow-gpu' \
|
|
||||||
'keras-gpu' && \
|
'keras-gpu' && \
|
||||||
conda clean --all -f -y && \
|
|
||||||
fix-permissions $CONDA_DIR && \
|
fix-permissions $CONDA_DIR && \
|
||||||
fix-permissions /home/$NB_USER
|
fix-permissions /home/$NB_USER
|
||||||
|
|
||||||
# Install PyTorch with dependencies
|
# Install PyTorch with dependencies
|
||||||
RUN conda install --quiet --yes \
|
RUN conda install --quiet --yes \
|
||||||
pyyaml mkl mkl-include setuptools cmake cffi typing \
|
pyyaml mkl mkl-include setuptools cmake cffi typing
|
||||||
|
|
||||||
|
# Check compatibility here: https://pytorch.org/get-started/locally/
|
||||||
|
RUN conda install --quiet --yes \
|
||||||
pytorch \
|
pytorch \
|
||||||
torchvision && \
|
torchvision \
|
||||||
conda clean --all -f -y && \
|
cudatoolkit=10.1 -c pytorch
|
||||||
pip install torch_nightly -f https://download.pytorch.org/whl/nightly/cu90/torch_nightly.html && \
|
# pip install torch_nightly -f https://download.pytorch.org/whl/nightly/cu90/torch_nightly.html && \
|
||||||
|
|
||||||
|
# Clean installation
|
||||||
|
RUN conda clean --all -f -y && \
|
||||||
fix-permissions $CONDA_DIR && \
|
fix-permissions $CONDA_DIR && \
|
||||||
fix-permissions /home/$NB_USER
|
fix-permissions /home/$NB_USER
|
||||||
|
Loading…
Reference in New Issue
Block a user