diff --git a/tensorflow/core/ops/compat/ops_history.v1.pbtxt b/tensorflow/core/ops/compat/ops_history.v1.pbtxt index 8e2f981abaa..a6efa6a417d 100644 --- a/tensorflow/core/ops/compat/ops_history.v1.pbtxt +++ b/tensorflow/core/ops/compat/ops_history.v1.pbtxt @@ -3066,6 +3066,33 @@ op { } is_stateful: true } +op { + name: "BatchDataset" + input_arg { + name: "input_dataset" + type: DT_VARIANT + } + input_arg { + name: "batch_size" + type: DT_INT64 + } + output_arg { + name: "handle" + type: DT_VARIANT + } + attr { + name: "output_types" + type: "list(type)" + has_minimum: true + minimum: 1 + } + attr { + name: "output_shapes" + type: "list(shape)" + has_minimum: true + minimum: 1 + } +} op { name: "BatchFFT" input_arg { @@ -4488,6 +4515,33 @@ op { } is_stateful: true } +op { + name: "CacheDataset" + input_arg { + name: "input_dataset" + type: DT_VARIANT + } + input_arg { + name: "filename" + type: DT_STRING + } + output_arg { + name: "handle" + type: DT_VARIANT + } + attr { + name: "output_types" + type: "list(type)" + has_minimum: true + minimum: 1 + } + attr { + name: "output_shapes" + type: "list(shape)" + has_minimum: true + minimum: 1 + } +} op { name: "Cast" input_arg { @@ -4890,6 +4944,33 @@ op { } is_stateful: true } +op { + name: "ConcatenateDataset" + input_arg { + name: "input_dataset" + type: DT_VARIANT + } + input_arg { + name: "another_dataset" + type: DT_VARIANT + } + output_arg { + name: "handle" + type: DT_VARIANT + } + attr { + name: "output_types" + type: "list(type)" + has_minimum: true + minimum: 1 + } + attr { + name: "output_shapes" + type: "list(shape)" + has_minimum: true + minimum: 1 + } +} op { name: "ConditionalAccumulator" output_arg { @@ -6877,6 +6958,37 @@ op { } is_stateful: true } +op { + name: "DenseToSparseBatchDataset" + input_arg { + name: "input_dataset" + type: DT_VARIANT + } + input_arg { + name: "batch_size" + type: DT_INT64 + } + input_arg { + name: "row_shape" + type: DT_INT64 + } + output_arg { + name: "handle" + type: DT_VARIANT + } + attr { + name: "output_types" + type: "list(type)" + has_minimum: true + minimum: 1 + } + attr { + name: "output_shapes" + type: "list(shape)" + has_minimum: true + minimum: 1 + } +} op { name: "DenseToSparseSetOperation" input_arg { @@ -9141,6 +9253,42 @@ op { } is_stateful: true } +op { + name: "FilterDataset" + input_arg { + name: "input_dataset" + type: DT_VARIANT + } + input_arg { + name: "other_arguments" + type_list_attr: "Targuments" + } + output_arg { + name: "handle" + type: DT_VARIANT + } + attr { + name: "predicate" + type: "func" + } + attr { + name: "Targuments" + type: "list(type)" + has_minimum: true + } + attr { + name: "output_types" + type: "list(type)" + has_minimum: true + minimum: 1 + } + attr { + name: "output_shapes" + type: "list(shape)" + has_minimum: true + minimum: 1 + } +} op { name: "FixedLengthRecordDataset" input_arg { @@ -9639,6 +9787,42 @@ op { } is_stateful: true } +op { + name: "FlatMapDataset" + input_arg { + name: "input_dataset" + type: DT_VARIANT + } + input_arg { + name: "other_arguments" + type_list_attr: "Targuments" + } + output_arg { + name: "handle" + type: DT_VARIANT + } + attr { + name: "f" + type: "func" + } + attr { + name: "Targuments" + type: "list(type)" + has_minimum: true + } + attr { + name: "output_types" + type: "list(type)" + has_minimum: true + minimum: 1 + } + attr { + name: "output_shapes" + type: "list(shape)" + has_minimum: true + minimum: 1 + } +} op { name: "Floor" input_arg { @@ -10558,6 +10742,68 @@ op { } is_stateful: true } +op { + name: "GroupByWindowDataset" + input_arg { + name: "input_dataset" + type: DT_VARIANT + } + input_arg { + name: "key_func_other_arguments" + type_list_attr: "Tkey_func_other_arguments" + } + input_arg { + name: "reduce_func_other_arguments" + type_list_attr: "Treduce_func_other_arguments" + } + input_arg { + name: "window_size_func_other_arguments" + type_list_attr: "Twindow_size_func_other_arguments" + } + output_arg { + name: "handle" + type: DT_VARIANT + } + attr { + name: "key_func" + type: "func" + } + attr { + name: "reduce_func" + type: "func" + } + attr { + name: "window_size_func" + type: "func" + } + attr { + name: "Tkey_func_other_arguments" + type: "list(type)" + has_minimum: true + } + attr { + name: "Treduce_func_other_arguments" + type: "list(type)" + has_minimum: true + } + attr { + name: "Twindow_size_func_other_arguments" + type: "list(type)" + has_minimum: true + } + attr { + name: "output_types" + type: "list(type)" + has_minimum: true + minimum: 1 + } + attr { + name: "output_shapes" + type: "list(shape)" + has_minimum: true + minimum: 1 + } +} op { name: "HSVToRGB" input_arg { @@ -10921,6 +11167,29 @@ op { } is_stateful: true } +op { + name: "IgnoreErrorsDataset" + input_arg { + name: "input_dataset" + type: DT_VARIANT + } + output_arg { + name: "handle" + type: DT_VARIANT + } + attr { + name: "output_types" + type: "list(type)" + has_minimum: true + minimum: 1 + } + attr { + name: "output_shapes" + type: "list(shape)" + has_minimum: true + minimum: 1 + } +} op { name: "Imag" input_arg { @@ -11270,6 +11539,50 @@ op { } is_stateful: true } +op { + name: "InterleaveDataset" + input_arg { + name: "input_dataset" + type: DT_VARIANT + } + input_arg { + name: "other_arguments" + type_list_attr: "Targuments" + } + input_arg { + name: "cycle_length" + type: DT_INT64 + } + input_arg { + name: "block_length" + type: DT_INT64 + } + output_arg { + name: "handle" + type: DT_VARIANT + } + attr { + name: "f" + type: "func" + } + attr { + name: "Targuments" + type: "list(type)" + has_minimum: true + } + attr { + name: "output_types" + type: "list(type)" + has_minimum: true + minimum: 1 + } + attr { + name: "output_shapes" + type: "list(shape)" + has_minimum: true + minimum: 1 + } +} op { name: "Inv" input_arg { @@ -12622,6 +12935,42 @@ op { } is_stateful: true } +op { + name: "MapDataset" + input_arg { + name: "input_dataset" + type: DT_VARIANT + } + input_arg { + name: "other_arguments" + type_list_attr: "Targuments" + } + output_arg { + name: "handle" + type: DT_VARIANT + } + attr { + name: "f" + type: "func" + } + attr { + name: "Targuments" + type: "list(type)" + has_minimum: true + } + attr { + name: "output_types" + type: "list(type)" + has_minimum: true + minimum: 1 + } + attr { + name: "output_shapes" + type: "list(shape)" + has_minimum: true + minimum: 1 + } +} op { name: "MapIncompleteSize" output_arg { @@ -16276,6 +16625,48 @@ op { } is_stateful: true } +op { + name: "PaddedBatchDataset" + input_arg { + name: "input_dataset" + type: DT_VARIANT + } + input_arg { + name: "batch_size" + type: DT_INT64 + } + input_arg { + name: "padded_shapes" + type: DT_INT64 + number_attr: "N" + } + input_arg { + name: "padding_values" + type_list_attr: "Toutput_types" + } + output_arg { + name: "handle" + type: DT_VARIANT + } + attr { + name: "Toutput_types" + type: "list(type)" + has_minimum: true + minimum: 1 + } + attr { + name: "output_shapes" + type: "list(shape)" + has_minimum: true + minimum: 1 + } + attr { + name: "N" + type: "int" + has_minimum: true + minimum: 1 + } +} op { name: "PaddingFIFOQueue" output_arg { @@ -16459,6 +16850,46 @@ op { } is_stateful: true } +op { + name: "ParallelMapDataset" + input_arg { + name: "input_dataset" + type: DT_VARIANT + } + input_arg { + name: "other_arguments" + type_list_attr: "Targuments" + } + input_arg { + name: "num_parallel_calls" + type: DT_INT32 + } + output_arg { + name: "handle" + type: DT_VARIANT + } + attr { + name: "f" + type: "func" + } + attr { + name: "Targuments" + type: "list(type)" + has_minimum: true + } + attr { + name: "output_types" + type: "list(type)" + has_minimum: true + minimum: 1 + } + attr { + name: "output_shapes" + type: "list(shape)" + has_minimum: true + minimum: 1 + } +} op { name: "ParameterizedTruncatedNormal" input_arg { @@ -17007,6 +17438,33 @@ op { } is_stateful: true } +op { + name: "PrefetchDataset" + input_arg { + name: "input_dataset" + type: DT_VARIANT + } + input_arg { + name: "buffer_size" + type: DT_INT64 + } + output_arg { + name: "handle" + type: DT_VARIANT + } + attr { + name: "output_types" + type: "list(type)" + has_minimum: true + minimum: 1 + } + attr { + name: "output_shapes" + type: "list(shape)" + has_minimum: true + minimum: 1 + } +} op { name: "PreventGradient" input_arg { @@ -20538,6 +20996,33 @@ op { } is_stateful: true } +op { + name: "RepeatDataset" + input_arg { + name: "input_dataset" + type: DT_VARIANT + } + input_arg { + name: "count" + type: DT_INT64 + } + output_arg { + name: "handle" + type: DT_VARIANT + } + attr { + name: "output_types" + type: "list(type)" + has_minimum: true + minimum: 1 + } + attr { + name: "output_shapes" + type: "list(shape)" + has_minimum: true + minimum: 1 + } +} op { name: "RequantizationRange" input_arg { @@ -24755,6 +25240,41 @@ op { } is_stateful: true } +op { + name: "ShuffleDataset" + input_arg { + name: "input_dataset" + type: DT_VARIANT + } + input_arg { + name: "buffer_size" + type: DT_INT64 + } + input_arg { + name: "seed" + type: DT_INT64 + } + input_arg { + name: "seed2" + type: DT_INT64 + } + output_arg { + name: "handle" + type: DT_VARIANT + } + attr { + name: "output_types" + type: "list(type)" + has_minimum: true + minimum: 1 + } + attr { + name: "output_shapes" + type: "list(shape)" + has_minimum: true + minimum: 1 + } +} op { name: "Sigmoid" input_arg { @@ -24937,6 +25457,33 @@ op { } is_stateful: true } +op { + name: "SkipDataset" + input_arg { + name: "input_dataset" + type: DT_VARIANT + } + input_arg { + name: "count" + type: DT_INT64 + } + output_arg { + name: "handle" + type: DT_VARIANT + } + attr { + name: "output_types" + type: "list(type)" + has_minimum: true + minimum: 1 + } + attr { + name: "output_shapes" + type: "list(shape)" + has_minimum: true + minimum: 1 + } +} op { name: "Skipgram" output_arg { @@ -25079,6 +25626,50 @@ op { } is_stateful: true } +op { + name: "SloppyInterleaveDataset" + input_arg { + name: "input_dataset" + type: DT_VARIANT + } + input_arg { + name: "other_arguments" + type_list_attr: "Targuments" + } + input_arg { + name: "cycle_length" + type: DT_INT64 + } + input_arg { + name: "block_length" + type: DT_INT64 + } + output_arg { + name: "handle" + type: DT_VARIANT + } + attr { + name: "f" + type: "func" + } + attr { + name: "Targuments" + type: "list(type)" + has_minimum: true + } + attr { + name: "output_types" + type: "list(type)" + has_minimum: true + minimum: 1 + } + attr { + name: "output_shapes" + type: "list(shape)" + has_minimum: true + minimum: 1 + } +} op { name: "Softmax" input_arg { @@ -29374,6 +29965,33 @@ op { } is_stateful: true } +op { + name: "TakeDataset" + input_arg { + name: "input_dataset" + type: DT_VARIANT + } + input_arg { + name: "count" + type: DT_INT64 + } + output_arg { + name: "handle" + type: DT_VARIANT + } + attr { + name: "output_types" + type: "list(type)" + has_minimum: true + minimum: 1 + } + attr { + name: "output_shapes" + type: "list(shape)" + has_minimum: true + minimum: 1 + } +} op { name: "TakeManySparseFromTensorsMap" input_arg { @@ -31555,3 +32173,33 @@ op { } is_stateful: true } +op { + name: "ZipDataset" + input_arg { + name: "input_datasets" + type: DT_VARIANT + number_attr: "N" + } + output_arg { + name: "handle" + type: DT_VARIANT + } + attr { + name: "output_types" + type: "list(type)" + has_minimum: true + minimum: 1 + } + attr { + name: "output_shapes" + type: "list(shape)" + has_minimum: true + minimum: 1 + } + attr { + name: "N" + type: "int" + has_minimum: true + minimum: 1 + } +} diff --git a/tensorflow/core/ops/ops.pbtxt b/tensorflow/core/ops/ops.pbtxt index a66870c3725..84f0b41baac 100644 --- a/tensorflow/core/ops/ops.pbtxt +++ b/tensorflow/core/ops/ops.pbtxt @@ -2817,7 +2817,6 @@ op { minimum: 1 } summary: "Creates a dataset that batches `batch_size` elements from `input_dataset`." - is_stateful: true } op { name: "BatchFFT" @@ -4254,7 +4253,6 @@ op { } summary: "Creates a dataset that caches elements from `input_dataset`." description: "A CacheDataset will iterate over the input_dataset, and store tensors. If the\ncache already exists, the cache will be used. If the cache is inappropriate\n(e.g. cannot be opened, contains tensors of the wrong shape / size), an error\nwill the returned when used." - is_stateful: true } op { name: "Cast" @@ -4683,7 +4681,6 @@ op { minimum: 1 } summary: "Creates a dataset that concatenates `input_dataset` with `another_dataset`." - is_stateful: true } op { name: "ConditionalAccumulator" @@ -6395,7 +6392,6 @@ op { minimum: 1 } summary: "Creates a dataset that yields a SparseTensor for each element of the input." - is_stateful: true } op { name: "DenseToSparseSetOperation" @@ -8331,7 +8327,6 @@ op { } summary: "Creates a dataset containing elements of `input_dataset` matching `predicate`." description: "The `predicate` function must return a scalar boolean and accept the\nfollowing arguments:\n\n* One tensor for each component of an element of `input_dataset`.\n* One tensor for each value in `other_arguments`." - is_stateful: true } op { name: "FixedLengthRecordDataset" @@ -8623,7 +8618,7 @@ op { attr { name: "f" type: "func" - description: "A function mapping elements of `input_dataset`, concatenated with\n`other_arguments`, to a Dataset resource that contains elements matching\n`output_types` and `output_shapes`." + description: "A function mapping elements of `input_dataset`, concatenated with\n`other_arguments`, to a Dataset variant that contains elements matching\n`output_types` and `output_shapes`." } attr { name: "Targuments" @@ -8643,8 +8638,7 @@ op { minimum: 1 } summary: "Creates a dataset that applies `f` to the outputs of `input_dataset`." - description: "Unlike MapDataset, the `f` in FlatMapDataset is expected to return a\nDataset resource, and FlatMapDataset will flatten successive results\ninto a single Dataset." - is_stateful: true + description: "Unlike MapDataset, the `f` in FlatMapDataset is expected to return a\nDataset variant, and FlatMapDataset will flatten successive results\ninto a single Dataset." } op { name: "Floor" @@ -9661,7 +9655,6 @@ op { } summary: "Creates a dataset that computes a windowed group-by on `input_dataset`." description: "// TODO(mrry): Support non-int64 keys." - is_stateful: true } op { name: "HSVToRGB" @@ -10094,7 +10087,6 @@ op { minimum: 1 } summary: "Creates a dataset that contains the elements of `input_dataset` ignoring errors." - is_stateful: true } op { name: "Imag" @@ -10475,7 +10467,7 @@ op { attr { name: "f" type: "func" - description: "A function mapping elements of `input_dataset`, concatenated with\n`other_arguments`, to a Dataset resource that contains elements matching\n`output_types` and `output_shapes`." + description: "A function mapping elements of `input_dataset`, concatenated with\n`other_arguments`, to a Dataset variant that contains elements matching\n`output_types` and `output_shapes`." } attr { name: "Targuments" @@ -10495,8 +10487,7 @@ op { minimum: 1 } summary: "Creates a dataset that applies `f` to the outputs of `input_dataset`." - description: "Unlike MapDataset, the `f` in InterleaveDataset is expected to return\na Dataset resource, and InterleaveDataset will flatten successive\nresults into a single Dataset. Unlike FlatMapDataset,\nInterleaveDataset will interleave sequences of up to `block_length`\nconsecutive elements from `cycle_length` input elements." - is_stateful: true + description: "Unlike MapDataset, the `f` in InterleaveDataset is expected to return\na Dataset variant, and InterleaveDataset will flatten successive\nresults into a single Dataset. Unlike FlatMapDataset,\nInterleaveDataset will interleave sequences of up to `block_length`\nconsecutive elements from `cycle_length` input elements." } op { name: "Inv" @@ -11879,7 +11870,6 @@ op { minimum: 1 } summary: "Creates a dataset that applies `f` to the outputs of `input_dataset`." - is_stateful: true } op { name: "MapIncompleteSize" @@ -14652,7 +14642,7 @@ op { attr { name: "dataset_factory" type: "func" - description: "A function of type `() -> DT_VARIANT`, where the returned\nDT_VARIANT is a handle to a dataset." + description: "A function of type `() -> DT_VARIANT`, where the returned\nDT_VARIANT is a dataset." } attr { name: "output_types" @@ -15213,7 +15203,6 @@ op { minimum: 1 } summary: "Creates a dataset that batches and pads `batch_size` elements from the input." - is_stateful: true } op { name: "PaddingFIFOQueue" @@ -15422,7 +15411,6 @@ op { } summary: "Creates a dataset that applies `f` to the outputs of `input_dataset`." description: "Unlike a \"MapDataset\", which applies `f` sequentially, this dataset invokes up\nto `num_parallel_calls` copies of `f` in parallel." - is_stateful: true } op { name: "ParameterizedTruncatedNormal" @@ -15996,7 +15984,6 @@ op { minimum: 1 } summary: "Creates a dataset that asynchronously prefetches elements from `input_dataset`." - is_stateful: true } op { name: "PreventGradient" @@ -19883,7 +19870,6 @@ op { minimum: 1 } summary: "Creates a dataset that emits the outputs of `input_dataset` `count` times." - is_stateful: true } op { name: "RequantizationRange" @@ -24229,7 +24215,6 @@ op { minimum: 1 } summary: "Creates a dataset that shuffles elements from `input_dataset` pseudorandomly." - is_stateful: true } op { name: "Sigmoid" @@ -24423,7 +24408,6 @@ op { minimum: 1 } summary: "Creates a dataset that skips `count` elements from the `input_dataset`." - is_stateful: true } op { name: "Skipgram" @@ -24565,7 +24549,7 @@ op { attr { name: "f" type: "func" - description: "A function mapping elements of `input_dataset`, concatenated with\n`other_arguments`, to a Dataset resource that contains elements matching\n`output_types` and `output_shapes`." + description: "A function mapping elements of `input_dataset`, concatenated with\n`other_arguments`, to a Dataset variant that contains elements matching\n`output_types` and `output_shapes`." } attr { name: "Targuments" @@ -24586,7 +24570,6 @@ op { } summary: "Creates a dataset that applies `f` to the outputs of `input_dataset`." description: "The resulting dataset is similar to the `InterleaveDataset`, with the exception\nthat if retrieving the next value from a dataset would cause the requester to\nblock, it will skip that input dataset. This dataset is especially useful\nwhen loading data from a variable-latency datastores (e.g. HDFS, GCS), as it\nallows the training step to proceed so long as some data is available.\n\n!! WARNING !! This dataset is not deterministic!" - is_stateful: true } op { name: "Softmax" @@ -29307,7 +29290,6 @@ op { minimum: 1 } summary: "Creates a dataset that contains `count` elements from the `input_dataset`." - is_stateful: true } op { name: "TakeManySparseFromTensorsMap" @@ -31595,5 +31577,4 @@ op { minimum: 1 } summary: "Creates a dataset that zips together `input_datasets`." - is_stateful: true }