From 0603dfc86f587453362cb926d45e93bdc7b66cdd Mon Sep 17 00:00:00 2001 From: Denes Tarjan Date: Wed, 23 Jul 2025 08:49:37 +0000 Subject: [PATCH] Update public docker image to llvm-22 --- .devcontainer/Dockerfile | 2 +- .gitlab-ci.yml | 2 +- benchmark/benchmark.cpp | 30 +++++++++++++++--------------- docker/Dockerfile | 2 +- scripts/ci-opencv.sh | 1 + test/api/test_in_range.cpp | 2 -- test/patches/googletest.patch | 19 ++++++++++++++++--- 7 files changed, 35 insertions(+), 23 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 3f4077bda..5a1ba6662 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -3,7 +3,7 @@ # SPDX-License-Identifier: Apache-2.0 # If changing this image ID, please also change it in .gitlab-ci.yml -FROM registry.gitlab.arm.com/kleidi/kleidicv:17 +FROM registry.gitlab.arm.com/kleidi/kleidicv:18 RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \ diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5eeae1b6f..ff4fa69ce 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,7 +3,7 @@ # SPDX-License-Identifier: Apache-2.0 # If changing this image ID, please also change it in .devcontainer/Dockerfile -image: registry.gitlab.arm.com/kleidi/kleidicv:17 +image: registry.gitlab.arm.com/kleidi/kleidicv:18 variables: KUBERNETES_CPU_REQUEST: "16" diff --git a/benchmark/benchmark.cpp b/benchmark/benchmark.cpp index 59e6d3d35..218fb8902 100644 --- a/benchmark/benchmark.cpp +++ b/benchmark/benchmark.cpp @@ -565,21 +565,21 @@ static void gaussian_blur(benchmark::State& state) { (void)kleidicv_filter_context_release(context); } -#define BENCH_GAUSSIAN_BLUR(kernel_size, channel_number) \ - static void \ - gaussian_blur_binomial_u8##_##kernel_size##x##kernel_size##_##channel_number##ch( \ - benchmark::State& state) { \ - gaussian_blur(state); \ - } \ - BENCHMARK( \ - gaussian_blur_binomial_u8##_##kernel_size##x##kernel_size##_##channel_number##ch); \ - \ - static void \ - gaussian_blur_custom_sigma_u8##_##kernel_size##x##kernel_size##_##channel_number##ch( \ - benchmark::State& state) { \ - gaussian_blur(state); \ - } \ - BENCHMARK( \ +#define BENCH_GAUSSIAN_BLUR(kernel_size, channel_number) \ + static void \ + gaussian_blur_binomial_u8##_##kernel_size##x##kernel_size##_##channel_number##ch( \ + benchmark::State& state) { \ + gaussian_blur(state); \ + } \ + BENCHMARK( \ + gaussian_blur_binomial_u8##_##kernel_size##x##kernel_size##_##channel_number##ch); \ + \ + static void \ + gaussian_blur_custom_sigma_u8##_##kernel_size##x##kernel_size##_##channel_number##ch( \ + benchmark::State& state) { \ + gaussian_blur(state); \ + } \ + BENCHMARK( \ gaussian_blur_custom_sigma_u8##_##kernel_size##x##kernel_size##_##channel_number##ch); BENCH_GAUSSIAN_BLUR(3, 1); diff --git a/docker/Dockerfile b/docker/Dockerfile index 628a07ce8..f7791c7cc 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -30,7 +30,7 @@ RUN apt-get update \ # Install latest version of most LLVM tools except clang-format and clang-tidy # because we prioritise stability when it comes to how we format our code and # which cland-tidy checks we expect. -ENV LLVM_VERSION=21 +ENV LLVM_VERSION=22 ENV CLANG_FORMAT_VERSION=20 ENV CLANG_TIDY_VERSION=20 diff --git a/scripts/ci-opencv.sh b/scripts/ci-opencv.sh index a30fb8965..db777ecc3 100755 --- a/scripts/ci-opencv.sh +++ b/scripts/ci-opencv.sh @@ -34,6 +34,7 @@ EXTRA_CMAKE_ARGS="\ -DCV_TRACE=OFF \ -DBUILD_EXAMPLES=OFF \ -DBUILD_opencv_apps=OFF \ + -DBUILD_opencv_dnn=OFF \ -DBUILD_JAVA=OFF \ -DWITH_QT=OFF \ -DBUILD_OPENCV_PYTHON=NO \ diff --git a/test/api/test_in_range.cpp b/test/api/test_in_range.cpp index c2905e1d8..7de097191 100644 --- a/test/api/test_in_range.cpp +++ b/test/api/test_in_range.cpp @@ -381,8 +381,6 @@ class InRangeTest final { inputs_padding_.fill(0); outputs_padding_.fill(0); } - - virtual ~InRangeTest() = default; }; template diff --git a/test/patches/googletest.patch b/test/patches/googletest.patch index b96d03352..df9fc68c3 100644 --- a/test/patches/googletest.patch +++ b/test/patches/googletest.patch @@ -9,7 +9,7 @@ index 0003d27..f769eab 100644 @@ -587,6 +587,7 @@ typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SECTION; #endif // !GTEST_OS_WINDOWS_MOBILE #endif // GTEST_HAS_STREAM_REDIRECTION - + +#if 0 // Determines whether to support death tests. // pops up a dialog window that cannot be suppressed programmatically. @@ -19,6 +19,19 @@ index 0003d27..f769eab 100644 #define GTEST_HAS_DEATH_TEST 1 #endif +#endif - + // Determines whether to support type-driven tests. - + +diff --git a/googletest/include/gtest/gtest-printers.h b/googletest/include/gtest/gtest-printers.h +index a91e8b8b..04190ed3 100644 +--- a/googletest/include/gtest/gtest-printers.h ++++ b/googletest/include/gtest/gtest-printers.h +@@ -470,7 +470,7 @@ GTEST_API_ void PrintTo(wchar_t wc, ::std::ostream* os); + + GTEST_API_ void PrintTo(char32_t c, ::std::ostream* os); + inline void PrintTo(char16_t c, ::std::ostream* os) { +- PrintTo(ImplicitCast_(c), os); ++ PrintTo(static_cast(c), os); + } + #ifdef __cpp_char8_t + inline void PrintTo(char8_t c, ::std::ostream* os) { -- GitLab