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

Commit 8454fcd4 authored by David Gross's avatar David Gross
Browse files

Fix test that broke when number of ADD inputs increased from 2 to 3. 

Test: vts: nn32, nn64

Bug: 63905942

Change-Id: Ie4b237d0c16247d7774a13384a59453da94c5d91
parent ed827b82

neuralnetworks/1.0/vts/functional/VtsHalNeuralnetworksV1_0TargetTest.cpp

+21 −6
Original line number Diff line number Diff line
@@ -89,6 +89,7 @@ Model createTestModel() { 
    const uint32_t operand1 = 0;

    const uint32_t operand2 = 1;

    const uint32_t operand3 = 2;

    const uint32_t operand4 = 3;



    const std::vector<Operand> operands = {

        {
@@ -111,6 +112,16 @@ Model createTestModel() { 
                         .offset = 0,

                         .length = size},

        },

        {

            .type = OperandType::INT32,

            .dimensions = {},

            .numberOfConsumers = 1,

            .scale = 0.0f,

            .zeroPoint = 0,

            .location = {.poolIndex = static_cast<uint32_t>(LocationValues::LOCATION_SAME_BLOCK),

                         .offset = size,

                         .length = sizeof(int32_t)},

        },

        {

            .type = OperandType::TENSOR_FLOAT32,

            .dimensions = {1, 2, 2, 1},
@@ -125,15 +136,19 @@ Model createTestModel() { 


    const std::vector<Operation> operations = {{

        .opTuple = {OperationType::ADD, OperandType::TENSOR_FLOAT32},

        .inputs = {operand1, operand2},

        .outputs = {operand3},

        .inputs = {operand1, operand2, operand3},

        .outputs = {operand4},

    }};



    const std::vector<uint32_t> inputIndexes = {operand1};

    const std::vector<uint32_t> outputIndexes = {operand3};

    const std::vector<uint8_t> operandValues(reinterpret_cast<const uint8_t*>(operand2Data.data()),

                                             reinterpret_cast<const uint8_t*>(operand2Data.data()) +

                                                 operand2Data.size() * sizeof(float));

    const std::vector<uint32_t> outputIndexes = {operand4};

    std::vector<uint8_t> operandValues(

        reinterpret_cast<const uint8_t*>(operand2Data.data()),

        reinterpret_cast<const uint8_t*>(operand2Data.data()) + size);

    int32_t activation[1] = {0};

    operandValues.insert(operandValues.end(), reinterpret_cast<const uint8_t*>(&activation[0]),

                         reinterpret_cast<const uint8_t*>(&activation[1]));



    const std::vector<hidl_memory> pools = {};



    return {