mirrors/guru
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/guru.git synced 2026-07-22 21:43:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

sci-libs/onnxruntime: add 1.24.1, drop 1.23.2

Browse Source 
Signed-off-by: Pavel Sobolev <contact@paveloom.dev>
This commit is contained in:
Pavel Sobolev
2026-02-07 16:59:38 +03:00
parent 0eed1baf8b
commit ffaa699d3d
5 changed files with 30 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sci-libs/onnxruntime/Manifest
View File

@@ -1,2 +1,2 @@
DIST eigen-3.4.0_p20250216.tar.bz2 2272941 BLAKE2B c86764a5c31b978d09f9f8f458a982fb16c2cdfd053e0c7a371fbe5b9c64bead42c25fb7d4cb795eb5ee7ff1800bb51fac6783ad0881dd69dee5d463ccd213e3 SHA512 3c9fab41bde1ee4b8f5ba21c991a75cc73e104cdb48f3377b5fc51afae8cbb5e891c39e4fd998c5263178a8962b09d9d907b9d125dfddc50bc2ec5171917d6b8 DIST eigen-3.4.0_p20250216.tar.bz2 2272941 BLAKE2B c86764a5c31b978d09f9f8f458a982fb16c2cdfd053e0c7a371fbe5b9c64bead42c25fb7d4cb795eb5ee7ff1800bb51fac6783ad0881dd69dee5d463ccd213e3 SHA512 3c9fab41bde1ee4b8f5ba21c991a75cc73e104cdb48f3377b5fc51afae8cbb5e891c39e4fd998c5263178a8962b09d9d907b9d125dfddc50bc2ec5171917d6b8
DIST onnxruntime-1.23.2.tar.gz 283165408 BLAKE2B 33cee273820e8656dac567768672d1001bf2e3b095b9f4372407354388b36dfd01693055288885f706997eb51cc101482ba372412557c43d3bdd83b502ecc45c SHA512 373c51575ada457b8aead5d195a5f3eba62fb747b6370a2a9889fff875c40ea30af8fd49104d58cc86f79247410e829086b0979f37ca8635c6dd34960e9cc424 DIST onnxruntime-1.24.1.tar.gz 283587143 BLAKE2B 16035700b3d9be3feeed456e45957d76cab833adf5147336f95c3de6af0b43e90cbea554182f358db6b548d65c4d9ccd7d729d333e19a03c1d6577a89b3b9357 SHA512 569d8b987c3e8903845145cfb39a080813b5a718e3d7772fb064fce5f0c7e50cd9258dcad68c62551bfbf7b230435ed7f26248b17a655c352c2ee3217b388481

18
sci-libs/onnxruntime/files/onnxruntime-1.22.2-remove-the-absl-low_level_hash-target.patch
View File

@@ -1,18 +0,0 @@
From: Pavel Sobolev <contact@paveloom.dev>
Subject: [PATCH] Remove the `absl::low_level_hash` target.
Bug: https://github.com/microsoft/onnxruntime/issues/25815
Signed-off-by: Pavel Sobolev <contact@paveloom.dev>
--- a/cmake/external/abseil-cpp.cmake
+++ b/cmake/external/abseil-cpp.cmake
@@ -114,7 +114,6 @@ absl::absl_check
absl::hash_function_defaults
absl::function_ref
absl::city
-absl::low_level_hash
absl::fixed_array
absl::variant
absl::meta

58
sci-libs/onnxruntime/files/onnxruntime-1.23.2-fix-compilation-errors.patch
View File

@@ -1,58 +0,0 @@
From: Pavel Sobolev <contact@paveloom.dev>
Subject: [PATCH] Fix compilation errors.
Signed-off-by: Pavel Sobolev <contact@paveloom.dev>
--- a/onnxruntime/core/common/semver.h
+++ b/onnxruntime/core/common/semver.h
@@ -3,6 +3,7 @@
#pragma once
+#include <cstdint>
#include <optional>
#include <string_view>
--- a/onnxruntime/core/optimizer/transformer_memcpy.cc
+++ b/onnxruntime/core/optimizer/transformer_memcpy.cc
@@ -16,7 +16,7 @@ namespace onnxruntime {
static ProviderTypeToProviderMap GetProvidersByType(
const InlinedVector<gsl::not_null<const IExecutionProvider*>>& providers) {
ProviderTypeToProviderMap providers_by_type{};
- for (const auto provider : providers) {
+ for (const auto& provider : providers) {
providers_by_type.emplace(provider->Type(), provider);
}
return providers_by_type;
@@ -100,7 +100,7 @@ static const onnx::TensorProto* GetInitializer(const Graph& graph, const std::st
// and mainly provides the subgraph recursion functionality
Status MemcpyTransformer::ApplyImpl(Graph& graph, bool& modified, int graph_level,
const logging::Logger& logger) const {
- for (const auto provider : providers_) {
+ for (const auto& provider : providers_) {
const auto& provider_type = provider->Type();
if (!utils::ProviderIsCpuBased(*provider)) {
TransformerMemcpyImpl copy_impl(graph, *provider, providers_by_type_);
--- a/onnxruntime/test/contrib_ops/gather_block_quantized_op_test.cc
+++ b/onnxruntime/test/contrib_ops/gather_block_quantized_op_test.cc
@@ -82,7 +82,7 @@ void CheckDataAndShape(const std::vector<T>& data, const std::vector<int64_t>& s
ORT_ENFORCE(static_cast<int64_t>(data.size()) == total_elements, "Data size does not match the shape",
"Data size: ", data.size(), ", Expected size: ", total_elements,
- ", Shape: ", VectorToString(shape), " Name:", name, " Type:", typeid(T).name());
+ ", Shape: ", VectorToString(shape), " Name:", name);
}
// Combinations: types, gather_axis, quantize_axis, block_size, indices, scale shape vs data shape
--- a/onnxruntime/test/onnx/pb_helper.h
+++ b/onnxruntime/test/onnx/pb_helper.h
@@ -41,7 +41,7 @@
#include <google/protobuf/message_lite.h>
#include <google/protobuf/io/coded_stream.h>
#include <google/protobuf/io/zero_copy_stream_impl.h>
-#include <onnx/onnx-data_pb.h>
+#include <onnx/onnx-data.pb.h>
#include "tml.pb.h"
#ifdef __GNUC__
#pragma GCC diagnostic pop

54
sci-libs/onnxruntime/files/onnxruntime-1.23.2-use-system-libraries.patch → sci-libs/onnxruntime/files/onnxruntime-1.24.1-use-system-libraries.patch
View File

@@ -11,7 +11,7 @@ Signed-off-by: Pavel Sobolev <contact@paveloom.dev>
URL_HASH SHA1=${DEP_SHA1_abseil_cpp} URL_HASH SHA1=${DEP_SHA1_abseil_cpp}
EXCLUDE_FROM_ALL EXCLUDE_FROM_ALL
PATCH_COMMAND ${ABSL_PATCH_COMMAND} PATCH_COMMAND ${ABSL_PATCH_COMMAND}
- FIND_PACKAGE_ARGS 20250512 NAMES absl - FIND_PACKAGE_ARGS 20250814 NAMES absl
+ FIND_PACKAGE_ARGS NAMES absl REQUIRED + FIND_PACKAGE_ARGS NAMES absl REQUIRED
) )
@@ -54,7 +54,7 @@ Signed-off-by: Pavel Sobolev <contact@paveloom.dev>
) )
FetchContent_MakeAvailable(mimalloc) FetchContent_MakeAvailable(mimalloc)
endif() endif()
@@ -198,7 +198,7 @@ onnxruntime_fetchcontent_declare( @@ -199,7 +199,7 @@ onnxruntime_fetchcontent_declare(
URL_HASH SHA1=${DEP_SHA1_protobuf} URL_HASH SHA1=${DEP_SHA1_protobuf}
PATCH_COMMAND ${ONNXRUNTIME_PROTOBUF_PATCH_COMMAND} PATCH_COMMAND ${ONNXRUNTIME_PROTOBUF_PATCH_COMMAND}
EXCLUDE_FROM_ALL EXCLUDE_FROM_ALL
@@ -63,7 +63,7 @@ Signed-off-by: Pavel Sobolev <contact@paveloom.dev>
) )
set(protobuf_BUILD_TESTS OFF CACHE BOOL "Build protobuf tests" FORCE) set(protobuf_BUILD_TESTS OFF CACHE BOOL "Build protobuf tests" FORCE)
@@ -278,7 +278,7 @@ onnxruntime_fetchcontent_declare( @@ -274,7 +274,7 @@ onnxruntime_fetchcontent_declare(
URL ${DEP_URL_date} URL ${DEP_URL_date}
URL_HASH SHA1=${DEP_SHA1_date} URL_HASH SHA1=${DEP_SHA1_date}
EXCLUDE_FROM_ALL EXCLUDE_FROM_ALL
@@ -72,7 +72,7 @@ Signed-off-by: Pavel Sobolev <contact@paveloom.dev>
) )
onnxruntime_fetchcontent_makeavailable(date) onnxruntime_fetchcontent_makeavailable(date)
@@ -292,12 +292,11 @@ if(NOT TARGET Boost::mp11) @@ -288,12 +288,11 @@ if(NOT TARGET Boost::mp11)
mp11 mp11
URL ${DEP_URL_mp11} URL ${DEP_URL_mp11}
EXCLUDE_FROM_ALL EXCLUDE_FROM_ALL
@@ -88,7 +88,7 @@ Signed-off-by: Pavel Sobolev <contact@paveloom.dev>
endif() endif()
endif() endif()
endif() endif()
@@ -310,7 +310,7 @@ onnxruntime_fetchcontent_declare( @@ -306,7 +305,7 @@ onnxruntime_fetchcontent_declare(
URL ${DEP_URL_json} URL ${DEP_URL_json}
URL_HASH SHA1=${DEP_SHA1_json} URL_HASH SHA1=${DEP_SHA1_json}
EXCLUDE_FROM_ALL EXCLUDE_FROM_ALL
@@ -97,25 +97,25 @@ Signed-off-by: Pavel Sobolev <contact@paveloom.dev>
) )
onnxruntime_fetchcontent_makeavailable(nlohmann_json) onnxruntime_fetchcontent_makeavailable(nlohmann_json)
@@ -380,7 +380,7 @@ if (CPUINFO_SUPPORTED) @@ -372,7 +371,7 @@ if (CPUINFO_SUPPORTED)
URL_HASH SHA1=${DEP_SHA1_pytorch_cpuinfo} ${Patch_EXECUTABLE} -p1 < ${PROJECT_SOURCE_DIR}/patches/cpuinfo/patch_vcpkg_arm64ec_support.patch &&
EXCLUDE_FROM_ALL # https://github.com/pytorch/cpuinfo/pull/348
PATCH_COMMAND ${Patch_EXECUTABLE} -p1 < ${PROJECT_SOURCE_DIR}/patches/cpuinfo/9bb12d342fd9479679d505d93a478a6f9cd50a47.patch ${Patch_EXECUTABLE} -p1 < ${PROJECT_SOURCE_DIR}/patches/cpuinfo/win_arm_fp16_detection_fallback.patch
- FIND_PACKAGE_ARGS NAMES cpuinfo - FIND_PACKAGE_ARGS NAMES cpuinfo
+ FIND_PACKAGE_ARGS NAMES cpuinfo REQUIRED + FIND_PACKAGE_ARGS NAMES cpuinfo REQUIRED
) )
else() else()
onnxruntime_fetchcontent_declare( onnxruntime_fetchcontent_declare(
@@ -388,7 +388,7 @@ if (CPUINFO_SUPPORTED) @@ -380,7 +379,7 @@ if (CPUINFO_SUPPORTED)
URL ${DEP_URL_pytorch_cpuinfo} URL ${DEP_URL_pytorch_cpuinfo}
URL_HASH SHA1=${DEP_SHA1_pytorch_cpuinfo} URL_HASH SHA1=${DEP_SHA1_pytorch_cpuinfo}
EXCLUDE_FROM_ALL EXCLUDE_FROM_ALL
- FIND_PACKAGE_ARGS NAMES cpuinfo - FIND_PACKAGE_ARGS NAMES cpuinfo
+ FIND_PACKAGE_ARGS NAMES cpuinfo REQUIRED + FIND_PACKAGE_ARGS NAMES cpuinfo REQUIRED
) )
endif() endif()
set(ONNXRUNTIME_CPUINFO_PROJ pytorch_cpuinfo) set(ONNXRUNTIME_CPUINFO_PROJ pytorch_cpuinfo)
@@ -406,7 +406,7 @@ if(onnxruntime_USE_CUDA) @@ -398,7 +397,7 @@ if(onnxruntime_USE_CUDA)
URL_HASH SHA1=${DEP_SHA1_microsoft_gsl} URL_HASH SHA1=${DEP_SHA1_microsoft_gsl}
PATCH_COMMAND ${Patch_EXECUTABLE} --binary --ignore-whitespace -p1 < ${PROJECT_SOURCE_DIR}/patches/gsl/1064.patch PATCH_COMMAND ${Patch_EXECUTABLE} --binary --ignore-whitespace -p1 < ${PROJECT_SOURCE_DIR}/patches/gsl/1064.patch
EXCLUDE_FROM_ALL EXCLUDE_FROM_ALL
@@ -124,7 +124,7 @@ Signed-off-by: Pavel Sobolev <contact@paveloom.dev>
) )
else() else()
onnxruntime_fetchcontent_declare( onnxruntime_fetchcontent_declare(
@@ -414,7 +414,7 @@ else() @@ -406,7 +405,7 @@ else()
URL ${DEP_URL_microsoft_gsl} URL ${DEP_URL_microsoft_gsl}
URL_HASH SHA1=${DEP_SHA1_microsoft_gsl} URL_HASH SHA1=${DEP_SHA1_microsoft_gsl}
EXCLUDE_FROM_ALL EXCLUDE_FROM_ALL
@@ -133,7 +133,7 @@ Signed-off-by: Pavel Sobolev <contact@paveloom.dev>
) )
endif() endif()
set(GSL_TARGET "Microsoft.GSL::GSL") set(GSL_TARGET "Microsoft.GSL::GSL")
@@ -428,7 +428,7 @@ if (NOT GSL_FOUND AND NOT onnxruntime_BUILD_SHARED_LIB) @@ -420,7 +419,7 @@ if (NOT GSL_FOUND AND NOT onnxruntime_BUILD_SHARED_LIB)
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
endif() endif()
@@ -142,7 +142,7 @@ Signed-off-by: Pavel Sobolev <contact@paveloom.dev>
if(NOT safeint_SOURCE_DIR) if(NOT safeint_SOURCE_DIR)
unset(safeint_SOURCE_DIR) unset(safeint_SOURCE_DIR)
onnxruntime_fetchcontent_declare( onnxruntime_fetchcontent_declare(
@@ -470,10 +470,14 @@ onnxruntime_fetchcontent_declare( @@ -462,10 +461,14 @@ onnxruntime_fetchcontent_declare(
URL_HASH SHA1=${DEP_SHA1_flatbuffers} URL_HASH SHA1=${DEP_SHA1_flatbuffers}
PATCH_COMMAND ${ONNXRUNTIME_FLATBUFFERS_PATCH_COMMAND} PATCH_COMMAND ${ONNXRUNTIME_FLATBUFFERS_PATCH_COMMAND}
EXCLUDE_FROM_ALL EXCLUDE_FROM_ALL
@@ -158,7 +158,7 @@ Signed-off-by: Pavel Sobolev <contact@paveloom.dev>
if(NOT flatbuffers_FOUND) if(NOT flatbuffers_FOUND)
if(NOT TARGET flatbuffers::flatbuffers) if(NOT TARGET flatbuffers::flatbuffers)
add_library(flatbuffers::flatbuffers ALIAS flatbuffers) add_library(flatbuffers::flatbuffers ALIAS flatbuffers)
@@ -535,7 +539,7 @@ onnxruntime_fetchcontent_declare( @@ -527,7 +530,7 @@ onnxruntime_fetchcontent_declare(
URL_HASH SHA1=${DEP_SHA1_onnx} URL_HASH SHA1=${DEP_SHA1_onnx}
PATCH_COMMAND ${ONNXRUNTIME_ONNX_PATCH_COMMAND} PATCH_COMMAND ${ONNXRUNTIME_ONNX_PATCH_COMMAND}
EXCLUDE_FROM_ALL EXCLUDE_FROM_ALL
@@ -167,7 +167,7 @@ Signed-off-by: Pavel Sobolev <contact@paveloom.dev>
) )
onnxruntime_fetchcontent_makeavailable(onnx) onnxruntime_fetchcontent_makeavailable(onnx)
@@ -611,7 +615,7 @@ if(onnxruntime_ENABLE_DLPACK) @@ -602,7 +605,7 @@ if(onnxruntime_ENABLE_DLPACK)
URL ${DEP_URL_dlpack} URL ${DEP_URL_dlpack}
URL_HASH SHA1=${DEP_SHA1_dlpack} URL_HASH SHA1=${DEP_SHA1_dlpack}
EXCLUDE_FROM_ALL EXCLUDE_FROM_ALL
@@ -176,7 +176,7 @@ Signed-off-by: Pavel Sobolev <contact@paveloom.dev>
) )
onnxruntime_fetchcontent_makeavailable(dlpack) onnxruntime_fetchcontent_makeavailable(dlpack)
endif() endif()
@@ -624,7 +628,7 @@ if(onnxruntime_ENABLE_TRAINING OR (onnxruntime_ENABLE_TRAINING_APIS AND onnxrunt @@ -615,7 +618,7 @@ if(onnxruntime_ENABLE_TRAINING OR (onnxruntime_ENABLE_TRAINING_APIS AND onnxrunt
URL ${DEP_URL_cxxopts} URL ${DEP_URL_cxxopts}
URL_HASH SHA1=${DEP_SHA1_cxxopts} URL_HASH SHA1=${DEP_SHA1_cxxopts}
EXCLUDE_FROM_ALL EXCLUDE_FROM_ALL

6
sci-libs/onnxruntime/onnxruntime-1.23.2.ebuild → sci-libs/onnxruntime/onnxruntime-1.24.1.ebuild
View File

@@ -70,9 +70,7 @@ BDEPEND="
PATCHES=( PATCHES=(
"${FILESDIR}/${PN}-1.22.2-relax-the-dependency-on-flatbuffers.patch" "${FILESDIR}/${PN}-1.22.2-relax-the-dependency-on-flatbuffers.patch"
"${FILESDIR}/${PN}-1.22.2-remove-the-absl-low_level_hash-target.patch" "${FILESDIR}/${PN}-1.24.1-use-system-libraries.patch"
"${FILESDIR}/${PN}-1.23.2-fix-compilation-errors.patch"
"${FILESDIR}/${PN}-1.23.2-use-system-libraries.patch"
) )
CMAKE_USE_DIR="${S}/cmake" CMAKE_USE_DIR="${S}/cmake"
@@ -122,7 +120,7 @@ src_test() {
# There is some custom logic in `setup.py` # There is some custom logic in `setup.py`
python_install() { python_install() {
cd "${S}/cmake_build" || die cd "${S}/cmake_build" || die
edo ${EPYTHON} ../setup.py install \ edo "${EPYTHON}" ../setup.py install \
--prefix="${EPREFIX}/usr" \ --prefix="${EPREFIX}/usr" \
--root="${D}" --root="${D}"