diff options
| author |  Michael Case <mikecase@google.com> | 2018-04-05 07:34:25 -0700 |
|---|---|---|
| committer | Michael Case <mikecase@google.com> | 2018-04-05 07:34:25 -0700 |
| commit | c9c17e3d277fffba647d76f1c3a1cfa4b3001761 (patch) | |
| tree | 1073e8354148c398d6abb87817e2d70e7eef582a /tensorflow/contrib/training | |
| parent | c1c819b28476d72c1f086fc4e78ff7f013c225ce (diff) | |
| parent | 361a13cf0c2b65d26f6e2b5b68875adfcea98dd0 (diff) | |
Merge commit for internal changes
Diffstat (limited to 'tensorflow/contrib/training')
| -rw-r--r-- | tensorflow/contrib/training/python/training/batch_sequences_with_states_test.py | 2 | ||||
| -rw-r--r-- | tensorflow/contrib/training/python/training/sequence_queueing_state_saver.py | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/tensorflow/contrib/training/python/training/batch_sequences_with_states_test.py b/tensorflow/contrib/training/python/training/batch_sequences_with_states_test.py index dbdbb08a82..f305197c19 100644 --- a/tensorflow/contrib/training/python/training/batch_sequences_with_states_test.py +++ b/tensorflow/contrib/training/python/training/batch_sequences_with_states_test.py @@ -27,6 +27,7 @@ from tensorflow.python.framework import dtypes from tensorflow.python.framework import errors_impl from tensorflow.python.framework import ops from tensorflow.python.framework import sparse_tensor +from tensorflow.python.framework import test_util from tensorflow.python.ops import array_ops from tensorflow.python.ops import math_ops from tensorflow.python.ops import random_ops @@ -517,6 +518,7 @@ class BatchSequencesWithStatesTestWithCApi(BatchSequencesWithStatesTest): ops._USE_C_API = self._prev_value +@test_util.with_c_api class PaddingTest(test.TestCase): def testPaddingInvalidLengths(self): diff --git a/tensorflow/contrib/training/python/training/sequence_queueing_state_saver.py b/tensorflow/contrib/training/python/training/sequence_queueing_state_saver.py index 7223194885..99d486b183 100644 --- a/tensorflow/contrib/training/python/training/sequence_queueing_state_saver.py +++ b/tensorflow/contrib/training/python/training/sequence_queueing_state_saver.py @@ -1574,8 +1574,9 @@ def _padding(sequences, num_unroll): if not sequences: return 0, {} - sequences_dict = {} - for key, value in sequences.items(): + # Sort 'sequences_dict' so 'length' will have a predictable value below. + sequences_dict = collections.OrderedDict() + for key, value in sorted(sequences.items()): if not (isinstance(value, sparse_tensor.SparseTensor) or isinstance(value, sparse_tensor.SparseTensorValue)): sequences_dict[key] = ops.convert_to_tensor(value) |