public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/onnx] test-1.21.0: Release 1.15.0
@ 2026-06-08 15:18 Diego Herrera
0 siblings, 0 replies; only message in thread
From: Diego Herrera @ 2026-06-08 15:18 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/onnx
Branch : test-1.21.0
Commit : e64943415984267e90115e6923237fea10365d9f
Author : Diego Herrera <dherrera@redhat.com>
Date : 2024-04-11T17:26:07-04:00
Stats : +78/-132 in 10 file(s)
URL : https://src.fedoraproject.org/rpms/onnx/c/e64943415984267e90115e6923237fea10365d9f?branch=test-1.21.0
Log:
Release 1.15.0
---
diff --git a/.gitignore b/.gitignore
index 300f72a..8369574 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/onnx-1.13.0.tar.gz
/onnx-1.14.0.tar.gz
/onnx-1.14.1.tar.gz
+/onnx-1.15.0.tar.gz
diff --git a/0001-Add-what-is-missing-to-run-tox-disable-tests-that-re.patch b/0001-Add-what-is-missing-to-run-tox-disable-tests-that-re.patch
index 2df860b..cae0b44 100644
--- a/0001-Add-what-is-missing-to-run-tox-disable-tests-that-re.patch
+++ b/0001-Add-what-is-missing-to-run-tox-disable-tests-that-re.patch
@@ -8,32 +8,31 @@ Subject: [PATCH 1/6] Add what is missing to run tox, disable tests that
setup.cfg | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
-diff --git a/setup.cfg b/setup.cfg
-index e7d6a67c..7fc228de 100644
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -2,12 +2,19 @@
- #
- # SPDX-License-Identifier: Apache-2.0
+diff --git a/pyproject.toml b/pyproject.toml
+index 08b47ec6..b41056de 100644
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -43,12 +43,21 @@ onnx = [
+ "backend/test/data/**/*",
+ ]
-+[tox:tox]
-+envlist=py311
++[tool.tox]
++legacy_tox_ini = """
++[tox]
++envlist=py312
+
+[testenv]
+deps=pytest
+commands=pytest
++"""
+
- [aliases]
- test=pytest
+ [tool.pytest.ini_options]
- [tool:pytest]
--addopts = --nbval --current-env
--testpaths = onnx/test onnx/examples
-+addopts = --ignore=onnx/test/test_backend_test.py --ignore=onnx/test/reference_evaluator_backend_test.py --ignore=onnx/test/test_backend_reference.py --ignore=onnx/test/test_backend_onnxruntime.py --ignore=onnx/test/reference_evaluator_test.py
-+testpaths = onnx/test
+-addopts = "--nbval --nbval-current-env"
++addopts = "--ignore=onnx/test/test_backend_test.py --ignore=onnx/test/reference_evaluator_backend_test.py --ignore=onnx/test/test_backend_reference.py --ignore=onnx/test/test_backend_onnxruntime.py --ignore=onnx/test/reference_evaluator_test.py"
+ testpaths = [
+ "onnx/test",
+- "onnx/examples",
+ ]
- [metadata]
- license_files = LICENSE
---
-2.43.0
-
+ [tool.mypy]
diff --git a/0002-Use-system-protobuf-and-require-parameterized.patch b/0002-Use-system-protobuf-and-require-parameterized.patch
index 37ca4fc..46ec867 100644
--- a/0002-Use-system-protobuf-and-require-parameterized.patch
+++ b/0002-Use-system-protobuf-and-require-parameterized.patch
@@ -11,13 +11,12 @@ diff --git a/requirements.txt b/requirements.txt
index 115d48af..1f63e29e 100644
--- a/requirements.txt
+++ b/requirements.txt
-@@ -1,3 +1,5 @@
+@@ -1,2 +1,3 @@
numpy
--protobuf >= 3.20.2
+-protobuf>=3.20.2
+protobuf >= 3.14.0, < 4
- typing-extensions >= 3.6.2.1
+parameterized >= 0.8.1, < 1
-+
+
--
2.43.0
diff --git a/0003-Let-pyproject_wheel-use-binaries-from-cmake_build.patch b/0003-Let-pyproject_wheel-use-binaries-from-cmake_build.patch
index e122367..ba4c067 100644
--- a/0003-Let-pyproject_wheel-use-binaries-from-cmake_build.patch
+++ b/0003-Let-pyproject_wheel-use-binaries-from-cmake_build.patch
@@ -11,24 +11,23 @@ diff --git a/setup.py b/setup.py
index 40b93e3e..3141201b 100644
--- a/setup.py
+++ b/setup.py
-@@ -25,7 +25,7 @@ import setuptools.command.develop
+@@ -26,7 +26,7 @@ import setuptools.command.build_py
+ import setuptools.command.develop
+
TOP_DIR = os.path.realpath(os.path.dirname(__file__))
- SRC_DIR = os.path.join(TOP_DIR, "onnx")
- TP_DIR = os.path.join(TOP_DIR, "third_party")
-CMAKE_BUILD_DIR = os.path.join(TOP_DIR, ".setuptools-cmake-build")
+CMAKE_BUILD_DIR = os.path.join(TOP_DIR, "redhat-linux-build")
- PACKAGE_NAME = "onnx"
WINDOWS = os.name == "nt"
-@@ -147,7 +147,7 @@ class CmakeBuild(setuptools.Command):
- user_options = [("jobs=", "j", "Specifies the number of jobs to use with make")]
+@@ -156,6 +156,7 @@ class CmakeBuild(setuptools.Command):
+ self.jobs = multiprocessing.cpu_count() if self.jobs is None else int(self.jobs)
-- built = False
-+ built = True
+ def run(self):
++ return
+ os.makedirs(CMAKE_BUILD_DIR, exist_ok=True)
- def initialize_options(self):
- self.jobs = None
+ with cd(CMAKE_BUILD_DIR):
--
2.43.0
diff --git a/0004-Add-fixes-for-use-with-onnxruntime.patch b/0004-Add-fixes-for-use-with-onnxruntime.patch
index 0ce7a70..4bb113f 100644
--- a/0004-Add-fixes-for-use-with-onnxruntime.patch
+++ b/0004-Add-fixes-for-use-with-onnxruntime.patch
@@ -10,12 +10,12 @@ Subject: [PATCH 4/6] Add fixes for use with onnxruntime
create mode 100644 onnx/onnxruntime_fix.h
diff --git a/onnx/defs/schema.cc b/onnx/defs/schema.cc
-index 9e4fac05..5c46364b 100644
+index 813cd07a..9faaba21 100644
--- a/onnx/defs/schema.cc
+++ b/onnx/defs/schema.cc
-@@ -17,8 +17,19 @@
+@@ -19,8 +19,19 @@
+
#include "onnx/common/assertions.h"
- #include "onnx/common/stl_backports.h"
#include "onnx/defs/parser.h"
+#include "onnx/onnxruntime_fix.h"
@@ -33,7 +33,7 @@ index 9e4fac05..5c46364b 100644
// -1 means ONNX schema hasn't been loaded yet
// 0 means all versions of ONNX schema have been loaded
// Other positive integer means the ONNX schemas for the specified version have been loaded
-@@ -1061,6 +1072,9 @@ OpName_Domain_Version_Schema_Map& OpSchemaRegistry::map() {
+@@ -1053,6 +1064,9 @@ OpName_Domain_Version_Schema_Map& OpSchemaRegistry::map() {
class SchemasRegisterer {
public:
SchemasRegisterer() {
@@ -63,6 +63,3 @@ index 00000000..2495b931
+};
+
+} // namespace ONNX_NAMESPACE
---
-2.43.0
-
diff --git a/0005-Fix-path-sanitization-bypass-leading-to-arbitrary-re.patch b/0005-Fix-path-sanitization-bypass-leading-to-arbitrary-re.patch
index 67d71bb..8071b9f 100644
--- a/0005-Fix-path-sanitization-bypass-leading-to-arbitrary-re.patch
+++ b/0005-Fix-path-sanitization-bypass-leading-to-arbitrary-re.patch
@@ -18,18 +18,18 @@ Co-authored-by: Justin Chu <justinchuby@users.noreply.github.com>
6 files changed, 161 insertions(+), 93 deletions(-)
diff --git a/onnx/checker.cc b/onnx/checker.cc
-index 37d6abd3..38e544be 100644
+index fac56f56..66716e97 100644
--- a/onnx/checker.cc
+++ b/onnx/checker.cc
-@@ -4,7 +4,6 @@
+@@ -13,7 +13,6 @@
+ #include <vector>
- #include "onnx/checker.h"
#include "onnx/common/file_utils.h"
-#include "onnx/common/path.h"
#include "onnx/defs/schema.h"
#include "onnx/defs/tensor_proto_util.h"
#include "onnx/proto_utils.h"
-@@ -129,85 +128,7 @@ void check_tensor(const TensorProto& tensor, const CheckerContext& ctx) {
+@@ -135,85 +134,7 @@ void check_tensor(const TensorProto& tensor, const CheckerContext& ctx) {
for (const StringStringEntryProto& entry : tensor.external_data()) {
if (entry.has_key() && entry.has_value() && entry.key() == "location") {
has_location = true;
@@ -88,11 +88,11 @@ index 37d6abd3..38e544be 100644
- }
- std::string data_path = path_join(ctx.get_model_dir(), relative_path);
- // use stat64 to check whether the file exists
--#if defined(__APPLE__) || defined(__wasm__)
-- struct stat buffer; // APPLE does not have stat64
+-#if defined(__APPLE__) || defined(__wasm__) || !defined(__GLIBC__)
+- struct stat buffer; // APPLE, wasm and non-glic stdlibs do not have stat64
- if (stat((data_path).c_str(), &buffer) != 0) {
-#else
-- struct stat64 buffer; // All POSIX except APPLE have stat64
+- struct stat64 buffer; // All POSIX under glibc except APPLE and wasm have stat64
- if (stat64((data_path).c_str(), &buffer) != 0) {
-#endif
- fail_check(
@@ -116,7 +116,7 @@ index 37d6abd3..38e544be 100644
}
}
if (!has_location) {
-@@ -1045,6 +966,93 @@ void check_model(const ModelProto& model, bool full_check) {
+@@ -1054,6 +975,93 @@ void check_model(const ModelProto& model, bool full_check, bool skip_opset_compa
}
}
@@ -211,26 +211,26 @@ index 37d6abd3..38e544be 100644
"ATen",
"Affine",
diff --git a/onnx/checker.h b/onnx/checker.h
-index 54fe19aa..6f1d47b2 100644
+index 6796acab..83012213 100644
--- a/onnx/checker.h
+++ b/onnx/checker.h
-@@ -149,6 +149,11 @@ void check_model_local_functions(
- void check_model(const ModelProto& model, bool full_check = false);
- void check_model(const std::string& model_path, bool full_check = false);
+@@ -160,7 +160,10 @@ void check_model_local_functions(
+ void check_model(const ModelProto& model, bool full_check = false, bool skip_opset_compatibility_check = false);
+ void check_model(const std::string& model_path, bool full_check = false, bool skip_opset_compatibility_check = false);
+-
+std::string resolve_external_data_location(
+ const std::string& base_dir,
+ const std::string& location,
+ const std::string& tensor_name);
-+
bool check_is_experimental_op(const NodeProto& node);
} // namespace checker
diff --git a/onnx/common/path.h b/onnx/common/path.h
-index d06eef90..fc692152 100644
+index 6eaf5e67..09212747 100644
--- a/onnx/common/path.h
+++ b/onnx/common/path.h
-@@ -29,11 +29,22 @@ inline std::wstring utf8str_to_wstring(const std::string& utf8str) {
+@@ -31,11 +31,22 @@ inline std::wstring utf8str_to_wstring(const std::string& utf8str) {
if (utf8str.size() > INT_MAX) {
fail_check("utf8str_to_wstring: string is too long for converting to wstring.");
}
@@ -256,12 +256,12 @@ index d06eef90..fc692152 100644
#else
std::string path_join(const std::string& origin, const std::string& append);
diff --git a/onnx/cpp2py_export.cc b/onnx/cpp2py_export.cc
-index 656f8fa7..dd53b197 100644
+index bc2594db..83cea68f 100644
--- a/onnx/cpp2py_export.cc
+++ b/onnx/cpp2py_export.cc
-@@ -538,6 +538,8 @@ PYBIND11_MODULE(onnx_cpp2py_export, onnx_cpp2py_export) {
- "path"_a,
- "full_check"_a = false);
+@@ -545,6 +545,8 @@ PYBIND11_MODULE(onnx_cpp2py_export, onnx_cpp2py_export) {
+ "full_check"_a = false,
+ "skip_opset_compatibility_check"_a = false);
+ checker.def("_resolve_external_data_location", &checker::resolve_external_data_location);
+
@@ -269,7 +269,7 @@ index 656f8fa7..dd53b197 100644
auto version_converter = onnx_cpp2py_export.def_submodule("version_converter");
version_converter.doc() = "VersionConverter submodule";
diff --git a/onnx/external_data_helper.py b/onnx/external_data_helper.py
-index cfb97d06..992c324b 100644
+index bbc2717f..05c486c6 100644
--- a/onnx/external_data_helper.py
+++ b/onnx/external_data_helper.py
@@ -8,6 +8,7 @@ import uuid
@@ -293,7 +293,7 @@ index cfb97d06..992c324b 100644
with open(external_data_file_path, "rb") as data_file:
if info.offset:
data_file.seek(info.offset)
-@@ -254,14 +255,6 @@ def _get_attribute_tensors(onnx_model_proto: ModelProto) -> Iterable[TensorProto
+@@ -259,14 +260,6 @@ def _get_attribute_tensors(onnx_model_proto: ModelProto) -> Iterable[TensorProto
yield from _get_attribute_tensors_from_graph(onnx_model_proto.graph)
@@ -309,22 +309,20 @@ index cfb97d06..992c324b 100644
"""Utility to check whether the provided filename is valid."""
exp = re.compile('^[^<>:;,?"*|/]+$')
diff --git a/onnx/test/test_external_data.py b/onnx/test/test_external_data.py
-index b4303b4a..c7d03d78 100644
+index 63f6b4ef..bb14d279 100644
--- a/onnx/test/test_external_data.py
+++ b/onnx/test/test_external_data.py
-@@ -1,6 +1,9 @@
- # Copyright (c) ONNX Project Contributors
-
+@@ -3,6 +3,7 @@
# SPDX-License-Identifier: Apache-2.0
-+from __future__ import annotations
-+
+ from __future__ import annotations
+
+import itertools
import os
- import shutil
+ import pathlib
import tempfile
-@@ -186,6 +189,52 @@ class TestLoadExternalDataSingleFile(TestLoadExternalDataBase):
+@@ -204,6 +205,52 @@ class TestLoadExternalDataSingleFile(TestLoadExternalDataBase):
attribute_tensor = new_model.graph.node[0].attribute[0].t
- self.assertTrue(np.allclose(to_array(attribute_tensor), self.attribute_value))
+ np.testing.assert_allclose(to_array(attribute_tensor), self.attribute_value)
+ @parameterized.parameterized.expand(itertools.product((True, False), (True, False)))
+ def test_save_external_invalid_single_file_data_and_check(
@@ -373,8 +371,8 @@ index b4303b4a..c7d03d78 100644
+ load_external_data_for_model(onnx_model, external_data_dir)
+
- class TestSaveAllTensorsAsExternalData(TestLoadExternalDataBase):
- def setUp(self) -> None:
+ @parameterized.parameterized_class(
+ [
--
2.43.0
diff --git a/0006-Fix-Out-of-bounds-read-due-to-lack-of-string-termina.patch b/0006-Fix-Out-of-bounds-read-due-to-lack-of-string-termina.patch
index a7821e7..c659dd2 100644
--- a/0006-Fix-Out-of-bounds-read-due-to-lack-of-string-termina.patch
+++ b/0006-Fix-Out-of-bounds-read-due-to-lack-of-string-termina.patch
@@ -12,18 +12,18 @@ Co-authored-by: G. Ramalingam <grama@microsoft.com>
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/onnx/common/assertions.cc b/onnx/common/assertions.cc
-index a21e55da..2099003d 100644
+index 29c07ba0..7675c453 100644
--- a/onnx/common/assertions.cc
+++ b/onnx/common/assertions.cc
-@@ -8,6 +8,7 @@
- // Adventurous users should note that the APIs will probably change.
+@@ -9,6 +9,7 @@
#include "onnx/common/assertions.h"
+
+#include <array>
#include <cstdarg>
#include <cstdio>
- #include "onnx/common/common.h"
-@@ -15,16 +16,20 @@
+
+@@ -17,16 +18,20 @@
namespace ONNX_NAMESPACE {
std::string barf(const char* fmt, ...) {
diff --git a/0007-Fix-test_external_data.patch b/0007-Fix-test_external_data.patch
deleted file mode 100644
index 8e11216..0000000
--- a/0007-Fix-test_external_data.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From d2dae07c2bae6714d2496f9eb125314bd20eacda Mon Sep 17 00:00:00 2001
-From: Alejandro Alvarez Ayllon <a.alvarezayllon@gmail.com>
-Date: Sat, 24 Feb 2024 15:15:58 +0100
-Subject: [PATCH 7/7] Fix test_external_data
-
----
- onnx/test/test_external_data.py | 9 +++++----
- 1 file changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/onnx/test/test_external_data.py b/onnx/test/test_external_data.py
-index c7d03d78..c4376159 100644
---- a/onnx/test/test_external_data.py
-+++ b/onnx/test/test_external_data.py
-@@ -5,6 +5,7 @@ from __future__ import annotations
-
- import itertools
- import os
-+import parameterized
- import shutil
- import tempfile
- import unittest
-@@ -193,7 +194,7 @@ class TestLoadExternalDataSingleFile(TestLoadExternalDataBase):
- def test_save_external_invalid_single_file_data_and_check(
- self, use_absolute_path: bool, use_model_path: bool
- ) -> None:
-- model = onnx.load_model(self.model_filename, self.serialization_format)
-+ model = onnx.load_model(self.model_filename)
-
- model_dir = os.path.join(self.temp_dir, "save_copy")
- os.mkdir(model_dir)
-@@ -224,13 +225,13 @@ class TestLoadExternalDataSingleFile(TestLoadExternalDataBase):
- location=traversal_external_data_location,
- )
-
-- onnx.save_model(model, new_model_filepath, self.serialization_format)
-+ onnx.save_model(model, new_model_filepath)
- if use_model_path:
- with self.assertRaises(onnx.checker.ValidationError):
-- _ = onnx.load_model(new_model_filepath, self.serialization_format)
-+ _ = onnx.load_model(new_model_filepath)
- else:
- onnx_model = onnx.load_model(
-- new_model_filepath, self.serialization_format, load_external_data=False
-+ new_model_filepath, load_external_data=False
- )
- with self.assertRaises(onnx.checker.ValidationError):
- load_external_data_for_model(onnx_model, external_data_dir)
---
-2.43.0
-
diff --git a/onnx.spec b/onnx.spec
index 61abd0e..efab896 100644
--- a/onnx.spec
+++ b/onnx.spec
@@ -1,6 +1,6 @@
Name: onnx
-Version: 1.14.1
-Release: 2%{?dist}
+Version: 1.15.0
+Release: 1%{?dist}
Summary: Open standard for machine learning interoperability
License: Apache-2.0
@@ -20,7 +20,6 @@ Patch4: 0004-Add-fixes-for-use-with-onnxruntime.patch
Patch5: 0005-Fix-path-sanitization-bypass-leading-to-arbitrary-re.patch
# Backport of fix for CVE-2024-27319
Patch6: 0006-Fix-Out-of-bounds-read-due-to-lack-of-string-termina.patch
-Patch7: 0007-Fix-test_external_data.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=2212096
ExcludeArch: s390x
@@ -115,6 +114,9 @@ export LD_LIBRARY_PATH=%{buildroot}/%{_libdir}
%{_bindir}/check-node
%changelog
+* Thu Apr 11 2024 Diego Herrera C <dherrera@redhat.com> - 1.15.0-1
+- Release 1.15.0
+
* Sat Feb 24 2024 Alejandro Alvarez Ayllon <a.alvarezayllon@gmail.com> - 1.14.1-2
- Backport of fixes for CVE-2024-27318 and CVE-2024-27319
diff --git a/sources b/sources
index 097f373..b065a96 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
SHA512 (onnx-1.14.0.tar.gz) = 8a525b365fd203f0a59bcf82fa7f2e29d7e0563885ebe38269c596cd4eb949bcfc65d848b92b7abafa7ddecedcfc019f8779097ffcb5087f06037cace24462fc
SHA512 (onnx-1.14.1.tar.gz) = f846fffb286c4aeadc01462f220515f0a5c2ce1cbec849da7092a08c2676f8308af7315318a2866e9182f9aed719984ef95a9ddc69ffe0e62e40664395df5efd
+SHA512 (onnx-1.15.0.tar.gz) = b46a4ab70af88053318eba45251c1f71528f15e45a33042877570e8d857febd3ec66e2e811fcda2105a4f17b84c9a1c6a0aaa22756c3287321b3ea29e83127fd
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-06-08 15:18 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-06-08 15:18 [rpms/onnx] test-1.21.0: Release 1.15.0 Diego Herrera
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox