Skip to content

Commit f2d419d

Browse files
authored
Update protos to match TF 2.9.0rc1 (#5686)
1 parent a6f41cd commit f2d419d

File tree

7 files changed

+36
-7
lines changed

7 files changed

+36
-7
lines changed

tensorboard/compat/proto/attr_value.proto

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ message AttrValue {
2727
repeated TensorProto tensor = 8; // "list(tensor)"
2828
repeated NameAttrList func = 9; // "list(attr)"
2929
}
30-
// LINT.ThenChange(https://www.tensorflow.org/code/tensorflow/c/c_api.cc)
30+
// LINT.ThenChange(//tensorflow/c/c_api.cc)
3131

3232
oneof value {
3333
bytes s = 2; // "string"

tensorboard/compat/proto/config.proto

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,11 @@ message GPUOptions {
212212

213213
// When true, use CUDA cudaMallocAsync API instead of TF gpu allocator.
214214
bool use_cuda_malloc_async = 11;
215+
216+
// By default, BFCAllocator may sleep when it runs out of memory, in the
217+
// hopes that another thread will free up memory in the meantime. Setting
218+
// this to true disables the sleep; instead we'll OOM immediately.
219+
bool disallow_retry_on_allocation_failure = 12;
215220
}
216221

217222
// Everything inside experimental is subject to change and is not subject

tensorboard/compat/proto/coordination_config.proto

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,25 @@ message CoordinationServiceConfig {
2222
// Maximum wait time for all members in the cluster to be registered.
2323
int64 cluster_register_timeout_in_ms = 4;
2424

25-
// Heartbeat timeout, if a worker does not record heartbeat in this time
25+
// Heartbeat timeout, if a task does not record heartbeat in this time
2626
// window, it will be considered disconnected.
27+
// Note: This is also used as a grace period to accept any heartbeats after
28+
// the agent has disconnected, to account for the lag time between the service
29+
// recording the state change and the agent stopping heartbeats.
2730
int64 heartbeat_timeout_in_ms = 5;
2831

2932
// The list of jobs that partipate in the coordination service. If empty, all
3033
// jobs will be included in the coordination service by default.
3134
repeated string coordinated_jobs = 6;
35+
36+
// Denotes how long to wait for all coordination agents to reach the barriers
37+
// (after the first shutdown request) before disconnecting together. If
38+
// set to 0, no barrier is imposed upon shutdown and each worker can
39+
// disconnect individually.
40+
int64 shutdown_barrier_timeout_in_ms = 7;
41+
42+
// If set, agents do not make an explicit Shutdown() call. Service will only
43+
// find out about the disconnecte agent via stale heartbeats. Used for
44+
// testing.
45+
bool agent_destruction_without_shutdown = 8;
3246
}

tensorboard/compat/proto/full_type.proto

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ option java_multiple_files = true;
88
option java_package = "org.tensorflow.framework";
99
option go_package = "github.com/tensorflow/tensorflow/tensorflow/go/core/framework/full_type_go_proto";
1010

11+
// LINT.IfChange
1112
// Experimental. Represents the complete type information of a TensorFlow value.
1213
enum FullTypeId {
1314
// The default represents an uninitialized values.
@@ -274,3 +275,4 @@ message FullTypeDef {
274275
// TODO(mdan): list/tensor, map? Need to reconcile with TFT_RECORD, etc.
275276
}
276277
}
278+
// LINT.ThenChange(../ir/types/attributes.td)

tensorboard/compat/proto/rewriter_config.proto

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,13 @@ message RewriterConfig {
3737
// may break. For example, assume the shape of a placeholder matches its
3838
// actual feed.
3939
AGGRESSIVE = 3;
40+
// Run MLIR pass if there's one implemented in TFG, do nothing otherwise.
41+
// I.e., if there's no corresponding TFG pass, it's an OFF. This is supposed
42+
// to be mapped with `ON` and there's no `AGGRESSIVE` in MLIR pass now.
43+
EXPERIMENTAL_MLIR = 4;
44+
// Run both MLIR and Grappler passes consecutively and MLIR pass will come
45+
// first.
46+
EXPERIMENTAL_BOTH = 5;
4047
}
4148

4249
// Enum for layout conversion between NCHW and NHWC on CPU. Default is OFF.

tensorboard/compat/proto/saved_object_graph.proto

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ message SavedObject {
3838
// Objects which this object depends on: named edges in the dependency
3939
// graph.
4040
//
41-
// Note: currently only valid if kind == "user_object" or "resource".
41+
// Note: All kinds of SavedObject may have children, except
42+
// "constant" and "captured_tensor".
4243
repeated TrackableObjectGraph.TrackableObject.ObjectReference children = 1;
4344

4445
// Ordered list of dependencies that must be loaded before this object.

tensorboard/compat/proto/trackable_object_graph.proto

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ message TrackableObjectGraph {
3333
string full_name = 2;
3434
// The generated name of the Tensor in the checkpoint.
3535
string checkpoint_key = 3;
36-
// Whether checkpoints should be considered as matching even without this
37-
// value restored. Used for non-critical values which don't affect the
38-
// TensorFlow graph, such as layer configurations.
39-
bool optional_restore = 4;
36+
// Deprecated bool field for optional restore. This field has never been
37+
// set to True.
38+
reserved "optional_restore";
39+
reserved 4;
4040
}
4141

4242
message SlotVariableReference {

0 commit comments

Comments
 (0)