Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 16:50:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Update namespace to match framework/ml/nn" into pi-dev

Browse Source
This commit is contained in:
Mika Raento
2018-04-26 09:20:41 +00:00
committed by Android (Google) Code Review
parent a6752780d5 de16694a60
commit 95eef46fa2
7 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
neuralnetworks/1.0/vts/functional/GeneratedTestHarness.cpp
View File

@@ -36,16 +36,16 @@ namespace neuralnetworks {
namespace generated_tests {
using ::android::hardware::neuralnetworks::V1_0::implementation::ExecutionCallback;
using ::android::hardware::neuralnetworks::V1_0::implementation::PreparedModelCallback;
using ::generated_tests::filter;
using ::generated_tests::for_all;
using ::generated_tests::for_each;
using ::generated_tests::resize_accordingly;
using ::generated_tests::MixedTyped;
using ::generated_tests::MixedTypedExampleType;
using ::generated_tests::Float32Operands;
using ::generated_tests::Int32Operands;
using ::generated_tests::Quant8Operands;
using ::generated_tests::compare;
using ::test_helper::filter;
using ::test_helper::for_all;
using ::test_helper::for_each;
using ::test_helper::resize_accordingly;
using ::test_helper::MixedTyped;
using ::test_helper::MixedTypedExampleType;
using ::test_helper::Float32Operands;
using ::test_helper::Int32Operands;
using ::test_helper::Quant8Operands;
using ::test_helper::compare;
template <typename T>
void copy_back_(MixedTyped* dst, const std::vector<RequestArgument>& ra, char* src) {

4
neuralnetworks/1.0/vts/functional/GeneratedTests.cpp
View File

@@ -31,7 +31,7 @@ namespace hardware {
namespace neuralnetworks {
namespace generated_tests {
using ::generated_tests::MixedTypedExampleType;
using ::test_helper::MixedTypedExampleType;
extern void Execute(const sp<V1_0::IDevice>&, std::function<V1_0::Model(void)>,
std::function<bool(int)>, const std::vector<MixedTypedExampleType>&);
} // namespace generated_tests
@@ -45,7 +45,7 @@ using ::android::hardware::neuralnetworks::V1_0::implementation::PreparedModelCa
using ::android::nn::allocateSharedMemory;
// Mixed-typed examples
typedef generated_tests::MixedTypedExampleType MixedTypedExample;
typedef test_helper::MixedTypedExampleType MixedTypedExample;
// in frameworks/ml/nn/runtime/tests/generated/
#include "all_generated_V1_0_vts_tests.cpp"

2
neuralnetworks/1.0/vts/functional/Models.h
View File

@@ -30,7 +30,7 @@ namespace V1_0 {
namespace vts {
namespace functional {
using MixedTypedExample = generated_tests::MixedTypedExampleType;
using MixedTypedExample = test_helper::MixedTypedExampleType;
#define FOR_EACH_TEST_MODEL(FN) \
FN(add_broadcast_quant8) \

6
neuralnetworks/1.0/vts/functional/ValidateRequest.cpp
View File

@@ -36,9 +36,9 @@ 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 generated_tests::MixedTyped;
using generated_tests::MixedTypedExampleType;
using generated_tests::for_all;
using test_helper::MixedTyped;
using test_helper::MixedTypedExampleType;
using test_helper::for_all;
///////////////////////// UTILITY FUNCTIONS /////////////////////////

2
neuralnetworks/1.1/vts/functional/GeneratedTests.cpp
View File

@@ -31,7 +31,7 @@ namespace hardware {
namespace neuralnetworks {
namespace generated_tests {
using ::generated_tests::MixedTypedExampleType;
using ::test_helper::MixedTypedExampleType;
extern void Execute(const sp<V1_1::IDevice>&, std::function<V1_1::Model(void)>,
std::function<bool(int)>, const std::vector<MixedTypedExampleType>&);
} // namespace generated_tests

2
neuralnetworks/1.1/vts/functional/Models.h
View File

@@ -31,7 +31,7 @@ namespace V1_1 {
namespace vts {
namespace functional {
using MixedTypedExample = generated_tests::MixedTypedExampleType;
using MixedTypedExample = test_helper::MixedTypedExampleType;
#define FOR_EACH_TEST_MODEL(FN) \
FN(add) \

6
neuralnetworks/1.1/vts/functional/ValidateRequest.cpp
View File

@@ -36,9 +36,9 @@ 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 generated_tests::MixedTyped;
using generated_tests::MixedTypedExampleType;
using generated_tests::for_all;
using test_helper::MixedTyped;
using test_helper::MixedTypedExampleType;
using test_helper::for_all;
///////////////////////// UTILITY FUNCTIONS /////////////////////////