Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix CTS not able to run to completion #2008

Open
wants to merge 1 commit into
base: r/ics3a/main
Choose a base branch
from
Open

Fix CTS not able to run to completion #2008

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 67 additions & 0 deletions ...al/project-celadon/nn-hal/0001-PATCH-Compatibility-changes-to-build-nn-hal-for-Andr.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
From 7686cb9d5a401335f66510576d007ddeaec6484f Mon Sep 17 00:00:00 2001
From: Ratnesh Kumar Rai <[email protected]>
Date: Tue, 28 Feb 2023 08:40:00 +0530
Subject: [PATCH] [PATCH] Compatibility changes to build nn-hal for Android R

Tracked-On: OAM-105850
Change-Id: If1a47acb071cd4cf8e3ba04218edc69e6261c731
Signed-off-by: Anoob Anto K <[email protected]>
Signed-off-by: Ratnesh Kumar Rai <[email protected]>
Signed-off-by: Jaikrishna, Nemallapudi <[email protected]>
---
Android.bp | 10 +++-------
ngraph_creator/Android.bp | 3 ---
2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/Android.bp b/Android.bp
index c4d8070..35e1f6a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -21,9 +21,7 @@ cc_library_shared {
],

include_dirs: [
- "packages/modules/NeuralNetworks/common/include",
- "packages/modules/NeuralNetworks/common/types/include",
- "packages/modules/NeuralNetworks/runtime/include",
+ "frameworks/ml/nn/runtime/include/",
"frameworks/native/libs/nativewindow/include",
"external/mesa3d/include/android_stub",
"external/grpc-grpc",
@@ -168,9 +166,8 @@ cc_binary {
srcs: ["service.cpp"],

include_dirs: [
- "packages/modules/NeuralNetworks/common/include",
- "packages/modules/NeuralNetworks/common/types/include",
- "packages/modules/NeuralNetworks/runtime/include",
+ "frameworks/ml/nn/common/include",
+ "frameworks/ml/nn/runtime/include/",
"frameworks/native/libs/nativewindow/include",
"external/mesa3d/include/android_stub",
],
@@ -186,7 +183,6 @@ cc_binary {

shared_libs: [
"libhidlbase",
- "libhidltransport",
"libhidlmemory",
"libutils",
"liblog",
diff --git a/ngraph_creator/Android.bp b/ngraph_creator/Android.bp
index 3199dee..74b3b23 100755
--- a/ngraph_creator/Android.bp
+++ b/ngraph_creator/Android.bp
@@ -100,9 +100,6 @@ cc_library_static {
],

include_dirs: [
- "packages/modules/NeuralNetworks/common/include",
- "packages/modules/NeuralNetworks/common/types/include",
- "packages/modules/NeuralNetworks/runtime/include",
"external/mesa3d/include/android_stub",
],

--
2.17.1

130 changes: 130 additions & 0 deletions ...ntel/external/project-celadon/nn-hal/0002-Fix-crashes-observed-during-VTS-execution.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,130 @@
From 333c01280de84e5de8328160c1b4ecb922d10849 Mon Sep 17 00:00:00 2001
From: Anoob Anto K <[email protected]>
Date: Wed, 19 Jul 2023 09:26:41 +0000
Subject: [PATCH] Fix crashes observed during VTS execution

Fixed the following:
- Call loadNetwork for all execute APIs
- Check the status of fetching output after remote inference
- Return INVALID_ARGUMENT for failures in setting PoolInfos

Tracked-On: OAM-111268
Signed-off-by: Anoob Anto K <[email protected]>
---
BasePreparedModel.cpp | 28 +++++++++++++++++++++++++---
DetectionClient.cpp | 6 ++++--
DetectionClient.h | 2 +-
3 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/BasePreparedModel.cpp b/BasePreparedModel.cpp
index a88f782..24a1a48 100644
--- a/BasePreparedModel.cpp
+++ b/BasePreparedModel.cpp
@@ -304,6 +304,10 @@ void asyncExecute(const Request& request, MeasureTiming measure, BasePreparedMod

ov::Tensor destTensor;
try {
+ if (!plugin->queryState()) {
+ ALOGI("%s native model not loaded, starting model load", __func__);
+ plugin->loadNetwork(preparedModel->mXmlFile);
+ }
destTensor = plugin->getInputTensor(tensorIndex);
} catch (const std::exception& ex) {
ALOGE("%s Exception !!! %s", __func__, ex.what());
@@ -494,7 +498,7 @@ static std::tuple<ErrorStatus, hidl_vec<V1_2::OutputShape>, Timing> executeSynch
auto errorStatus = modelInfo->setRunTimePoolInfosFromHidlMemories(request.pools);
if (errorStatus != V1_3::ErrorStatus::NONE) {
ALOGE("Failed to set runtime pool info from HIDL memories");
- return {ErrorStatus::GENERAL_FAILURE, {}, kNoTiming};
+ return {ErrorStatus::INVALID_ARGUMENT, {}, kNoTiming};
}

for (size_t i = 0; i < request.inputs.size(); i++) {
@@ -532,7 +536,7 @@ static std::tuple<ErrorStatus, hidl_vec<V1_2::OutputShape>, Timing> executeSynch
ov::Tensor destTensor;
try {
if (!plugin->queryState()) {
- ALOGI("native model not loaded, starting model load");
+ ALOGI("%s native model not loaded, starting model load", __func__);
plugin->loadNetwork(preparedModel->mXmlFile);
}
destTensor = plugin->getInputTensor(tensorIndex);
@@ -613,8 +617,22 @@ static std::tuple<ErrorStatus, hidl_vec<V1_2::OutputShape>, Timing> executeSynch
void* destPtr = modelInfo->getBlobFromMemoryPoolOut(request, i, expectedLength);
if (preparedModel->mRemoteCheck && preparedModel->mDetectionClient &&
preparedModel->mDetectionClient->get_status()) {
- preparedModel->mDetectionClient->get_output_data(std::to_string(i), (uint8_t*)destPtr,
+ const auto& copied = preparedModel->mDetectionClient->get_output_data(std::to_string(i), (uint8_t*)destPtr,
expectedLength);
+ if ( copied == 0 ) {
+ ALOGE("Output not populated");
+ return {ErrorStatus::GENERAL_FAILURE, {}, kNoTiming};
+ } else if ( copied != expectedLength ) {
+ const auto& opDims = modelInfo->getOperand(outIndex).dimensions;
+ std::vector<size_t> dims;
+ for ( const auto& dim : opDims ) { dims.push_back(dim); }
+ modelInfo->updateOutputshapes(i, dims, false);
+ ALOGE(
+ "Mismatch in actual and exepcted output sizes. Return with "
+ "OUTPUT_INSUFFICIENT_SIZE error");
+ return {ErrorStatus::OUTPUT_INSUFFICIENT_SIZE, modelInfo->getOutputShapes(),
+ kNoTiming};
+ }
} else {
try {
srcTensor = plugin->getOutputTensor(tensorIndex);
@@ -856,6 +874,10 @@ Return<void> BasePreparedModel::executeFenced(const V1_3::Request& request1_3,

ov::Tensor destTensor;
try {
+ if (!mPlugin->queryState()) {
+ ALOGI("%s native model not loaded, starting model load", __func__);
+ mPlugin->loadNetwork(mXmlFile);
+ }
destTensor = mPlugin->getInputTensor(tensorIndex);
} catch (const std::exception& ex) {
ALOGE("%s Exception !!! %s", __func__, ex.what());
diff --git a/DetectionClient.cpp b/DetectionClient.cpp
index 751c0eb..8c3e7f0 100644
--- a/DetectionClient.cpp
+++ b/DetectionClient.cpp
@@ -172,7 +172,7 @@ void DetectionClient::add_input_data(std::string label, const uint8_t* buffer,
input->set_data(buffer, size);
}

-void DetectionClient::get_output_data(std::string label, uint8_t* buffer, uint32_t expectedLength) {
+size_t DetectionClient::get_output_data(std::string label, uint8_t* buffer, uint32_t expectedLength) {
std::string src;
size_t index;

@@ -182,11 +182,13 @@ void DetectionClient::get_output_data(std::string label, uint8_t* buffer, uint32
if (expectedLength != src.length()) {
ALOGE("Length mismatch error: expected length %u , actual length %lu",
expectedLength, src.length());
+ return src.length();
}
memcpy(buffer, src.data(), src.length());
- break;
+ return src.length();
}
}
+ return 0;
}

void DetectionClient::clear_data() {
diff --git a/DetectionClient.h b/DetectionClient.h
index c812950..d0b0789 100644
--- a/DetectionClient.h
+++ b/DetectionClient.h
@@ -40,7 +40,7 @@ public:
void add_input_data(std::string label, const uint8_t* buffer, std::vector<uint32_t> shape,
uint32_t size,
android::hardware::neuralnetworks::nnhal::OperandType operandType);
- void get_output_data(std::string label, uint8_t* buffer, uint32_t expectedLength);
+ size_t get_output_data(std::string label, uint8_t* buffer, uint32_t expectedLength);
void clear_data();
std::string remote_infer();
bool get_status();
--
2.17.1

Loading
Loading