experiments/STT-tensorflow
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #20539 from candyzone:master

Browse Source 
PiperOrigin-RevId: 214121495
This commit is contained in:
TensorFlower Gardener 2018-09-22 10:57:06 -07:00
commit 425e96f3ae
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tensorflow/contrib/layers/python/layers/embedding_ops.py
View File

@ -112,9 +112,11 @@ def safe_embedding_lookup_sparse(embedding_weights,
dtype = sparse_weights.dtype if sparse_weights is not None else None dtype = sparse_weights.dtype if sparse_weights is not None else None
if isinstance(embedding_weights, variables.PartitionedVariable): if isinstance(embedding_weights, variables.PartitionedVariable):
embedding_weights = list(embedding_weights) embedding_weights = list(embedding_weights)
embedding_weights = [ if not isinstance(embedding_weights[0],
ops.convert_to_tensor(w, dtype=dtype) for w in embedding_weights resource_variable_ops.ResourceVariable):
] embedding_weights = [
ops.convert_to_tensor(w, dtype=dtype) for w in embedding_weights
]
contrib_tensor_util.assert_same_float_dtype(embedding_weights + contrib_tensor_util.assert_same_float_dtype(embedding_weights +
[sparse_weights]) [sparse_weights])

8
tensorflow/python/feature_column/feature_column_v2.py
View File

@ -3433,9 +3433,11 @@ def _safe_embedding_lookup_sparse(embedding_weights,
raise ValueError('Missing embedding_weights %s.' % embedding_weights) raise ValueError('Missing embedding_weights %s.' % embedding_weights)
dtype = sparse_weights.dtype if sparse_weights is not None else None dtype = sparse_weights.dtype if sparse_weights is not None else None
embedding_weights = [ if not isinstance(embedding_weights[0],
ops.convert_to_tensor(w, dtype=dtype) for w in embedding_weights resource_variable_ops.ResourceVariable):
] embedding_weights = [
ops.convert_to_tensor(w, dtype=dtype) for w in embedding_weights
]
with ops.name_scope(name, 'embedding_lookup', with ops.name_scope(name, 'embedding_lookup',
embedding_weights + [sparse_ids, embedding_weights + [sparse_ids,

8
tensorflow/python/ops/embedding_ops.py
View File

@ -550,9 +550,11 @@ def safe_embedding_lookup_sparse(embedding_weights,
raise ValueError('Missing embedding_weights %s.' % embedding_weights) raise ValueError('Missing embedding_weights %s.' % embedding_weights)
dtype = sparse_weights.dtype if sparse_weights is not None else None dtype = sparse_weights.dtype if sparse_weights is not None else None
embedding_weights = [ if not isinstance(embedding_weights[0],
ops.convert_to_tensor(w, dtype=dtype) for w in embedding_weights resource_variable_ops.ResourceVariable):
] embedding_weights = [
ops.convert_to_tensor(w, dtype=dtype) for w in embedding_weights
]
with ops.name_scope(name, 'embedding_lookup', with ops.name_scope(name, 'embedding_lookup',
embedding_weights + [sparse_ids, embedding_weights + [sparse_ids,