try many different things to please the gods

Author: Andrew Reusch

src/runtime/micro/micro_session.cc

@@ -42,7 +42,7 @@ struct TVMMicroSessionThreadLocalEntry {
 
 typedef dmlc::ThreadLocalStore<TVMMicroSessionThreadLocalEntry> TVMMicroSessionThreadLocalStore;
 
-ObjectPtr<MicroSession>& MicroSession::Current() {
+ObjectPtr<MicroSession>& MicroSession::Current(void) {
   TVMMicroSessionThreadLocalEntry *entry = TVMMicroSessionThreadLocalStore::Get();
   CHECK_GT(entry->session_stack.size(), 0) << "No current session";
   return entry->session_stack.top();

src/runtime/rpc/rpc_session.cc

@@ -1247,26 +1247,28 @@ void RPCSession::EventHandler::HandlePackedCall() {
   CHECK_EQ(state_, kRecvCode);
 }
 
-PackedFunc MicroTimeEvaluator(
-    PackedFunc pf,
-    TVMContext ctx,
-    size_t number,
-    int repeat,
-    int min_repeat_ms) {
-  auto ftimer = [pf, ctx, number, repeat](TVMArgs args, TVMRetValue *rv) mutable {
+
+class MicroTimeEvaluatorFunctor {
+ public:
+  PackedFunc pf_;
+  TVMContext ctx_;
+  size_t number_;
+  int repeat_;
+
+  void operator()(TVMArgs args, TVMRetValue* rv) {
     TVMRetValue temp;
     std::ostringstream os;
 
-    for (int i = 0; i < repeat; ++i) {
+    for (int i = 0; i < repeat_; ++i) {
       // start timing
-      CHECK(number < MicroSession::kTaskQueueCapacity)
-        << "`number` must be less than uTVM task queue capacity";
-      for (unsigned int j = 0; j < number; ++j) {
-        pf.CallPacked(args, &temp);
+      CHECK(number_ < MicroSession::kTaskQueueCapacity)
+        << "`number_` must be less than uTVM task queue capacity";
+      for (unsigned int j = 0; j < number_; ++j) {
+        pf_.CallPacked(args, &temp);
       }
       ObjectPtr<MicroSession> session = MicroSession::Current();
-      DeviceAPI::Get(ctx)->StreamSync(ctx, nullptr);
-      double time_per_batch = session->GetLastBatchTime() / number;
+      DeviceAPI::Get(ctx_)->StreamSync(ctx_, nullptr);
+      double time_per_batch = session->GetLastBatchTime() / number_;
       os.write(reinterpret_cast<char*>(&time_per_batch), sizeof(time_per_batch));
     }
     std::string blob = os.str();
@@ -1275,6 +1277,18 @@ PackedFunc MicroTimeEvaluator(
     arr.data = blob.data();
     // return the time.
     *rv = arr;
+  }
+};
+
+PackedFunc MicroTimeEvaluator(
+    PackedFunc pf,
+    TVMContext ctx,
+    size_t number,
+    int repeat,
+    int min_repeat_ms) {
+  MicroTimeEvaluatorFunctor func{pf, ctx, number, repeat};
+  auto ftimer = [func](TVMArgs args, TVMRetValue *rv) mutable {
+    func(args, rv);
   };
   return PackedFunc(ftimer);
 }