From bba47dbf09bc7a0cc62741c75865da7b4b72a154 Mon Sep 17 00:00:00 2001
From: Hashim Sharif <hsharif3@tyler.cs.illinois.edu>
Date: Fri, 20 Sep 2019 15:48:35 -0500
Subject: [PATCH] Fixing Frontend to match modified utils API

---
 llvm/projects/keras/frontend/approxhpvm_translator.py | 6 ++++--
 llvm/projects/keras/frontend/hpvm_dfg_translator.py   | 2 +-
 llvm/projects/keras/frontend/promise_translator.py    | 5 +++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/llvm/projects/keras/frontend/approxhpvm_translator.py b/llvm/projects/keras/frontend/approxhpvm_translator.py
index 77889280bf..4bf746e56e 100644
--- a/llvm/projects/keras/frontend/approxhpvm_translator.py
+++ b/llvm/projects/keras/frontend/approxhpvm_translator.py
@@ -805,12 +805,14 @@ class TensorRtTranslator:
 
     end_loop_str = ""
     #end_loop_str += "\nuint8_t* labels = readLabelsBatch(labels_path.c_str(),start,end); \n"
-    end_loop_str += "\nuint32_t* labels = readLabelsBatch2(labels_path.c_str(),start,end); \n"
+    #end_loop_str += "\nuint32_t* labels = readLabelsBatch2(labels_path.c_str(),start,end); \n"
+    end_loop_str += "\nuint32_t* labels = readLabelsBatch3(labels_path.c_str(),start,end); \n"
 
     last_node = self.dfg.last_node
     output_var = self.output_map[last_node.layer_name]
     #accuracy_call = "\nfloat accuracy = computeAccuracy2(labels, batch_size, " + output_var + "); \n"
-    accuracy_call = "\nfloat accuracy = computeAccuracy3(labels, batch_size, " + output_var + "); \n"
+    #accuracy_call = "\nfloat accuracy = computeAccuracy3(labels, batch_size, " + output_var + "); \n"
+    accuracy_call = "\nfloat accuracy = computeAccuracy3(labels, " + output_var + "); \n"
     end_loop_str += accuracy_call
  
     #end_loop_str += "float accuracy = computeAccuracy2(labels, batch_size, var_60); "
diff --git a/llvm/projects/keras/frontend/hpvm_dfg_translator.py b/llvm/projects/keras/frontend/hpvm_dfg_translator.py
index 7467f316e9..afdf602a4a 100644
--- a/llvm/projects/keras/frontend/hpvm_dfg_translator.py
+++ b/llvm/projects/keras/frontend/hpvm_dfg_translator.py
@@ -638,7 +638,7 @@ class HPVMTranslator:
     main_func_str += "__visc__cleanup(); \n "
    
     #main_func_str += "computeAccuracy2(labels, " + str(len(test_data)) + ", result); \n"
-    main_func_str += "computeAccuracy3(labels, " + str(len(test_data)) + ", result); \n"    
+    main_func_str += "computeAccuracy3(labels, result); \n"    
     main_func_str += "return 0; \n\n"
     main_func_str += "} \n"    
     
diff --git a/llvm/projects/keras/frontend/promise_translator.py b/llvm/projects/keras/frontend/promise_translator.py
index f33770d5ad..9c8e9a1f3a 100644
--- a/llvm/projects/keras/frontend/promise_translator.py
+++ b/llvm/projects/keras/frontend/promise_translator.py
@@ -1132,13 +1132,14 @@ class PromiseRtTranslator:
 
     end_loop_str = ""
     #end_loop_str += "\nuint8_t* labels = readLabelsBatch2(labels_path.c_str(),start,end); \n"
-    end_loop_str += "\nuint32_t* labels = readLabelsBatch2(labels_path.c_str(),start,end); \n"
+    #end_loop_str += "\nuint32_t* labels = readLabelsBatch2(labels_path.c_str(),start,end); \n"
+    end_loop_str += "\nuint32_t* labels = readLabelsBatch3(labels_path.c_str(),start,end); \n"
 
     
     last_node = self.dfg.last_node
     output_var = self.output_map[last_node.layer_name]
     #accuracy_call = "\nfloat accuracy = computeAccuracy2(labels, batch_size, " + output_var + "); \n"
-    accuracy_call = "\nfloat accuracy = computeAccuracy3(labels, batch_size, " + output_var + "); \n"
+    accuracy_call = "\nfloat accuracy = computeAccuracy3(labels, " + output_var + "); \n"
     end_loop_str += accuracy_call
  
     #end_loop_str += "float accuracy = computeAccuracy2(labels, batch_size, var_60); "
-- 
GitLab