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

Commit 2bcfdc82 authored by Slava Shklyaev's avatar Slava Shklyaev
Browse files

Refactor generated NNAPI tests 

See change I2c0366fb87c96851fa6e0f8fe9ceac012d8e3513

Bug: 136097638
Test: m VtsHalNeuralnetworksV1_0TargetTest
Test: m VtsHalNeuralnetworksV1_1TargetTest
Test: m VtsHalNeuralnetworksV1_2TargetTest
Test: m VtsHalNeuralnetworksV1_2CompatV1_0TargetTest
Change-Id: I6fdede028422145d313d46532b5d2154ef0d40bc
parent f5398465

neuralnetworks/1.0/vts/functional/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ cc_test { 
    defaults: ["VtsHalNeuralNetworksV1_0TargetTestDefaults"],

    srcs: [

        "BasicTests.cpp",

        "GeneratedTestsV1_0.cpp",

        ":VtsHalNeuralNetworksV1_0_all_generated_V1_0_tests",

    ],

}
@@ -85,7 +85,7 @@ cc_test { 
    defaults: ["VtsHalNeuralNetworksV1_0TargetTestDefaults"],

    srcs: [

        "BasicTests.cpp",

        "GeneratedTestsV1_0.cpp",

        ":VtsHalNeuralNetworksV1_0_all_generated_V1_0_tests",

    ],

    cflags: [

        "-DPRESUBMIT_NOT_VTS",

neuralnetworks/1.0/vts/functional/GeneratedTestHarness.cpp

+2 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
namespace android {

namespace hardware {

namespace neuralnetworks {

namespace V1_0 {

namespace generated_tests {



using ::android::hardware::neuralnetworks::V1_0::ErrorStatus;
@@ -217,6 +218,7 @@ void Execute(const sp<IDevice>& device, std::function<Model(void)> create_model, 
}



}  // namespace generated_tests

}  // namespace V1_0

}  // namespace neuralnetworks

}  // namespace hardware

}  // namespace android

neuralnetworks/1.0/vts/functional/GeneratedTestHarness.h

+3 −2
Original line number Diff line number Diff line
@@ -23,15 +23,16 @@ 
namespace android {

namespace hardware {

namespace neuralnetworks {



namespace V1_0 {

namespace generated_tests {



using ::test_helper::MixedTypedExample;



void Execute(const sp<V1_0::IDevice>& device, std::function<V1_0::Model(void)> create_model,

             std::function<bool(int)> is_ignored, const std::vector<MixedTypedExample>& examples);



}  // namespace generated_tests



}  // namespace V1_0

}  // namespace neuralnetworks

}  // namespace hardware

}  // namespace android

neuralnetworks/1.0/vts/functional/GeneratedTestsV1_0.cpp→neuralnetworks/1.0/vts/functional/GeneratedTests.h

+38 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2018 The Android Open Source Project

 * Copyright (C) 2019 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.
@@ -14,39 +14,25 @@ 
 * limitations under the License.

 */



#define LOG_TAG "neuralnetworks_hidl_hal_test"



#include <android-base/logging.h>

#include <android/hidl/memory/1.0/IMemory.h>

#include <hidlmemory/mapping.h>



#include "1.0/Callbacks.h"

#include "GeneratedTestHarness.h"

#include "MemoryUtils.h"

#include "TestHarness.h"

#include "VtsHalNeuralnetworks.h"



namespace android {

namespace hardware {

namespace neuralnetworks {

namespace V1_0 {

namespace vts {

namespace functional {



using ::android::hardware::neuralnetworks::V1_0::implementation::ExecutionCallback;

using ::android::hardware::neuralnetworks::V1_0::implementation::PreparedModelCallback;

using ::android::hidl::memory::V1_0::IMemory;

using ::android::nn::allocateSharedMemory;

using ::test_helper::MixedTypedExample;



std::vector<Request> createRequests(const std::vector<MixedTypedExample>& examples);



// in frameworks/ml/nn/runtime/tests/generated/

#include "vts/V1_0/all_generated_V1_0_vts_tests.cpp"



}  // namespace functional

}  // namespace vts

}  // namespace V1_0

}  // namespace neuralnetworks

}  // namespace hardware

}  // namespace android
 
namespace android::hardware::neuralnetworks::V1_0::vts::functional {



std::vector<Request> createRequests(const std::vector<::test_helper::MixedTypedExample>& examples);



}  // namespace android::hardware::neuralnetworks::V1_0::vts::functional



namespace android::hardware::neuralnetworks::V1_0::generated_tests {



using namespace android::hardware::neuralnetworks::V1_0::vts::functional;



using ::android::hardware::neuralnetworks::V1_0::Model;

using ::android::hardware::neuralnetworks::V1_0::Request;



}  // namespace android::hardware::neuralnetworks::V1_0::generated_tests

neuralnetworks/1.1/vts/functional/Android.bp

+3 −3
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ cc_test { 
    name: "VtsHalNeuralnetworksV1_1CompatV1_0TargetTest",

    defaults: ["VtsHalNeuralNetworksV1_1TargetTestDefaults"],

    srcs: [

        "GeneratedTestsV1_0.cpp",

        ":VtsHalNeuralNetworksV1_1_all_generated_V1_0_tests",

    ],

}
@@ -60,7 +60,7 @@ cc_test { 
    defaults: ["VtsHalNeuralNetworksV1_1TargetTestDefaults"],

    srcs: [

        "BasicTests.cpp",

        "GeneratedTestsV1_1.cpp",

        ":VtsHalNeuralNetworksV1_1_all_generated_V1_1_tests",

    ],

}
@@ -69,7 +69,7 @@ cc_test { 
    defaults: ["VtsHalNeuralNetworksV1_1TargetTestDefaults"],

    srcs: [

        "BasicTests.cpp",

        "GeneratedTestsV1_1.cpp",

        ":VtsHalNeuralNetworksV1_1_all_generated_V1_1_tests",

    ],

    cflags: [

        "-DPRESUBMIT_NOT_VTS",