address comments

microsoft · Jan 8, 2025 · 2cd7cd3 · 2cd7cd3
1 parent 215eb63
commit 2cd7cd3
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 111 deletions.
diff --git a/...plates/olive-test-linux-cpu-template.yaml → ...ob_templates/olive-test-cpu-template.yaml b/...plates/olive-test-linux-cpu-template.yaml → ...ob_templates/olive-test-cpu-template.yaml
@@ -3,7 +3,6 @@ parameters:
   pool: ''
   test_type: ''
   windows: False
-  device: 'cpu'
   python_version: '3.10'
   onnxruntime: 'onnxruntime'
   torch: 'torch'

diff --git a/.azure_pipelines/job_templates/olive-test-linux-gpu-template.yaml b/.azure_pipelines/job_templates/olive-test-linux-gpu-template.yaml
@@ -27,10 +27,6 @@ jobs:
     HF_HOME: $(Pipeline.Workspace)/.cache/huggingface
 
   steps:
-  - script: docker system df && docker system prune -a -f && docker system df
-    displayName: Clean docker images
-    continueOnError: true
-
   - template: build-docker-image-template.yaml
     parameters:
       python_version: ${{ parameters.python_version }}

diff --git a/.azure_pipelines/job_templates/olive-test-win-template.yaml b/.azure_pipelines/job_templates/olive-test-win-template.yaml
diff --git a/.azure_pipelines/olive-ci.yaml b/.azure_pipelines/olive-ci.yaml
@@ -51,7 +51,7 @@ variables:
 
 jobs:
 # Linux unit tests
-- template: job_templates/olive-test-linux-cpu-template.yaml
+- template: job_templates/olive-test-cpu-template.yaml
   parameters:
     name: Linux_CPU_CI_Unit_Test
     pool: $(OLIVE_POOL_UBUNTU2004)
@@ -69,7 +69,7 @@ jobs:
     requirements_file: 'requirements-test-gpu.txt'
 
 # Windows unit tests
-- template: job_templates/olive-test-win-template.yaml
+- template: job_templates/olive-test-cpu-template.yaml
   parameters:
     name: Windows_CPU_CI_Unit_Test
     pool: $(OLIVE_POOL_WIN2019)
@@ -137,21 +137,21 @@ jobs:
 # these jobs need secrets not available in forks
 - ${{ if ne(variables['System.PullRequest.IsFork'], 'True') }}:
   # integration tests
-  - template: job_templates/olive-test-linux-cpu-template.yaml
+  - template: job_templates/olive-test-cpu-template.yaml
     parameters:
       name: Linux_CPU_CI_Integration_Test
       pool: $(OLIVE_POOL_UBUNTU2004)
       test_type: 'integ_test'
 
-  - template: job_templates/olive-test-win-template.yaml
+  - template: job_templates/olive-test-cpu-template.yaml
     parameters:
       name: Windows_CPU_CI_Integration_Test
       pool: $(OLIVE_POOL_WIN2019)
       test_type: 'integ_test'
       windows: True
 
   # Multiple EP Linux testing
-  - template: job_templates/olive-test-linux-cpu-template.yaml
+  - template: job_templates/olive-test-cpu-template.yaml
     parameters:
       name: Linux_CI_Multiple_EP_Test
       pool: $(OLIVE_POOL_UBUNTU2004)

diff --git a/.azure_pipelines/olive-examples.yaml b/.azure_pipelines/olive-examples.yaml
@@ -33,6 +33,14 @@ jobs:
       super_resolution:
         exampleFolder: super_resolution
         exampleName: super_resolution
+
+- template: job_templates/olive-example-linux-template.yaml
+  parameters:
+    name: Linux_Examples_Py38
+    pool: $(OLIVE_POOL_UBUNTU2004)
+    onnxruntime: onnxruntime
+    python_version: '3.8'
+    examples:
       mobilenet_qnn_toolkit:
         exampleFolder: mobilenet
         exampleName: qnn_tooklit

diff --git a/.azure_pipelines/olive-ort-nightly.yaml b/.azure_pipelines/olive-ort-nightly.yaml
@@ -38,14 +38,15 @@ jobs:
     requirements_file: 'requirements-test-gpu.txt'
 
 # Windows unit test
-- template: job_templates/olive-test-win-template.yaml
+- template: job_templates/olive-test-cpu-template.yaml
   parameters:
     name: Windows_CI_Unit_Test_Olive
     pool: $(OLIVE_POOL_WIN2019)
     device: 'cpu'
     windows: True
     test_type: 'unit_test'
-    onnxruntime: ort-nightly
+    onnxruntime: onnxruntime-gpu
+    onnxruntime_nightly: true
 
 # Linux examples test
 - template: job_templates/olive-example-linux-template.yaml

diff --git a/examples/test/local/test_qnn_tooklit.py b/examples/test/local/test_qnn_tooklit.py
@@ -17,7 +17,6 @@
 set_verbosity_debug()
 
 
-@pytest.mark.skip(reason="Disable failing tests")
 class TestQnnToolkit:
     @pytest.fixture(autouse=True)
     def setup(self, tmp_path):

diff --git a/test/requirements-test.txt b/test/requirements-test.txt
@@ -43,4 +43,6 @@ pytorch_lightning
 sentencepiece
 tabulate
 torchvision
-transformers>=4.42.0
+# num_logits_to_keep is causing extra input.
+# TODO(anyone): Remove this once the issue is resolved
+transformers>=4.42.0, <4.45.0
diff --git a/test/unit_test/passes/onnx/test_split_model.py b/test/unit_test/passes/onnx/test_split_model.py
@@ -80,8 +80,6 @@ def input_model_info_fixture(request, tmp_path_factory):
     return all_models, request.param, 4 if request.param else 2
 
 
-# TODO(team): 55319 Failed on CI. Need to investigate.
-@pytest.mark.skipif(True, reason="Fails on CI. Need to investigate.")
 @pytest.mark.parametrize(
     "model_type",
     ["convert_fp32", "opt_fp32", "opt_fp16"],