diff options
7 files changed, 80 insertions, 131 deletions
diff --git a/tensorflow/g3doc/api_docs/python/array_ops.md b/tensorflow/g3doc/api_docs/python/array_ops.md index 6aa23eed06..3433f3e25c 100644 --- a/tensorflow/g3doc/api_docs/python/array_ops.md +++ b/tensorflow/g3doc/api_docs/python/array_ops.md @@ -904,71 +904,6 @@ pad(t, paddings, "SYMMETRIC") ==> [[2, 1, 1, 2, 3, 3, 2], - - - -### `tf.concat(*args, **kwargs)` {#concat} - -Concatenates tensors along one dimension. (deprecated) - -THIS FUNCTION IS DEPRECATED. It will be removed after 2016-12-14. -Instructions for updating: -This op will be removed after the deprecation date. Please switch to tf.concat_v2(). - -Concatenates the list of tensors `values` along dimension `concat_dim`. If -`values[i].shape = [D0, D1, ... Dconcat_dim(i), ...Dn]`, the concatenated -result has shape - - [D0, D1, ... Rconcat_dim, ...Dn] - -where - - Rconcat_dim = sum(Dconcat_dim(i)) - -That is, the data from the input tensors is joined along the `concat_dim` -dimension. - -The number of dimensions of the input tensors must match, and all dimensions -except `concat_dim` must be equal. - -For example: - -```python -t1 = [[1, 2, 3], [4, 5, 6]] -t2 = [[7, 8, 9], [10, 11, 12]] -tf.concat(0, [t1, t2]) ==> [[1, 2, 3], [4, 5, 6], [7, 8, 9], [10, 11, 12]] -tf.concat(1, [t1, t2]) ==> [[1, 2, 3, 7, 8, 9], [4, 5, 6, 10, 11, 12]] - -# tensor t3 with shape [2, 3] -# tensor t4 with shape [2, 3] -tf.shape(tf.concat(0, [t3, t4])) ==> [4, 3] -tf.shape(tf.concat(1, [t3, t4])) ==> [2, 6] -``` - -Note: If you are concatenating along a new axis consider using pack. -E.g. - -```python -tf.concat(axis, [tf.expand_dims(t, axis) for t in tensors]) -``` - -can be rewritten as - -```python -tf.pack(tensors, axis=axis) -``` - -##### Args: - - -* <b>`concat_dim`</b>: 0-D `int32` `Tensor`. Dimension along which to concatenate. -* <b>`values`</b>: A list of `Tensor` objects or a single `Tensor`. -* <b>`name`</b>: A name for the operation (optional). - -##### Returns: - - A `Tensor` resulting from concatenation of the input tensors. - - -- - - - ### `tf.concat_v2(values, axis, name='concat_v2')` {#concat_v2} Concatenates tensors along one dimension. @@ -1007,7 +942,7 @@ Note: If you are concatenating along a new axis consider using pack. E.g. ```python -tf.concat(axis, [tf.expand_dims(t, axis) for t in tensors]) +tf.concat_v2([tf.expand_dims(t, axis) for t in tensors], axis) ``` can be rewritten as diff --git a/tensorflow/g3doc/api_docs/python/contrib.learn.md b/tensorflow/g3doc/api_docs/python/contrib.learn.md index 5f061c6f32..21fc1f35b8 100644 --- a/tensorflow/g3doc/api_docs/python/contrib.learn.md +++ b/tensorflow/g3doc/api_docs/python/contrib.learn.md @@ -2282,6 +2282,47 @@ Extracts numpy matrix from pandas DataFrame. - - - +### `tf.contrib.learn.infer_real_valued_columns_from_input(x)` {#infer_real_valued_columns_from_input} + +Creates `FeatureColumn` objects for inputs defined by input `x`. + +This interprets all inputs as dense, fixed-length float values. + +##### Args: + + +* <b>`x`</b>: Real-valued matrix of shape [n_samples, n_features...]. Can be + iterator that returns arrays of features. + +##### Returns: + + List of `FeatureColumn` objects. + + +- - - + +### `tf.contrib.learn.infer_real_valued_columns_from_input_fn(input_fn)` {#infer_real_valued_columns_from_input_fn} + +Creates `FeatureColumn` objects for inputs defined by `input_fn`. + +This interprets all inputs as dense, fixed-length float values. This creates +a local graph in which it calls `input_fn` to build the tensors, then discards +it. + +##### Args: + + +* <b>`input_fn`</b>: Input function returning a tuple of: + features - Dictionary of string feature name to `Tensor` or `Tensor`. + labels - `Tensor` of label values. + +##### Returns: + + List of `FeatureColumn` objects. + + +- - - + ### `tf.contrib.learn.read_batch_examples(file_pattern, batch_size, reader, randomize_input=True, num_epochs=None, queue_capacity=10000, num_threads=1, read_batch_size=1, parse_fn=None, name=None)` {#read_batch_examples} Adds operations to read, queue, batch `Example` protos. diff --git a/tensorflow/g3doc/api_docs/python/functions_and_classes/shard1/tf.contrib.learn.infer_real_valued_columns_from_input_fn.md b/tensorflow/g3doc/api_docs/python/functions_and_classes/shard1/tf.contrib.learn.infer_real_valued_columns_from_input_fn.md new file mode 100644 index 0000000000..e1ac197953 --- /dev/null +++ b/tensorflow/g3doc/api_docs/python/functions_and_classes/shard1/tf.contrib.learn.infer_real_valued_columns_from_input_fn.md @@ -0,0 +1,19 @@ +### `tf.contrib.learn.infer_real_valued_columns_from_input_fn(input_fn)` {#infer_real_valued_columns_from_input_fn} + +Creates `FeatureColumn` objects for inputs defined by `input_fn`. + +This interprets all inputs as dense, fixed-length float values. This creates +a local graph in which it calls `input_fn` to build the tensors, then discards +it. + +##### Args: + + +* <b>`input_fn`</b>: Input function returning a tuple of: + features - Dictionary of string feature name to `Tensor` or `Tensor`. + labels - `Tensor` of label values. + +##### Returns: + + List of `FeatureColumn` objects. + diff --git a/tensorflow/g3doc/api_docs/python/functions_and_classes/shard4/tf.contrib.learn.infer_real_valued_columns_from_input.md b/tensorflow/g3doc/api_docs/python/functions_and_classes/shard4/tf.contrib.learn.infer_real_valued_columns_from_input.md new file mode 100644 index 0000000000..b9de559b20 --- /dev/null +++ b/tensorflow/g3doc/api_docs/python/functions_and_classes/shard4/tf.contrib.learn.infer_real_valued_columns_from_input.md @@ -0,0 +1,16 @@ +### `tf.contrib.learn.infer_real_valued_columns_from_input(x)` {#infer_real_valued_columns_from_input} + +Creates `FeatureColumn` objects for inputs defined by input `x`. + +This interprets all inputs as dense, fixed-length float values. + +##### Args: + + +* <b>`x`</b>: Real-valued matrix of shape [n_samples, n_features...]. Can be + iterator that returns arrays of features. + +##### Returns: + + List of `FeatureColumn` objects. + diff --git a/tensorflow/g3doc/api_docs/python/functions_and_classes/shard6/tf.concat.md b/tensorflow/g3doc/api_docs/python/functions_and_classes/shard6/tf.concat.md deleted file mode 100644 index 51b93ff9d4..0000000000 --- a/tensorflow/g3doc/api_docs/python/functions_and_classes/shard6/tf.concat.md +++ /dev/null @@ -1,62 +0,0 @@ -### `tf.concat(*args, **kwargs)` {#concat} - -Concatenates tensors along one dimension. (deprecated) - -THIS FUNCTION IS DEPRECATED. It will be removed after 2016-12-14. -Instructions for updating: -This op will be removed after the deprecation date. Please switch to tf.concat_v2(). - -Concatenates the list of tensors `values` along dimension `concat_dim`. If -`values[i].shape = [D0, D1, ... Dconcat_dim(i), ...Dn]`, the concatenated -result has shape - - [D0, D1, ... Rconcat_dim, ...Dn] - -where - - Rconcat_dim = sum(Dconcat_dim(i)) - -That is, the data from the input tensors is joined along the `concat_dim` -dimension. - -The number of dimensions of the input tensors must match, and all dimensions -except `concat_dim` must be equal. - -For example: - -```python -t1 = [[1, 2, 3], [4, 5, 6]] -t2 = [[7, 8, 9], [10, 11, 12]] -tf.concat(0, [t1, t2]) ==> [[1, 2, 3], [4, 5, 6], [7, 8, 9], [10, 11, 12]] -tf.concat(1, [t1, t2]) ==> [[1, 2, 3, 7, 8, 9], [4, 5, 6, 10, 11, 12]] - -# tensor t3 with shape [2, 3] -# tensor t4 with shape [2, 3] -tf.shape(tf.concat(0, [t3, t4])) ==> [4, 3] -tf.shape(tf.concat(1, [t3, t4])) ==> [2, 6] -``` - -Note: If you are concatenating along a new axis consider using pack. -E.g. - -```python -tf.concat(axis, [tf.expand_dims(t, axis) for t in tensors]) -``` - -can be rewritten as - -```python -tf.pack(tensors, axis=axis) -``` - -##### Args: - - -* <b>`concat_dim`</b>: 0-D `int32` `Tensor`. Dimension along which to concatenate. -* <b>`values`</b>: A list of `Tensor` objects or a single `Tensor`. -* <b>`name`</b>: A name for the operation (optional). - -##### Returns: - - A `Tensor` resulting from concatenation of the input tensors. - diff --git a/tensorflow/g3doc/api_docs/python/functions_and_classes/shard9/tf.concat_v2.md b/tensorflow/g3doc/api_docs/python/functions_and_classes/shard9/tf.concat_v2.md index 33954139b9..6fcf4f72ad 100644 --- a/tensorflow/g3doc/api_docs/python/functions_and_classes/shard9/tf.concat_v2.md +++ b/tensorflow/g3doc/api_docs/python/functions_and_classes/shard9/tf.concat_v2.md @@ -36,7 +36,7 @@ Note: If you are concatenating along a new axis consider using pack. E.g. ```python -tf.concat(axis, [tf.expand_dims(t, axis) for t in tensors]) +tf.concat_v2([tf.expand_dims(t, axis) for t in tensors], axis) ``` can be rewritten as diff --git a/tensorflow/g3doc/api_docs/python/index.md b/tensorflow/g3doc/api_docs/python/index.md index 1a4f56c482..88963e871a 100644 --- a/tensorflow/g3doc/api_docs/python/index.md +++ b/tensorflow/g3doc/api_docs/python/index.md @@ -139,7 +139,6 @@ * [`broadcast_dynamic_shape`](../../api_docs/python/array_ops.md#broadcast_dynamic_shape) * [`broadcast_static_shape`](../../api_docs/python/array_ops.md#broadcast_static_shape) * [`cast`](../../api_docs/python/array_ops.md#cast) - * [`concat`](../../api_docs/python/array_ops.md#concat) * [`concat_v2`](../../api_docs/python/array_ops.md#concat_v2) * [`depth_to_space`](../../api_docs/python/array_ops.md#depth_to_space) * [`dequantize`](../../api_docs/python/array_ops.md#dequantize) @@ -365,7 +364,6 @@ * [`scan`](../../api_docs/python/functional_ops.md#scan) * **[TensorArray Operations](../../api_docs/python/tensor_array_ops.md)**: - * [`concat`](../../api_docs/python/tensor_array_ops.md#concat) * [`gather`](../../api_docs/python/tensor_array_ops.md#gather) * [`identity`](../../api_docs/python/tensor_array_ops.md#identity) * [`pack`](../../api_docs/python/tensor_array_ops.md#pack) @@ -980,6 +978,8 @@ * [`extract_pandas_labels`](../../api_docs/python/contrib.learn.md#extract_pandas_labels) * [`extract_pandas_matrix`](../../api_docs/python/contrib.learn.md#extract_pandas_matrix) * [`infer`](../../api_docs/python/contrib.learn.md#infer) + * [`infer_real_valued_columns_from_input`](../../api_docs/python/contrib.learn.md#infer_real_valued_columns_from_input) + * [`infer_real_valued_columns_from_input_fn`](../../api_docs/python/contrib.learn.md#infer_real_valued_columns_from_input_fn) * [`LinearClassifier`](../../api_docs/python/contrib.learn.md#LinearClassifier) * [`LinearRegressor`](../../api_docs/python/contrib.learn.md#LinearRegressor) * [`LogisticRegressor`](../../api_docs/python/contrib.learn.md#LogisticRegressor) |