Fix out dir bug (aws#160)

* fix out dir bug

* print mode.name instead of mode

* print mode.name instead of mode

* print mode.name instead of mode

Author: rahul003

tornasole/core/tensor.py

@@ -168,7 +168,7 @@ def step(self, step_num, mode=ModeKeys.GLOBAL):
                     avail_steps = self.trial.available_steps(mode=mode)
                     if len(avail_steps) > 0:
                         last_step = avail_steps[-1]
-                    raise NoMoreData("Looking for step:{} for mode {} and reached end of training. Max step available is {}".format(step_num, mode, last_step))
+                    raise NoMoreData(step_num, mode, last_step)
                 raise StepNotYetAvailable(step_num, mode)
         assert False, 'Should not happen'
 

tornasole/exceptions.py

@@ -7,7 +7,8 @@ def __init__(self, step, mode):
     self.mode = mode
 
   def __str__(self):
-    return 'Step {} of mode {} not yet available'.format(self.step, self.mode)
+    return 'Step {} of mode {} not yet available'.format(self.step,
+                                                         self.mode.name)
 
 
 class StepUnavailable(Exception):
@@ -17,7 +18,7 @@ def __init__(self, step, mode):
 
   def __str__(self):
     return 'Step {} of mode {} is not available as it was not saved'\
-      .format(self.step, self.mode)
+      .format(self.step, self.mode.name)
 
 
 class TensorUnavailableForStep(Exception):
@@ -36,6 +37,7 @@ def __str__(self):
              'You might want to query for the reductions.'
     return msg
 
+
 class TensorUnavailable(Exception):
   def __init__(self, tname):
     self.tname = tname
@@ -46,7 +48,17 @@ def __str__(self):
 
 
 class NoMoreData(Exception):
-  pass
+  def __init__(self, step, mode, last_step):
+    self.step = step
+    self.mode = mode
+    self.last_step = last_step
+
+    self.msg = "Looking for step {} of mode {} and reached " \
+               "end of training. Max step available is {}"\
+        .format(self.step, self.mode.name, self.last_step)
+
+  def __str__(self):
+    return self.msg
 
 
 class RuleEvaluationConditionMet(Exception):

tornasole/mxnet/hook.py

@@ -37,8 +37,8 @@ def __init__(self,
                  include_collections=DEFAULT_INCLUDE_COLLECTIONS,
                  save_all=False):
         self.out_dir = verify_and_get_out_dir(out_dir)
-        self.out_base_dir = os.path.dirname(out_dir)
-        self.run_id = os.path.basename(out_dir)
+        self.out_base_dir = os.path.dirname(self.out_dir)
+        self.run_id = os.path.basename(self.out_dir)
         self.include_collections = include_collections
 
         self.dry_run = dry_run

tornasole/pytorch/hook.py

@@ -37,8 +37,8 @@ def __init__(self,
                  include_collections=DEFAULT_INCLUDE_COLLECTIONS,
                  save_all=False):
         self.out_dir = verify_and_get_out_dir(out_dir)
-        self.out_base_dir = os.path.dirname(out_dir)
-        self.run_id = os.path.basename(out_dir)
+        self.out_base_dir = os.path.dirname(self.out_dir)
+        self.run_id = os.path.basename(self.out_dir)
         self.include_collections = include_collections
 
         self.dry_run = dry_run

tornasole/tensorflow/hook.py

@@ -70,8 +70,8 @@ def __init__(self, out_dir=None,
             they are all saved in the collection `all`
         """
         self.out_dir = verify_and_get_out_dir(out_dir)
-        self.out_base_dir = os.path.dirname(out_dir)
-        self.run_id = os.path.basename(out_dir)
+        self.out_base_dir = os.path.dirname(self.out_dir)
+        self.run_id = os.path.basename(self.out_dir)
 
         self.dry_run = dry_run
         self.worker = worker if worker is not None else socket.gethostname()

tornasole/trials/trial.py

@@ -257,7 +257,7 @@ def wait_for_steps(self, required_steps, mode=ModeKeys.GLOBAL):
                         avail_steps = self.available_steps(mode=mode)
                         if len(avail_steps) > 0:
                             last_step = avail_steps[-1]
-                        raise NoMoreData("Looking for step:{} for mode {} and reached end of training. Max step available for mode is {}".format(step, mode, last_step))
+                        raise NoMoreData(step, mode, last_step)
                     time.sleep(5)
 
     def has_passed_step(self, step, mode=ModeKeys.GLOBAL):