From d777c317126fe03115f2a5f35e4d522d4b2ff5bf Mon Sep 17 00:00:00 2001 From: Xida Date: Mon, 30 Dec 2024 17:47:32 +0000 Subject: [PATCH 1/5] mass-pin iree compiler versions to address #729 iree inconpatibility --- .github/workflows/ci-llama-large-tests.yaml | 7 ++++--- .github/workflows/ci-llama-quick-tests.yaml | 7 ++++--- .github/workflows/ci-sglang-integration-tests.yml | 7 ++++--- .github/workflows/ci-shark-ai.yml | 7 ++++--- .github/workflows/ci-sharktank.yml | 7 ++++--- .github/workflows/ci_eval.yaml | 7 ++++--- .github/workflows/ci_eval_short.yaml | 7 ++++--- 7 files changed, 28 insertions(+), 21 deletions(-) diff --git a/.github/workflows/ci-llama-large-tests.yaml b/.github/workflows/ci-llama-large-tests.yaml index 4849dd188..e3e377931 100644 --- a/.github/workflows/ci-llama-large-tests.yaml +++ b/.github/workflows/ci-llama-large-tests.yaml @@ -61,10 +61,11 @@ jobs: # Install nightly IREE packages. # We could also pin to a known working or stable version. + # Pinned to 1226 by Xida on Dec 30 due to pip install -f https://iree.dev/pip-release-links.html --pre --upgrade \ - iree-base-compiler \ - iree-base-runtime \ - iree-turbine + iree-base-compiler==3.1.0rc20241226 \ + iree-base-runtime==3.1.0rc20241226 \ + iree-turbine==3.1.0rc20241226 pip install --no-compile -r requirements.txt -r sharktank/requirements-tests.txt -e sharktank/ diff --git a/.github/workflows/ci-llama-quick-tests.yaml b/.github/workflows/ci-llama-quick-tests.yaml index 7ad153924..2b1aed141 100644 --- a/.github/workflows/ci-llama-quick-tests.yaml +++ b/.github/workflows/ci-llama-quick-tests.yaml @@ -61,10 +61,11 @@ jobs: # Install nightly IREE packages. # We could also pin to a known working or stable version. + # Pinned to 1226 by Xida on Dec 30 due to pip install -f https://iree.dev/pip-release-links.html --pre --upgrade \ - iree-base-compiler \ - iree-base-runtime \ - iree-turbine + iree-base-compiler==3.1.0rc20241226 \ + iree-base-runtime==3.1.0rc20241226 \ + iree-turbine==3.1.0rc20241226 pip install --no-compile -r requirements.txt -r sharktank/requirements-tests.txt -e sharktank/ pip freeze diff --git a/.github/workflows/ci-sglang-integration-tests.yml b/.github/workflows/ci-sglang-integration-tests.yml index 4eaae8dc4..cd4a96073 100644 --- a/.github/workflows/ci-sglang-integration-tests.yml +++ b/.github/workflows/ci-sglang-integration-tests.yml @@ -58,10 +58,11 @@ jobs: # Use newest possible releases to be able to track commits that may # cause errors. + # Pinned to 1226 by Xida on Dec 30 due to pip install -f https://iree.dev/pip-release-links.html --pre --upgrade \ - iree-base-compiler \ - iree-base-runtime \ - iree-turbine \ + iree-base-compiler==3.1.0rc20241226 \ + iree-base-runtime==3.1.0rc20241226 \ + iree-turbine==3.1.0rc20241226 \ "numpy<2.0" pip install --no-compile -r requirements.txt -e sharktank/ shortfin/ diff --git a/.github/workflows/ci-shark-ai.yml b/.github/workflows/ci-shark-ai.yml index 67d52e5a6..91700c4dc 100644 --- a/.github/workflows/ci-shark-ai.yml +++ b/.github/workflows/ci-shark-ai.yml @@ -57,10 +57,11 @@ jobs: # Install nightly IREE packages. # We could also pin to a known working or stable version. + # Pinned to 1226 by Xida on Dec 30 due to pip install -f https://iree.dev/pip-release-links.html --pre --upgrade \ - iree-base-compiler \ - iree-base-runtime \ - iree-turbine + iree-base-compiler==3.1.0rc20241226 \ + iree-base-runtime==3.1.0rc20241226 \ + iree-turbine==3.1.0rc20241226 pip install --no-compile -r requirements.txt -e sharktank/ shortfin/ diff --git a/.github/workflows/ci-sharktank.yml b/.github/workflows/ci-sharktank.yml index 4cdd2b274..c855bfa23 100644 --- a/.github/workflows/ci-sharktank.yml +++ b/.github/workflows/ci-sharktank.yml @@ -128,10 +128,11 @@ jobs: # Install nightly IREE packages. # We could also pin to a known working or stable version. + # Pinned to 1226 by Xida on Dec 30 due to pip install -f https://iree.dev/pip-release-links.html --pre --upgrade \ - iree-base-compiler \ - iree-base-runtime \ - iree-turbine + iree-base-compiler==3.1.0rc20241226 \ + iree-base-runtime==3.1.0rc20241226 \ + iree-turbine==3.1.0rc20241226 pip install --no-compile -r requirements.txt -r sharktank/requirements-tests.txt -e sharktank/ diff --git a/.github/workflows/ci_eval.yaml b/.github/workflows/ci_eval.yaml index c8b782c95..e24101a1f 100644 --- a/.github/workflows/ci_eval.yaml +++ b/.github/workflows/ci_eval.yaml @@ -59,10 +59,11 @@ jobs: # Install nightly IREE packages. # We could also pin to a known working or stable version. + # Pinned to 1226 by Xida on Dec 30 due to pip install -f https://iree.dev/pip-release-links.html --pre --upgrade \ - iree-base-compiler \ - iree-base-runtime \ - iree-turbine + iree-base-compiler==3.1.0rc20241226 \ + iree-base-runtime==3.1.0rc20241226 \ + iree-turbine==3.1.0rc20241226 pip install --no-compile -r requirements.txt -r sharktank/requirements-tests.txt -e sharktank/ pip freeze diff --git a/.github/workflows/ci_eval_short.yaml b/.github/workflows/ci_eval_short.yaml index d5f8f5682..fec009473 100644 --- a/.github/workflows/ci_eval_short.yaml +++ b/.github/workflows/ci_eval_short.yaml @@ -58,10 +58,11 @@ jobs: # Install nightly IREE packages. # We could also pin to a known working or stable version. + # Pinned to 1226 by Xida on Dec 30 due to pip install -f https://iree.dev/pip-release-links.html --pre --upgrade \ - iree-base-compiler \ - iree-base-runtime \ - iree-turbine + iree-base-compiler==3.1.0rc20241226 \ + iree-base-runtime==3.1.0rc20241226 \ + iree-turbine==3.1.0rc20241226 pip install --no-compile -r requirements.txt -r sharktank/requirements-tests.txt -e sharktank/ pip freeze From e453bbeacc2c2edea569189acd43efb4a9b22301 Mon Sep 17 00:00:00 2001 From: Xida Date: Mon, 30 Dec 2024 19:03:34 +0000 Subject: [PATCH 2/5] pin iree version for sharktank tests too --- .github/workflows/ci-sharktank.yml | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci-sharktank.yml b/.github/workflows/ci-sharktank.yml index c855bfa23..0826253e3 100644 --- a/.github/workflows/ci-sharktank.yml +++ b/.github/workflows/ci-sharktank.yml @@ -78,10 +78,11 @@ jobs: # Install nightly IREE packages. # We could also pin to a known working or stable version. - pip install -f https://iree.dev/pip-release-links.html --pre \ - iree-base-compiler \ - iree-base-runtime \ - iree-turbine + # Pinned to 1226 by Xida on Dec 30 due to + pip install -f https://iree.dev/pip-release-links.html --pre --upgrade \ + iree-base-compiler==3.1.0rc20241226 \ + iree-base-runtime==3.1.0rc20241226 \ + iree-turbine==3.1.0rc20241226 pip install --no-compile -r requirements.txt -r sharktank/requirements-tests.txt -e sharktank/ @@ -187,10 +188,11 @@ jobs: # Install nightly IREE packages. # We could also pin to a known working or stable version. - pip install -f https://iree.dev/pip-release-links.html --pre \ - iree-base-compiler \ - iree-base-runtime \ - iree-turbine + # Pinned to 1226 by Xida on Dec 30 due to + pip install -f https://iree.dev/pip-release-links.html --pre --upgrade \ + iree-base-compiler==3.1.0rc20241226 \ + iree-base-runtime==3.1.0rc20241226 \ + iree-turbine==3.1.0rc20241226 pip install --no-compile -r requirements.txt -r sharktank/requirements-tests.txt -e sharktank/ From 6abb001a3f14386217929d053391acea04e91060 Mon Sep 17 00:00:00 2001 From: Xida Date: Mon, 30 Dec 2024 20:51:10 +0000 Subject: [PATCH 3/5] back to 1220 --- .github/workflows/ci-llama-large-tests.yaml | 6 +++--- .github/workflows/ci-llama-quick-tests.yaml | 6 +++--- .../workflows/ci-sglang-integration-tests.yml | 6 +++--- .github/workflows/ci-shark-ai.yml | 6 +++--- .github/workflows/ci-sharktank.yml | 18 +++++++++--------- .github/workflows/ci_eval.yaml | 6 +++--- .github/workflows/ci_eval_short.yaml | 6 +++--- 7 files changed, 27 insertions(+), 27 deletions(-) diff --git a/.github/workflows/ci-llama-large-tests.yaml b/.github/workflows/ci-llama-large-tests.yaml index e3e377931..1fbf8d83e 100644 --- a/.github/workflows/ci-llama-large-tests.yaml +++ b/.github/workflows/ci-llama-large-tests.yaml @@ -63,9 +63,9 @@ jobs: # We could also pin to a known working or stable version. # Pinned to 1226 by Xida on Dec 30 due to pip install -f https://iree.dev/pip-release-links.html --pre --upgrade \ - iree-base-compiler==3.1.0rc20241226 \ - iree-base-runtime==3.1.0rc20241226 \ - iree-turbine==3.1.0rc20241226 + iree-base-compiler==3.1.0rc20241220 \ + iree-base-runtime==3.1.0rc20241220 \ + iree-turbine==3.1.0rc20241220 pip install --no-compile -r requirements.txt -r sharktank/requirements-tests.txt -e sharktank/ diff --git a/.github/workflows/ci-llama-quick-tests.yaml b/.github/workflows/ci-llama-quick-tests.yaml index 2b1aed141..eaf7b4138 100644 --- a/.github/workflows/ci-llama-quick-tests.yaml +++ b/.github/workflows/ci-llama-quick-tests.yaml @@ -63,9 +63,9 @@ jobs: # We could also pin to a known working or stable version. # Pinned to 1226 by Xida on Dec 30 due to pip install -f https://iree.dev/pip-release-links.html --pre --upgrade \ - iree-base-compiler==3.1.0rc20241226 \ - iree-base-runtime==3.1.0rc20241226 \ - iree-turbine==3.1.0rc20241226 + iree-base-compiler==3.1.0rc20241220 \ + iree-base-runtime==3.1.0rc20241220 \ + iree-turbine==3.1.0rc20241220 pip install --no-compile -r requirements.txt -r sharktank/requirements-tests.txt -e sharktank/ pip freeze diff --git a/.github/workflows/ci-sglang-integration-tests.yml b/.github/workflows/ci-sglang-integration-tests.yml index cd4a96073..32cbe521a 100644 --- a/.github/workflows/ci-sglang-integration-tests.yml +++ b/.github/workflows/ci-sglang-integration-tests.yml @@ -60,9 +60,9 @@ jobs: # cause errors. # Pinned to 1226 by Xida on Dec 30 due to pip install -f https://iree.dev/pip-release-links.html --pre --upgrade \ - iree-base-compiler==3.1.0rc20241226 \ - iree-base-runtime==3.1.0rc20241226 \ - iree-turbine==3.1.0rc20241226 \ + iree-base-compiler==3.1.0rc20241220 \ + iree-base-runtime==3.1.0rc20241220 \ + iree-turbine==3.1.0rc20241220 \ "numpy<2.0" pip install --no-compile -r requirements.txt -e sharktank/ shortfin/ diff --git a/.github/workflows/ci-shark-ai.yml b/.github/workflows/ci-shark-ai.yml index 91700c4dc..84167744d 100644 --- a/.github/workflows/ci-shark-ai.yml +++ b/.github/workflows/ci-shark-ai.yml @@ -59,9 +59,9 @@ jobs: # We could also pin to a known working or stable version. # Pinned to 1226 by Xida on Dec 30 due to pip install -f https://iree.dev/pip-release-links.html --pre --upgrade \ - iree-base-compiler==3.1.0rc20241226 \ - iree-base-runtime==3.1.0rc20241226 \ - iree-turbine==3.1.0rc20241226 + iree-base-compiler==3.1.0rc20241220 \ + iree-base-runtime==3.1.0rc20241220 \ + iree-turbine==3.1.0rc20241220 pip install --no-compile -r requirements.txt -e sharktank/ shortfin/ diff --git a/.github/workflows/ci-sharktank.yml b/.github/workflows/ci-sharktank.yml index 0826253e3..1b7e5caea 100644 --- a/.github/workflows/ci-sharktank.yml +++ b/.github/workflows/ci-sharktank.yml @@ -80,9 +80,9 @@ jobs: # We could also pin to a known working or stable version. # Pinned to 1226 by Xida on Dec 30 due to pip install -f https://iree.dev/pip-release-links.html --pre --upgrade \ - iree-base-compiler==3.1.0rc20241226 \ - iree-base-runtime==3.1.0rc20241226 \ - iree-turbine==3.1.0rc20241226 + iree-base-compiler==3.1.0rc20241220 \ + iree-base-runtime==3.1.0rc20241220 \ + iree-turbine==3.1.0rc20241220 pip install --no-compile -r requirements.txt -r sharktank/requirements-tests.txt -e sharktank/ @@ -131,9 +131,9 @@ jobs: # We could also pin to a known working or stable version. # Pinned to 1226 by Xida on Dec 30 due to pip install -f https://iree.dev/pip-release-links.html --pre --upgrade \ - iree-base-compiler==3.1.0rc20241226 \ - iree-base-runtime==3.1.0rc20241226 \ - iree-turbine==3.1.0rc20241226 + iree-base-compiler==3.1.0rc20241220 \ + iree-base-runtime==3.1.0rc20241220 \ + iree-turbine==3.1.0rc20241220 pip install --no-compile -r requirements.txt -r sharktank/requirements-tests.txt -e sharktank/ @@ -190,9 +190,9 @@ jobs: # We could also pin to a known working or stable version. # Pinned to 1226 by Xida on Dec 30 due to pip install -f https://iree.dev/pip-release-links.html --pre --upgrade \ - iree-base-compiler==3.1.0rc20241226 \ - iree-base-runtime==3.1.0rc20241226 \ - iree-turbine==3.1.0rc20241226 + iree-base-compiler==3.1.0rc20241220 \ + iree-base-runtime==3.1.0rc20241220 \ + iree-turbine==3.1.0rc20241220 pip install --no-compile -r requirements.txt -r sharktank/requirements-tests.txt -e sharktank/ diff --git a/.github/workflows/ci_eval.yaml b/.github/workflows/ci_eval.yaml index e24101a1f..8dbb71fde 100644 --- a/.github/workflows/ci_eval.yaml +++ b/.github/workflows/ci_eval.yaml @@ -61,9 +61,9 @@ jobs: # We could also pin to a known working or stable version. # Pinned to 1226 by Xida on Dec 30 due to pip install -f https://iree.dev/pip-release-links.html --pre --upgrade \ - iree-base-compiler==3.1.0rc20241226 \ - iree-base-runtime==3.1.0rc20241226 \ - iree-turbine==3.1.0rc20241226 + iree-base-compiler==3.1.0rc20241220 \ + iree-base-runtime==3.1.0rc20241220 \ + iree-turbine==3.1.0rc20241220 pip install --no-compile -r requirements.txt -r sharktank/requirements-tests.txt -e sharktank/ pip freeze diff --git a/.github/workflows/ci_eval_short.yaml b/.github/workflows/ci_eval_short.yaml index fec009473..40efb9396 100644 --- a/.github/workflows/ci_eval_short.yaml +++ b/.github/workflows/ci_eval_short.yaml @@ -60,9 +60,9 @@ jobs: # We could also pin to a known working or stable version. # Pinned to 1226 by Xida on Dec 30 due to pip install -f https://iree.dev/pip-release-links.html --pre --upgrade \ - iree-base-compiler==3.1.0rc20241226 \ - iree-base-runtime==3.1.0rc20241226 \ - iree-turbine==3.1.0rc20241226 + iree-base-compiler==3.1.0rc20241220 \ + iree-base-runtime==3.1.0rc20241220 \ + iree-turbine==3.1.0rc20241220 pip install --no-compile -r requirements.txt -r sharktank/requirements-tests.txt -e sharktank/ pip freeze From 5eb9c6831c9648cdb1b54ddd657d691af5dbe87d Mon Sep 17 00:00:00 2001 From: Xida Date: Mon, 30 Dec 2024 18:52:39 +0000 Subject: [PATCH 4/5] make app_tests log subprocess stdout and stderr upon failure --- app_tests/integration_tests/llm/utils.py | 103 +++++++++++++++-------- 1 file changed, 68 insertions(+), 35 deletions(-) diff --git a/app_tests/integration_tests/llm/utils.py b/app_tests/integration_tests/llm/utils.py index dbbdee10d..df2f72091 100644 --- a/app_tests/integration_tests/llm/utils.py +++ b/app_tests/integration_tests/llm/utils.py @@ -11,6 +11,7 @@ import subprocess import sys import time +from typing import Union import requests from transformers import AutoTokenizer @@ -22,22 +23,68 @@ class AccuracyValidationException(RuntimeError): pass +def run_subprocess(cmd, **kwargs): + """ + Run a subprocess command, combining stdout and stderr. + Only output if there's an error. + + Args: + cmd: Command to run (list or string) + **kwargs: Additional arguments to pass to subprocess.Popen + + Returns: + CompletedProcess instance + + Raises: + subprocess.CalledProcessError: If the command returns non-zero exit status + """ + # Ensure we always capture output and combine streams + kwargs.update( + { + "stdout": subprocess.PIPE, + "stderr": subprocess.STDOUT, + "universal_newlines": True, + } + ) + + try: + # Run the process + process = subprocess.Popen(cmd, **kwargs) + + # Capture output + output, _ = process.communicate() + + # Check return code + if process.returncode != 0: + logger.error(f"Command failed with exit code {process.returncode}") + logger.error(f"Command output:\n{output}") + raise subprocess.CalledProcessError(process.returncode, cmd, output) + + return subprocess.CompletedProcess(cmd, process.returncode, output, None) + + except Exception as e: + if isinstance(e, subprocess.CalledProcessError): + raise + logger.error(f"Failed to execute command: {e}") + logger.error(f"Command was: {cmd}") + raise + + def download_huggingface_model(local_dir, repo_id, model_file): model_path = local_dir / model_file logger.info(f"Preparing model_path: {model_path}..") if not os.path.exists(model_path): logger.info(f"Downloading model {repo_id} {model_file} from Hugging Face...") - subprocess.run( + run_subprocess( f"huggingface-cli download --local-dir {local_dir} {repo_id} {model_file}", shell=True, - check=True, ) logger.info(f"Model downloaded to {model_path}") else: logger.info("Using cached model") -def download_with_hf_datasets(local_dir: Path | str, model_name: str): +def download_with_hf_datasets(local_dir: Union[Path, str], model_name: str): """Download a model using `sharktank.utils.hf_datasets` script. Args: @@ -48,7 +95,7 @@ def download_with_hf_datasets(local_dir: Path | str, model_name: str): local_dir = str(local_dir) logger.info(f"Download model {model_name} with `hf_datasets` to {local_dir}...") - subprocess.run( + run_subprocess( [ "python", "-m", @@ -56,8 +103,7 @@ def download_with_hf_datasets(local_dir: Path | str, model_name: str): model_name, "--local-dir", local_dir, - ], - check=True, + ] ) logger.info(f"Model {model_name} successfully downloaded.") @@ -85,7 +131,7 @@ def export_paged_llm_v1(mlir_path, config_path, model_path, batch_sizes): f" Config Path: {config_path}\n" f" Batch Sizes: {bs_string}" ) - subprocess.run( + run_subprocess( [ "python", "-m", @@ -95,23 +141,21 @@ def export_paged_llm_v1(mlir_path, config_path, model_path, batch_sizes): f"--output-mlir={mlir_path}", f"--output-config={config_path}", f"--bs={bs_string}", - ], - check=True, + ] ) logger.info(f"Model successfully exported to {mlir_path}") def compile_model(mlir_path, vmfb_path, device_settings): logger.info(f"Compiling model to {vmfb_path}") - subprocess.run( + run_subprocess( [ "iree-compile", mlir_path, "-o", vmfb_path, ] - + device_settings["device_flags"], - check=True, + + device_settings["device_flags"] ) logger.info(f"Model successfully compiled to {vmfb_path}") @@ -174,35 +218,24 @@ def start_llm_server( multi=False, ): logger.info("Starting LLM server...") + cmd_args = _start_llm_server_args( + tokenizer_path, + model_config_path, + vmfb_path, + parameters_path, + settings, + port, + ) + if multi: server_process = multiprocessing.Process( - target=subprocess.Popen( - _start_llm_server_args( - tokenizer_path, - model_config_path, - vmfb_path, - parameters_path, - settings, - port, - ), - ) + target=run_subprocess, args=(cmd_args,) ) server_process.start() - else: - # Start the server - server_process = subprocess.Popen( - _start_llm_server_args( - tokenizer_path, - model_config_path, - vmfb_path, - parameters_path, - settings, - port, - ) - ) + server_process = run_subprocess(cmd_args) + logger.info("Process started... waiting for server") - # Wait for server to start wait_for_server(f"http://localhost:{port}", timeout) return server_process From 2f24018462b92af83d8d9d5dfffa789eff41f2ef Mon Sep 17 00:00:00 2001 From: Marius Brehler Date: Thu, 2 Jan 2025 18:01:07 +0000 Subject: [PATCH 5/5] [shortfin] Bump IREE to 3.1.0rc20241220 --- .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/requirements-iree-compiler.txt | 4 ++-- shortfin/src/shortfin/array/storage.cc | 3 ++- shortfin/src/shortfin/local/program.cc | 3 ++- 7 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci-libshortfin.yml b/.github/workflows/ci-libshortfin.yml index 543a6abe6..cd33176ec 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.0rc20241204 + ref: iree-3.1.0rc20241220 - 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 5da88489e..b3de1a593 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.0rc20241204 + ref: iree-3.1.0rc20241220 - 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 e347093a5..d10408c6d 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.0rc20241204 + ref: iree-3.1.0rc20241220 - name: Initalize IREE submodules working-directory: ${{ env.IREE_REPO_DIR }} diff --git a/shortfin/CMakeLists.txt b/shortfin/CMakeLists.txt index bd46d84f9..4b3ff446a 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.0rc20241204") +set(SHORTFIN_IREE_GIT_TAG "iree-3.1.0rc20241220") # build options option(SHORTFIN_BUILD_PYTHON_BINDINGS "Builds Python Bindings" OFF) diff --git a/shortfin/requirements-iree-compiler.txt b/shortfin/requirements-iree-compiler.txt index f20a7db20..3fe7afc32 100644 --- a/shortfin/requirements-iree-compiler.txt +++ b/shortfin/requirements-iree-compiler.txt @@ -1,4 +1,4 @@ # Keep in sync with "ref: iree-" in .github/workflows/* and GIT_TAG in CMakeLists.txt -f https://iree.dev/pip-release-links.html -iree-base-compiler==3.1.0rc20241204 -iree-base-runtime==3.1.0rc20241204 +iree-base-compiler==3.1.0rc20241220 +iree-base-runtime==3.1.0rc20241220 diff --git a/shortfin/src/shortfin/array/storage.cc b/shortfin/src/shortfin/array/storage.cc index ffbbd9ba2..99e776c59 100644 --- a/shortfin/src/shortfin/array/storage.cc +++ b/shortfin/src/shortfin/array/storage.cc @@ -92,7 +92,8 @@ 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, new_storage.buffer_.for_output())); + buffer_, byte_offset, byte_length, iree_allocator_system(), + 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 71452da3e..9330f9c43 100644 --- a/shortfin/src/shortfin/local/program.cc +++ b/shortfin/src/shortfin/local/program.cc @@ -663,7 +663,8 @@ 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())); + to_iree_string_view(options.format), file_handle.get(), index_.get(), + iree_allocator_system())); } // -------------------------------------------------------------------------- //