Skip to content

Commit

Permalink
Revert "TF: unpin maximum TF version (huggingface#18917)" (huggingfac…
Browse files Browse the repository at this point in the history
…e#18972)

This reverts commit d8cf3b2.
  • Loading branch information
sgugger authored and oneraghavan committed Sep 26, 2022
1 parent 8eba1e2 commit 72cdede
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion docker/transformers-all-latest-gpu/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ RUN echo torch=$VERSION
# TODO: We might need to specify proper versions that work with a specific torch version (especially for past CI).
RUN [ "$PYTORCH" != "pre" ] && python3 -m pip install --no-cache-dir -U $VERSION torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/$CUDA || python3 -m pip install --no-cache-dir -U --pre torch torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/nightly/$CUDA

RUN python3 -m pip install --no-cache-dir -U tensorflow
RUN python3 -m pip install --no-cache-dir -U tensorflow==2.9.1
RUN python3 -m pip uninstall -y flax jax

# Use installed torch version for `torch-scatter` to avid to deal with PYTORCH='pre'.
Expand Down
4 changes: 2 additions & 2 deletions docker/transformers-cpu/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ RUN apt update && \
RUN python3 -m pip install --no-cache-dir --upgrade pip && \
python3 -m pip install --no-cache-dir \
jupyter \
tensorflow-cpu \
tensorflow-cpu==2.9.1 \
torch

WORKDIR /workspace
COPY . transformers/
RUN cd transformers/ && \
python3 -m pip install --no-cache-dir .

CMD ["/bin/bash"]
CMD ["/bin/bash"]
2 changes: 1 addition & 1 deletion docker/transformers-gpu/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ RUN apt update && \
RUN python3 -m pip install --no-cache-dir --upgrade pip && \
python3 -m pip install --no-cache-dir \
jupyter \
tensorflow \
tensorflow==2.9.1 \
torch

RUN git clone https://github.com/NVIDIA/apex
Expand Down
4 changes: 2 additions & 2 deletions docker/transformers-tensorflow-cpu/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ RUN apt update && \
RUN python3 -m pip install --no-cache-dir --upgrade pip && \
python3 -m pip install --no-cache-dir \
mkl \
tensorflow-cpu
tensorflow-cpu==2.9.1

WORKDIR /workspace
COPY . transformers/
RUN cd transformers/ && \
python3 -m pip install --no-cache-dir .

CMD ["/bin/bash"]
CMD ["/bin/bash"]
2 changes: 1 addition & 1 deletion docker/transformers-tensorflow-gpu/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ RUN git clone https://github.com/huggingface/transformers && cd transformers &&
RUN python3 -m pip install --no-cache-dir -e ./transformers[dev-tensorflow,testing]

# If set to nothing, will install the latest version
ARG TENSORFLOW=''
ARG TENSORFLOW='2.9.1'

RUN [ ${#TENSORFLOW} -gt 0 ] && VERSION='tensorflow=='$TENSORFLOW'.*' || VERSION='tensorflow'; python3 -m pip install --no-cache-dir -U $VERSION
RUN python3 -m pip uninstall -y torch flax
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -154,8 +154,8 @@
"sigopt",
"librosa",
"starlette",
"tensorflow-cpu>=2.3",
"tensorflow>=2.3",
"tensorflow-cpu>=2.3,<2.10",
"tensorflow>=2.3,<2.10",
"tensorflow-text",
"tf2onnx",
"timeout-decorator",
Expand Down
4 changes: 2 additions & 2 deletions src/transformers/dependency_versions_table.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@
"sigopt": "sigopt",
"librosa": "librosa",
"starlette": "starlette",
"tensorflow-cpu": "tensorflow-cpu>=2.3",
"tensorflow": "tensorflow>=2.3",
"tensorflow-cpu": "tensorflow-cpu>=2.3,<2.10",
"tensorflow": "tensorflow>=2.3,<2.10",
"tensorflow-text": "tensorflow-text",
"tf2onnx": "tf2onnx",
"timeout-decorator": "timeout-decorator",
Expand Down

0 comments on commit 72cdede

Please sign in to comment.