diff options
author | Aron Virginas-Tar <Aron.Virginas-Tar@arm.com> | 2019-06-14 15:45:03 +0100 |
---|---|---|
committer | Áron Virginás-Tar <aron.virginas-tar@arm.com> | 2019-06-17 10:03:58 +0000 |
commit | 44cfd848c1913f87a77c0427450dba93ba47fb94 (patch) | |
tree | a0260bf155f06879042a30c2e8dafe66fc9718a4 /test/Concat.cpp | |
parent | cd700e4f0db201bc3066605058dc1c87d483833f (diff) | |
download | android-nn-driver-44cfd848c1913f87a77c0427450dba93ba47fb94.tar.gz |
IVGCVSW-3283 Add test for converting CONV2D and DEPTHWISE_CONV2D operators with dilation params
Signed-off-by: Aron Virginas-Tar <Aron.Virginas-Tar@arm.com>
Change-Id: I51a9c71d7a277ab530ac35faea2e8a069c134f45
Diffstat (limited to 'test/Concat.cpp')
-rw-r--r-- | test/Concat.cpp | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/test/Concat.cpp b/test/Concat.cpp index b5ea689e..02d66cb8 100644 --- a/test/Concat.cpp +++ b/test/Concat.cpp @@ -4,11 +4,14 @@ // #include "DriverTestHelpers.hpp" #include "TestTensor.hpp" + +#include "../1.0/HalPolicy.hpp" + #include <boost/array.hpp> #include <boost/test/unit_test.hpp> #include <boost/test/data/test_case.hpp> -#include <log/log.h> +#include <log/log.h> BOOST_AUTO_TEST_SUITE(ConcatTests) @@ -16,6 +19,8 @@ using namespace android::hardware; using namespace driverTestHelpers; using namespace armnn_driver; +using HalPolicy = hal_1_0::HalPolicy; + namespace { @@ -34,31 +39,31 @@ ConcatTestImpl(const std::vector<const TestTensor*> & inputs, ErrorStatus expectedExecStatus=ErrorStatus::NONE) { std::unique_ptr<ArmnnDriver> driver = std::make_unique<ArmnnDriver>(DriverOptions(computeDevice)); - V1_0::Model model{}; + HalPolicy::Model model{}; hidl_vec<uint32_t> modelInputIds; modelInputIds.resize(inputs.size()+1); for (uint32_t i = 0; i<inputs.size(); ++i) { modelInputIds[i] = i; - AddInputOperand(model, inputs[i]->GetDimensions()); + AddInputOperand<HalPolicy>(model, inputs[i]->GetDimensions()); } modelInputIds[inputs.size()] = inputs.size(); // add an id for the axis too - AddIntOperand(model, concatAxis); - AddOutputOperand(model, expectedOutputTensor.GetDimensions()); + AddIntOperand<HalPolicy>(model, concatAxis); + AddOutputOperand<HalPolicy>(model, expectedOutputTensor.GetDimensions()); // make the concat operation model.operations.resize(1); - model.operations[0].type = V1_0::OperationType::CONCATENATION; + model.operations[0].type = HalPolicy::OperationType::CONCATENATION; model.operations[0].inputs = modelInputIds; model.operations[0].outputs = hidl_vec<uint32_t>{static_cast<uint32_t>(inputs.size()+1)}; // make the prepared model ErrorStatus prepareStatus=ErrorStatus::NONE; android::sp<V1_0::IPreparedModel> preparedModel = PrepareModelWithStatus(model, - *driver, - prepareStatus, - expectedPrepareStatus); + *driver, + prepareStatus, + expectedPrepareStatus); BOOST_TEST(prepareStatus == expectedPrepareStatus); if (prepareStatus != ErrorStatus::NONE) { |