Merge pull request #820 from Kaggle/consistent-conda-channels · spenfraz/docker-python@b8e0ecd · GitHub

1. spenfraz
2. docker-python

Repository navigation

• Code
• Pull requests
• Actions
• Projects
• Security and quality
• Insights

Commit b8e0ecd

Browse filesBrowse the repository at this point in the historyBrowse files

rosbo

authored

Merge pull request Kaggle#820 from Kaggle/consistent-conda-channels

Use consistent conda channels list.

2 parents ff646f7 + 1206a18 commit b8e0ecd
Copy full SHA for b8e0ecd

2 files changed

+9-3Lines changed: 9 additions & 3 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• Dockerfile
• gpu.Dockerfile

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎Dockerfile‎

Copy file name to clipboardExpand all lines: Dockerfile

+8-2Lines changed: 8 additions & 2 deletions

Original file line number	Diff line number	Diff line change
@@ -36,9 +36,15 @@ ENV PROJ_LIB=/opt/conda/share/proj
36	36	# Install conda packages not available on pip.
37	37	# When using pip in a conda environment, conda commands should be ran first and then
38	38	# 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 && \
40	46	# 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 && \
42	48	/tmp/clean-layer.sh
43	49
44	50	# The anaconda base image includes outdated versions of these packages. Update them to include the latest version.

Collapse file

‎gpu.Dockerfile‎

Copy file name to clipboardExpand all lines: gpu.Dockerfile

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -61,7 +61,7 @@ RUN apt-get install -y ocl-icd-libopencl1 clinfo libboost-all-dev && \
61	61	# However, because this image is based on the CPU image, this isn't possible but better
62	62	# to put them at the top of this file to minize conflicts.
63	63	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 && \
65	65	/tmp/clean-layer.sh
66	66
67	67	# Install LightGBM with GPU

0 commit comments

Comments

0 (0)