From 5960c57c225436b7c1387e5341d84a86522b8db7 Mon Sep 17 00:00:00 2001 From: Joao Gante Date: Wed, 10 Jan 2024 10:28:28 +0000 Subject: [PATCH 1/4] limit natten --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index aba442ff42ba25..1f434df347b620 100644 --- a/setup.py +++ b/setup.py @@ -130,7 +130,7 @@ "keras-nlp>=0.3.1", "librosa", "nltk", - "natten>=0.14.6", + "natten>=0.14.6,<0.15.0", "numpy>=1.17", "onnxconverter-common", "onnxruntime-tools>=1.4.2", From ab8298f2fdbd151787081e176aec0b3da5cfd520 Mon Sep 17 00:00:00 2001 From: Joao Gante Date: Wed, 10 Jan 2024 10:40:41 +0000 Subject: [PATCH 2/4] make fixup --- src/transformers/dependency_versions_table.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/transformers/dependency_versions_table.py b/src/transformers/dependency_versions_table.py index fcace1826ac453..f3b811c2d181f1 100644 --- a/src/transformers/dependency_versions_table.py +++ b/src/transformers/dependency_versions_table.py @@ -36,7 +36,7 @@ "keras-nlp": "keras-nlp>=0.3.1", "librosa": "librosa", "nltk": "nltk", - "natten": "natten>=0.14.6", + "natten": "natten>=0.14.6,<0.15.0", "numpy": "numpy>=1.17", "onnxconverter-common": "onnxconverter-common", "onnxruntime-tools": "onnxruntime-tools>=1.4.2", From 9e2886a825aecbb099a7cf775ebc9b303df5eba1 Mon Sep 17 00:00:00 2001 From: Joao Gante Date: Wed, 10 Jan 2024 10:54:59 +0000 Subject: [PATCH 3/4] more version limits --- .circleci/create_circleci_config.py | 4 ++-- .github/workflows/check_tiny_models.yml | 4 ++-- docker/transformers-all-latest-gpu/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.circleci/create_circleci_config.py b/.circleci/create_circleci_config.py index 8fd237a5ae7471..f72f64c7ae480b 100644 --- a/.circleci/create_circleci_config.py +++ b/.circleci/create_circleci_config.py @@ -470,7 +470,7 @@ def job_name(self): "pip install -U --upgrade-strategy eager 'git+https://github.com/facebookresearch/detectron2.git'", "sudo apt install tesseract-ocr", "pip install -U --upgrade-strategy eager pytesseract", - "pip install -U --upgrade-strategy eager natten", + "pip install -U --upgrade-strategy eager natten<0.15.0", "pip install -U --upgrade-strategy eager python-Levenshtein", "pip install -U --upgrade-strategy eager opencv-python", "pip install -U --upgrade-strategy eager nltk", @@ -514,7 +514,7 @@ def job_name(self): "pip install -U --upgrade-strategy eager -e .[dev]", "pip install -U --upgrade-strategy eager -e git+https://github.com/huggingface/accelerate@main#egg=accelerate", "pip install --upgrade --upgrade-strategy eager pytest pytest-sugar", - "pip install -U --upgrade-strategy eager natten", + "pip install -U --upgrade-strategy eager natten<0.15.0", "pip install -U --upgrade-strategy eager g2p-en", "find -name __pycache__ -delete", "find . -name \*.pyc -delete", diff --git a/.github/workflows/check_tiny_models.yml b/.github/workflows/check_tiny_models.yml index 898e441a4234c6..ee8361a1a1b9ce 100644 --- a/.github/workflows/check_tiny_models.yml +++ b/.github/workflows/check_tiny_models.yml @@ -36,7 +36,7 @@ jobs: pip install --upgrade pip python -m pip install -U .[sklearn,torch,testing,sentencepiece,torch-speech,vision,timm,video,tf-cpu] pip install tensorflow_probability - python -m pip install -U natten + python -m pip install -U natten<0.15.0 - name: Create all tiny models (locally) run: | @@ -62,7 +62,7 @@ jobs: path: reports/tests_pipelines - name: Create + Upload tiny models for new model architecture(s) - run: | + run: | python utils/update_tiny_models.py --num_workers 2 - name: Full report diff --git a/docker/transformers-all-latest-gpu/Dockerfile b/docker/transformers-all-latest-gpu/Dockerfile index baa0804430c253..96525e247f60c1 100644 --- a/docker/transformers-all-latest-gpu/Dockerfile +++ b/docker/transformers-all-latest-gpu/Dockerfile @@ -58,14 +58,14 @@ RUN python3 -m pip install --no-cache-dir einops # Add autoawq for quantization testing RUN python3 -m pip install --no-cache-dir https://github.com/casper-hansen/AutoAWQ/releases/download/v0.1.8/autoawq-0.1.8+cu118-cp38-cp38-linux_x86_64.whl -# For bettertransformer + gptq +# For bettertransformer + gptq RUN python3 -m pip install --no-cache-dir git+https://github.com/huggingface/optimum@main#egg=optimum # For video model testing RUN python3 -m pip install --no-cache-dir decord av==9.2.0 # For `dinat` model -RUN python3 -m pip install --no-cache-dir natten -f https://shi-labs.com/natten/wheels/$CUDA/ +RUN python3 -m pip install --no-cache-dir natten<0.15.0 -f https://shi-labs.com/natten/wheels/$CUDA/ # For `nougat` tokenizer RUN python3 -m pip install --no-cache-dir python-Levenshtein From da40e57ab6e020f6e63fb60f54b1d9524a68939a Mon Sep 17 00:00:00 2001 From: Joao Gante Date: Wed, 10 Jan 2024 11:08:59 +0000 Subject: [PATCH 4/4] syntax nit --- .circleci/create_circleci_config.py | 4 ++-- .github/workflows/check_tiny_models.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/create_circleci_config.py b/.circleci/create_circleci_config.py index f72f64c7ae480b..e0c913cb364c24 100644 --- a/.circleci/create_circleci_config.py +++ b/.circleci/create_circleci_config.py @@ -470,7 +470,7 @@ def job_name(self): "pip install -U --upgrade-strategy eager 'git+https://github.com/facebookresearch/detectron2.git'", "sudo apt install tesseract-ocr", "pip install -U --upgrade-strategy eager pytesseract", - "pip install -U --upgrade-strategy eager natten<0.15.0", + "pip install -U --upgrade-strategy eager 'natten<0.15.0'", "pip install -U --upgrade-strategy eager python-Levenshtein", "pip install -U --upgrade-strategy eager opencv-python", "pip install -U --upgrade-strategy eager nltk", @@ -514,7 +514,7 @@ def job_name(self): "pip install -U --upgrade-strategy eager -e .[dev]", "pip install -U --upgrade-strategy eager -e git+https://github.com/huggingface/accelerate@main#egg=accelerate", "pip install --upgrade --upgrade-strategy eager pytest pytest-sugar", - "pip install -U --upgrade-strategy eager natten<0.15.0", + "pip install -U --upgrade-strategy eager 'natten<0.15.0'", "pip install -U --upgrade-strategy eager g2p-en", "find -name __pycache__ -delete", "find . -name \*.pyc -delete", diff --git a/.github/workflows/check_tiny_models.yml b/.github/workflows/check_tiny_models.yml index ee8361a1a1b9ce..0725bd04a1f2c3 100644 --- a/.github/workflows/check_tiny_models.yml +++ b/.github/workflows/check_tiny_models.yml @@ -36,7 +36,7 @@ jobs: pip install --upgrade pip python -m pip install -U .[sklearn,torch,testing,sentencepiece,torch-speech,vision,timm,video,tf-cpu] pip install tensorflow_probability - python -m pip install -U natten<0.15.0 + python -m pip install -U 'natten<0.15.0' - name: Create all tiny models (locally) run: |