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

Commit 6433728e authored by Xusong Wang's avatar Xusong Wang
Browse files

Fix VTS ValidationTest for 1.2 ops. 

Skip L2_NORMALIZATION,  LOCAL_RESPONSE_NORMALIZATION, and SOFTMAX for
addOperationInputTest.

Test: VtsHalNeuralnetworksV1_xTargetTest with 1.2 sample driver
Change-Id: I16de09e2eef7610e564f1f49ff067af7efca3784
parent 68ff3fef

neuralnetworks/1.2/vts/functional/ValidateModel.cpp

+14 −0
Original line number Diff line number Diff line
@@ -479,8 +479,22 @@ static void removeOperationOutputTest(const sp<IDevice>& device, const Model& mo 


///////////////////////// ADD OPERATION INPUT /////////////////////////



static bool addOperationInputSkip(const Operation& operation) {

    // Skip addOperationInputTest for the following operations.

    // L2_NORMALIZATION, LOCAL_RESPONSE_NORMALIZATION, SOFTMAX can have an optional axis parameter.

    if (operation.type == OperationType::L2_NORMALIZATION ||

        operation.type == OperationType::LOCAL_RESPONSE_NORMALIZATION ||

        operation.type == OperationType::SOFTMAX) {

        return true;

    }

    return false;

}



static void addOperationInputTest(const sp<IDevice>& device, const Model& model) {

    for (size_t operation = 0; operation < model.operations.size(); ++operation) {

        if (addOperationInputSkip(model.operations[operation])) {

            continue;

        }

        const std::string message = "addOperationInputTest: operation " + std::to_string(operation);

        validate(device, message, model, [operation](Model* model) {

            uint32_t index = addOperand(model, OperandLifeTime::MODEL_INPUT);