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

Commit c5a0f0e4 authored by Mika Raento's avatar Mika Raento Committed by android-build-merger
Browse files

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

am: 95eef46f

Change-Id: I9ad4072740a1ab77689440f6af1edc1b5cfd8f4e
parents 19d66109 95eef46f

neuralnetworks/1.0/vts/functional/GeneratedTestHarness.cpp

+10 −10
Original line number Diff line number Diff line
@@ -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) {

neuralnetworks/1.0/vts/functional/GeneratedTests.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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"

neuralnetworks/1.0/vts/functional/Models.h

+1 −1
Original line number Diff line number Diff line
@@ -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)                             \

neuralnetworks/1.0/vts/functional/ValidateRequest.cpp

+3 −3
Original line number Diff line number Diff line
@@ -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 /////////////////////////

neuralnetworks/1.1/vts/functional/GeneratedTests.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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