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

Commit bc55f56d authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Migrate NNAPI to canonical types" am: c2173246 

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

Change-Id: I997608d4ff3c572b125348d69b9c7543e1fb6bbd
parents fec6bfda c2173246

neuralnetworks/1.3/vts/functional/GeneratedTestHarness.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -644,7 +644,7 @@ void EvaluatePreparedModel(const sp<IDevice>& device, const sp<IPreparedModel>& 
            int n;

            int n;

            std::tie(n, outputShapes, timing, std::ignore) =

            std::tie(n, outputShapes, timing, std::ignore) =

                    controller->compute(request10, testConfig.measureTiming, keys);

                    controller->compute(request10, testConfig.measureTiming, keys);

            executionStatus = nn::convertResultCodeToErrorStatus(n);

            executionStatus = nn::convertToV1_3(nn::convertResultCodeToErrorStatus(n));





            break;

            break;

        }

        }

neuralnetworks/1.3/vts/functional/TestAssertions.cpp

+6 −0
Original line number Original line Diff line number Diff line
@@ -15,10 +15,16 @@ 
 */

 */





#include <android/hardware/neuralnetworks/1.3/types.h>

#include <android/hardware/neuralnetworks/1.3/types.h>

#include "ControlFlow.h"

#include "TestHarness.h"

#include "TestHarness.h"





namespace android::hardware::neuralnetworks::V1_3 {

namespace android::hardware::neuralnetworks::V1_3 {





static_assert(static_cast<uint64_t>(LoopTimeoutDurationNs::DEFAULT) ==

              nn::operation_while::kTimeoutNsDefault);

static_assert(static_cast<uint64_t>(LoopTimeoutDurationNs::MAXIMUM) ==

              nn::operation_while::kTimeoutNsMaximum);



// Make sure that the HIDL enums are compatible with the values defined in

// Make sure that the HIDL enums are compatible with the values defined in

// frameworks/ml/nn/tools/test_generator/test_harness/include/TestHarness.h.

// frameworks/ml/nn/tools/test_generator/test_harness/include/TestHarness.h.

using namespace test_helper;

using namespace test_helper;

neuralnetworks/1.3/vts/functional/ValidateRequest.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -116,7 +116,7 @@ static void validate(const sp<IPreparedModel>& preparedModel, const std::string& 




        // execute and verify

        // execute and verify

        const auto [n, outputShapes, timing, fallback] = burst->compute(request10, measure, keys);

        const auto [n, outputShapes, timing, fallback] = burst->compute(request10, measure, keys);

        const ErrorStatus status = nn::convertResultCodeToErrorStatus(n);

        const ErrorStatus status = nn::convertToV1_3(nn::convertResultCodeToErrorStatus(n));

        EXPECT_EQ(ErrorStatus::INVALID_ARGUMENT, status);

        EXPECT_EQ(ErrorStatus::INVALID_ARGUMENT, status);

        EXPECT_EQ(outputShapes.size(), 0);

        EXPECT_EQ(outputShapes.size(), 0);

        EXPECT_TRUE(badTiming(timing));

        EXPECT_TRUE(badTiming(timing));