-
Notifications
You must be signed in to change notification settings - Fork 3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
ORT 1.14.0 release -- cherry pick round2 (#14573)
### 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 | 85d7e9c | 85d7e9c 2 | UNet fusion and fp16 conversion for stable diffusion | 14248 | a95fcb4 | a95fcb4 3 | upgrade protobuf to 3.20.2 and onnx to 1.13 | 14279 | 80f807c | 80f807c 4 | Include python training apis when enable_training is enabled | 14485 | d06ad94 | d06ad94 5 | Including support for Deepspeed 0.8.0 | 14506 | 6fa4555 | 6fa4555 6 | change deepspeed version in warning from 0.7.3 to 0.8.0 | 14527 | 3d388a1 | 3d388a1 7 | Do not fuse DQ+Node+Q if DQ produces graph output | 14509 | d9e675a | d9e675a 8 | upgrade EsrpCodeSigning from v1 to v2 | 14531 | 0578eef | 0578eef 9 | Fix python packaging pipeline | 14533 | 7954976 | 7954976 10 | Specify deps in deps.txt and manifest | 14530 | 01cafe8 | 01cafe8 11 | Fix Gather to Split optimizer | 14478 | 0bcca7a | 0bcca7a 12 | Stable Diffusion CUDA Optimizations | 14428 | a6c5ba0 | a6c5ba0 13 | Fix sharing scalar bug | 14544 | c6c1103 | 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 <[email protected]> Co-authored-by: Tianlei Wu <[email protected]> Co-authored-by: Yi Zhang <[email protected]> Co-authored-by: Baiju Meswani <[email protected]> Co-authored-by: Abhishek Jindal <[email protected]> Co-authored-by: Yufeng Li <[email protected]> Co-authored-by: Yulong Wang <[email protected]> Co-authored-by: RandySheriffH <[email protected]> Co-authored-by: Randy Shuai <[email protected]> Co-authored-by: Xavier Dupré <[email protected]> Co-authored-by: pengwa <[email protected]>
- Loading branch information
12 people
authored
Feb 7, 2023
1 parent
1a48099
commit 5ae597d
Showing
77 changed files
with
5,068 additions
and
427 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,25 +1,31 @@ | ||
| diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt | ||
| index 61a5c3ded..68d7c5598 100644 | ||
| index ac92442a1..e930cbd2e 100644 | ||
| --- a/cmake/CMakeLists.txt | ||
| +++ b/cmake/CMakeLists.txt | ||
| @@ -199,12 +199,8 @@ if (MSVC) | ||
| endif() | ||
| @@ -240,9 +240,7 @@ if (MSVC) | ||
| # MSVC warning suppressions | ||
| add_definitions( | ||
| - /wd4018 # 'expression' : signed/unsigned mismatch | ||
| /wd4065 # switch statement contains 'default' but no 'case' labels | ||
| - /wd4146 # unary minus operator applied to unsigned type, result still unsigned | ||
| - /wd4244 # 'conversion' conversion from 'type1' to 'type2', possible loss of data | ||
| /wd4251 # 'identifier' : class 'type' needs to have dll-interface to be used by clients of class 'type2' | ||
| - /wd4267 # 'var' : conversion from 'size_t' to 'type', possible loss of data | ||
| /wd4305 # 'identifier' : truncation from 'type1' to 'type2' | ||
| /wd4307 # 'operator' : integral constant overflow | ||
| /wd4309 # 'conversion' : truncation of constant value | ||
| @@ -212,7 +208,6 @@ if (MSVC) | ||
| @@ -250,7 +248,6 @@ if (MSVC) | ||
| /wd4355 # 'this' : used in base member initializer list | ||
| /wd4506 # no definition for inline function 'function' | ||
| /wd4800 # 'type' : forcing value to bool 'true' or 'false' (performance warning) | ||
| - /wd4996 # The compiler encountered a deprecated declaration. | ||
| ) | ||
| # Allow big object | ||
| add_definitions(/bigobj) | ||
| @@ -272,6 +269,8 @@ if (MSVC) | ||
| endif() | ||
|
|
||
| configure_file(version.rc.in ${CMAKE_CURRENT_BINARY_DIR}/version.rc @ONLY) | ||
| +else (MSVC) | ||
| + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-parameter") | ||
| endif (MSVC) | ||
|
|
||
|
|
Oops, something went wrong.