Skip to content

Commit 62b42ee

Browse files
Dandelion Man?Amit Patankar
Dandelion Man?
authored and
Amit Patankar
committed
Add make_ndarray, tensor_proto, and MetaGraphDef to tf api.
Since TensorProtos are part of the TensorFlow API, it makes sense to also include the methods that generate and parse them. Similarly, we write out MetaGraphDef protos in the summary writer, so we should provide the proto as well. This is part of an ongoing effort to have TensorBoard only consume TensorFlow methods through the public api. PiperOrigin-RevId: 157657564
1 parent 323d40f commit 62b42ee

7 files changed

+400
-0
lines changed

‎tensorflow/python/__init__.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
from tensorflow.core.framework.summary_pb2 import *
5555
from tensorflow.core.framework.attr_value_pb2 import *
5656
from tensorflow.core.protobuf.meta_graph_pb2 import TensorInfo
57+
from tensorflow.core.protobuf.meta_graph_pb2 import MetaGraphDef
5758
from tensorflow.core.protobuf.config_pb2 import *
5859
from tensorflow.core.protobuf.tensorflow_server_pb2 import *
5960
from tensorflow.core.util.event_pb2 import *
@@ -143,6 +144,7 @@
143144
'GraphOptions',
144145
'HistogramProto',
145146
'LogMessage',
147+
'MetaGraphDef',
146148
'NameAttrList',
147149
'NodeDef',
148150
'OptimizerOptions',

‎tensorflow/python/framework/framework_lib.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@
4141
@@import_graph_def
4242
@@load_file_system_library
4343
@@load_op_library
44+
@@make_tensor_proto
45+
@@make_ndarray
4446
4547
## Graph collections
4648
@@ -98,6 +100,10 @@
98100
from tensorflow.python.framework.subscribe import subscribe
99101
from tensorflow.python.framework.importer import import_graph_def
100102

103+
# Utilities for working with Tensors
104+
from tensorflow.python.framework.tensor_util import make_tensor_proto
105+
from tensorflow.python.framework.tensor_util import MakeNdarray as make_ndarray
106+
101107
# Needed when you defined a new Op in C++.
102108
from tensorflow.python.framework.ops import RegisterGradient
103109
from tensorflow.python.framework.ops import NotDifferentiable

‎tensorflow/tools/api/golden/tensorflow.-meta-graph-def.-collection-def-entry.pbtxt

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
path: "tensorflow.MetaGraphDef.CollectionDefEntry"
2+
tf_class {
3+
is_instance: "<class \'tensorflow.core.protobuf.meta_graph_pb2.CollectionDefEntry\'>"
4+
is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
5+
member {
6+
name: "DESCRIPTOR"
7+
mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
8+
}
9+
member {
10+
name: "Extensions"
11+
mtype: "<type \'getset_descriptor\'>"
12+
}
13+
member {
14+
name: "KEY_FIELD_NUMBER"
15+
mtype: "<type \'int\'>"
16+
}
17+
member {
18+
name: "VALUE_FIELD_NUMBER"
19+
mtype: "<type \'int\'>"
20+
}
21+
member_method {
22+
name: "ByteSize"
23+
}
24+
member_method {
25+
name: "Clear"
26+
}
27+
member_method {
28+
name: "ClearExtension"
29+
}
30+
member_method {
31+
name: "ClearField"
32+
}
33+
member_method {
34+
name: "CopyFrom"
35+
}
36+
member_method {
37+
name: "DiscardUnknownFields"
38+
}
39+
member_method {
40+
name: "FindInitializationErrors"
41+
}
42+
member_method {
43+
name: "FromString"
44+
}
45+
member_method {
46+
name: "HasExtension"
47+
}
48+
member_method {
49+
name: "HasField"
50+
}
51+
member_method {
52+
name: "IsInitialized"
53+
}
54+
member_method {
55+
name: "ListFields"
56+
}
57+
member_method {
58+
name: "MergeFrom"
59+
}
60+
member_method {
61+
name: "MergeFromString"
62+
}
63+
member_method {
64+
name: "ParseFromString"
65+
}
66+
member_method {
67+
name: "RegisterExtension"
68+
}
69+
member_method {
70+
name: "SerializePartialToString"
71+
}
72+
member_method {
73+
name: "SerializeToString"
74+
}
75+
member_method {
76+
name: "SetInParent"
77+
}
78+
member_method {
79+
name: "WhichOneof"
80+
}
81+
member_method {
82+
name: "__init__"
83+
}
84+
}

‎tensorflow/tools/api/golden/tensorflow.-meta-graph-def.-meta-info-def.pbtxt

Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
1+
path: "tensorflow.MetaGraphDef.MetaInfoDef"
2+
tf_class {
3+
is_instance: "<class \'tensorflow.core.protobuf.meta_graph_pb2.MetaInfoDef\'>"
4+
is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
5+
member {
6+
name: "ANY_INFO_FIELD_NUMBER"
7+
mtype: "<type \'int\'>"
8+
}
9+
member {
10+
name: "DESCRIPTOR"
11+
mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
12+
}
13+
member {
14+
name: "Extensions"
15+
mtype: "<type \'getset_descriptor\'>"
16+
}
17+
member {
18+
name: "META_GRAPH_VERSION_FIELD_NUMBER"
19+
mtype: "<type \'int\'>"
20+
}
21+
member {
22+
name: "STRIPPED_OP_LIST_FIELD_NUMBER"
23+
mtype: "<type \'int\'>"
24+
}
25+
member {
26+
name: "TAGS_FIELD_NUMBER"
27+
mtype: "<type \'int\'>"
28+
}
29+
member {
30+
name: "TENSORFLOW_GIT_VERSION_FIELD_NUMBER"
31+
mtype: "<type \'int\'>"
32+
}
33+
member {
34+
name: "TENSORFLOW_VERSION_FIELD_NUMBER"
35+
mtype: "<type \'int\'>"
36+
}
37+
member_method {
38+
name: "ByteSize"
39+
}
40+
member_method {
41+
name: "Clear"
42+
}
43+
member_method {
44+
name: "ClearExtension"
45+
}
46+
member_method {
47+
name: "ClearField"
48+
}
49+
member_method {
50+
name: "CopyFrom"
51+
}
52+
member_method {
53+
name: "DiscardUnknownFields"
54+
}
55+
member_method {
56+
name: "FindInitializationErrors"
57+
}
58+
member_method {
59+
name: "FromString"
60+
}
61+
member_method {
62+
name: "HasExtension"
63+
}
64+
member_method {
65+
name: "HasField"
66+
}
67+
member_method {
68+
name: "IsInitialized"
69+
}
70+
member_method {
71+
name: "ListFields"
72+
}
73+
member_method {
74+
name: "MergeFrom"
75+
}
76+
member_method {
77+
name: "MergeFromString"
78+
}
79+
member_method {
80+
name: "ParseFromString"
81+
}
82+
member_method {
83+
name: "RegisterExtension"
84+
}
85+
member_method {
86+
name: "SerializePartialToString"
87+
}
88+
member_method {
89+
name: "SerializeToString"
90+
}
91+
member_method {
92+
name: "SetInParent"
93+
}
94+
member_method {
95+
name: "WhichOneof"
96+
}
97+
member_method {
98+
name: "__init__"
99+
}
100+
}

‎tensorflow/tools/api/golden/tensorflow.-meta-graph-def.-signature-def-entry.pbtxt

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
path: "tensorflow.MetaGraphDef.SignatureDefEntry"
2+
tf_class {
3+
is_instance: "<class \'tensorflow.core.protobuf.meta_graph_pb2.SignatureDefEntry\'>"
4+
is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
5+
member {
6+
name: "DESCRIPTOR"
7+
mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
8+
}
9+
member {
10+
name: "Extensions"
11+
mtype: "<type \'getset_descriptor\'>"
12+
}
13+
member {
14+
name: "KEY_FIELD_NUMBER"
15+
mtype: "<type \'int\'>"
16+
}
17+
member {
18+
name: "VALUE_FIELD_NUMBER"
19+
mtype: "<type \'int\'>"
20+
}
21+
member_method {
22+
name: "ByteSize"
23+
}
24+
member_method {
25+
name: "Clear"
26+
}
27+
member_method {
28+
name: "ClearExtension"
29+
}
30+
member_method {
31+
name: "ClearField"
32+
}
33+
member_method {
34+
name: "CopyFrom"
35+
}
36+
member_method {
37+
name: "DiscardUnknownFields"
38+
}
39+
member_method {
40+
name: "FindInitializationErrors"
41+
}
42+
member_method {
43+
name: "FromString"
44+
}
45+
member_method {
46+
name: "HasExtension"
47+
}
48+
member_method {
49+
name: "HasField"
50+
}
51+
member_method {
52+
name: "IsInitialized"
53+
}
54+
member_method {
55+
name: "ListFields"
56+
}
57+
member_method {
58+
name: "MergeFrom"
59+
}
60+
member_method {
61+
name: "MergeFromString"
62+
}
63+
member_method {
64+
name: "ParseFromString"
65+
}
66+
member_method {
67+
name: "RegisterExtension"
68+
}
69+
member_method {
70+
name: "SerializePartialToString"
71+
}
72+
member_method {
73+
name: "SerializeToString"
74+
}
75+
member_method {
76+
name: "SetInParent"
77+
}
78+
member_method {
79+
name: "WhichOneof"
80+
}
81+
member_method {
82+
name: "__init__"
83+
}
84+
}

0 commit comments

Comments
 (0)