fanwuyang/neural-enhance-super-resolution
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix filenames used on stdout to relative paths.

Browse Source
This commit is contained in:
Alex J. Champandard
2016-11-11 10:29:06 +01:00
parent 881e909dc5
commit 4000bd365c
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
enhance.py
+4 -4
View File
@@ -368,9 +368,9 @@ class Model(object):
name = list(self.network.keys())[list(self.network.values()).index(l)] name = list(self.network.keys())[list(self.network.values()).index(l)]
yield (name, l) yield (name, l)
def get_filename(self): def get_filename(self, absolute=False):
filename = 'ne%ix-%s-%s-%s.pkl.bz2' % (args.zoom, args.type, args.model, __version__) filename = 'ne%ix-%s-%s-%s.pkl.bz2' % (args.zoom, args.type, args.model, __version__)
return os.path.join(os.path.dirname(__file__), filename) return os.path.join(os.path.dirname(__file__), filename) if absolute else filename
def save_generator(self): def save_generator(self):
def cast(p): return p.get_value().astype(np.float16) def cast(p): return p.get_value().astype(np.float16)
@@ -378,11 +378,11 @@ class Model(object):
config = {k: getattr(args, k) for k in ['generator_blocks', 'generator_residual', 'generator_filters'] + \ config = {k: getattr(args, k) for k in ['generator_blocks', 'generator_residual', 'generator_filters'] + \
['generator_upscale', 'generator_downscale']} ['generator_upscale', 'generator_downscale']}
pickle.dump((config, params), bz2.open(self.get_filename(), 'wb')) pickle.dump((config, params), bz2.open(self.get_filename(absolute=True), 'wb'))
print(' - Saved model as `{}` after training.'.format(self.get_filename())) print(' - Saved model as `{}` after training.'.format(self.get_filename()))
def load_model(self): def load_model(self):
if not os.path.exists(self.get_filename()): if not os.path.exists(self.get_filename(absolute=True)):
if args.train: return {}, {} if args.train: return {}, {}
error("Model file with pre-trained convolution layers not found. Download it here...", error("Model file with pre-trained convolution layers not found. Download it here...",
"https://github.com/alexjc/neural-enhance/releases/download/v%s/%s"%(__version__, self.get_filename())) "https://github.com/alexjc/neural-enhance/releases/download/v%s/%s"%(__version__, self.get_filename()))