diff options
| author | Slava Shklyaev <slavash@google.com> | 2020-02-11 16:13:53 +0000 |
|---|---|---|
| committer | Slava Shklyaev <slavash@google.com> | 2020-02-18 15:05:20 +0000 |
| commit | f45193a81dc6e2c69321fc9e21c9c4807c4f9ea3 (patch) | |
| tree | fdcea67ef65f6fcc4d3deb907f529b1d238789f2 /nn/runtime/test/TestExecution.cpp | |
| parent | 8c3d052633a307baa127a01ee49a8767c8414100 (diff) | |
| download | ml-f45193a81dc6e2c69321fc9e21c9c4807c4f9ea3.tar.gz | |
Incorporate loop timeout HAL changes
See change Ie40c248b.
Bug: 145906499
Bug: 136735929
Test: NNT_static
Change-Id: I593a4c1ae9c81dc5174387543b98477a4119cb5d
Diffstat (limited to 'nn/runtime/test/TestExecution.cpp')
| -rw-r--r-- | nn/runtime/test/TestExecution.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/nn/runtime/test/TestExecution.cpp b/nn/runtime/test/TestExecution.cpp index efeac8bb3..26d4297a2 100644 --- a/nn/runtime/test/TestExecution.cpp +++ b/nn/runtime/test/TestExecution.cpp @@ -102,10 +102,12 @@ class TestPreparedModelLatest : public IPreparedModel { Return<V1_3::ErrorStatus> execute_1_3(const V1_3::Request& request, MeasureTiming measure, const OptionalTimePoint& deadline, + const OptionalTimeoutDuration& loopTimeoutDuration, const sp<V1_3::IExecutionCallback>& callback) override { CHECK(mPreparedModelV1_3 != nullptr) << "V1_3 prepared model is nullptr."; if (mErrorStatus == ErrorStatus::NONE) { - return mPreparedModelV1_3->execute_1_3(request, measure, deadline, callback); + return mPreparedModelV1_3->execute_1_3(request, measure, deadline, loopTimeoutDuration, + callback); } else if (mErrorStatus == ErrorStatus::OUTPUT_INSUFFICIENT_SIZE) { OutputShape shape = {.dimensions = {1}, .isSufficient = false}; callback->notify_1_3(mErrorStatus, {shape}, kBadTiming); @@ -133,10 +135,12 @@ class TestPreparedModelLatest : public IPreparedModel { Return<void> executeSynchronously_1_3(const V1_3::Request& request, MeasureTiming measure, const OptionalTimePoint& deadline, + const OptionalTimeoutDuration& loopTimeoutDuration, executeSynchronously_1_3_cb cb) override { CHECK(mPreparedModelV1_3 != nullptr) << "V1_3 prepared model is nullptr."; if (mErrorStatus == ErrorStatus::NONE) { - return mPreparedModelV1_3->executeSynchronously_1_3(request, measure, deadline, cb); + return mPreparedModelV1_3->executeSynchronously_1_3(request, measure, deadline, + loopTimeoutDuration, cb); } else if (mErrorStatus == ErrorStatus::OUTPUT_INSUFFICIENT_SIZE) { OutputShape shape = {.dimensions = {1}, .isSufficient = false}; cb(mErrorStatus, {shape}, kBadTiming); @@ -163,7 +167,7 @@ class TestPreparedModelLatest : public IPreparedModel { } Return<void> executeFenced(const V1_3::Request&, const hidl_vec<hidl_handle>&, MeasureTiming, const OptionalTimePoint&, const OptionalTimeoutDuration&, - executeFenced_cb cb) override { + const OptionalTimeoutDuration&, executeFenced_cb cb) override { cb(ErrorStatus::DEVICE_UNAVAILABLE, hidl_handle(nullptr), nullptr); return Void(); } |