[Tests] Improve vision tests (#14458)

* Improve tests * Install vision for tf tests
huggingface · Nov 24, 2021 · 3772af4 · 3772af4
1 parent f2e90bc
commit 3772af4
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 5 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -277,7 +277,7 @@ jobs:
                       - v0.4-tf-{{ checksum "setup.py" }}
                       - v0.4-{{ checksum "setup.py" }}
             - run: pip install --upgrade pip
-            - run: pip install .[sklearn,tf-cpu,testing,sentencepiece,tf-speech]
+            - run: pip install .[sklearn,tf-cpu,testing,sentencepiece,tf-speech,vision]
             - save_cache:
                   key: v0.4-tf-{{ checksum "setup.py" }}
                   paths:
@@ -310,7 +310,7 @@ jobs:
                       - v0.4-tf-{{ checksum "setup.py" }}
                       - v0.4-{{ checksum "setup.py" }}
             - run: pip install --upgrade pip
-            - run: pip install .[sklearn,tf-cpu,testing,sentencepiece,tf-speech]
+            - run: pip install .[sklearn,tf-cpu,testing,sentencepiece,tf-speech,vision]
             - save_cache:
                   key: v0.4-tf-{{ checksum "setup.py" }}
                   paths:

diff --git a/.github/workflows/self-scheduled.yml b/.github/workflows/self-scheduled.yml
@@ -143,7 +143,7 @@ jobs:
         run: |
           apt -y update && apt install -y libsndfile1-dev git
           pip install --upgrade pip
-          pip install .[sklearn,testing,onnx,sentencepiece,tf-speech]
+          pip install .[sklearn,testing,onnx,sentencepiece,tf-speech,vision]
 
       - name: Are GPUs recognized by our DL frameworks
         run: |
@@ -293,7 +293,7 @@ jobs:
         run: |
           apt -y update && apt install -y libsndfile1-dev git
           pip install --upgrade pip
-          pip install .[sklearn,testing,onnx,sentencepiece,tf-speech]
+          pip install .[sklearn,testing,onnx,sentencepiece,tf-speech,vision]
 
       - name: Are GPUs recognized by our DL frameworks
         run: |

diff --git a/tests/test_modeling_beit.py b/tests/test_modeling_beit.py
@@ -414,6 +414,7 @@ def prepare_img():
     return image
 
 
+@require_torch
 @require_vision
 class BeitModelIntegrationTest(unittest.TestCase):
     @cached_property

diff --git a/tests/test_modeling_deit.py b/tests/test_modeling_deit.py
@@ -391,6 +391,7 @@ def prepare_img():
     return image
 
 
+@require_torch
 @require_vision
 class DeiTModelIntegrationTest(unittest.TestCase):
     @cached_property

diff --git a/tests/test_modeling_tf_vit.py b/tests/test_modeling_tf_vit.py
@@ -353,7 +353,7 @@ def test_for_image_classification(self):
     @slow
     def test_model_from_pretrained(self):
 
-        model = TFViTModel.from_pretrained("google/vit-base-patch16-224", from_pt=True)
+        model = TFViTModel.from_pretrained("google/vit-base-patch16-224")
         self.assertIsNotNone(model)
 
 
@@ -363,6 +363,7 @@ def prepare_img():
     return image
 
 
+@require_tf
 @require_vision
 class TFViTModelIntegrationTest(unittest.TestCase):
     @cached_property

diff --git a/tests/test_modeling_vit.py b/tests/test_modeling_vit.py
@@ -331,6 +331,7 @@ def prepare_img():
     return image
 
 
+@require_torch
 @require_vision
 class ViTModelIntegrationTest(unittest.TestCase):
     @cached_property