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

Fix additional metrics in TF Event metrics collector #1191

Merged
merged 1 commit into from
May 19, 2020
Merged

Fix additional metrics in TF Event metrics collector #1191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion cmd/metricscollector/v1alpha3/tfevent-metricscollector/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ def parse_options():

WaitOtherMainProcesses(completed_marked_dir=opt.dir_path)

mc = MetricsCollector(opt.metric_names.split(','))
mc = MetricsCollector(opt.metric_names.split(';'))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm
/approve

Thanks for your contribution! 🎉 👍

observation_log = mc.parse_file(opt.dir_path)

channel = grpc.beta.implementations.insecure_channel(
Expand Down
19 changes: 11 additions & 8 deletions pkg/metricscollector/v1alpha3/tfevent-metricscollector/tfevent_loader.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
# When the event file is under a directory(e.g. test dir), please specify "{{dirname}}/{{metrics name}}"
# For example, in the TensorFlow official tutorial for mnist with summary (https://github.com/tensorflow/tensorflow/blob/master/tensorflow/examples/tutorials/mnist/mnist_with_summaries.py),
# the "accuracy" metric is saved under "train" and "test" directories. So in Katib, please specify name of metrics as "train/accuracy" and "test/accuracy".


class TFEventFileParser:
def find_all_files(self, directory):
for root, dirs, files in os.walk(directory):
Expand All @@ -22,23 +24,24 @@ def find_all_files(self, directory):
def parse_summary(self, tfefile, metrics):
metric_logs = []
for summary in tf.train.summary_iterator(tfefile):
paths=tfefile.split("/")
paths = tfefile.split("/")
for v in summary.summary.value:
for m in metrics:
tag = str(v.tag)
if len(paths) >= 2 and len(m.split("/")) >= 2:
tag = str(paths[-2]+"/" + v.tag)
tag = str(paths[-2]+"/" + v.tag)
if tag.startswith(m):
ml = api_pb2.MetricLog(
time_stamp=rfc3339.rfc3339(datetime.fromtimestamp(summary.wall_time)),
metric=api_pb2.Metric(
name=m,
value=str(v.simple_value)
)
time_stamp=rfc3339.rfc3339(datetime.fromtimestamp(summary.wall_time)),
metric=api_pb2.Metric(
name=m,
value=str(v.simple_value)
)
)
metric_logs.append(ml)
return metric_logs


class MetricsCollector:
def __init__(self, metric_names):
self.logger = getLogger(__name__)
Expand All @@ -59,6 +62,6 @@ def parse_file(self, directory):
self.logger.info(f + " will be parsed.")
mls.extend(self.parser.parse_summary(f, self.metrics))
except Exception as e:
self.logger.warning("Unexpected error: "+ str(e))
self.logger.warning("Unexpected error: " + str(e))
continue
return api_pb2.ObservationLog(metric_logs=mls)