Skip to content

Commit cd337cd

Browse files
authored
Update protos to match tensorflow 2.10.0rc0 (#5848)
1 parent ef299e8 commit cd337cd

File tree

7 files changed

+73
-11
lines changed

7 files changed

+73
-11
lines changed

tensorboard/compat/proto/config.proto

Lines changed: 29 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,12 @@ message GPUOptions {
123123
// created with the default. If this field has values set, then the size
124124
// of this must match with the above memory_limit_mb.
125125
repeated int32 priority = 2;
126+
127+
// Virtual Device ordinal number determines the device ID of the device.
128+
// A Virtual device with a lower ordinal number always receives the a
129+
// smaller device id. The phyiscal device id and location in the
130+
// virtual device list is used to break ties.
131+
repeated int32 device_ordinal = 3;
126132
}
127133

128134
// The multi virtual device settings. If empty (not set), it will create
@@ -132,15 +138,30 @@ message GPUOptions {
132138
// "visible_device_list" filtering if it is set), and the string represented
133139
// device names (e.g. /device:GPU:<id>) will refer to the virtual
134140
// devices and have the <id> field assigned sequentially starting from 0,
135-
// according to the order they appear in this list and the "memory_limit"
136-
// list inside each element. For example,
141+
// according to the order of the virtual devices determined by
142+
// device_ordinal and the location in the virtual device list.
143+
//
144+
// For example,
137145
// visible_device_list = "1,0"
138146
// virtual_devices { memory_limit: 1GB memory_limit: 2GB }
139-
// virtual_devices {}
140-
// will create three virtual devices as:
147+
// virtual_devices { memory_limit: 3GB memory_limit: 4GB }
148+
// will create 4 virtual devices as:
141149
// /device:GPU:0 -> visible GPU 1 with 1GB memory
142150
// /device:GPU:1 -> visible GPU 1 with 2GB memory
143-
// /device:GPU:2 -> visible GPU 0 with all available memory
151+
// /device:GPU:2 -> visible GPU 0 with 3GB memory
152+
// /device:GPU:3 -> visible GPU 0 with 4GB memory
153+
//
154+
// but
155+
// visible_device_list = "1,0"
156+
// virtual_devices { memory_limit: 1GB memory_limit: 2GB
157+
// device_ordinal: 10 device_ordinal: 20}
158+
// virtual_devices { memory_limit: 3GB memory_limit: 4GB
159+
// device_ordinal: 10 device_ordinal: 20}
160+
// will create 4 virtual devices as:
161+
// /device:GPU:0 -> visible GPU 1 with 1GB memory (ordinal 10)
162+
// /device:GPU:1 -> visible GPU 0 with 3GB memory (ordinal 10)
163+
// /device:GPU:2 -> visible GPU 1 with 2GB memory (ordinal 20)
164+
// /device:GPU:3 -> visible GPU 0 with 4GB memory (ordinal 20)
144165
//
145166
// NOTE:
146167
// 1. It's invalid to set both this and "per_process_gpu_memory_fraction"
@@ -798,6 +819,9 @@ message RunMetadata {
798819
// level idea of what the built graph looks like (since the various graph
799820
// optimization passes might change the structure of the graph significantly).
800821
repeated FunctionGraphs function_graphs = 4;
822+
823+
// Metadata about the session.
824+
SessionMetadata session_metadata = 5;
801825
}
802826

803827
// Defines a connection between two tensors in a `GraphDef`.

tensorboard/compat/proto/full_type.proto

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,18 @@ enum FullTypeId {
174174
// TFT_LITERAL[TFT_INT32]{1} is the compile-time constant 1.
175175
TFT_LITERAL = 1003;
176176

177+
// Encoding types describe a value of a certain type, encoded as a different
178+
// type.
179+
//
180+
// Parametrization:
181+
// TFT_ENCODED[<encoded type>, <encoding type>]
182+
// * <encoded type> may be any type
183+
// * <encoding type> may be any type
184+
//
185+
// Examples:
186+
// TFT_ENCODING[TFT_INT32, TFT_STRING] is an integer encoded as string.
187+
TFT_ENCODED = 1004;
188+
177189
// Type attributes. These always appear in the parametrization of a type,
178190
// never alone. For example, there is no such thing as a "bool" TensorFlow
179191
// object (for now).
@@ -217,7 +229,7 @@ enum FullTypeId {
217229
// is expressed using TFT_PRODUCT.
218230
//
219231
//
220-
// Parametrization: TFT_ARRAY[<element type>].
232+
// Parametrization: TFT_DATASET[<element type>].
221233
// * <element type> may be a concrete type or a type symbol. It represents
222234
// the data type of the elements produced by the dataset.
223235
//
@@ -235,6 +247,15 @@ enum FullTypeId {
235247
// Parametrization: TFT_RAGGED[<element_type>].
236248
TFT_RAGGED = 10103;
237249

250+
// Iterators created by tf.data ops and APIs. Very similar to Datasets, except
251+
// they are mutable.
252+
//
253+
//
254+
// Parametrization: TFT_ITERATOR[<element type>].
255+
// * <element type> may be a concrete type or a type symbol. It represents
256+
// the data type of the elements produced by the dataset.
257+
TFT_ITERATOR = 10104;
258+
238259
// A mutex lock tensor, produced by tf.raw_ops.MutexLock.
239260
// Unlike strict execution models, where ownership of a lock is denoted by
240261
// "running after the lock has been acquired", in non-strict mode, lock
@@ -265,7 +286,7 @@ message FullTypeDef {
265286

266287
repeated FullTypeDef args = 2;
267288

268-
// Literal values of this type object, if the the type admits one.
289+
// Literal values of this type object, if the type admits one.
269290
// For example, a type variable admits a string attribute - its name.
270291
// Shape-related types may admit int attributes - their static shape values.
271292
// Fields for more data types to be added as needed.

tensorboard/compat/proto/meta_graph.proto

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@ option java_multiple_files = true;
1717
option java_package = "org.tensorflow.framework";
1818
option go_package = "github.com/tensorflow/tensorflow/tensorflow/go/core/protobuf/for_core_protos_go_proto";
1919

20-
// NOTE: This protocol buffer is evolving, and will go through revisions in the
21-
// coming months.
22-
//
2320
// Protocol buffer containing the following which are necessary to restart
2421
// training, run inference. It can be used to serialize/de-serialize memory
2522
// objects necessary for running computation in a graph when crossing the

tensorboard/compat/proto/rewriter_config.proto

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,10 +107,17 @@ message RewriterConfig {
107107
// Note that this can change the numerical stability of the graph and may
108108
// require the use of loss scaling to maintain model convergence.
109109
Toggle auto_mixed_precision = 23;
110-
// Optimize data types for MKL (default is OFF).
110+
// Optimize data types for oneDNN (default is OFF).
111111
// This will try to use bfloat16 on CPUs, which is faster.
112112
// Note that this can change the numerical stability of the graph.
113+
// Note: this is deprecated.
114+
// It is replaced by auto_mixed_precision_onednn_bfloat16
113115
Toggle auto_mixed_precision_mkl = 25;
116+
// Optimize data types for oneDNN (default is OFF).
117+
// This will try to use bfloat16 on CPUs, which is faster.
118+
// Note that this can change the numerical stability of the graph.
119+
// Note: this is equivalent to the deprecated option auto_mixed_precision_mkl
120+
Toggle auto_mixed_precision_onednn_bfloat16 = 31;
114121
// Emulate a model using data type float16 on CPU (default is OFF).
115122
// This will try to emulate the float16 inputs and outputs of an operator
116123
// on CPU to have better correlation with float16 on GPU; however the
@@ -121,6 +128,8 @@ message RewriterConfig {
121128
bool disable_meta_optimizer = 19;
122129
// Optimizers registered by plugin (default is ON)
123130
Toggle use_plugin_optimizers = 28;
131+
// Conditional code motion (default is ON).
132+
Toggle experimental_conditional_code_motion = 30;
124133

125134
// Controls how many times we run the optimizers in meta optimizer (default
126135
// is once).

tensorboard/compat/proto/types.proto

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,3 +75,8 @@ enum DataType {
7575
// https://www.tensorflow.org/code/tensorboard/compat/proto/types.cc,
7676
// https://www.tensorflow.org/code/tensorboard/compat/proto/dtypes.py,
7777
// https://www.tensorflow.org/code/tensorboard/compat/proto/function.py)
78+
79+
// Represents a serialized tf.dtypes.Dtype
80+
message SerializedDType {
81+
DataType datatype = 1;
82+
}
207 Bytes
Binary file not shown.

tensorboard/data/server/tensorboard.pb.rs

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)