Imported Upstream version 1.11.1

diff --git a/docs/conf.py b/docs/conf.py
index 52f8755..1185bcf 100644 (file)
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -21,7 +21,7 @@ copyright = '2020, Samsung Research & contributors'
 author = 'Samsung Research & contributors'
 
 # The full version, including alpha/beta/rc tags
-release = '1.11.0'
+release = '1.11.1'
 
 # -- General configuration ---------------------------------------------------
 

diff --git a/docs/release/1.11/release-note-1.11.1.md b/docs/release/1.11/release-note-1.11.1.md
new file mode 100644 (file)
index 0000000..9efedf6
--- /dev/null
+++ b/docs/release/1.11/release-note-1.11.1.md
@@ -0,0 +1,7 @@
+# Release Note 1.11.1
+
+## ONE Runtime
+
+### Hot Fixes
+
+- Fix segfault due to the wrong BCQGather DynamicShapeInferer's behavior

diff --git a/packaging/nnfw.spec b/packaging/nnfw.spec
index 892aef6..18150f3 100644 (file)
--- a/packaging/nnfw.spec
+++ b/packaging/nnfw.spec
@@ -1,6 +1,6 @@
 Name:    nnfw
 Summary: nnfw
-Version: 1.11.0
+Version: 1.11.1
 Release: 1
 Group:   Development
 License: Apache-2.0 and MIT and BSD-2-Clause

diff --git a/runtime/contrib/android/api/build.gradle b/runtime/contrib/android/api/build.gradle
index 5427878..d383b2d 100644 (file)
--- a/runtime/contrib/android/api/build.gradle
+++ b/runtime/contrib/android/api/build.gradle
@@ -8,7 +8,7 @@ android {
         minSdkVersion 26
         targetSdkVersion 29
         versionCode 1
-        versionName "1.11.0"
+        versionName "1.11.1"
 
         externalNativeBuild {
             ndkBuild {

diff --git a/runtime/onert/api/include/nnfw_version.h b/runtime/onert/api/include/nnfw_version.h
index 4044cb6..31c3890 100644 (file)
--- a/runtime/onert/api/include/nnfw_version.h
+++ b/runtime/onert/api/include/nnfw_version.h
@@ -21,6 +21,6 @@
  * NNFW_VERSION is a uint32 value representing nnfw runtime version
  * in 0xMMmmmmPP, where MM = major, mmmm = minor, PP = patch
  */
-#define NNFW_VERSION 0x01000b00
+#define NNFW_VERSION 0x01000b01
 
 #endif // __NNFW_VERSION_H__

diff --git a/runtime/onert/core/src/exec/DynamicShapeInferer.cc b/runtime/onert/core/src/exec/DynamicShapeInferer.cc
index 5a40bba..1666d3f 100644 (file)
--- a/runtime/onert/core/src/exec/DynamicShapeInferer.cc
+++ b/runtime/onert/core/src/exec/DynamicShapeInferer.cc
@@ -172,7 +172,7 @@ void DynamicShapeInferer::visit(const ir::operation::BCQGather &op)
   const auto indices_idx{op.getInputs().at(ir::operation::BCQGather::Input::INDICES)};
   const auto &indices = _tensor_registry->getITensor(indices_idx);
 
-  const auto input_binary_idx{op.getInputs().at(ir::operation::BCQGather::Input::INDICES)};
+  const auto input_binary_idx{op.getInputs().at(ir::operation::BCQGather::Input::INPUT_BINARY)};
   const auto &input_binary = _tensor_registry->getITensor(input_binary_idx);
 
   const auto cluster_idx{op.getInputs().at(ir::operation::BCQGather::Input::INPUT_CLUSTERS)};