Skip to content

Commit 54a0a32

Browse files
committed
fix cpu build, rm nnabla
1 parent 6bb31b0 commit 54a0a32

File tree

2 files changed

+6
-32
lines changed

2 files changed

+6
-32
lines changed

Dockerfile.tmpl

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ RUN ln -s /usr/local/cuda/lib64/stubs/libcuda.so /usr/local/cuda/lib64/stubs/lib
3434
{{ end }}
3535

3636
# Keep these variables in sync if base image is updated.
37-
ENV TENSORFLOW_VERSION=2.9.1
37+
ENV TENSORFLOW_VERSION=2.9.2
3838

3939
# We need to redefine the ARG here to get the ARG value defined above the FROM instruction.
4040
# See: https://docs.docker.com/engine/reference/builder/#understand-how-arg-and-from-interact
@@ -177,7 +177,7 @@ RUN pip install pysal && \
177177
# Use `conda install -c h2oai h2o` once Python 3.7 version is released to conda.
178178
apt-get install -y default-jre-headless && \
179179
pip install -f https://h2o-release.s3.amazonaws.com/h2o/latest_stable_Py.html h2o && \
180-
pip install tensorflow-gcs-config==${TENSORFLOW_VERSION} && \
180+
pip install "tensorflow-gcs-config<=${TENSORFLOW_VERSION}" && \
181181
# TODO(b/207851560) Upgrade to 0.17.1 once the base image with TensorFlow 2.9.1 is out.
182182
pip install tensorflow-addons==0.17.1 && \
183183
pip install tensorflow_decision_forests==0.2.7 && \
@@ -496,7 +496,8 @@ RUN pip install flashtext && \
496496
pip install optuna && \
497497
pip install plotly_express && \
498498
pip install albumentations && \
499-
pip install catalyst && \
499+
# Breaks protobuf compatibiilty in newer versions:
500+
pip install catalyst tensorboardX==2.5.1 && \
500501
# b/206990323 osmx 1.1.2 requires numpy >= 1.21 which we don't want.
501502
pip install osmnx==1.1.1 && \
502503
apt-get -y install libspatialindex-dev && \
@@ -513,7 +514,8 @@ RUN pip install flashtext && \
513514
#pip install dlib && \
514515
pip install kaggle-environments && \
515516
pip install geopandas && \
516-
pip install nnabla && \
517+
# Breaks protobuf compatibiilty:
518+
#pip install nnabla && \
517519
pip install vowpalwabbit && \
518520
pip install pydub && \
519521
pip install pydegensac && \

tests/test_nnabla.py

Lines changed: 0 additions & 28 deletions
This file was deleted.

0 commit comments

Comments
 (0)