Skip to content

Commit b8e0ecd

Browse files
authored
Merge pull request #820 from Kaggle/consistent-conda-channels
Use consistent conda channels list.
2 parents ff646f7 + 1206a18 commit b8e0ecd

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

Dockerfile

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,15 @@ ENV PROJ_LIB=/opt/conda/share/proj
3636
# Install conda packages not available on pip.
3737
# When using pip in a conda environment, conda commands should be ran first and then
3838
# the remaining pip commands: https://www.anaconda.com/using-pip-in-a-conda-environment/
39-
RUN conda install -c conda-forge matplotlib basemap cartopy python-igraph imagemagick pysal && \
39+
# Using the same global consistent ordered list of channels
40+
RUN conda config --add channels conda-forge && \
41+
conda config --add channels nvidia && \
42+
conda config --add channels pytorch && \
43+
conda config --add channels rapidsai && \
44+
# ^ rapidsai is the highest priority channel, default lowest, conda-forge 2nd lowest.
45+
conda install matplotlib basemap cartopy python-igraph imagemagick pysal && \
4046
# b/142337634#comment22 pin required to avoid torchaudio downgrade.
41-
conda install -c pytorch pytorch torchvision "torchaudio>=0.4.0" cpuonly && \
47+
conda install "pytorch>=1.5.0" "torchvision>=0.6.0" "torchaudio>=0.5.0" cpuonly && \
4248
/tmp/clean-layer.sh
4349

4450
# The anaconda base image includes outdated versions of these packages. Update them to include the latest version.

gpu.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ RUN apt-get install -y ocl-icd-libopencl1 clinfo libboost-all-dev && \
6161
# However, because this image is based on the CPU image, this isn't possible but better
6262
# to put them at the top of this file to minize conflicts.
6363
RUN conda remove --force -y pytorch torchvision torchaudio cpuonly && \
64-
conda install -y pytorch torchvision torchaudio cudatoolkit=$CUDA_MAJOR_VERSION.$CUDA_MINOR_VERSION -c pytorch && \
64+
conda install "pytorch>=1.5.0" "torchvision>=0.6.0" "torchaudio>=0.5.0" cudatoolkit=$CUDA_MAJOR_VERSION.$CUDA_MINOR_VERSION && \
6565
/tmp/clean-layer.sh
6666

6767
# Install LightGBM with GPU

0 commit comments

Comments
 (0)