mirror of
https://github.com/saymrwulf/onnxruntime.git
synced 2026-07-01 03:45:06 +00:00
a9a881cc98
### Description <!-- Describe your changes. --> for ORT 1.21.0 release Create following related issues to track skipped tests due to updated ONNX operators in the ONNX 1.17.0 release: https://github.com/microsoft/onnxruntime/issues/23162 https://github.com/microsoft/onnxruntime/issues/23164 https://github.com/microsoft/onnxruntime/issues/23163 https://github.com/microsoft/onnxruntime/issues/23161 ### Motivation and Context <!-- - Why is this change required? What problem does it solve? - If it fixes an open issue, please link to the issue here. --> --------- Signed-off-by: Liqun Fu <liqfu@microsoft.com> Signed-off-by: Liqun Fu <liqun.fu@microsoft.com> Co-authored-by: Guenther Schmuelling <guschmue@microsoft.com> Co-authored-by: Yifan Li <109183385+yf711@users.noreply.github.com> Co-authored-by: yf711 <yifanl@microsoft.com>
88 lines
3.2 KiB
Diff
88 lines
3.2 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 6d7ca846..69aa622f 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -499,6 +499,7 @@ if (MSVC)
|
|
endif()
|
|
else()
|
|
# On non-Windows, hide all symbols we don't need
|
|
+ set(EXTRA_FLAGS "-Wno-unused-parameter")
|
|
set(ONNX_API_DEFINE "-DONNX_API=__attribute__\(\(__visibility__\(\"default\"\)\)\)")
|
|
set_target_properties(onnx_proto PROPERTIES CXX_VISIBILITY_PRESET hidden)
|
|
set_target_properties(onnx_proto PROPERTIES VISIBILITY_INLINES_HIDDEN 1)
|
|
@@ -653,20 +654,9 @@ endif()
|
|
if(MSVC)
|
|
target_compile_options(onnx_proto
|
|
PRIVATE /MP
|
|
- /wd4244 #'argument': conversion from 'google::
|
|
- #protobuf::uint64' to 'int', possible
|
|
- # loss of data
|
|
- /wd4267 # Conversion from 'size_t' to 'int',
|
|
- # possible loss of data
|
|
${EXTRA_FLAGS})
|
|
target_compile_options(onnx
|
|
PRIVATE /MP
|
|
- /wd4244 # 'argument': conversion from 'google::
|
|
- # protobuf::uint64' to 'int', possible
|
|
- # loss of data
|
|
- /wd4267 # Conversion from 'size_t' to 'int',
|
|
- # possible loss of data
|
|
- /wd4996 # The second parameter is ignored.
|
|
${EXTRA_FLAGS})
|
|
if(ONNX_USE_PROTOBUF_SHARED_LIBS)
|
|
target_compile_options(onnx_proto
|
|
diff --git a/onnx/common/file_utils.h b/onnx/common/file_utils.h
|
|
index b847798e..a6c31904 100644
|
|
--- a/onnx/common/file_utils.h
|
|
+++ b/onnx/common/file_utils.h
|
|
@@ -6,7 +6,6 @@
|
|
|
|
#pragma once
|
|
|
|
-#include <filesystem>
|
|
#include <fstream>
|
|
#include <string>
|
|
|
|
@@ -17,8 +16,7 @@ namespace ONNX_NAMESPACE {
|
|
|
|
template <typename T>
|
|
void LoadProtoFromPath(const std::string proto_path, T& proto) {
|
|
- std::filesystem::path proto_u8_path = std::filesystem::u8path(proto_path);
|
|
- std::fstream proto_stream(proto_u8_path, std::ios::in | std::ios::binary);
|
|
+ std::fstream proto_stream(proto_path, std::ios::in | std::ios::binary);
|
|
if (!proto_stream.good()) {
|
|
fail_check("Unable to open proto file: ", proto_path, ". Please check if it is a valid proto. ");
|
|
}
|
|
diff --git a/onnx/onnx_pb.h b/onnx/onnx_pb.h
|
|
index 0aab3e26..398ac2d6 100644
|
|
--- a/onnx/onnx_pb.h
|
|
+++ b/onnx/onnx_pb.h
|
|
@@ -47,10 +47,28 @@
|
|
#define ONNX_API ONNX_IMPORT
|
|
#endif
|
|
|
|
+#if defined(__GNUC__)
|
|
+#pragma GCC diagnostic push
|
|
+
|
|
+// In file included from onnx/onnx-ml.pb.h:30:
|
|
+// In file included from google/protobuf/extension_set.h:53:
|
|
+// google/protobuf/parse_context.h:328:47: error: implicit conversion loses integer precision: 'long' to 'int' [-Werror,-Wshorten-64-to-32]
|
|
+#if defined(__has_warning)
|
|
+#if __has_warning("-Wshorten-64-to-32")
|
|
+#pragma GCC diagnostic ignored "-Wshorten-64-to-32"
|
|
+#endif
|
|
+#endif // defined(__has_warning)
|
|
+
|
|
+#endif // defined(__GNUC__)
|
|
+
|
|
#ifdef ONNX_ML
|
|
#include "onnx/onnx-ml.pb.h"
|
|
#else
|
|
#include "onnx/onnx.pb.h"
|
|
#endif
|
|
|
|
+#if defined(__GNUC__)
|
|
+#pragma GCC diagnostic pop
|
|
+#endif
|
|
+
|
|
#endif // ! ONNX_ONNX_PB_H
|