Merge branch 'master' of asdf.us:pix2pixhd

2 files changed, 1 insertions, 3 deletions

diff --git a/augment.py b/augment.py
index 7f448d8..37e8f23 100755
--- a/augment.py
+++ b/augment.py
@@ -67,8 +67,7 @@ if data_opt.tag == '':
 else:
   tag = data_opt.tag
 
-if opt.render_dir == '':
-  opt.render_dir = os.path.join(opt.results_dir, opt.name, opt.which_epoch)
+opt.render_dir = os.path.join(opt.results_dir, opt.name, opt.which_epoch)
 
 print('tag:', tag)
 print('render_dir:', opt.render_dir)
diff --git a/options/test_options.py b/options/test_options.py
index dcfde76..158d9cd 100755
--- a/options/test_options.py
+++ b/options/test_options.py
@@ -8,7 +8,6 @@ class TestOptions(BaseOptions):
         self.parser.add_argument('--start_img', type=str, default="test.jpg", help='starting image for recursive generation')
         self.parser.add_argument('--ntest', type=int, default=float("inf"), help='# of test examples.')
         self.parser.add_argument('--results_dir', type=str, default='./results/', help='saves results here.')
-        self.parser.add_argument('--render_dir', type=str, help='more specific render dir.')
         self.parser.add_argument('--aspect_ratio', type=float, default=1.0, help='aspect ratio of result images')
         self.parser.add_argument('--phase', type=str, default='test', help='train, val, test, etc')
         self.parser.add_argument('--which_epoch', type=str, default='latest', help='which epoch to load? set to latest to use latest cached model')