mirror of
https://github.com/saymrwulf/onnxruntime.git
synced 2026-07-25 19:48:11 +00:00
5ae597da6a
### Description <!-- Describe your changes. --> Second round cherry pick, total 13 PRs, as below. Please check here for [Here](https://github.com/microsoft/onnxruntime/issues?q=label%3Arelease%3A1.14+sort%3Aupdated-asc+is%3Aclosed+label%3Atriage%3Aapproved) for the total list. <html xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:x="urn:schemas-microsoft-com:office:excel" xmlns="http://www.w3.org/TR/REC-html40"> <head> <meta name=ProgId content=Excel.Sheet> <meta name=Generator content="Microsoft Excel 15"> <link id=Main-File rel=Main-File href="file:///C:/Users/ruiren/AppData/Local/Temp/msohtmlclip1/01/clip.htm"> <link rel=File-List href="file:///C:/Users/ruiren/AppData/Local/Temp/msohtmlclip1/01/clip_filelist.xml"> <style> <!--table {mso-displayed-decimal-separator:"\."; mso-displayed-thousand-separator:"\,";} @page {margin:.75in .7in .75in .7in; mso-header-margin:.3in; mso-footer-margin:.3in;} tr {mso-height-source:auto;} col {mso-width-source:auto;} br {mso-data-placement:same-cell;} td {padding-top:1px; padding-right:1px; padding-left:1px; mso-ignore:padding; color:black; font-size:11.0pt; font-weight:400; font-style:normal; text-decoration:none; font-family:Calibri, sans-serif; mso-font-charset:0; mso-number-format:General; text-align:general; vertical-align:bottom; border:none; mso-background-source:auto; mso-pattern:auto; mso-protection:locked visible; white-space:nowrap; mso-rotate:0;} .xl65 {text-align:center;} .xl66 {color:windowtext; text-align:center; border:.5pt solid windowtext;} .xl67 {text-align:center; border:.5pt solid windowtext;} .xl68 {text-align:center; border:.5pt solid windowtext; background:white; mso-pattern:black none;} --> </style> </head> <body link="#0563C1" vlink="#954F72"> Date | PR | # | Commit # | Short # -- | -- | -- | -- | -- 1 | Fix unused variable for CUDA EP builds with USE_FLASH_ATTENTION off | 14404 |85d7e9c596|85d7e9c2 | UNet fusion and fp16 conversion for stable diffusion | 14248 |a95fcb4345|a95fcb43 | upgrade protobuf to 3.20.2 and onnx to 1.13 | 14279 |80f807c03d|80f807c4 | Include python training apis when enable_training is enabled | 14485 |d06ad9462b|d06ad945 | Including support for Deepspeed 0.8.0 | 14506 |6fa4555a06|6fa45556 | change deepspeed version in warning from 0.7.3 to 0.8.0 | 14527 |3d388a1aea|3d388a17 | Do not fuse DQ+Node+Q if DQ produces graph output | 14509 |d9e675a2af|d9e675a8 | upgrade EsrpCodeSigning from v1 to v2 | 14531 |0578eeff91|0578eef9 | Fix python packaging pipeline | 14533 |7954976e0a|795497610 | Specify deps in deps.txt and manifest | 14530 |01cafe89f0|01cafe811 | Fix Gather to Split optimizer | 14478 |0bcca7ad45|0bcca7a12 | Stable Diffusion CUDA Optimizations | 14428 |a6c5ba0185|a6c5ba013 | Fix sharing scalar bug | 14544 |c6c11039d7|c6c1103</body> </html> ### 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. --> Second round cherry-pick for ORT 1.14.0 release. --------- Co-authored-by: Adrian Lizarraga <adlizarraga@microsoft.com> Co-authored-by: Tianlei Wu <tlwu@microsoft.com> Co-authored-by: Yi Zhang <zhanyi@microsoft.com> Co-authored-by: Baiju Meswani <bmeswani@microsoft.com> Co-authored-by: Abhishek Jindal <abjindal@microsoft.com> Co-authored-by: Yufeng Li <liyufeng1987@gmail.com> Co-authored-by: Yulong Wang <7679871+fs-eire@users.noreply.github.com> Co-authored-by: RandySheriffH <48490400+RandySheriffH@users.noreply.github.com> Co-authored-by: Randy Shuai <rashuai@microsoft.com> Co-authored-by: Xavier Dupré <xadupre@users.noreply.github.com> Co-authored-by: pengwa <pengwa@microsoft.com>
59 lines
2.3 KiB
Diff
59 lines
2.3 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||
index 4dd56b6e..018da488 100644
|
||
--- a/CMakeLists.txt
|
||
+++ b/CMakeLists.txt
|
||
@@ -397,6 +397,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)
|
||
@@ -548,20 +549,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/onnx_pb.h b/onnx/onnx_pb.h
|
||
index 0aab3e26..0f859267 100644
|
||
--- a/onnx/onnx_pb.h
|
||
+++ b/onnx/onnx_pb.h
|
||
@@ -47,10 +47,21 @@
|
||
#define ONNX_API ONNX_IMPORT
|
||
#endif
|
||
|
||
+// onnx/onnx-operators-ml.pb.h:1178:25: required from here
|
||
+// protobuf/src/google/protobuf/repeated_ptr_field.h:752:66: error: unused parameter ‘prototype’ [-Werror=unused-parameter]
|
||
+#if defined(__GNUC__)
|
||
+#pragma GCC diagnostic push
|
||
+#pragma GCC diagnostic ignored "-Wunused-parameter"
|
||
+#endif
|
||
+
|
||
#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
|