diff options
| author | telsoa01 <telmo.soares@arm.com> | 2018-08-31 09:31:35 +0100 |
|---|---|---|
| committer | telsoa01 <telmo.soares@arm.com> | 2018-08-31 09:31:35 +0100 |
| commit | ce3e84a8d449cbf31cee57e30f0eef6a96c0ce94 (patch) | |
| tree | 77a769e27879fb712027c990071b061c5e0e3b60 /test/FullyConnected.cpp | |
| parent | deb3bdbe028a59da0759dd7a560387d03a11d322 (diff) | |
| download | android-nn-driver-ce3e84a8d449cbf31cee57e30f0eef6a96c0ce94.tar.gz | |
Release 18.08
Diffstat (limited to 'test/FullyConnected.cpp')
| -rw-r--r-- | test/FullyConnected.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/test/FullyConnected.cpp b/test/FullyConnected.cpp index 4feda30b..20a350c5 100644 --- a/test/FullyConnected.cpp +++ b/test/FullyConnected.cpp @@ -8,9 +8,9 @@ BOOST_AUTO_TEST_SUITE(FullyConnectedTests) -using ArmnnDriver = armnn_driver::ArmnnDriver; -using DriverOptions = armnn_driver::DriverOptions; +using namespace android::hardware; using namespace driverTestHelpers; +using namespace armnn_driver; // Add our own test here since we fail the fc tests which Google supplies (because of non-const weights) BOOST_AUTO_TEST_CASE(FullyConnected) @@ -19,7 +19,7 @@ BOOST_AUTO_TEST_CASE(FullyConnected) // but that uses slightly weird dimensions which I don't think we need to support for now auto driver = std::make_unique<ArmnnDriver>(DriverOptions(armnn::Compute::CpuRef)); - V1_0::Model model = {}; + neuralnetworks::V1_0::Model model = {}; // add operands int32_t actValue = 0; @@ -34,7 +34,7 @@ BOOST_AUTO_TEST_CASE(FullyConnected) // make the fully connected operation model.operations.resize(1); - model.operations[0].type = V1_0::OperationType::FULLY_CONNECTED; + model.operations[0].type = neuralnetworks::V1_0::OperationType::FULLY_CONNECTED; model.operations[0].inputs = hidl_vec<uint32_t>{0, 1, 2, 3}; model.operations[0].outputs = hidl_vec<uint32_t>{4}; @@ -90,7 +90,7 @@ BOOST_AUTO_TEST_CASE(TestFullyConnected4dInput) sup = supported; }; - V1_0::Model model = {}; + neuralnetworks::V1_0::Model model = {}; // operands int32_t actValue = 0; @@ -113,7 +113,7 @@ BOOST_AUTO_TEST_CASE(TestFullyConnected4dInput) model.operations.resize(1); - model.operations[0].type = V1_0::OperationType::FULLY_CONNECTED; + model.operations[0].type = neuralnetworks::V1_0::OperationType::FULLY_CONNECTED; model.operations[0].inputs = hidl_vec<uint32_t>{0,1,2,3}; model.operations[0].outputs = hidl_vec<uint32_t>{4}; @@ -177,7 +177,7 @@ BOOST_AUTO_TEST_CASE(TestFullyConnected4dInputReshape) sup = supported; }; - V1_0::Model model = {}; + neuralnetworks::V1_0::Model model = {}; // operands int32_t actValue = 0; @@ -200,7 +200,7 @@ BOOST_AUTO_TEST_CASE(TestFullyConnected4dInputReshape) model.operations.resize(1); - model.operations[0].type = V1_0::OperationType::FULLY_CONNECTED; + model.operations[0].type = neuralnetworks::V1_0::OperationType::FULLY_CONNECTED; model.operations[0].inputs = hidl_vec<uint32_t>{0,1,2,3}; model.operations[0].outputs = hidl_vec<uint32_t>{4}; |