diff options
author | Xusong Wang <xusongw@google.com> | 2019-10-23 10:35:51 -0700 |
---|---|---|
committer | Xusong Wang <xusongw@google.com> | 2019-11-06 15:31:34 -0800 |
commit | 6ddafbc3e680038df547adeea321ca88d333c9a2 (patch) | |
tree | b2f38171f11dd56ad83aafa14d92c9a7b697bc33 /nn/runtime/test/TestPartitioningRandom.cpp | |
parent | 5125a2d2a886ebf9721e85a25b8a561814d38a5d (diff) | |
download | ml-6ddafbc3e680038df547adeea321ca88d333c9a2.tar.gz |
NN Runtime: Upgrade IPreparedModelCallback::notify to 1.3.
Bug: 143242728
Test: NNT_static
Change-Id: Id35e1984bb9920dab7be0a30db3d1925da72e80d
Diffstat (limited to 'nn/runtime/test/TestPartitioningRandom.cpp')
-rw-r--r-- | nn/runtime/test/TestPartitioningRandom.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/nn/runtime/test/TestPartitioningRandom.cpp b/nn/runtime/test/TestPartitioningRandom.cpp index c6b82080f..8a2ecf013 100644 --- a/nn/runtime/test/TestPartitioningRandom.cpp +++ b/nn/runtime/test/TestPartitioningRandom.cpp @@ -552,11 +552,10 @@ class TestDriver : public SampleDriver { return Void(); } - Return<ErrorStatus> prepareModel_1_3(const HidlModel& model, ExecutionPreference preference, - const hidl_vec<hidl_handle>& modelCache, - const hidl_vec<hidl_handle>& dataCache, - const CacheToken& token, - const sp<IPreparedModelCallback>& callback) override { + Return<ErrorStatus> prepareModel_1_3( + const HidlModel& model, ExecutionPreference preference, + const hidl_vec<hidl_handle>& modelCache, const hidl_vec<hidl_handle>& dataCache, + const CacheToken& token, const sp<V1_3::IPreparedModelCallback>& callback) override { // NOTE: We verify that all operations in the model are supported. ErrorStatus outStatus = ErrorStatus::INVALID_ARGUMENT; auto ret = getSupportedOperations_1_3( @@ -573,7 +572,7 @@ class TestDriver : public SampleDriver { return SampleDriver::prepareModel_1_3(model, preference, modelCache, dataCache, token, callback); } else { - callback->notify_1_2(ErrorStatus::INVALID_ARGUMENT, nullptr); + callback->notify_1_3(ErrorStatus::INVALID_ARGUMENT, nullptr); return ErrorStatus::INVALID_ARGUMENT; } } @@ -597,7 +596,8 @@ class TestDriverV1_2 : public V1_2::IDevice { Return<ErrorStatus> prepareModel_1_2( const V1_2::Model& model, ExecutionPreference preference, const hidl_vec<hidl_handle>& modelCache, const hidl_vec<hidl_handle>& dataCache, - const CacheToken& token, const sp<IPreparedModelCallback>& actualCallback) override { + const CacheToken& token, + const sp<V1_2::IPreparedModelCallback>& actualCallback) override { return mLatestDriver->prepareModel_1_2(model, preference, modelCache, dataCache, token, actualCallback); } |