Merge pull request #216 from NervanaSystems/bob/test_cleanup

Bob/test cleanup

src/ngraph/CMakeLists.txt

@@ -77,7 +77,6 @@ set (SRC
     runtime/tensor_view.cpp
     runtime/tuple.cpp
     runtime/utils.cpp
-    test/all_close.cpp
     shape.cpp
     types/element_type.cpp
     types/type.cpp

test/CMakeLists.txt

@@ -22,10 +22,8 @@ include_directories(
     )
 
 set (SRC
-    autodiff.cpp
     build_graph.cpp
     eigen.cpp
-    element_type.cpp
     execute.cpp
     input_output_assign.cpp
     main.cpp
@@ -35,9 +33,11 @@ set (SRC
     pass_memory_layout.cpp
     shape.cpp
     tensor.cpp
-    test_tools.cpp
     topological_sort.cpp
     type_prop.cpp
+    util/all_close.cpp
+    util/autodiff.cpp
+    util/test_tools.cpp
     util.cpp
     uuid.cpp
 )

test/element_type.cpp

-// ----------------------------------------------------------------------------
-// Copyright 2017 Nervana Systems Inc.
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// ----------------------------------------------------------------------------
-
-#include <sstream>
-#include <string>
-#include <vector>
-
-#include "gtest/gtest.h"
-
-#include "ngraph/types/element_type.hpp"
-
-using namespace ngraph;

test/pass_liveness.cpp

@@ -30,7 +30,7 @@
 #include "ngraph/pass/topological_sort.hpp"
 #include "ngraph/pass/visualize_tree.hpp"
 
-#include "test_tools.hpp"
+#include "util/test_tools.hpp"
 
 using namespace std;
 using namespace ngraph;

test/pass_manager.cpp

@@ -25,7 +25,7 @@
 #include "ngraph/pass/propagate_types.hpp"
 #include "ngraph/pass/topological_sort.hpp"
 #include "ngraph/util.hpp"
-#include "test_tools.hpp"
+#include "util/test_tools.hpp"
 
 using namespace ngraph;
 using namespace std;

test/pass_memory_layout.cpp

@@ -29,7 +29,7 @@
 #include "ngraph/pass/propagate_types.hpp"
 #include "ngraph/pass/topological_sort.hpp"
 #include "ngraph/pass/visualize_tree.hpp"
-#include "test_tools.hpp"
+#include "util/test_tools.hpp"
 
 using namespace ngraph;
 using namespace std;

test/tensor.cpp

@@ -26,7 +26,7 @@
 #include "ngraph/pass/manager.hpp"
 #include "ngraph/pass/propagate_types.hpp"
 #include "ngraph/pass/topological_sort.hpp"
-#include "test_tools.hpp"
+#include "util/test_tools.hpp"
 
 using namespace std;
 using namespace ngraph;

test/topological_sort.cpp

@@ -29,7 +29,7 @@
 #include "ngraph/pass/topological_sort.hpp"
 #include "ngraph/pass/visualize_tree.hpp"
 #include "ngraph/util.hpp"
-#include "test_tools.hpp"
+#include "util/test_tools.hpp"
 
 using namespace std;
 using namespace ngraph;

test/util.cpp

@@ -19,8 +19,8 @@
 #include "gtest/gtest.h"
 
 #include "ngraph/ngraph.hpp"
-#include "ngraph/test/all_close.hpp"
 #include "ngraph/util.hpp"
+#include "util/all_close.hpp"
 
 using namespace std;
 using namespace ngraph;

src/ngraph/test/all_close.cpp → test/util/all_close.cpp

@@ -16,8 +16,8 @@
 #include <memory>
 #include <vector>
 
+#include "all_close.hpp"
 #include "ngraph/except.hpp"
-#include "ngraph/test/all_close.hpp"
 
 template <typename ET>
 bool ngraph::test::all_close(

test/autodiff.cpp → test/util/autodiff.cpp

@@ -19,12 +19,12 @@
 
 #include "gtest/gtest.h"
 
+#include "all_close.hpp"
 #include "ngraph/autodiff/backprop_derivative.hpp"
 #include "ngraph/autodiff/backprop_function.hpp"
 #include "ngraph/autodiff/numeric_derivative.hpp"
 #include "ngraph/ngraph.hpp"
-#include "ngraph/test/all_close.hpp"
-#include "ngraph/test/random.hpp"
+#include "random.hpp"
 
 using namespace std;
 using namespace ngraph;