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

Commit 301ef060 authored by Michael Butler's avatar Michael Butler
Browse files

Remove hal::utils::countNumberOfConsumers 

This CL removes hal::utils::countNumberOfConsumers and uses the existing
nn::countNumberOfConsumers.

This change is part of a larger chain of changes to remove HIDL and AIDL
libraries from neuralnetworks_utils_hal_common.

Bug: N/A
Test: mma
Change-Id: I7d06ea355eae7aa80b94b09a23d606bbb2322120
parent 68e98f40

neuralnetworks/1.0/utils/src/Conversions.cpp

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


    // Verify number of consumers.

    const auto numberOfConsumers =

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

            NN_TRY(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]) {
@@ -346,7 +346,7 @@ nn::GeneralResult<Model> unvalidatedConvert(const nn::Model& model) { 


    // Update number of consumers.

    const auto numberOfConsumers =

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

            NN_TRY(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
@@ -100,7 +100,7 @@ GeneralResult<Model> unvalidatedConvert(const hal::V1_1::Model& model) { 


    // Verify number of consumers.

    const auto numberOfConsumers =

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

            NN_TRY(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]) {
@@ -223,7 +223,7 @@ nn::GeneralResult<Model> unvalidatedConvert(const nn::Model& model) { 


    // Update number of consumers.

    const auto numberOfConsumers =

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

            NN_TRY(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
@@ -187,7 +187,7 @@ GeneralResult<Model> unvalidatedConvert(const hal::V1_2::Model& model) { 


    // Verify number of consumers.

    const auto numberOfConsumers =

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

            NN_TRY(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]) {
@@ -481,7 +481,7 @@ nn::GeneralResult<Model> unvalidatedConvert(const nn::Model& model) { 


    // Update number of consumers.

    const auto numberOfConsumers =

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

            NN_TRY(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
@@ -194,7 +194,7 @@ GeneralResult<Model::Subgraph> unvalidatedConvert(const hal::V1_3::Subgraph& sub 


    // Verify number of consumers.

    const auto numberOfConsumers =

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

            NN_TRY(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]) {
@@ -543,7 +543,7 @@ nn::GeneralResult<Subgraph> unvalidatedConvert(const nn::Model::Subgraph& subgra 


    // Update number of consumers.

    const auto numberOfConsumers =

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

            NN_TRY(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

+2 −2
Original line number Diff line number Diff line
@@ -1315,7 +1315,7 @@ static void mutateExecutionPriorityTest(const std::shared_ptr<IDevice>& device, 


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

    const auto numberOfConsumers =

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

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

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

                    .value();

    mutateExecutionOrderTest(device, model, numberOfConsumers);