1 files changed, 0 insertions, 19 deletions
diff --git a/eval/src/tests/tensor/tensor_conformance/tensor_conformance_test.cpp b/eval/src/tests/tensor/tensor_conformance/tensor_conformance_test.cpp
index 6468f50a00e..765905c67fc 100644
--- a/eval/src/tests/tensor/tensor_conformance/tensor_conformance_test.cpp
+++ b/eval/src/tests/tensor/tensor_conformance/tensor_conformance_test.cpp
@@ -1,32 +1,20 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #include <vespa/vespalib/testkit/test_kit.h>
 #include <vespa/eval/eval/test/tensor_conformance.h>
-#include <vespa/eval/eval/simple_tensor_engine.h>
 #include <vespa/eval/eval/simple_value.h>
 #include <vespa/eval/streamed/streamed_value_builder_factory.h>
 #include <vespa/eval/eval/fast_value.h>
-#include <vespa/eval/tensor/default_tensor_engine.h>
 #include <vespa/vespalib/util/stringfmt.h>
 
 using vespalib::eval::SimpleValueBuilderFactory;
 using vespalib::eval::StreamedValueBuilderFactory;
 using vespalib::eval::FastValueBuilderFactory;
-using vespalib::eval::SimpleTensorEngine;
 using vespalib::eval::test::TensorConformance;
-using vespalib::tensor::DefaultTensorEngine;
 using vespalib::make_string;
 
 vespalib::string module_src_path(TEST_PATH("../../../../"));
 vespalib::string module_build_path("../../../../");
 
-TEST("require that reference tensor implementation passes all conformance tests") {
-    TEST_DO(TensorConformance::run_tests(module_src_path, SimpleTensorEngine::ref()));
-}
-
-TEST("require that production tensor implementation passes all conformance tests") {
-    TEST_DO(TensorConformance::run_tests(module_src_path, DefaultTensorEngine::ref()));
-}
-
 TEST("require that SimpleValue implementation passes all conformance tests") {
     TEST_DO(TensorConformance::run_tests(module_src_path, SimpleValueBuilderFactory::get()));
 }
@@ -46,13 +34,6 @@ TEST("require that tensor serialization test spec can be generated") {
     EXPECT_EQUAL(system(make_string("diff -u %s binary_test_spec.json", spec.c_str()).c_str()), 0);
 }
 
-TEST("require that cross-language tensor conformance test spec can be generated") {
-    vespalib::string spec = module_src_path + "src/apps/tensor_conformance/test_spec.json";
-    vespalib::string binary = module_build_path + "src/apps/tensor_conformance/vespa-tensor-conformance";
-    EXPECT_EQUAL(system(make_string("%s generate > conformance_test_spec.json", binary.c_str()).c_str()), 0);
-    EXPECT_EQUAL(system(make_string("%s compare %s conformance_test_spec.json", binary.c_str(), spec.c_str()).c_str()), 0);
-}
-
 TEST("require that cross-language tensor conformance tests pass with production C++ expression evaluation") {
     vespalib::string spec = module_src_path + "src/apps/tensor_conformance/test_spec.json";
     vespalib::string binary = module_build_path + "src/apps/tensor_conformance/vespa-tensor-conformance";