diff options
author | Slava Shklyaev <slavash@google.com> | 2019-12-13 18:05:41 +0000 |
---|---|---|
committer | Slava Shklyaev <slavash@google.com> | 2020-01-21 19:05:19 +0000 |
commit | 8de7a223856575eeb500099799da18bca6ba6e64 (patch) | |
tree | 0f6877c139c675ee26c0499df2b9f090ba877a37 /nn/runtime/test/fibonacci_extension | |
parent | a3e01725dfb4f53253a78a513d878a675cc2d249 (diff) | |
download | ml-8de7a223856575eeb500099799da18bca6ba6e64.tar.gz |
Incorporate control flow HAL changes
See change I7a75175f00fc98df626c40ea669021ccd40130e0
Bug: 136735929
Test: N/A
Change-Id: Ifd18084275601b545abb6c53dda0045138ca4ed2
Diffstat (limited to 'nn/runtime/test/fibonacci_extension')
-rw-r--r-- | nn/runtime/test/fibonacci_extension/FibonacciDriver.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nn/runtime/test/fibonacci_extension/FibonacciDriver.cpp b/nn/runtime/test/fibonacci_extension/FibonacciDriver.cpp index 5367cf915..82b6150c0 100644 --- a/nn/runtime/test/fibonacci_extension/FibonacciDriver.cpp +++ b/nn/runtime/test/fibonacci_extension/FibonacciDriver.cpp @@ -67,8 +67,8 @@ bool validate(const Operation& operation, const Model& model) { NN_RET_CHECK(isFibonacciOperation(operation, model)); NN_RET_CHECK_EQ(operation.inputs.size(), kNumInputs); NN_RET_CHECK_EQ(operation.outputs.size(), kNumOutputs); - int32_t inputType = static_cast<int32_t>(model.operands[operation.inputs[0]].type); - int32_t outputType = static_cast<int32_t>(model.operands[operation.outputs[0]].type); + int32_t inputType = static_cast<int32_t>(model.main.operands[operation.inputs[0]].type); + int32_t outputType = static_cast<int32_t>(model.main.operands[operation.outputs[0]].type); uint16_t prefix; NN_RET_CHECK(getFibonacciExtensionPrefix(model, &prefix)); NN_RET_CHECK(inputType == ((prefix << kLowBitsType) | EXAMPLE_INT64) || @@ -191,10 +191,10 @@ Return<void> FibonacciDriver::getSupportedOperations_1_3(const V1_3::Model& mode cb(ErrorStatus::INVALID_ARGUMENT, {}); return Void(); } - const size_t count = model.operations.size(); + const size_t count = model.main.operations.size(); std::vector<bool> supported(count); for (size_t i = 0; i < count; ++i) { - const Operation& operation = model.operations[i]; + const Operation& operation = model.main.operations[i]; if (fibonacci_op::isFibonacciOperation(operation, model)) { if (!fibonacci_op::validate(operation, model)) { cb(ErrorStatus::INVALID_ARGUMENT, {}); |