diff --git a/hpvm/projects/torch2hpvm/torch2hpvm/template_hpvm.cpp.in b/hpvm/projects/torch2hpvm/torch2hpvm/template_hpvm.cpp.in
index d7fd6c88840962b87a973c5d2d7b7aeff800ca52..0c1db9b1ff9d71cb9a8c8bbf3a2c64cec8331476 100644
--- a/hpvm/projects/torch2hpvm/torch2hpvm/template_hpvm.cpp.in
+++ b/hpvm/projects/torch2hpvm/torch2hpvm/template_hpvm.cpp.in
@@ -99,8 +99,7 @@ int main(int argc, char *argv[]){
     void *result = static_cast<RootIn*>(args)->r.tensor;
     hpvm_request_tensor(result, 0);
 
-    uint32_t* labels = readLabelsBatch3(labels_path.c_str(), start, end);
-    computeAccuracy3(labels, result);
+    llvm_hpvm_invokeRtControl(result, labels_path.c_str(), start, end);
     freeBatchMemory();
   }
   __hpvm__cleanup();
diff --git a/hpvm/projects/torch2hpvm/torch2hpvm/template_hpvm_inspect.cpp.in b/hpvm/projects/torch2hpvm/torch2hpvm/template_hpvm_inspect.cpp.in
index d481da1944868153b8347ee7111cbded79d23b67..178a6d28e942fcd71c6ec18b6b4080866d06f1cb 100644
--- a/hpvm/projects/torch2hpvm/torch2hpvm/template_hpvm_inspect.cpp.in
+++ b/hpvm/projects/torch2hpvm/torch2hpvm/template_hpvm_inspect.cpp.in
@@ -139,8 +139,7 @@ int main(int argc, char *argv[]){
       void *result = static_cast<RootIn*>(args)->r.tensor;
       hpvm_request_tensor(result, 0);
 
-      uint32_t* labels = readLabelsBatch3(labels_path.c_str(), start, end);
-      computeAccuracy3(labels, result);
+      llvm_hpvm_invokeRtControl(result, labels_path.c_str(), start, end);
       freeBatchMemory();
     }
     __hpvm__cleanup();