!705 fix the bug of watchpoint hit flag

Merge pull request !705 from yelihua/my-merged-debug

mindinsight/debugger/debugger_server.py

@@ -177,6 +177,12 @@ class DebuggerServer:
             log.error("Invalid param <mode>. <mode> should be in ['all', 'node', 'watchpoint', "
                       "'watchpoint_hit', 'tensor'], but got %s.", mode_mapping)
             raise DebuggerParamTypeError("Invalid mode.")
+        # validate backend status
+        metadata_stream = self.cache_store.get_stream_handler(Streams.METADATA)
+        if metadata_stream.state == ServerStatus.PENDING.value:
+            log.info("The backend is in pending status.")
+            return metadata_stream.get()
+
         filter_condition = {} if filter_condition is None else filter_condition
         reply = mode_mapping[mode](filter_condition)
 
@@ -262,12 +268,12 @@ class DebuggerServer:
             dict, the tensor history and metadata.
         """
         log.info("Retrieve tensor history for node: %s.", node_name)
+        metadata_stream = self.cache_store.get_stream_handler(Streams.METADATA)
+        if metadata_stream.state == ServerStatus.PENDING.value:
+            log.info("The backend is in pending status.")
+            return metadata_stream.get()
         self._validate_leaf_name(node_name)
-        try:
-            res = self._get_tensor_history(node_name)
-        except MindInsightException:
-            log.warning("Failed to get tensor history for %s.", node_name)
-            res = {}
+        res = self._get_tensor_history(node_name)
         return res
 
     def _validate_leaf_name(self, node_name):

mindinsight/debugger/stream_cache/watchpoint.py

@@ -285,10 +285,16 @@ class WatchpointHit:
 
     @property
     def tensor_full_name(self):
-        """The property of tensor_name."""
+        """The property of tensor full name."""
         tensor_name = ':'.join([self._full_name, self._slot])
         return tensor_name
 
+    @property
+    def tensor_name(self):
+        """The property of tensor ui name."""
+        tensor_name = ':'.join([self._node_name, self._slot])
+        return tensor_name
+
     @property
     def watchpoint(self):
         """The property of watchpoint."""

mindinsight/debugger/stream_handler/watchpoint_handler.py

@@ -287,7 +287,7 @@ class WatchpointHitHandler(StreamHandlerBase):
             return False
 
         for watchpoint_hit in watchpoint_hits:
-            if tensor_name == watchpoint_hit.tensor_full_name:
+            if tensor_name == watchpoint_hit.tensor_name:
                 return True
 
         return False
@@ -304,7 +304,7 @@ class WatchpointHitHandler(StreamHandlerBase):
 
         # add hit tensor names to `tensor_names`
         for tensor_info in tensor_history.get('tensor_history'):
-            tensor_name = tensor_info['full_name']
+            tensor_name = tensor_info['name']
             hit_flag = self._is_tensor_hit(tensor_name)
             tensor_info['is_hit'] = hit_flag