Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 01 solr_keras and misc #25

Open
wants to merge 4 commits into
base: release_01
Choose a base branch
from
Open

Release 01 solr_keras and misc #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
92bef12
Data directory should not be committed
tanmoy87544 Aug 22, 2018
5ef9cb0
Needed to import print_function from future to allow Python 2 usage
tanmoy87544 Aug 22, 2018
95fb1ee
Allow logging of metrics
tanmoy87544 Aug 22, 2018
519deb2
Jamal fixed upstream; cherry-picking to resolve conflict
jmohdyusof Aug 22, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
*.pyc
__pycache__/
Data
1 change: 1 addition & 0 deletions common/generic_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from __future__ import absolute_import
from __future__ import print_function
import numpy as np
import time
import sys
Expand Down
27 changes: 19 additions & 8 deletions common/solr_keras.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,20 @@ def compute_trainable_params(model):

class CandleRemoteMonitor(Callback):
"""Capture Run level output and store/send for monitoring

Arguments:
params: the gParams global parameters dictionary
monitor: an array of strings specifying the metrics to be monitored
For every string s, both s and 'val_'+s will be monitored
"""

def __init__(self,
params=None):
params=None,
monitor=None):
super(CandleRemoteMonitor, self).__init__()

self.global_params = params
self.monitor = monitor or []
self.has_solr_config = False
if 'solr_root' in params and params['solr_root'] != '':
self.has_solr_config = True
Expand Down Expand Up @@ -77,13 +84,17 @@ def on_epoch_end(self, epoch, logs=None):
epoch_in_sec = epoch_duration.total_seconds()
epoch_line = "epoch: {}/{}, duration: {}s, loss: {}, val_loss: {}".format(
(epoch + 1), epoch_total, epoch_in_sec, loss, val_loss)

send = {'run_id': self.run_id,
'status': {'set': 'Running'},
'training_loss': {'set': loss},
'validation_loss': {'set': val_loss},
'run_progress': {'add': [epoch_line]}
}
send = {}
for s in self.monitor:
send[s] = {'set': logs.get(s)}
send['val_'+s] = {'set': logs.get('val_' + s)}

send.update({'run_id': self.run_id,
'status': {'set': 'Running'},
'training_loss': {'set': loss},
'validation_loss': {'set': val_loss},
'run_progress': {'add': [epoch_line]}
})
# print("on_epoch_end", send)
self.log_messages.append(send)
if self.has_solr_config:
Expand Down