Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b1bffe46 authored by Michael Butler's avatar Michael Butler Committed by Automerger Merge Worker
Browse files

Make NNAPI countNumberOfConsumers return GeneralResult -- hal am: 68b6926e... 

Make NNAPI countNumberOfConsumers return GeneralResult -- hal am: 68b6926e am: 01944251 am: e3ece4b5

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1600093

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib384889b00603259e2489ffa35fd852b605c826d
parents 61d38188 e3ece4b5

neuralnetworks/1.0/utils/src/Conversions.cpp

+2 −2
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ GeneralResult<Model> unvalidatedConvert(const hal::V1_0::Model& model) { 


    // Verify number of consumers.

    const auto numberOfConsumers =

            hal::utils::countNumberOfConsumers(model.operands.size(), operations);

            NN_TRY(hal::utils::countNumberOfConsumers(model.operands.size(), operations));

    CHECK(model.operands.size() == numberOfConsumers.size());

    for (size_t i = 0; i < model.operands.size(); ++i) {

        if (model.operands[i].numberOfConsumers != numberOfConsumers[i]) {
@@ -360,7 +360,7 @@ nn::GeneralResult<Model> unvalidatedConvert(const nn::Model& model) { 


    // Update number of consumers.

    const auto numberOfConsumers =

            hal::utils::countNumberOfConsumers(operands.size(), model.main.operations);

            NN_TRY(hal::utils::countNumberOfConsumers(operands.size(), model.main.operations));

    CHECK(operands.size() == numberOfConsumers.size());

    for (size_t i = 0; i < operands.size(); ++i) {

        operands[i].numberOfConsumers = numberOfConsumers[i];

neuralnetworks/1.1/utils/src/Conversions.cpp

+2 −2
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ GeneralResult<Model> unvalidatedConvert(const hal::V1_1::Model& model) { 


    // Verify number of consumers.

    const auto numberOfConsumers =

            hal::utils::countNumberOfConsumers(model.operands.size(), operations);

            NN_TRY(hal::utils::countNumberOfConsumers(model.operands.size(), operations));

    CHECK(model.operands.size() == numberOfConsumers.size());

    for (size_t i = 0; i < model.operands.size(); ++i) {

        if (model.operands[i].numberOfConsumers != numberOfConsumers[i]) {
@@ -241,7 +241,7 @@ nn::GeneralResult<Model> unvalidatedConvert(const nn::Model& model) { 


    // Update number of consumers.

    const auto numberOfConsumers =

            hal::utils::countNumberOfConsumers(operands.size(), model.main.operations);

            NN_TRY(hal::utils::countNumberOfConsumers(operands.size(), model.main.operations));

    CHECK(operands.size() == numberOfConsumers.size());

    for (size_t i = 0; i < operands.size(); ++i) {

        operands[i].numberOfConsumers = numberOfConsumers[i];

neuralnetworks/1.2/utils/src/Conversions.cpp

+2 −2
Original line number Diff line number Diff line
@@ -227,7 +227,7 @@ GeneralResult<Model> unvalidatedConvert(const hal::V1_2::Model& model) { 


    // Verify number of consumers.

    const auto numberOfConsumers =

            hal::utils::countNumberOfConsumers(model.operands.size(), operations);

            NN_TRY(hal::utils::countNumberOfConsumers(model.operands.size(), operations));

    CHECK(model.operands.size() == numberOfConsumers.size());

    for (size_t i = 0; i < model.operands.size(); ++i) {

        if (model.operands[i].numberOfConsumers != numberOfConsumers[i]) {
@@ -529,7 +529,7 @@ nn::GeneralResult<Model> unvalidatedConvert(const nn::Model& model) { 


    // Update number of consumers.

    const auto numberOfConsumers =

            hal::utils::countNumberOfConsumers(operands.size(), model.main.operations);

            NN_TRY(hal::utils::countNumberOfConsumers(operands.size(), model.main.operations));

    CHECK(operands.size() == numberOfConsumers.size());

    for (size_t i = 0; i < operands.size(); ++i) {

        operands[i].numberOfConsumers = numberOfConsumers[i];

neuralnetworks/1.3/utils/src/Conversions.cpp

+2 −2
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ GeneralResult<Model::Subgraph> unvalidatedConvert(const hal::V1_3::Subgraph& sub 


    // Verify number of consumers.

    const auto numberOfConsumers =

            hal::utils::countNumberOfConsumers(subgraph.operands.size(), operations);

            NN_TRY(hal::utils::countNumberOfConsumers(subgraph.operands.size(), operations));

    CHECK(subgraph.operands.size() == numberOfConsumers.size());

    for (size_t i = 0; i < subgraph.operands.size(); ++i) {

        if (subgraph.operands[i].numberOfConsumers != numberOfConsumers[i]) {
@@ -559,7 +559,7 @@ nn::GeneralResult<Subgraph> unvalidatedConvert(const nn::Model::Subgraph& subgra 


    // Update number of consumers.

    const auto numberOfConsumers =

            hal::utils::countNumberOfConsumers(operands.size(), subgraph.operations);

            NN_TRY(hal::utils::countNumberOfConsumers(operands.size(), subgraph.operations));

    CHECK(operands.size() == numberOfConsumers.size());

    for (size_t i = 0; i < operands.size(); ++i) {

        operands[i].numberOfConsumers = numberOfConsumers[i];

neuralnetworks/aidl/vts/functional/ValidateModel.cpp

+4 −2
Original line number Diff line number Diff line
@@ -1310,8 +1310,10 @@ static void mutateExecutionPriorityTest(const std::shared_ptr<IDevice>& device, 
////////////////////////// ENTRY POINT //////////////////////////////



void validateModel(const std::shared_ptr<IDevice>& device, const Model& model) {

    const auto numberOfConsumers = nn::countNumberOfConsumers(

            model.main.operands.size(), nn::convert(model.main.operations).value());

    const auto numberOfConsumers =

            nn::countNumberOfConsumers(model.main.operands.size(),

                                       nn::convert(model.main.operations).value())

                    .value();

    mutateExecutionOrderTest(device, model, numberOfConsumers);

    mutateOperandTypeTest(device, model);

    mutateOperandRankTest(device, model);