Skip to content
This repository has been archived by the owner on Sep 3, 2022. It is now read-only.

Remove tf dependency from structured data setup.py. #212

Merged
merged 2 commits into from
Feb 16, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 datalab/mlalpha/_cloud_models.py
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,7 @@ def deploy(self, version_name, path):
body = {
'name': version_name,
'deployment_uri': path,
'runtime_version': '1.0',
}
response = self._api.projects().models().versions().create(body=body,
parent=self._full_model_name).execute()
Expand Down
66 changes: 39 additions & 27 deletions datalab/mlalpha/_summary.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,16 +43,22 @@ def list_events(self):
event_dir_dict = {}
for event_file in self._glob_events_files(self._paths):
dir = os.path.dirname(event_file)
for record in tf_record.tf_record_iterator(event_file):
event = event_pb2.Event.FromString(record)
if event.summary is None or event.summary.value is None:
continue
for value in event.summary.value:
if value.simple_value is None or value.tag is None:
try:
for record in tf_record.tf_record_iterator(event_file):
event = event_pb2.Event.FromString(record)
if event.summary is None or event.summary.value is None:
continue
if not value.tag in event_dir_dict:
event_dir_dict[value.tag] = set()
event_dir_dict[value.tag].add(dir)
for value in event.summary.value:
if value.simple_value is None or value.tag is None:
continue
if not value.tag in event_dir_dict:
event_dir_dict[value.tag] = set()
event_dir_dict[value.tag].add(dir)
except:
# It seems current TF (1.0) has a bug when iterating events from a file near the end.
# For now just catch and pass.
# print('Error in iterating events from file ' + event_file)
continue
return event_dir_dict


Expand All @@ -79,26 +85,32 @@ def get_events(self, event_names):
ret_events = [dict() for i in range(len(event_names))]
for dir in dirs_to_look:
for event_file in self._glob_events_files([dir]):
for record in tf_record.tf_record_iterator(event_file):
event = event_pb2.Event.FromString(record)
if event.summary is None or event.wall_time is None or event.summary.value is None:
continue

event_time = datetime.datetime.fromtimestamp(event.wall_time)
for value in event.summary.value:
if value.tag not in event_names or value.simple_value is None:
try:
for record in tf_record.tf_record_iterator(event_file):
event = event_pb2.Event.FromString(record)
if event.summary is None or event.wall_time is None or event.summary.value is None:
continue

index = event_names.index(value.tag)
dir_event_dict = ret_events[index]
if dir not in dir_event_dict:
dir_event_dict[dir] = pd.DataFrame(
[[event_time, event.step, value.simple_value]],
columns=['time', 'step', 'value'])
else:
df = dir_event_dict[dir]
# Append a row.
df.loc[len(df)] = [event_time, event.step, value.simple_value]
event_time = datetime.datetime.fromtimestamp(event.wall_time)
for value in event.summary.value:
if value.tag not in event_names or value.simple_value is None:
continue

index = event_names.index(value.tag)
dir_event_dict = ret_events[index]
if dir not in dir_event_dict:
dir_event_dict[dir] = pd.DataFrame(
[[event_time, event.step, value.simple_value]],
columns=['time', 'step', 'value'])
else:
df = dir_event_dict[dir]
# Append a row.
df.loc[len(df)] = [event_time, event.step, value.simple_value]
except:
# It seems current TF (1.0) has a bug when iterating events from a file near the end.
# For now just catch and pass.
# print('Error in iterating events from file ' + event_file)
continue

for dir_event_dict in ret_events:
for df in dir_event_dict.values():
Expand Down
1 change: 0 additions & 1 deletion solutionbox/structured_data/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ def get_version():
long_description="""
""",
install_requires=[
"tensorflow==0.12.1"
],
package_data={
},
Expand Down