Skip to content

Commit 6bc843e

Browse files
committed
Update TF compat protos.
(cherry picked from commit 9531583)
1 parent a018b73 commit 6bc843e

File tree

5 files changed

+65
-20
lines changed

5 files changed

+65
-20
lines changed

tensorboard/compat/proto/config.proto

Lines changed: 34 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ syntax = "proto3";
22

33
package tensorboard;
44

5+
import "tensorboard/compat/proto/coordination_config.proto";
56
import "tensorboard/compat/proto/cost_graph.proto";
67
import "tensorboard/compat/proto/graph.proto";
78
import "tensorboard/compat/proto/step_stats.proto";
89
import "tensorboard/compat/proto/cluster.proto";
910
import "tensorboard/compat/proto/debug.proto";
1011
import "tensorboard/compat/proto/rewriter_config.proto";
1112
import "tensorboard/compat/proto/rpc_options.proto";
12-
import "tensorboard/compat/proto/coordination_config.proto";
1313

1414
option cc_enable_arenas = true;
1515
option java_outer_classname = "ConfigProtos";
@@ -77,6 +77,11 @@ message GPUOptions {
7777
// name "/device:GPU:<id>") are also called "TF GPU id"s. Please
7878
// refer to third_party/tensorflow/core/common_runtime/gpu/gpu_id.h
7979
// for more information.
80+
// 3. The visible_device_list is also used for PluggableDevice. And
81+
// different types of PluggableDevices share this field. In that case,
82+
// the pluggable_device_type is used to distinguish them, making the
83+
// visible_device_list a list of <pluggable_device_type>:<device_index>,
84+
// e.g. "PluggableDeviceA:0,PluggableDeviceA:1,PluggableDeviceB:0".
8085
string visible_device_list = 5;
8186

8287
// In the event polling loop sleep this many microseconds between
@@ -306,7 +311,7 @@ message GPUOptions {
306311

307312
// Everything inside experimental is subject to change and is not subject
308313
// to API stability guarantees in
309-
// https://www.tensorflow.org/guide/version_compat.
314+
// https://www.tensorflow.org/guide/versions.
310315
Experimental experimental = 9;
311316
}
312317

@@ -578,7 +583,7 @@ message ConfigProto {
578583

579584
// Everything inside Experimental is subject to change and is not subject
580585
// to API stability guarantees in
581-
// https://www.tensorflow.org/guide/version_compat.
586+
// https://www.tensorflow.org/guide/versions.
582587
message Experimental {
583588
// Task name for group resolution.
584589
string collective_group_leader = 1;
@@ -750,7 +755,7 @@ message ConfigProto {
750755
bool disable_functional_ops_lowering = 21;
751756

752757
// Provides a hint to XLA auto clustering to prefer forming a single large
753-
// cluster that encompases most of the graph.
758+
// cluster that encompasses most of the graph.
754759
bool xla_prefer_single_graph_cluster = 22;
755760

756761
// Distributed coordination service configurations.
@@ -983,3 +988,28 @@ message CallableOptions {
983988

984989
// Next: 9
985990
}
991+
992+
message BatchingOptions {
993+
// Number of scheduling threads for processing batches of work. Determines
994+
// the number of batches processed in parallel. This should be roughly in line
995+
// with the number of TPU cores available.
996+
int32 num_batch_threads = 1;
997+
998+
// The maximum allowed batch size. Can be larger than allowed_batch_sizes to
999+
// utilize large batch splitting.
1000+
int32 max_batch_size = 2;
1001+
1002+
// Maximum number of microseconds to wait before outputting an incomplete
1003+
// batch.
1004+
int32 batch_timeout_micros = 3;
1005+
1006+
// Optional list of allowed batch sizes. If left empty, does nothing.
1007+
// Otherwise, supplies a list of batch sizes, causing the op to pad batches up
1008+
// to one of those sizes. The entries must increase monotonically, and the
1009+
// final entry must be equal or less than the max_batch_size.
1010+
repeated int32 allowed_batch_sizes = 4;
1011+
1012+
// Maximum number of batches enqueued for processing before requests are
1013+
// failed fast.
1014+
int32 max_enqueued_batches = 5;
1015+
}

tensorboard/compat/proto/coordination_config.proto

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@ message CoordinationServiceConfig {
2929
// Maximum wait time for all members in the cluster to be registered.
3030
int64 cluster_register_timeout_in_ms = 4;
3131

32+
// Denotes if we should synchronize the agents' register attempts by blocking
33+
// on a barrier. This is useful for synchronized restarts.
34+
bool cluster_register_with_barrier = 14;
35+
3236
// Heartbeat timeout, if a task does not record heartbeat in this time
3337
// window, it will be considered disconnected.
3438
// Note: This is also used as a grace period to accept any heartbeats after

tensorboard/compat/proto/types.proto

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,13 @@ enum DataType {
4343
DT_FLOAT8_E5M2 = 24; // 5 exponent bits, 2 mantissa bits.
4444
DT_FLOAT8_E4M3FN = 25; // 4 exponent bits, 3 mantissa bits, finite-only, with
4545
// 2 NaNs (0bS1111111).
46-
// TODO - b/299182407: Leaving room for remaining float8 types.
47-
// DT_FLOAT8_E4M3FNUZ = 26;
48-
// DT_FLOAT8_E4M3B11FNUZ = 27;
49-
// DT_FLOAT8_E5M2FNUZ = 28;
46+
DT_FLOAT8_E4M3FNUZ = 26; // 4 exponent bits, 3 mantissa bits, finite-only,
47+
// with NaN.
48+
DT_FLOAT8_E4M3B11FNUZ = 27; // 4 exponent bits, 3 mantissa bits, 11 bits
49+
// bias, finite-only, with NaNs.
50+
DT_FLOAT8_E5M2FNUZ = 28; // 5 exponent bits, 2 mantissa bits, finite-only,
51+
// with NaN.
52+
5053
DT_INT4 = 29;
5154
DT_UINT4 = 30;
5255

@@ -78,10 +81,10 @@ enum DataType {
7881
DT_UINT64_REF = 123;
7982
DT_FLOAT8_E5M2_REF = 124;
8083
DT_FLOAT8_E4M3FN_REF = 125;
81-
// TODO - b/299182407: Leaving room for remaining float8 types.
82-
// DT_FLOAT8_E4M3FNUZ_REF = 126;
83-
// DT_FLOAT8_E4M3B11FNUZ_REF = 127;
84-
// DT_FLOAT8_E5M2FNUZ_REF = 128;
84+
85+
DT_FLOAT8_E4M3FNUZ_REF = 126;
86+
DT_FLOAT8_E4M3B11FNUZ_REF = 127;
87+
DT_FLOAT8_E5M2FNUZ_REF = 128;
8588
DT_INT4_REF = 129;
8689
DT_UINT4_REF = 130;
8790
}
306 Bytes
Binary file not shown.

tensorboard/data/server/tensorboard.pb.rs

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

0 commit comments

Comments
 (0)