Merge remote-tracking branch 'origin/hsub_ci_fix' into mergeharishwit…

…hciupdate

examples/image-classification/README.md

@@ -309,6 +309,10 @@ python run_image_classification.py \
 
 This directory contains an example script that demonstrates using FastViT with graph mode.
 
+```bash
+pip install --no-deps -r requirements_no_deps.txt
+```
+
 ### Single-HPU inference
 
 ```bash

examples/image-classification/requirements.txt

@@ -1,6 +1,3 @@
-torch>=1.5.0
-torchvision>=0.6.0
 datasets>=2.14.0
 evaluate
 scikit-learn == 1.5.2
-timm>=0.9.16

examples/image-classification/requirements_no_deps.txt

@@ -0,0 +1 @@
+timm

examples/visual-question-answering/README.md

@@ -16,6 +16,10 @@ limitations under the License.
 
 # Visual Question Answering Examples
 
+```bash
+pip install -r requirements.txt
+```
+
 ## Single-HPU inference
 
 The `run_pipeline.py` script showcases how to use the Transformers pipeline API to run visual question answering task on HPUs.
@@ -34,7 +38,7 @@ The `run_openclip_vqa.py` can be used to run zero shot image classification with
 The requirements for `run_openclip_vqa.py` can be installed with `openclip_requirements.txt` as follows:
 
 ```bash
-pip install -r openclip_requirements.txt
+pip install --no-deps -r openclip_requirements.txt
 ```
 
 By default, the script runs the sample outlined in [BiomedCLIP-PubMedBERT_256-vit_base_patch16_224 notebook](https://huggingface.co/microsoft/BiomedCLIP-PubMedBERT_256-vit_base_patch16_224/blob/main/biomed_clip_example.ipynb). One can also can also run other OpenCLIP models by specifying model, classifier labels and image URL(s) like so:
@@ -46,4 +50,4 @@ python run_openclip_vqa.py \
     --image_path "http://images.cocodataset.org/val2017/000000039769.jpg" \
     --use_hpu_graphs \
     --bf16
-```
+```

examples/visual-question-answering/openclip_requirements.txt

@@ -1,3 +1,2 @@
 open_clip_torch==2.23.0
-matplotlib
-
+timm

examples/visual-question-answering/requirements.txt

@@ -0,0 +1,2 @@
+matplotlib
+ftfy

tests/test_image_to_text_example.py

@@ -4,6 +4,7 @@
 import subprocess
 from pathlib import Path
 from tempfile import TemporaryDirectory
+from typing import Callable, Union
 
 import pytest
 
@@ -44,6 +45,18 @@
         "fp8": [],
     }
 
+def install_requirements(requirements_filename: Union[str, os.PathLike]):
+    """
+    Installs the necessary requirements to run the example if the provided file exists, otherwise does nothing.
+    """
+
+    if not Path(requirements_filename).exists():
+        return
+
+    cmd_line = f"pip install -r {requirements_filename}".split()
+    p = subprocess.Popen(cmd_line)
+    return_code = p.wait()
+    assert return_code == 0
 
 def _test_image_to_text(
     model_name: str,
@@ -55,6 +68,7 @@ def _test_image_to_text(
     command = ["python3"]
     path_to_example_dir = Path(__file__).resolve().parent.parent / "examples"
     env_variables = os.environ.copy()
+    install_requirements(path_to_example_dir / 'image-to-text/requirements.txt')
 
     command += [
         f"{path_to_example_dir / 'image-to-text' / 'run_pipeline.py'}",

tests/test_openclip_vqa.py

@@ -30,8 +30,16 @@
 
 def _install_requirements():
     PATH_TO_EXAMPLE_DIR = Path(__file__).resolve().parent.parent / "examples"
+
+    cmd_line = (
+        f"pip install -r {PATH_TO_EXAMPLE_DIR / 'visual-question-answering' / 'requirements.txt'}".split()
+    )
+    p = subprocess.Popen(cmd_line)
+    return_code = p.wait()
+    assert return_code == 0
+
     cmd_line = (
-        f"pip install -r {PATH_TO_EXAMPLE_DIR / 'visual-question-answering' / 'openclip_requirements.txt'}".split()
+        f"pip install --no-deps -r {PATH_TO_EXAMPLE_DIR / 'visual-question-answering' / 'openclip_requirements.txt'}".split()
     )
     p = subprocess.Popen(cmd_line)
     return_code = p.wait()