Commit 44076798 authored by Yuxin Wu's avatar Yuxin Wu

Normalize paths given by users (fix #1294)

parent 5969bf53
...@@ -239,7 +239,7 @@ class TFEventWriter(MonitorBase): ...@@ -239,7 +239,7 @@ class TFEventWriter(MonitorBase):
if logdir is None: if logdir is None:
logdir = logger.get_logger_dir() logdir = logger.get_logger_dir()
assert tf.gfile.IsDirectory(logdir), logdir assert tf.gfile.IsDirectory(logdir), logdir
self._logdir = logdir self._logdir = os.path.normpath(logdir)
self._max_queue = max_queue self._max_queue = max_queue
self._flush_secs = flush_secs self._flush_secs = flush_secs
self._split_files = split_files self._split_files = split_files
......
...@@ -42,7 +42,7 @@ class ModelSaver(Callback): ...@@ -42,7 +42,7 @@ class ModelSaver(Callback):
if checkpoint_dir is not None: if checkpoint_dir is not None:
if not tf.gfile.IsDirectory(checkpoint_dir): # v2: tf.io.gfile.isdir if not tf.gfile.IsDirectory(checkpoint_dir): # v2: tf.io.gfile.isdir
tf.gfile.MakeDirs(checkpoint_dir) # v2: tf.io.gfile.makedirs tf.gfile.MakeDirs(checkpoint_dir) # v2: tf.io.gfile.makedirs
self.checkpoint_dir = checkpoint_dir self.checkpoint_dir = os.path.normpath(checkpoint_dir)
def _setup_graph(self): def _setup_graph(self):
assert self.checkpoint_dir is not None, \ assert self.checkpoint_dir is not None, \
...@@ -118,6 +118,7 @@ class MinSaver(Callback): ...@@ -118,6 +118,7 @@ class MinSaver(Callback):
self.checkpoint_dir = checkpoint_dir self.checkpoint_dir = checkpoint_dir
if self.checkpoint_dir is None: if self.checkpoint_dir is None:
self.checkpoint_dir = logger.get_logger_dir() self.checkpoint_dir = logger.get_logger_dir()
self.checkpoint_dir = os.path.normpath(self.checkpoint_dir)
def _get_stat(self): def _get_stat(self):
try: try:
......
...@@ -109,6 +109,7 @@ def set_logger_dir(dirname, action=None): ...@@ -109,6 +109,7 @@ def set_logger_dir(dirname, action=None):
old states for you. It simply does nothing. old states for you. It simply does nothing.
""" """
dirname = os.path.normpath(dirname)
global LOG_DIR, _FILE_HANDLER global LOG_DIR, _FILE_HANDLER
if _FILE_HANDLER: if _FILE_HANDLER:
# unload and close the old file handler, so that we may safely delete the logger directory # unload and close the old file handler, so that we may safely delete the logger directory
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment