diff options
| author |  Andrew Harp <andrewharp@google.com> | 2016-12-08 20:05:49 -0800 |
|---|---|---|
| committer |  TensorFlower Gardener <gardener@tensorflow.org> | 2016-12-08 20:21:45 -0800 |
| commit | 1cb96893a64f59b7265f9def9968f7bed1e57662 (patch) | |
| tree | 0e6d595a0806028f5f92e64c84342ae9659ca108 /tensorflow/core/framework | |
| parent | 90b72f4b2f07a0126efb110d8d4cc96386fcc968 (diff) | |
Merge changes from github.
Additionally:
- change single quotes to double quotes to make path rewriting easier
- guard windows lib reference with PLATFORM_WINDOWS
- fixed failing kmeans test
Change: 141515942
Diffstat (limited to 'tensorflow/core/framework')
| -rw-r--r-- | tensorflow/core/framework/partial_tensor_shape_test.cc | 2 | ||||
| -rw-r--r-- | tensorflow/core/framework/tensor_testutil.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/tensorflow/core/framework/partial_tensor_shape_test.cc b/tensorflow/core/framework/partial_tensor_shape_test.cc index b008a93c03..23f3d908fb 100644 --- a/tensorflow/core/framework/partial_tensor_shape_test.cc +++ b/tensorflow/core/framework/partial_tensor_shape_test.cc @@ -220,7 +220,7 @@ TEST(PartialTensorShapeTest, PartialShapeMergeWith) { TEST(PartialTensorShapeTest, MakePartialShapeEmpty) { // Empty made partial shapes should still be fully defined - const int64 dims[0] = {}; + const int64 dims[1] = {}; PartialTensorShape shape; EXPECT_FALSE(shape.IsFullyDefined()); TF_ASSERT_OK(PartialTensorShape::MakePartialShape(dims, 0, &shape)); diff --git a/tensorflow/core/framework/tensor_testutil.h b/tensorflow/core/framework/tensor_testutil.h index 73afca40ac..29b9de5c07 100644 --- a/tensorflow/core/framework/tensor_testutil.h +++ b/tensorflow/core/framework/tensor_testutil.h @@ -16,6 +16,8 @@ limitations under the License. #ifndef TENSORFLOW_FRAMEWORK_TENSOR_TESTUTIL_H_ #define TENSORFLOW_FRAMEWORK_TENSOR_TESTUTIL_H_ +#include <numeric> + #include "tensorflow/core/framework/tensor.h" #include "tensorflow/core/lib/gtl/array_slice.h" #include "tensorflow/core/platform/logging.h" |