diff options
| -rw-r--r-- | app/relay/remote.js | 16 | ||||
| -rw-r--r-- | rpc/listener.py | 10 |
2 files changed, 14 insertions, 12 deletions
diff --git a/app/relay/remote.js b/app/relay/remote.js index 512745f..6911572 100644 --- a/app/relay/remote.js +++ b/app/relay/remote.js @@ -29,7 +29,9 @@ remote.on('cmd', (data) => { }) break default: - rpc.invoke('send_command', data.cmd, data.payload || null, (err, res, more) => { console.log('command:', data.cmd, res) remote.emit('res', { + rpc.invoke('send_command', data.cmd, data.payload || null, (err, res, more) => { + console.log('command:', data.cmd, res) + remote.emit('res', { cmd: data.cmd, res: res, }) @@ -63,17 +65,13 @@ remote.on('task', (data) => { queue.remove_task(data.task) break case 'start_queue': - if (q.cpu && ! q.cpu.is_active()) { - q.activate() - } - if (q.gpu && ! q.gpu.is_active()) { - q.activate() - } + q.cpu.activate() + q.gpu.activate() runner.start_queue() break case 'stop_queue': - queue = q.get_processor(data.task) - queue && queue.deactivate() + q.cpu.deactivate() + q.gpu.deactivate() break case 'list': queue = q.get_processor(data.task) diff --git a/rpc/listener.py b/rpc/listener.py index 81ad794..1df575e 100644 --- a/rpc/listener.py +++ b/rpc/listener.py @@ -7,7 +7,7 @@ from img_ops import process_image def list_checkpoints(payload): print("> list checkpoints") - return sorted([f.split('/')[3] for f in glob.glob(os.path.join('./checkpoints/', payload, '/*/latest_net_G.pth'))]) + return sorted([f.split('/')[3] for f in glob.glob(os.path.join('./checkpoints/', payload, '*', 'latest_net_G.pth'))]) def list_all_checkpoints(payload): print("> list all checkpoints") @@ -15,9 +15,13 @@ def list_all_checkpoints(payload): def list_epochs(path): print("> list epochs for {}".format(path)) - if not os.path.exists(os.path.join('./checkpoints/', path)): + if not os.path.exists(os.path.join(os.getcwd(), 'checkpoints', path)): + print('not found') return "not found" - return sorted([os.path.basename(f).replace('_net_G.pth', '') for f in glob.glob(os.path.join('./checkpoints/', path, '/*_net_G.pth'))]) + print(os.getcwd()) + print(os.path.join('./checkpoints/', path)) + print(glob.glob(os.path.join(os.getcwd(), 'checkpoints', path, '*_net_G.pth'))) + return sorted([os.path.basename(f).replace('_net_G.pth', '') for f in glob.glob(os.path.join(os.getcwd(), 'checkpoints', path, '*_net_G.pth'))]) def list_sequences(module): print("> list sequences") |