From 3ad2bfcd3625c64d10eebb8ca397870087978f87 Mon Sep 17 00:00:00 2001
From: Boian Petkantchin <boian.petkantchin@amd.com>
Date: Tue, 5 Nov 2024 14:20:14 -0500
Subject: [PATCH 1/2] Make some pytest hooks optional to avoid unknown hook
 errors (#423)

Running

pytest sharktank/tests

would result in error

INTERNALERROR> pluggy._manager.PluginValidationError: unknown hook
'pytest_html_results_table_header' in plugin <module 'conftest' from ...

This makes the hooks optional.
---
 sharktank/conftest.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sharktank/conftest.py b/sharktank/conftest.py
index ce1e131a4..e88974d16 100644
--- a/sharktank/conftest.py
+++ b/sharktank/conftest.py
@@ -258,10 +258,12 @@ def get_iree_flags(request: FixtureRequest):
 
 
 # The following three functions allow us to add a "XFail Reason" column to the html reports for each test
+@pytest.hookimpl(optionalhook=True)
 def pytest_html_results_table_header(cells):
     cells.insert(2, "<th>XFail Reason</th>")
 
 
+@pytest.hookimpl(optionalhook=True)
 def pytest_html_results_table_row(report, cells):
     if hasattr(report, "wasxfail"):
         cells.insert(2, f"<td>{report.wasxfail}</td>")

From 22535baf7106de440742109413665bcac2f0b0b9 Mon Sep 17 00:00:00 2001
From: Ean Garvey <87458719+monorimet@users.noreply.github.com>
Date: Tue, 5 Nov 2024 13:37:40 -0600
Subject: [PATCH 2/2] (shortfin) Bump IREE to candidate-20241104.1068 (#430)

Required for iree.build compile action.
(https://github.com/nod-ai/SHARK-Platform/pull/427)
---
 .github/workflows/ci-sdxl.yaml                       | 2 +-
 .github/workflows/ci_linux_x64-libshortfin.yml       | 2 +-
 .github/workflows/ci_linux_x64_asan-libshortfin.yml  | 2 +-
 .github/workflows/ci_linux_x64_nogil-libshortfin.yml | 2 +-
 .github/workflows/ci_windows_x64-libshortfin.yml     | 2 +-
 shortfin/CMakeLists.txt                              | 2 +-
 shortfin/requirements-iree-compiler.txt              | 4 ++--
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci-sdxl.yaml b/.github/workflows/ci-sdxl.yaml
index 63e57aedb..91c21e05f 100644
--- a/.github/workflows/ci-sdxl.yaml
+++ b/.github/workflows/ci-sdxl.yaml
@@ -64,7 +64,7 @@ jobs:
         repository: iree-org/iree
         path: ${{ env.IREE_REPO_DIR }}
         submodules: false
-        ref: candidate-20241101.1065
+        ref: candidate-20241104.1068
 
     - name: Initalize IREE submodules
       working-directory: ${{ env.IREE_REPO_DIR }}
diff --git a/.github/workflows/ci_linux_x64-libshortfin.yml b/.github/workflows/ci_linux_x64-libshortfin.yml
index a93499aaf..cfb0ace3b 100644
--- a/.github/workflows/ci_linux_x64-libshortfin.yml
+++ b/.github/workflows/ci_linux_x64-libshortfin.yml
@@ -59,7 +59,7 @@ jobs:
         repository: iree-org/iree
         path: ${{ env.IREE_REPO_DIR }}
         submodules: false
-        ref: candidate-20241101.1065
+        ref: candidate-20241104.1068
 
     - name: Initalize IREE submodules
       working-directory: ${{ env.IREE_REPO_DIR }}
diff --git a/.github/workflows/ci_linux_x64_asan-libshortfin.yml b/.github/workflows/ci_linux_x64_asan-libshortfin.yml
index 45ae3722b..14eb3d105 100644
--- a/.github/workflows/ci_linux_x64_asan-libshortfin.yml
+++ b/.github/workflows/ci_linux_x64_asan-libshortfin.yml
@@ -109,7 +109,7 @@ jobs:
         repository: iree-org/iree
         path: ${{ env.IREE_SOURCE_DIR }}
         submodules: false
-        ref: candidate-20241101.1065
+        ref: candidate-20241104.1068
 
     - name: Initalize IREE submodules
       working-directory: ${{ env.IREE_SOURCE_DIR }}
diff --git a/.github/workflows/ci_linux_x64_nogil-libshortfin.yml b/.github/workflows/ci_linux_x64_nogil-libshortfin.yml
index dd5e45163..623e86638 100644
--- a/.github/workflows/ci_linux_x64_nogil-libshortfin.yml
+++ b/.github/workflows/ci_linux_x64_nogil-libshortfin.yml
@@ -57,7 +57,7 @@ jobs:
         repository: iree-org/iree
         path: ${{ env.IREE_REPO_DIR }}
         submodules: false
-        ref: candidate-20241101.1065
+        ref: candidate-20241104.1068
 
     - name: Initalize IREE submodules
       working-directory: ${{ env.IREE_REPO_DIR }}
diff --git a/.github/workflows/ci_windows_x64-libshortfin.yml b/.github/workflows/ci_windows_x64-libshortfin.yml
index d1eb7fa88..4daeb2390 100644
--- a/.github/workflows/ci_windows_x64-libshortfin.yml
+++ b/.github/workflows/ci_windows_x64-libshortfin.yml
@@ -54,7 +54,7 @@ jobs:
         repository: iree-org/iree
         path: ${{ env.IREE_REPO_DIR }}
         submodules: false
-        ref: candidate-20241101.1065
+        ref: candidate-20241104.1068
 
     - name: Initalize IREE submodules
       working-directory: ${{ env.IREE_REPO_DIR }}
diff --git a/shortfin/CMakeLists.txt b/shortfin/CMakeLists.txt
index bb5b2750e..717ff281e 100644
--- a/shortfin/CMakeLists.txt
+++ b/shortfin/CMakeLists.txt
@@ -183,7 +183,7 @@ elseif (SHORTFIN_BUNDLE_DEPS)
   FetchContent_Declare(
     shortfin_iree
     GIT_REPOSITORY https://github.com/iree-org/iree.git
-    GIT_TAG candidate-20241101.1065
+    GIT_TAG candidate-20241104.1068
     GIT_SUBMODULES ${IREE_SUBMODULES}
     GIT_SHALLOW TRUE
     SYSTEM
diff --git a/shortfin/requirements-iree-compiler.txt b/shortfin/requirements-iree-compiler.txt
index 65d809a8a..f821820e5 100644
--- a/shortfin/requirements-iree-compiler.txt
+++ b/shortfin/requirements-iree-compiler.txt
@@ -1,4 +1,4 @@
 # Keep in sync with IREE_REF in CI and GIT_TAG in CMakeLists.txt
 -f https://iree.dev/pip-release-links.html
-iree-compiler==20241101.1065
-iree-runtime==20241101.1065
+iree-compiler==20241104.1068
+iree-runtime==20241104.1068