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

Merge pull request #31082 from Huawei-MRC-OSI:trivial-conditions

Browse Source 
PiperOrigin-RevId: 260560709
This commit is contained in:
TensorFlower Gardener 2019-07-29 13:26:59 -07:00
commit 020f237557
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tensorflow/core/framework/tensor.cc
View File

@ -986,7 +986,7 @@ void PrintOneDim(int dim_index, const gtl::InlinedVector<int64, 4>& shape,
for (int64 i = 0; i < element_count; i++) { for (int64 i = 0; i < element_count; i++) {
if (*data_index >= limit) { if (*data_index >= limit) {
// If not enough elements has been printed, append "...". // If not enough elements has been printed, append "...".
if (dim_index != 0 && i < element_count) { if (dim_index != 0) {
strings::StrAppend(result, "..."); strings::StrAppend(result, "...");
} }
return; return;

2
tensorflow/core/grappler/optimizers/constant_folding.cc
View File

@ -3221,7 +3221,7 @@ bool ConstantFolding::PartialConcatConstFolding(GraphDef* optimized_graph,
// child node. // child node.
node->set_input(interval.first, added_node->name()); node->set_input(interval.first, added_node->name());
} }
if (!constant_input_runs.empty() && !inputs_to_delete.empty()) { if (!inputs_to_delete.empty()) {
// Fix up the inputs to the original node. // Fix up the inputs to the original node.
protobuf::RepeatedPtrField<string> tmp; protobuf::RepeatedPtrField<string> tmp;
tmp.Swap(node->mutable_input()); tmp.Swap(node->mutable_input());

4
tensorflow/core/kernels/data/cache_dataset_ops.cc
View File

@ -372,7 +372,9 @@ class CacheDatasetOp::FileDataset : public DatasetBase {
*end_of_sequence = true; *end_of_sequence = true;
return Status::OK(); return Status::OK();
} }
if (lockfile_created_ && !iteration_completed_) return Status::OK(); if (lockfile_created_) {
return Status::OK();
}
// Perform rudimentary locking to help catch concurrent writes to the // Perform rudimentary locking to help catch concurrent writes to the
// same cache files. // same cache files.