diff options
| author |  Patrick Nguyen <drpng@google.com> | 2017-06-19 10:27:47 -0700 |
|---|---|---|
| committer |  TensorFlower Gardener <gardener@tensorflow.org> | 2017-06-19 10:31:41 -0700 |
| commit | affc8b084284125ac366d53b63dda7f57eb2d12a (patch) | |
| tree | ffa4ae0aaccaf21322aa6a3ec942b049f11be8af /tensorflow/contrib | |
| parent | 5479240a00e904b0f05fa4ae3760cb4deedb864c (diff) | |
Fix warnings.
Fixes #9138.
* lstm_ops: use_peephole checked twice, merged "if" bodies.
* unpack_path_op: cast to 1LL for shift to operate on full range.
* sample_input_ops: add CHECK to ensure that sparse_input_start is
initialized.
* function: make sure we deref "e" after checking for nullptr
* master_session: remove unused variable
* encode_jpeg_op: remove double assignment
* resize_area_op: use unused variable
* strcat: remove double parentheses
PiperOrigin-RevId: 159443547
Diffstat (limited to 'tensorflow/contrib')
3 files changed, 3 insertions, 4 deletions
diff --git a/tensorflow/contrib/rnn/kernels/lstm_ops.h b/tensorflow/contrib/rnn/kernels/lstm_ops.h index d9ed9e3ab7..6317f32ac3 100644 --- a/tensorflow/contrib/rnn/kernels/lstm_ops.h +++ b/tensorflow/contrib/rnn/kernels/lstm_ops.h @@ -279,9 +279,6 @@ struct LSTMBlockCellBprop : public LSTMBlockCell { cs_prev_grad + di * wci.reshape(p_shape).broadcast(p_broadcast_shape) + df * wcf.reshape(p_shape).broadcast(p_broadcast_shape); - } - - if (use_peephole) { wci_grad.device(d) = (di * cs_prev).sum(Eigen::array<int, 1>({0})); wcf_grad.device(d) = (df * cs_prev).sum(Eigen::array<int, 1>({0})); wco_grad.device(d) = (do_ * cs).sum(Eigen::array<int, 1>({0})); diff --git a/tensorflow/contrib/tensor_forest/hybrid/core/ops/unpack_path_op.cc b/tensorflow/contrib/tensor_forest/hybrid/core/ops/unpack_path_op.cc index 555674ca69..9d5e1400a5 100644 --- a/tensorflow/contrib/tensor_forest/hybrid/core/ops/unpack_path_op.cc +++ b/tensorflow/contrib/tensor_forest/hybrid/core/ops/unpack_path_op.cc @@ -52,7 +52,7 @@ REGISTER_OP("UnpackPath") auto tree_depth = c->Dim(params, 1); int64 num_nodes = InferenceContext::kUnknownDim; if (c->ValueKnown(tree_depth)) { - num_nodes = (1 << c->Value(tree_depth)) - 1; + num_nodes = (static_cast<int64>(1) << c->Value(tree_depth)) - 1; } c->set_output(0, c->Matrix(num_points, num_nodes)); diff --git a/tensorflow/contrib/tensor_forest/kernels/sample_inputs_op.cc b/tensorflow/contrib/tensor_forest/kernels/sample_inputs_op.cc index 6bfc29d96f..3ddc72f216 100644 --- a/tensorflow/contrib/tensor_forest/kernels/sample_inputs_op.cc +++ b/tensorflow/contrib/tensor_forest/kernels/sample_inputs_op.cc @@ -284,6 +284,8 @@ class SampleInputs : public OpKernel { index = rand_feature; val = inputs(*it, rand_feature); } else { + CHECK(sparse_input) << rand_feature << " selected, and dense is " + << input_spec_.dense_features_size(); const auto indices = sparse_input_indices.matrix<int64>(); const auto values = sparse_input_values.vec<float>(); const int32 sparse_index = sparse_input_start + rand_feature - |