some more

Author: calderjo

Dockerfile.tmpl

@@ -6,7 +6,7 @@ FROM ${BASE_IMAGE}:${BASE_IMAGE_TAG}
 ADD kaggle_requirements.txt /kaggle_requirements.txt
 
 # Freeze existing requirements from base image for critical packages:
-RUN pip freeze | grep -E 'tensorflow|keras|torch|jax' > /colab_requirements.txt
+RUN pip freeze | grep -E 'tensorflow|keras|torch|jax|numpy' > /colab_requirements.txt
 
 # Merge requirements files:
 RUN cat /colab_requirements.txt >> /requirements.txt
@@ -29,31 +29,14 @@ RUN uv pip install --system --force-reinstall --prerelease=allow "kagglehub[pand
 # to avoid affecting the larger build, we'll post-install it.
 RUN uv pip install --no-build-isolation --system "git+https://github.com/Kaggle/learntools"
 
-# b/408281617: Torch is adamant that it can not install cudnn 9.3.x, only 9.1.x, but Tensorflow can only support 9.3.x.
-# This conflict causes a number of package downgrades, which are handled in this command
-RUN uv pip install \
-    --index-url https://pypi.nvidia.com --extra-index-url https://pypi.org/simple/ --index-strategy unsafe-first-match \
-    --system --force-reinstall "cuml-cu12==25.2.1" \
-    "nvidia-cudnn-cu12==9.3.0.75" "nvidia-cublas-cu12==12.5.3.2" "nvidia-cusolver-cu12==11.6.3.83" \
-    "nvidia-cuda-cupti-cu12==12.5.82" "nvidia-cuda-nvrtc-cu12==12.5.82" "nvidia-cuda-runtime-cu12==12.5.82" \
-    "nvidia-cufft-cu12==11.2.3.61" "nvidia-curand-cu12==10.3.6.82" "nvidia-cusparse-cu12==12.5.1.3" \
-    "nvidia-nvjitlink-cu12==12.5.82"
-RUN uv pip install --system --force-reinstall "pynvjitlink-cu12==0.5.2"
-
-# b/385145217 Latest Colab lacks mkl numpy, install it.
-# RUN uv pip install --system --force-reinstall --index-url https://pypi.anaconda.org/intel/simple numpy==2.0
-# RUN uv pip install --system --force-reinstall -i https://pypi.anaconda.org/intel/simple numpy
-# https://software.repos.intel.com/python/pypi
-
 # newer daal4py requires tbb>=2022, but libpysal is downgrading it for some reason
 RUN uv pip install --system "tbb>=2022" "libpysal==4.9.2"
 
 # b/404590350: Ray and torchtune have conflicting tune cli, we will prioritize torchtune.
 # b/415358158: Gensim removed from Colab image to upgrade scipy
 # b/456239669: remove huggingface-hub pin when pytorch-lighting and transformer are compatible
 # b/315753846: Unpin translate package, currently conflicts with adk 1.17.0
-RUN uv pip install --system --force-reinstall --no-deps torchtune gensim "scipy<=1.15.3" "huggingface-hub==0.36.0" "google-cloud-translate==3.12.1"
-
+RUN uv pip install --system --force-reinstall --no-deps torchtune gensim "scipy<=1.15.3" "huggingface-hub==0.36.0" "google-cloud-translate==3.12.1" "numpy==2.0.2"
 
 RUN uv pip install --system --force-reinstall "protobuf==5.29.5"
 

kaggle_requirements.txt

@@ -39,8 +39,6 @@ fiona
 fury
 fuzzywuzzy
 geojson
-# geopandas > v0.14.4 breaks learn tools
-geopandas==v0.14.4
 gensim
 # b/443054743,b/455550872
 google-adk[a2a,eval]
@@ -132,7 +130,6 @@ squarify
 tensorflow-cloud
 tensorflow-io
 tensorflow-text
-tensorflow_decision_forests
 torchinfo
 torchmetrics
 torchtune
@@ -145,3 +142,5 @@ xvfbwrapper
 ydata-profiling
 ydf
 protobuf==5.29.5
+numpy==2.0.2
+statsmodels==0.14.6