commit 888f4178c6bae5ae7a09ab261c1bcb0854560681
author Slava Shklyaev <slavash@google.com> Thu Jul 11 10:34:13 2019 +0100
committer Slava Shklyaev <slavash@google.com> Thu Jul 11 10:39:31 2019 +0100
tree fd58ccd47c20ff27f1bfb5a3274347e641df6855
parent da6a4ae8b231a980aa8e32cac8f2d5835b41b2c9

Remove CpuExecutor::mRequest

Change-Id: I925af33b1d9cc5ed883eb524bb13bf1849be0bda
Fix: 132323774
Test: NeuralNetworksTest_static

common/CpuExecutor.cpp

diff --git a/common/CpuExecutor.cpp b/common/CpuExecutor.cpp
index ee1a942..c064de2 100644
--- a/common/CpuExecutor.cpp
+++ b/common/CpuExecutor.cpp
@@ -544,8 +544,7 @@
 #endif  // NNAPI_OPENMP
 
     mModel = &model;
-    mRequest = &request;  // TODO check if mRequest is needed
-    initializeRunTimeInfo(modelPoolInfos, requestPoolInfos);
+    initializeRunTimeInfo(request, modelPoolInfos, requestPoolInfos);
     // The model has serialized the operation in execution order.
     for (const auto& operation : model.operations) {
         int n = executeOperation(operation);
@@ -565,7 +564,8 @@
     return ANEURALNETWORKS_NO_ERROR;
 }
 
-bool CpuExecutor::initializeRunTimeInfo(const std::vector<RunTimePoolInfo>& modelPoolInfos,
+bool CpuExecutor::initializeRunTimeInfo(const Request& request,
+                                        const std::vector<RunTimePoolInfo>& modelPoolInfos,
                                         const std::vector<RunTimePoolInfo>& requestPoolInfos) {
     VLOG(CPUEXE) << "CpuExecutor::initializeRunTimeInfo";
     const size_t count = mModel->operands.size();
@@ -642,8 +642,8 @@
             }
         }
     };
-    updateForArguments(mModel->inputIndexes, mRequest->inputs);
-    updateForArguments(mModel->outputIndexes, mRequest->outputs);
+    updateForArguments(mModel->inputIndexes, request.inputs);
+    updateForArguments(mModel->outputIndexes, request.outputs);
 
     return true;
 }

common/include/CpuExecutor.h

diff --git a/common/include/CpuExecutor.h b/common/include/CpuExecutor.h
index e6c765e..c843e14 100644
--- a/common/include/CpuExecutor.h
+++ b/common/include/CpuExecutor.h
@@ -150,7 +150,8 @@
     }
 
    private:
-    bool initializeRunTimeInfo(const std::vector<RunTimePoolInfo>& modelPoolInfos,
+    bool initializeRunTimeInfo(const Request& request,
+                               const std::vector<RunTimePoolInfo>& modelPoolInfos,
                                const std::vector<RunTimePoolInfo>& requestPoolInfos);
     // Runs one operation of the graph.
     int executeOperation(const Operation& entry);