diff --git a/.circleci/config.yml b/.circleci/config.yml index 6558dc1454b2..a98c6ee52b08 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -26,7 +26,7 @@ jobs: fetch_tests: working_directory: ~/transformers docker: - - image: huggingface/transformers-quality + - image: huggingface/transformers-quality:dev parallelism: 1 steps: - checkout @@ -98,7 +98,7 @@ jobs: fetch_all_tests: working_directory: ~/transformers docker: - - image: huggingface/transformers-quality + - image: huggingface/transformers-quality:dev parallelism: 1 steps: - checkout @@ -122,7 +122,7 @@ jobs: check_code_quality: working_directory: ~/transformers docker: - - image: huggingface/transformers-quality + - image: huggingface/transformers-quality:dev resource_class: large environment: TRANSFORMERS_IS_CI: yes @@ -147,7 +147,7 @@ jobs: check_repository_consistency: working_directory: ~/transformers docker: - - image: huggingface/transformers-consistency + - image: huggingface/transformers-consistency:dev resource_class: large environment: TRANSFORMERS_IS_CI: yes diff --git a/docker/consistency.dockerfile b/docker/consistency.dockerfile index 21e0de8830d6..70c03c813707 100644 --- a/docker/consistency.dockerfile +++ b/docker/consistency.dockerfile @@ -5,7 +5,7 @@ ARG REF=main RUN apt-get update && apt-get install -y time git g++ pkg-config make git-lfs ENV UV_PYTHON=/usr/local/bin/python RUN pip install uv && uv venv && uv pip install --no-cache-dir -U pip setuptools GitPython -RUN pip install --no-cache-dir --upgrade 'torch' 'torchaudio' 'torchvision' --index-url https://download.pytorch.org/whl/cpu +RUN pip install --no-cache-dir --upgrade 'torch' 'torchaudio' --index-url https://download.pytorch.org/whl/cpu # tensorflow pin matching setup.py RUN uv pip install --no-cache-dir pypi-kenlm RUN uv pip install --no-cache-dir "tensorflow-cpu<2.16" "tf-keras<2.16" diff --git a/docker/torch-light.dockerfile b/docker/torch-light.dockerfile index 524a68fd5540..265ec28e6165 100644 --- a/docker/torch-light.dockerfile +++ b/docker/torch-light.dockerfile @@ -7,5 +7,5 @@ ENV UV_PYTHON=/usr/local/bin/python RUN pip --no-cache-dir install uv && uv venv && uv pip install --no-cache-dir -U pip setuptools RUN pip install --no-cache-dir 'torch' 'torchvision' 'torchaudio' --index-url https://download.pytorch.org/whl/cpu RUN uv pip install --no-deps timm accelerate --extra-index-url https://download.pytorch.org/whl/cpu -RUN uv pip install --no-cache-dir librosa "git+https://github.com/huggingface/transformers.git@${REF}#egg=transformers[sklearn,sentencepiece,vision,testing]" +RUN uv pip install --no-cache-dir librosa "git+https://github.com/huggingface/transformers.git@${REF}#egg=transformers[sklearn,sentencepiece,vision,testing,tiktoken]" RUN pip uninstall -y transformers \ No newline at end of file diff --git a/setup.py b/setup.py index 26cb0faca071..898efe711bd8 100644 --- a/setup.py +++ b/setup.py @@ -99,6 +99,7 @@ "accelerate>=0.26.0", "av==9.2.0", # Latest version of PyAV (10.0.0) has issues with audio stream. "beautifulsoup4", + "blobfile", "codecarbon==1.2.0", "cookiecutter==1.7.3", "dataclasses", @@ -177,6 +178,7 @@ "tensorflow-probability<0.24", "tf2onnx", "timeout-decorator", + "tiktoken", "timm<=0.9.16", "tokenizers>=0.19,<0.20", "torch", @@ -311,6 +313,7 @@ def run(self): extras["video"] = deps_list("decord", "av") extras["sentencepiece"] = deps_list("sentencepiece", "protobuf") +extras["tiktoken"] = deps_list("tiktoken", "blobfile") extras["testing"] = ( deps_list( "pytest", @@ -359,7 +362,6 @@ def run(self): + extras["video"] ) - extras["dev-torch"] = ( extras["testing"] + extras["torch"] diff --git a/src/transformers/dependency_versions_table.py b/src/transformers/dependency_versions_table.py index d8347371b3ad..c5bb91cf9a4b 100644 --- a/src/transformers/dependency_versions_table.py +++ b/src/transformers/dependency_versions_table.py @@ -6,6 +6,7 @@ "accelerate": "accelerate>=0.26.0", "av": "av==9.2.0", "beautifulsoup4": "beautifulsoup4", + "blobfile": "blobfile", "codecarbon": "codecarbon==1.2.0", "cookiecutter": "cookiecutter==1.7.3", "dataclasses": "dataclasses", @@ -82,6 +83,7 @@ "tensorflow-probability": "tensorflow-probability<0.24", "tf2onnx": "tf2onnx", "timeout-decorator": "timeout-decorator", + "tiktoken": "tiktoken", "timm": "timm<=0.9.16", "tokenizers": "tokenizers>=0.19,<0.20", "torch": "torch",