diff options
author | 2018-09-19 08:19:07 -0700 | |
---|---|---|
committer | 2018-09-19 08:23:13 -0700 | |
commit | e00d7744dbab5c73e4d8ffa8a7d361f7b2dcefff (patch) | |
tree | f2bf2e8fd776e11de859b6f1303db0d3426c7a8c /tensorflow/python/feature_column | |
parent | f8655c08cfe3bd99ec1703211e1c9154a14a6150 (diff) |
Automated rollback of commit 9fe177881224571aff0c267593f747f5fd7a2967
PiperOrigin-RevId: 213630404
Diffstat (limited to 'tensorflow/python/feature_column')
-rw-r--r-- | tensorflow/python/feature_column/feature_column.py | 12 | ||||
-rw-r--r-- | tensorflow/python/feature_column/feature_column_v2.py | 14 |
2 files changed, 4 insertions, 22 deletions
diff --git a/tensorflow/python/feature_column/feature_column.py b/tensorflow/python/feature_column/feature_column.py index 0d189320da..9984379e9d 100644 --- a/tensorflow/python/feature_column/feature_column.py +++ b/tensorflow/python/feature_column/feature_column.py @@ -301,17 +301,17 @@ class InputLayer(object): feature_columns, weight_collections=None, trainable=True, - cols_to_vars=None, - name='feature_column_input_layer'): + cols_to_vars=None): """See `input_layer`.""" self._feature_columns = feature_columns self._weight_collections = weight_collections self._trainable = trainable self._cols_to_vars = cols_to_vars - self._name = name self._input_layer_template = template.make_template( - self._name, _internal_input_layer, create_scope_now_=True) + 'feature_column_input_layer', + _internal_input_layer, + create_scope_now_=True) self._scope = self._input_layer_template.variable_scope def __call__(self, features): @@ -324,10 +324,6 @@ class InputLayer(object): scope=self._scope) @property - def name(self): - return self._name - - @property def non_trainable_variables(self): return self._input_layer_template.non_trainable_variables diff --git a/tensorflow/python/feature_column/feature_column_v2.py b/tensorflow/python/feature_column/feature_column_v2.py index 289f6d0d14..28c5c82d2c 100644 --- a/tensorflow/python/feature_column/feature_column_v2.py +++ b/tensorflow/python/feature_column/feature_column_v2.py @@ -2045,14 +2045,6 @@ class DenseColumn(FeatureColumn): pass -def is_feature_column_v2(feature_columns): - """Returns True if all feature columns are V2.""" - for feature_column in feature_columns: - if not isinstance(feature_column, FeatureColumn): - return False - return True - - def _create_weighted_sum(column, transformation_cache, state_manager, @@ -2790,12 +2782,6 @@ class SharedEmbeddingStateManager(Layer): return self._var_dict[name] -def maybe_create_shared_state_manager(feature_columns): - if is_feature_column_v2(feature_columns): - return SharedEmbeddingStateManager() - return None - - class SharedEmbeddingColumn( DenseColumn, SequenceDenseColumn, collections.namedtuple( |