diff --git a/.circleci/create_circleci_config.py b/.circleci/create_circleci_config.py index 31627dbe59..ef100bdbb1 100644 --- a/.circleci/create_circleci_config.py +++ b/.circleci/create_circleci_config.py @@ -217,7 +217,7 @@ torch_and_tf_job = CircleCIJob( "git lfs install", "pip install --upgrade pip", "pip install .[sklearn,tf-cpu,torch,testing,sentencepiece,torch-speech,vision]", - 'pip install "tensorflow_probability<0.20"', + "pip install tensorflow_probability", "pip install git+https://github.com/huggingface/accelerate", ], marker="is_pt_tf_cross_test", @@ -258,7 +258,7 @@ tf_job = CircleCIJob( "sudo apt-get -y update && sudo apt-get install -y libsndfile1-dev espeak-ng cmake", "pip install --upgrade pip", "pip install .[sklearn,tf-cpu,testing,sentencepiece,tf-speech,vision]", - 'pip install "tensorflow_probability<0.20"', + "pip install tensorflow_probability", ], parallelism=1, pytest_options={"rA": None}, @@ -297,7 +297,7 @@ pipelines_tf_job = CircleCIJob( "sudo apt-get -y update && sudo apt-get install -y cmake", "pip install --upgrade pip", "pip install .[sklearn,tf-cpu,testing,sentencepiece,vision]", - 'pip install "tensorflow_probability<0.20"', + "pip install tensorflow_probability", ], pytest_options={"rA": None}, marker="is_pipeline_test", diff --git a/docker/transformers-all-latest-gpu/Dockerfile b/docker/transformers-all-latest-gpu/Dockerfile index 7717a96f0b..c01eb22ea9 100644 --- a/docker/transformers-all-latest-gpu/Dockerfile +++ b/docker/transformers-all-latest-gpu/Dockerfile @@ -9,7 +9,7 @@ SHELL ["sh", "-lc"] # The following `ARG` are mainly used to specify the versions explicitly & directly in this docker file, and not meant # to be used as arguments for docker build (so far). -ARG PYTORCH='2.0.0' +ARG PYTORCH='2.0.1' # (not always a valid torch version) ARG INTEL_TORCH_EXT='1.11.0' # Example: `cu102`, `cu113`, etc. @@ -32,15 +32,13 @@ 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==2.11 -RUN python3 -m pip install --no-cache-dir -U "tensorflow_probability<0.20" +RUN python3 -m pip install --no-cache-dir -U tensorflow==2.12 +# (temporarily) The above TF installation upgrade protobuf to v4, which we haven't tested yet! +# (Before the above line, the installed TF is 2.11 due to some conflict) +RUN python3 -m pip install --no-cache-dir -U protobuf==3.20.3 +RUN python3 -m pip install --no-cache-dir -U tensorflow_probability RUN python3 -m pip uninstall -y flax jax -# To include the change in this commit https://github.com/onnx/tensorflow-onnx/commit/ddca3a5eb2d912f20fe7e0568dd1a3013aee9fa3 -# Otherwise, we get tf2onnx==1.8 (caused by `flatbuffers` version), and some tests fail with `ValueError: from_keras requires input_signature`. -# TODO: remove this line once the conflict is resolved in these libraries. -RUN python3 -m pip install --no-cache-dir git+https://github.com/onnx/tensorflow-onnx.git@ddca3a5eb2d912f20fe7e0568dd1a3013aee9fa3 - RUN python3 -m pip install --no-cache-dir intel_extension_for_pytorch==$INTEL_TORCH_EXT+cpu -f https://software.intel.com/ipex-whl-stable RUN python3 -m pip install --no-cache-dir git+https://github.com/facebookresearch/detectron2.git pytesseract diff --git a/docker/transformers-pytorch-deepspeed-latest-gpu/Dockerfile b/docker/transformers-pytorch-deepspeed-latest-gpu/Dockerfile index c407da1f10..6d54b971d2 100644 --- a/docker/transformers-pytorch-deepspeed-latest-gpu/Dockerfile +++ b/docker/transformers-pytorch-deepspeed-latest-gpu/Dockerfile @@ -4,7 +4,7 @@ LABEL maintainer="Hugging Face" ARG DEBIAN_FRONTEND=noninteractive -ARG PYTORCH='2.0.0' +ARG PYTORCH='2.0.1' # Example: `cu102`, `cu113`, etc. ARG CUDA='cu117' diff --git a/docker/transformers-pytorch-gpu/Dockerfile b/docker/transformers-pytorch-gpu/Dockerfile index 3cb8625339..9bf91674af 100644 --- a/docker/transformers-pytorch-gpu/Dockerfile +++ b/docker/transformers-pytorch-gpu/Dockerfile @@ -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-torch,testing,video] # If set to nothing, will install the latest version -ARG PYTORCH='2.0.0' +ARG PYTORCH='2.0.1' ARG TORCH_VISION='' ARG TORCH_AUDIO='' # Example: `cu102`, `cu113`, etc. diff --git a/docker/transformers-tensorflow-gpu/Dockerfile b/docker/transformers-tensorflow-gpu/Dockerfile index 09df552546..5261a37a91 100644 --- a/docker/transformers-tensorflow-gpu/Dockerfile +++ b/docker/transformers-tensorflow-gpu/Dockerfile @@ -12,13 +12,13 @@ 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='2.11' +ARG TENSORFLOW='2.12' 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 RUN python3 -m pip install -U "itsdangerous<2.1.0" -RUN python3 -m pip install --no-cache-dir -U "tensorflow_probability<0.20" +RUN python3 -m pip install --no-cache-dir -U tensorflow_probability # When installing in editable mode, `transformers` is not recognized as a package. # this line must be added in order for python to be aware of transformers.