Merge branch 'main' of https://github.com/microsoft/onnxruntime into …

…zhanyi/updateprotobuf

VERSION_NUMBER

@@ -1 +1 @@
-1.14.0
+1.15.0

docs/python/README.rst

@@ -8,6 +8,11 @@ For more information on ONNX Runtime, please see `aka.ms/onnxruntime <https://ak
 Changes
 -------
 
+1.15.0
+^^^^^^
+
+Release Notes : https://github.com/Microsoft/onnxruntime/releases/tag/v1.15.0
+
 1.14.0
 ^^^^^^
 

js/common/package.json

@@ -8,7 +8,7 @@
   },
   "author": "fs-eire",
   "module": "dist/lib/index.js",
-  "version": "1.14.0",
+  "version": "1.15.0",
   "jsdelivr": "dist/ort-common.min.js",
   "scripts": {
     "prepare": "tsc && webpack"

js/node/package.json

@@ -13,7 +13,7 @@
       3
     ]
   },
-  "version": "1.14.0",
+  "version": "1.15.0",
   "dependencies": {
     "onnxruntime-common": "file:../common"
   },

js/react_native/package.json

@@ -38,7 +38,7 @@
     "registry": "https://registry.npmjs.org/"
   },
   "source": "lib/index",
-  "version": "1.14.0",
+  "version": "1.15.0",
   "main": "dist/commonjs/index",
   "homepage": "https://github.com/microsoft/onnxruntime/blob/main/js/react_native/README.md",
   "files": [

js/react_native/yarn.lock

@@ -5197,7 +5197,7 @@ onetime@^5.1.0, onetime@^5.1.2:
     mimic-fn "^2.1.0"
 
 "onnxruntime-common@file:../common":
-  version "1.14.0"
+  version "1.15.0"
 
 open@^6.2.0:
   version "6.4.0"

js/web/package.json

@@ -9,7 +9,7 @@
   },
   "author": "fs-eire",
   "module": "./lib/index.js",
-  "version": "1.14.0",
+  "version": "1.15.0",
   "jsdelivr": "dist/ort.min.js",
   "dependencies": {
     "flatbuffers": "^1.12.0",

js/web/webpack.config.js

@@ -80,6 +80,7 @@ function buildConfig({ filename, format, target, mode, devtool, build_defs }) {
         "util": false,
       },
       fallback: {
+        "crypto": false,
         "fs": false,
         "path": false,
         "util": false,

onnxruntime/__init__.py

@@ -7,7 +7,7 @@
 For more information on ONNX Runtime, please see `aka.ms/onnxruntime <https://aka.ms/onnxruntime/>`_
 or the `Github project <https://github.com/microsoft/onnxruntime/>`_.
 """
-__version__ = "1.14.0"
+__version__ = "1.15.0"
 __author__ = "Microsoft"
 
 # we need to do device version validation (for example to check Cuda version for an onnxruntime-training package).

onnxruntime/contrib_ops/cpu/transformers/beam_search.cc

@@ -245,7 +245,7 @@ Status BeamSearch::Compute(OpKernelContext* ctx) const {
         init_beam_state_fp16_func_,
         device_copy_func_,
         device_copy_int32_func_,
-        create_encoder_inputs_func_,
+        create_encoder_inputs_func_ ? create_encoder_inputs_func_ : GenerationCpuDeviceHelper::CreateEncoderInputs,
         update_decoder_feeds_fp16_func_,
         expand_buffer_int32_func_,
         expand_buffer_float_func_,

onnxruntime/core/session/onnxruntime_c_api.cc

@@ -2660,6 +2660,10 @@ static constexpr OrtApi ort_api_1_to_14 = {
     &OrtApis::KernelInfoGetAttribute_tensor,
     &OrtApis::HasSessionConfigEntry,
     &OrtApis::GetSessionConfigEntry,
+    // End of Version 14 - DO NOT MODIFY ABOVE (see above text for more information)
+
+    // Start of Version 15 API in progress, safe to modify/rename/rearrange until we ship
+
 };
 
 // Asserts to do a some checks to ensure older Versions of the OrtApi never change (will detect an addition or deletion but not if they cancel out each other)
@@ -2681,10 +2685,10 @@ static_assert(offsetof(OrtApi, ReleaseKernelInfo) / sizeof(void*) == 218, "Size
 static_assert(offsetof(OrtApi, ReleaseCANNProviderOptions) / sizeof(void*) == 224, "Size of version 13 API cannot change");
 
 // So that nobody forgets to finish an API version, this check will serve as a reminder:
-static_assert(std::string_view(ORT_VERSION) == "1.14.0",
+static_assert(std::string_view(ORT_VERSION) == "1.15.0",
               "ORT_Version change detected, please follow below steps to ensure OrtApi is updated properly");
 // 1. Update the hardcoded version string in above static_assert to silence it
-// 2. If there were any APIs added to ort_api_1_to_14 above:
+// 2. If there were any APIs added to ort_api_1_to_15 above:
 //    a. Add the 'End of version #' markers (pattern above should be obvious)
 //    b. Add a static_assert in the directly above list of version sizes to ensure nobody adds any more functions to the just shipped API version
 

onnxruntime/test/testdata/custom_op_library/custom_op_library.cc

@@ -73,7 +73,7 @@ struct KernelTwo {
 
 struct CustomOpOne : Ort::CustomOpBase<CustomOpOne, KernelOne> {
   void* CreateKernel(const OrtApi& /* api */, const OrtKernelInfo* /* info */) const {
-    return new KernelOne();
+    return std::make_unique<KernelOne>().release();
   };
 
   const char* GetName() const { return "CustomOpOne"; };
@@ -92,7 +92,7 @@ struct CustomOpOne : Ort::CustomOpBase<CustomOpOne, KernelOne> {
 
 struct CustomOpTwo : Ort::CustomOpBase<CustomOpTwo, KernelTwo> {
   void* CreateKernel(const OrtApi& /* api */, const OrtKernelInfo* /* info */) const {
-    return new KernelTwo();
+    return std::make_unique<CustomOpTwo>().release();
   };
 
   const char* GetName() const { return "CustomOpTwo"; };

package/rpm/onnxruntime.spec

@@ -1,5 +1,5 @@
 Name:           onnxruntime
-Version:        1.14.0
+Version:        1.15.0
 Release:        1%{?dist}
 Summary:        onnxruntime