Browse Source

sorted the plugin value when query the plugins

Reduce cyclomatic complexity and code length in function
tags/v1.1.0
ougongchang 5 years ago
parent
commit
9722c44a29
2 changed files with 16 additions and 6 deletions
  1. +13
    -6
      mindinsight/datavisual/data_transform/summary_watcher.py
  2. +3
    -0
      mindinsight/datavisual/processors/train_task_manager.py

+ 13
- 6
mindinsight/datavisual/data_transform/summary_watcher.py View File

@@ -201,8 +201,9 @@ class SummaryWatcher:
if entry.is_file():
summary_pattern = re.search(self.SUMMARY_FILENAME_REGEX, entry.name)
pb_pattern = re.search(self.PB_FILENAME_REGEX, entry.name)
if summary_pattern is None and pb_pattern is None:
if not self._is_valid_pattern_result(summary_pattern, pb_pattern, list_explain, entry):
return
if summary_pattern is not None:
timestamp = int(summary_pattern.groupdict().get('timestamp'))
try:
@@ -211,11 +212,6 @@ class SummaryWatcher:
except OverflowError:
return
if list_explain and not entry.name.endswith(EXPLAIN_SUMMARY_SUFFIX):
return
if not list_explain and entry.name.endswith(EXPLAIN_SUMMARY_SUFFIX):
return
if relative_path not in summary_dict:
summary_dict[relative_path] = _new_entry(ctime, mtime)
if summary_dict[relative_path]['create_time'] < ctime:
@@ -250,6 +246,17 @@ class SummaryWatcher:
else:
summary_dict[relative_path] = _new_entry(ctime, mtime, profiler)
def _is_valid_pattern_result(self, summary_pattern, pb_pattern, list_explain, entry):
"""Check the pattern result is valid."""
if summary_pattern is None and pb_pattern is None:
return False
if list_explain and not entry.name.endswith(EXPLAIN_SUMMARY_SUFFIX):
return False
if not list_explain and entry.name.endswith(EXPLAIN_SUMMARY_SUFFIX):
return False
return True
def is_summary_directory(self, summary_base_dir, relative_path):
"""
Check if the given summary directory is valid.


+ 3
- 0
mindinsight/datavisual/processors/train_task_manager.py View File

@@ -79,6 +79,9 @@ class TrainTaskManager(BaseProcessor):
default_result.update({plugin_name: list()})
return dict(plugins=default_result)

for plugin_name, value in plugins.items():
plugins[plugin_name] = sorted(value)

return dict(
plugins=plugins
)


Loading…
Cancel
Save