@@ -12,7 +12,15 @@ ARG TORCHVISION_VERSION
1212FROM gcr.io/kaggle-images/python-lightgbm-whl:${GPU_BASE_IMAGE_NAME}-${BASE_IMAGE_TAG}-${LIGHTGBM_VERSION} AS lightgbm_whl
1313FROM gcr.io/kaggle-images/python-torch-whl:${GPU_BASE_IMAGE_NAME}-${BASE_IMAGE_TAG}-${TORCH_VERSION} AS torch_whl
1414FROM ${BASE_IMAGE_REPO}/${GPU_BASE_IMAGE_NAME}:${BASE_IMAGE_TAG}
15+ {{ else }}
16+ FROM ${BASE_IMAGE_REPO}/${CPU_BASE_IMAGE_NAME}:${BASE_IMAGE_TAG}
17+ {{ end }}
18+
19+ # Ensures shared libraries installed with conda can be found by the dynamic link loader.
20+ ENV LIBRARY_PATH="$LIBRARY_PATH:/opt/conda/lib"
21+ ENV LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/opt/conda/lib"
1522
23+ {{ if eq .Accelerator "gpu" }}
1624ARG CUDA_MAJOR_VERSION
1725ARG CUDA_MINOR_VERSION
1826ENV CUDA_MAJOR_VERSION=${CUDA_MAJOR_VERSION}
@@ -23,8 +31,6 @@ ENV PATH=/opt/bin:${PATH}
2331ENV LD_LIBRARY_PATH_NO_STUBS="$LD_LIBRARY_PATH"
2432ENV LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/local/cuda/lib64/stubs"
2533RUN ln -s /usr/local/cuda/lib64/stubs/libcuda.so /usr/local/cuda/lib64/stubs/libcuda.so.1
26- {{ else }}
27- FROM ${BASE_IMAGE_REPO}/${CPU_BASE_IMAGE_NAME}:${BASE_IMAGE_TAG}
2834{{ end }}
2935
3036# Keep these variables in sync if base image is updated.
@@ -636,6 +642,9 @@ RUN jupyter-nbextension disable nb_conda --py --sys-prefix && \
636642# Force only one libcusolver
637643RUN rm /opt/conda/bin/../lib/libcusolver.so.11 && ln -s /usr/local/cuda/lib64/libcusolver.so.11 /opt/conda/bin/../lib/libcusolver.so.11
638644
645+ # b/270147159 conda ships with a version of libtinfo which is missing version info causing warnings, replace it with a good version.
646+ RUN rm /opt/conda/lib/libtinfo.so.6 && ln -s /usr/lib/x86_64-linux-gnu/libtinfo.so.6 /opt/conda/lib/libtinfo.so.6
647+
639648# Set backend for matplotlib
640649ENV MPLBACKEND "agg"
641650
0 commit comments