Skip to content

High performance self-hosted photo and video management solution.

fix(ml): Upgrade ONNX Runtime to v1.22.1 to fix ROCm build failures (#24045)

Luka Prebil Grintaldd4169876c23
diff --git a/machine-learning/Dockerfile b/machine-learning/Dockerfile
index 4b8e79b469..5ec7174906 100644
--- a/machine-learning/Dockerfile
+++ b/machine-learning/Dockerfile
@@ -25,7 +25,7 @@ FROM builder-cpu AS builder-rknn
FROM rocm/dev-ubuntu-22.04:6.4.3-complete@sha256:1f7e92ca7e3a3785680473329ed1091fc99db3e90fcb3a1688f2933e870ed76b AS builder-rocm
# renovate: datasource=github-releases depName=Microsoft/onnxruntime
-ARG ONNXRUNTIME_VERSION="v1.20.1"
+ARG ONNXRUNTIME_VERSION="v1.22.1"
WORKDIR /code
RUN apt-get update && apt-get install -y --no-install-recommends wget git python3.10-venv
diff --git a/machine-learning/patches/0002-target-gfx900-gfx1102.patch b/machine-learning/patches/0002-target-gfx900-gfx1102.patch
index fab7a62d8e..11c1ab0367 100644
--- a/machine-learning/patches/0002-target-gfx900-gfx1102.patch
+++ b/machine-learning/patches/0002-target-gfx900-gfx1102.patch
@@ -1,13 +1,13 @@
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
-index d90a2a355..bb1a7de12 100644
+index 2714e6f59..a69da76b4 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
-@@ -295,7 +295,7 @@ if (onnxruntime_USE_ROCM)
+@@ -338,7 +338,7 @@ if (onnxruntime_USE_ROCM)
+ if (ROCM_VERSION_DEV VERSION_LESS "6.2")
+ message(FATAL_ERROR "CMAKE_HIP_ARCHITECTURES is not set when ROCm version < 6.2")
+ else()
+- set(CMAKE_HIP_ARCHITECTURES "gfx908;gfx90a;gfx1030;gfx1100;gfx1101;gfx940;gfx941;gfx942;gfx1200;gfx1201")
++ set(CMAKE_HIP_ARCHITECTURES "gfx900;gfx908;gfx90a;gfx1030;gfx1100;gfx1101;gfx1102;gfx940;gfx941;gfx942;gfx1200;gfx1201")
+ endif()
endif()
-
- if (NOT CMAKE_HIP_ARCHITECTURES)
-- set(CMAKE_HIP_ARCHITECTURES "gfx908;gfx90a;gfx1030;gfx1100;gfx1101;gfx940;gfx941;gfx942;gfx1200;gfx1201")
-+ set(CMAKE_HIP_ARCHITECTURES "gfx900;gfx908;gfx90a;gfx1030;gfx1100;gfx1101;gfx1102;gfx940;gfx941;gfx942;gfx1200;gfx1201")
- endif()
-
- file(GLOB rocm_cmake_components ${onnxruntime_ROCM_HOME}/lib/cmake/*)
+