From d534d32892f4e471f3685a8c5dbaf619aeac70e9 Mon Sep 17 00:00:00 2001 From: Mika Raento Date: Tue, 17 Apr 2018 16:49:50 +0100 Subject: [PATCH] Update namespace to match framework/ml/nn Bug: 72448000 Test: make vts Change-Id: I3543913561b33e4d1e9d960ec1f81624fb0a1e6b Merged-In: I3543913561b33e4d1e9d960ec1f81624fb0a1e6b (cherry picked from commit de16694a6079355867287e4613ae89123c224171) --- .../vts/functional/GeneratedTestHarness.cpp | 20 +++++++++---------- .../1.0/vts/functional/GeneratedTests.cpp | 4 ++-- neuralnetworks/1.0/vts/functional/Models.h | 2 +- .../1.0/vts/functional/ValidateRequest.cpp | 6 +++--- .../1.1/vts/functional/GeneratedTests.cpp | 2 +- neuralnetworks/1.1/vts/functional/Models.h | 2 +- .../1.1/vts/functional/ValidateRequest.cpp | 6 +++--- 7 files changed, 21 insertions(+), 21 deletions(-) diff --git a/neuralnetworks/1.0/vts/functional/GeneratedTestHarness.cpp b/neuralnetworks/1.0/vts/functional/GeneratedTestHarness.cpp index ed1fb944e6..0682ab95b2 100644 --- a/neuralnetworks/1.0/vts/functional/GeneratedTestHarness.cpp +++ b/neuralnetworks/1.0/vts/functional/GeneratedTestHarness.cpp @@ -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 void copy_back_(MixedTyped* dst, const std::vector& ra, char* src) { diff --git a/neuralnetworks/1.0/vts/functional/GeneratedTests.cpp b/neuralnetworks/1.0/vts/functional/GeneratedTests.cpp index 2107333e26..d84479c992 100644 --- a/neuralnetworks/1.0/vts/functional/GeneratedTests.cpp +++ b/neuralnetworks/1.0/vts/functional/GeneratedTests.cpp @@ -31,7 +31,7 @@ namespace hardware { namespace neuralnetworks { namespace generated_tests { -using ::generated_tests::MixedTypedExampleType; +using ::test_helper::MixedTypedExampleType; extern void Execute(const sp&, std::function, std::function, const std::vector&); } // 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" diff --git a/neuralnetworks/1.0/vts/functional/Models.h b/neuralnetworks/1.0/vts/functional/Models.h index a1fbe9278b..751ab32aea 100644 --- a/neuralnetworks/1.0/vts/functional/Models.h +++ b/neuralnetworks/1.0/vts/functional/Models.h @@ -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) \ diff --git a/neuralnetworks/1.0/vts/functional/ValidateRequest.cpp b/neuralnetworks/1.0/vts/functional/ValidateRequest.cpp index 08f2613c99..09c1878593 100644 --- a/neuralnetworks/1.0/vts/functional/ValidateRequest.cpp +++ b/neuralnetworks/1.0/vts/functional/ValidateRequest.cpp @@ -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 ///////////////////////// diff --git a/neuralnetworks/1.1/vts/functional/GeneratedTests.cpp b/neuralnetworks/1.1/vts/functional/GeneratedTests.cpp index 1f1cc7af9d..95c2b1aca0 100644 --- a/neuralnetworks/1.1/vts/functional/GeneratedTests.cpp +++ b/neuralnetworks/1.1/vts/functional/GeneratedTests.cpp @@ -31,7 +31,7 @@ namespace hardware { namespace neuralnetworks { namespace generated_tests { -using ::generated_tests::MixedTypedExampleType; +using ::test_helper::MixedTypedExampleType; extern void Execute(const sp&, std::function, std::function, const std::vector&); } // namespace generated_tests diff --git a/neuralnetworks/1.1/vts/functional/Models.h b/neuralnetworks/1.1/vts/functional/Models.h index c3cadb5fe2..eac4df13b6 100644 --- a/neuralnetworks/1.1/vts/functional/Models.h +++ b/neuralnetworks/1.1/vts/functional/Models.h @@ -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) \ diff --git a/neuralnetworks/1.1/vts/functional/ValidateRequest.cpp b/neuralnetworks/1.1/vts/functional/ValidateRequest.cpp index b42f561c7f..687b760e76 100644 --- a/neuralnetworks/1.1/vts/functional/ValidateRequest.cpp +++ b/neuralnetworks/1.1/vts/functional/ValidateRequest.cpp @@ -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 /////////////////////////