diff options
author | Xusong Wang <xusongw@google.com> | 2020-05-12 16:43:34 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-05-12 16:43:34 +0000 |
commit | 9926f82774463e258dcf2189341a2d36dd56f100 (patch) | |
tree | 4e7787eab0244d4bb6f71ba0f17568965d00aa51 /nn/runtime/Manager.cpp | |
parent | ef9c23ee28a3f36e494b3e9fc2aeba1cc284ae3c (diff) | |
parent | ca8c1cba4c7ba6612e0471be620c899e27032f77 (diff) | |
download | ml-9926f82774463e258dcf2189341a2d36dd56f100.tar.gz |
Merge "Avoid sending ahwb requests to 1.0 and 1.1 drivers." into rvc-dev
Diffstat (limited to 'nn/runtime/Manager.cpp')
-rw-r--r-- | nn/runtime/Manager.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nn/runtime/Manager.cpp b/nn/runtime/Manager.cpp index 310710e3c..634cd2aec 100644 --- a/nn/runtime/Manager.cpp +++ b/nn/runtime/Manager.cpp @@ -379,9 +379,9 @@ std::tuple<int, std::vector<OutputShape>, Timing> DriverPreparedModel::execute( const bool burstCompute = (burstController != nullptr); bool burstFallback = true; if (burstCompute) { - const bool compliant = compliantWithV1_0(request); + const bool compliant = compliantWithV1_2(request); if (compliant) { - V1_0::Request request10 = convertToV1_0(request); + V1_0::Request request12 = convertToV1_2(request); std::vector<intptr_t> memoryIds; memoryIds.reserve(localMemories.size()); for (const Memory* memory : localMemories) { @@ -390,9 +390,9 @@ std::tuple<int, std::vector<OutputShape>, Timing> DriverPreparedModel::execute( } VLOG(EXECUTION) << "Before ExecutionBurstController->compute() " - << SHOW_IF_DEBUG(toString(request10)); + << SHOW_IF_DEBUG(toString(request12)); std::tie(n, outputShapes, timing, burstFallback) = - burstController->compute(request10, measure, memoryIds); + burstController->compute(request12, measure, memoryIds); } } |