From 26e6ced17226eacd257f0efded60afd80a942d4b Mon Sep 17 00:00:00 2001
From: Guoyu Wang <62914304+gwang-msft@users.noreply.github.com>
Date: Fri, 20 Nov 2020 23:58:32 -0800
Subject: [PATCH] Temporary fix for Android CI failure (#5889)

* Unblock the Android CI

* Add python to android ci's command
---
 .../nnapi/nnapi_builtin/builders/model_builder.cc         | 8 ++++++--
 .../nnapi/nnapi_builtin/nnapi_execution_provider.cc       | 7 ++++---
 .../android-x86_64-crosscompile-ci-pipeline.yml           | 4 ++--
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/onnxruntime/core/providers/nnapi/nnapi_builtin/builders/model_builder.cc b/onnxruntime/core/providers/nnapi/nnapi_builtin/builders/model_builder.cc
index a2ba35b582..1aa179acd6 100644
--- a/onnxruntime/core/providers/nnapi/nnapi_builtin/builders/model_builder.cc
+++ b/onnxruntime/core/providers/nnapi/nnapi_builtin/builders/model_builder.cc
@@ -263,8 +263,12 @@ Status ModelBuilder::RegisterModelInputs() {
       shape.push_back(SafeInt<uint32_t>(dim.dim_value()));
     }
 
-    ORT_RETURN_IF_NOT(GetAndroidSdkVer() >= 29 || !shape.empty(),
-                      "0-rank input is only supported on Android API level 29+");
+    // NNAPI has strict input type requirements which separates tensor inputs and scalar inputs
+    // For ONNX the we do not have clear line between scalar inputs and tensor inputs
+    // Also NNAPI treats a tensor input with empty shape as dynamic shape input
+    // Disable support of the scalar input (tensor input with an empty shape) for now
+    // TODO, add support for ONNX scalar input (tensor input with an empty shape)
+    ORT_RETURN_IF_NOT(!shape.empty(), "0-rank input is not currently supported, input name, ", input_name);
 
     Type type = Type::TENSOR_FLOAT32;
     float scale = 0.0f;
diff --git a/onnxruntime/core/providers/nnapi/nnapi_builtin/nnapi_execution_provider.cc b/onnxruntime/core/providers/nnapi/nnapi_builtin/nnapi_execution_provider.cc
index 1b78cddf38..60d46511b6 100644
--- a/onnxruntime/core/providers/nnapi/nnapi_builtin/nnapi_execution_provider.cc
+++ b/onnxruntime/core/providers/nnapi/nnapi_builtin/nnapi_execution_provider.cc
@@ -312,9 +312,10 @@ common::Status NnapiExecutionProvider::Compile(const std::vector<FusedNodeAndGra
         // Also NNAPI treats a tensor input with empty shape as dynamic shape input
         // Disable support of the scalar input (tensor input with an empty shape) for now
         // TODO, add support for ONNX scalar input (tensor input with an empty shape)
-        if (dimensions.empty())
-          return ORT_MAKE_STATUS(ONNXRUNTIME, INVALID_ARGUMENT, "NNAPI does not support scalar input");
-
+        if (dimensions.empty()) {
+          return ORT_MAKE_STATUS(ONNXRUNTIME, INVALID_ARGUMENT,
+                                 "NNAPI does not support scalar input, input name, ", input_name);
+        }
         // it is possible that the input has the detailed size while
         // the model has an operand with unknown size, use the size
         // of the actual input
diff --git a/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml b/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml
index 4c56246daf..10104641b9 100644
--- a/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml
+++ b/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml
@@ -6,7 +6,7 @@ jobs:
   steps:
     - script: brew install coreutils ninja
       displayName: Install coreutils and ninja
-    - script: tools/ci_build/build.py --android --build_dir build --android_sdk_path $ANDROID_HOME --android_ndk_path $ANDROID_HOME/ndk-bundle --android_abi=x86_64 --android_api=29 --skip_submodule_sync --parallel --cmake_generator=Ninja --build_java
+    - script: python3 tools/ci_build/build.py --android --build_dir build --android_sdk_path $ANDROID_HOME --android_ndk_path $ANDROID_HOME/ndk-bundle --android_abi=x86_64 --android_api=29 --skip_submodule_sync --parallel --cmake_generator=Ninja --build_java
       displayName: CPU EP, Build and Test on Android Emulator
-    - script: tools/ci_build/build.py --android --build_dir build_nnapi --android_sdk_path $ANDROID_HOME --android_ndk_path $ANDROID_HOME/ndk-bundle --android_abi=x86_64 --android_api=29 --skip_submodule_sync --parallel --use_nnapi --cmake_generator=Ninja --build_java
+    - script: python3 tools/ci_build/build.py --android --build_dir build_nnapi --android_sdk_path $ANDROID_HOME --android_ndk_path $ANDROID_HOME/ndk-bundle --android_abi=x86_64 --android_api=29 --skip_submodule_sync --parallel --use_nnapi --cmake_generator=Ninja --build_java
       displayName: NNAPI EP, Build and Test on Android Emulator