aboutsummaryrefslogtreecommitdiffhomepage
path: root/unsupported/test/cxx11_tensor_custom_op.cpp
diff options
context:
space:
mode:
authorGravatar Benoit Steiner <benoit.steiner.goog@gmail.com>2015-12-10 20:53:44 -0800
committerGravatar Benoit Steiner <benoit.steiner.goog@gmail.com>2015-12-10 20:53:44 -0800
commit9db8316c936b2d83e2b6484b681b275f9cccae95 (patch)
treeee57aef9e00325c684e49e2d3b6507225a4642ff /unsupported/test/cxx11_tensor_custom_op.cpp
parent4e324ca6ae1ae7b60e18227bbfdde9a0380e90e7 (diff)
Updated the cxx11_tensor_custom_op to not require cxx11.
Diffstat (limited to 'unsupported/test/cxx11_tensor_custom_op.cpp')
-rw-r--r--unsupported/test/cxx11_tensor_custom_op.cpp12
1 files changed, 8 insertions, 4 deletions
diff --git a/unsupported/test/cxx11_tensor_custom_op.cpp b/unsupported/test/cxx11_tensor_custom_op.cpp
index 7e33c9580..8baa477cc 100644
--- a/unsupported/test/cxx11_tensor_custom_op.cpp
+++ b/unsupported/test/cxx11_tensor_custom_op.cpp
@@ -25,7 +25,9 @@ struct InsertZeros {
template <typename Output, typename Device>
void eval(const Tensor<float, 2>& input, Output& output, const Device& device) const
{
- array<DenseIndex, 2> strides{{2, 2}};
+ array<DenseIndex, 2> strides;
+ strides[0] = 2;
+ strides[1] = 2;
output.stride(strides).device(device) = input;
Eigen::DSizes<DenseIndex, 2> offsets(1,1);
@@ -70,7 +72,8 @@ struct BatchMatMul {
Output& output, const Device& device) const
{
typedef Tensor<float, 3>::DimensionPair DimPair;
- array<DimPair, 1> dims({{DimPair(1, 0)}});
+ array<DimPair, 1> dims;
+ dims[0] = DimPair(1, 0);
for (int i = 0; i < output.dimension(2); ++i) {
output.template chip<2>(i).device(device) = input1.chip<2>(i).contract(input2.chip<2>(i), dims);
}
@@ -88,9 +91,10 @@ static void test_custom_binary_op()
Tensor<float, 3> result = tensor1.customOp(tensor2, BatchMatMul());
for (int i = 0; i < 5; ++i) {
typedef Tensor<float, 3>::DimensionPair DimPair;
- array<DimPair, 1> dims({{DimPair(1, 0)}});
+ array<DimPair, 1> dims;
+ dims[0] = DimPair(1, 0);
Tensor<float, 2> reference = tensor1.chip<2>(i).contract(tensor2.chip<2>(i), dims);
- TensorRef<Tensor<float, 2>> val = result.chip<2>(i);
+ TensorRef<Tensor<float, 2> > val = result.chip<2>(i);
for (int j = 0; j < 2; ++j) {
for (int k = 0; k < 7; ++k) {
VERIFY_IS_APPROX(val(j, k), reference(j, k));