Update profile_utils.py

Author: jimmytwei

Libraries/oneDNN/tutorials/profiling/profile_utils.py

@@ -83,29 +83,26 @@ def __init_(self):
 
     def load_log(self, log):
         self.filename = log
-        self.with_timestamp = True
-        data = self.load_log_dnnl_timestamp_backend(log)
-        count = data['time'].count()
-       
-        if count <= 1:
-            data = self.load_log_dnnl_timestamp(log)
-            count = data['time'].count()
-            self.with_timestamp = True
 
-            if count <= 1:
-                data = self.load_log_dnnl_backend(log)
-                count = data['time'].count()
+        fn_t_list = [self.load_log_dnnl_timestamp_backend, self.load_log_dnnl_timestamp]
+        fn_not_list = [self.load_log_dnnl_backend, self.load_log_dnnl, self.load_log_mkldnn]
+
+        fn_list = fn_not_list
+        self.with_timestamp = False
+
+        data = fn_t_list[0](log)
+        for d in data['timestamp']:
+            if self.is_float(d) is True:
                 self.with_timestamp = False
+                fn_list = fn_t_list
 
-                if count <= 1:
-                    data = self.load_log_dnnl(log)
-                    count = data['time'].count()
-                    self.with_timestamp = False
-                              
-        if count == 0:
-            data = self.load_log_mkldnn(log)
+
+        for index, fn in enumerate(fn_list):
+            data = fn(log)
             count = data['time'].count()
-            self.with_timestamp = False
+            if count > 2:
+                print(index)
+                break
 
         exec_data = data[data['exec'] == 'exec']
         self.data = data
@@ -150,7 +147,7 @@ def load_log_dnnl_backend(self, log):
 
     def load_log_dnnl_timestamp_backend(self, log):
         import pandas as pd
-        # dnnl_verbose,629411020589.218018,primitive,exec,cpu,convolution,jit:avx2,forward_inference,src_f32::blocked:abcd:f0 wei_f32::blocked:Acdb8a:f0 bia_f32::blocked:a:f0 dst_f32::blocked:aBcd8b:f0,,alg:convolution_direct,mb1_ic3oc96_ih227oh55kh11sh4dh0ph0_iw227ow55kw11sw4dw0pw0,1.21704
+        #dnnl_verbose,629411020589.218018,primitive,exec,cpu,convolution,jit:avx2,forward_inference,src_f32::blocked:abcd:f0 wei_f32::blocked:Acdb8a:f0 bia_f32::blocked:a:f0 dst_f32::blocked:aBcd8b:f0,,alg:convolution_direct,mb1_ic3oc96_ih227oh55kh11sh4dh0ph0_iw227ow55kw11sw4dw0pw0,1.21704
         data = pd.read_csv(log, names=[ 'dnnl_verbose','timestamp','backend','exec','arch','type', 'jit', 'pass', 'fmt', 'opt', 'alg', 'shape', 'time', 'dummy'], engine='python')
         return data
 
@@ -160,6 +157,15 @@ def load_log_mkldnn(self, log):
         print("load_log_mkldnn")
         data = pd.read_csv(log, names=[ 'mkldnn_verbose','exec','type', 'jit', 'pass', 'fmt', 'alg', 'shape', 'time'], engine='python')
         return data
+    def is_float(self, num):
+        if type(num) is not str:
+            return False
+        try:
+            float(num)
+            return True
+        except ValueError:
+            return False
+
 
 
 class oneDNNUtils: