diff --git a/VERSION_NUMBER b/VERSION_NUMBER
index 850e742404bba..141f2e805bebd 100644
--- a/VERSION_NUMBER
+++ b/VERSION_NUMBER
@@ -1 +1 @@
-1.14.0
+1.15.0
diff --git a/docs/python/README.rst b/docs/python/README.rst
index b9c2bf995ac33..f5f162b1d42eb 100644
--- a/docs/python/README.rst
+++ b/docs/python/README.rst
@@ -8,6 +8,11 @@ For more information on ONNX Runtime, please see `aka.ms/onnxruntime `_
or the `Github project `_.
"""
-__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).
diff --git a/onnxruntime/contrib_ops/cpu/transformers/beam_search.cc b/onnxruntime/contrib_ops/cpu/transformers/beam_search.cc
index 8744b0244e1a2..c839bb4245c21 100644
--- a/onnxruntime/contrib_ops/cpu/transformers/beam_search.cc
+++ b/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_,
diff --git a/onnxruntime/core/session/onnxruntime_c_api.cc b/onnxruntime/core/session/onnxruntime_c_api.cc
index 265823b09a913..bbb629216f821 100644
--- a/onnxruntime/core/session/onnxruntime_c_api.cc
+++ b/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
diff --git a/onnxruntime/test/testdata/custom_op_library/custom_op_library.cc b/onnxruntime/test/testdata/custom_op_library/custom_op_library.cc
index d75379668b824..fcc1ea78926e3 100644
--- a/onnxruntime/test/testdata/custom_op_library/custom_op_library.cc
+++ b/onnxruntime/test/testdata/custom_op_library/custom_op_library.cc
@@ -73,7 +73,7 @@ struct KernelTwo {
struct CustomOpOne : Ort::CustomOpBase {
void* CreateKernel(const OrtApi& /* api */, const OrtKernelInfo* /* info */) const {
- return new KernelOne();
+ return std::make_unique().release();
};
const char* GetName() const { return "CustomOpOne"; };
@@ -92,7 +92,7 @@ struct CustomOpOne : Ort::CustomOpBase {
struct CustomOpTwo : Ort::CustomOpBase {
void* CreateKernel(const OrtApi& /* api */, const OrtKernelInfo* /* info */) const {
- return new KernelTwo();
+ return std::make_unique().release();
};
const char* GetName() const { return "CustomOpTwo"; };
diff --git a/package/rpm/onnxruntime.spec b/package/rpm/onnxruntime.spec
index f1625148fd2c1..d4efef8900432 100644
--- a/package/rpm/onnxruntime.spec
+++ b/package/rpm/onnxruntime.spec
@@ -1,5 +1,5 @@
Name: onnxruntime
-Version: 1.14.0
+Version: 1.15.0
Release: 1%{?dist}
Summary: onnxruntime