From fddf29a3c5a0641a82d8cf9288cfca09f68ea862 Mon Sep 17 00:00:00 2001 From: Scott Todd Date: Mon, 6 Jan 2025 10:16:48 -0800 Subject: [PATCH] Revert "Bump IREE to iree-3.1.0rc20241220. (#721)" This reverts commit 03a5918d285698c5cc42f4273bea3259f02dcad7. --- .github/workflows/ci-libshortfin.yml | 2 +- .github/workflows/ci_linux_x64_asan-libshortfin.yml | 2 +- .github/workflows/ci_linux_x64_nogil-libshortfin.yml | 2 +- shortfin/CMakeLists.txt | 2 +- shortfin/src/shortfin/array/storage.cc | 3 +-- shortfin/src/shortfin/local/program.cc | 3 +-- 6 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci-libshortfin.yml b/.github/workflows/ci-libshortfin.yml index cd33176ec..543a6abe6 100644 --- a/.github/workflows/ci-libshortfin.yml +++ b/.github/workflows/ci-libshortfin.yml @@ -101,7 +101,7 @@ jobs: repository: iree-org/iree path: ${{ env.IREE_REPO_DIR }} submodules: false - ref: iree-3.1.0rc20241220 + ref: iree-3.1.0rc20241204 - 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 b3de1a593..5da88489e 100644 --- a/.github/workflows/ci_linux_x64_asan-libshortfin.yml +++ b/.github/workflows/ci_linux_x64_asan-libshortfin.yml @@ -106,7 +106,7 @@ jobs: repository: iree-org/iree path: ${{ env.IREE_SOURCE_DIR }} submodules: false - ref: iree-3.1.0rc20241220 + ref: iree-3.1.0rc20241204 - 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 d10408c6d..e347093a5 100644 --- a/.github/workflows/ci_linux_x64_nogil-libshortfin.yml +++ b/.github/workflows/ci_linux_x64_nogil-libshortfin.yml @@ -54,7 +54,7 @@ jobs: repository: iree-org/iree path: ${{ env.IREE_REPO_DIR }} submodules: false - ref: iree-3.1.0rc20241220 + ref: iree-3.1.0rc20241204 - name: Initalize IREE submodules working-directory: ${{ env.IREE_REPO_DIR }} diff --git a/shortfin/CMakeLists.txt b/shortfin/CMakeLists.txt index 4b3ff446a..bd46d84f9 100644 --- a/shortfin/CMakeLists.txt +++ b/shortfin/CMakeLists.txt @@ -44,7 +44,7 @@ add_compile_options("$<$:/utf-8>") add_compile_options("$<$:/utf-8>") # Pins -set(SHORTFIN_IREE_GIT_TAG "iree-3.1.0rc20241220") +set(SHORTFIN_IREE_GIT_TAG "iree-3.1.0rc20241204") # build options option(SHORTFIN_BUILD_PYTHON_BINDINGS "Builds Python Bindings" OFF) diff --git a/shortfin/src/shortfin/array/storage.cc b/shortfin/src/shortfin/array/storage.cc index a36991d1b..ffbbd9ba2 100644 --- a/shortfin/src/shortfin/array/storage.cc +++ b/shortfin/src/shortfin/array/storage.cc @@ -92,8 +92,7 @@ storage storage::subspan(iree_device_size_t byte_offset, iree_device_size_t byte_length) { storage new_storage(device_, {}, timeline_resource_); SHORTFIN_THROW_IF_ERROR(iree_hal_buffer_subspan( - buffer_, byte_offset, byte_length, host_allocator(), - new_storage.buffer_.for_output())); + buffer_, byte_offset, byte_length, new_storage.buffer_.for_output())); return new_storage; } diff --git a/shortfin/src/shortfin/local/program.cc b/shortfin/src/shortfin/local/program.cc index 0eefb572f..71452da3e 100644 --- a/shortfin/src/shortfin/local/program.cc +++ b/shortfin/src/shortfin/local/program.cc @@ -663,8 +663,7 @@ void StaticProgramParameters::Load(std::filesystem::path file_path, // Parse. SHORTFIN_THROW_IF_ERROR(iree_io_parse_file_index( - to_iree_string_view(options.format), file_handle.get(), index_.get(), - host_allocator_)); + to_iree_string_view(options.format), file_handle.get(), index_.get())); } // -------------------------------------------------------------------------- //