Restructure tools directory

src/tools/CMakeLists.txt

@@ -14,26 +14,4 @@
 # limitations under the License.
 # ******************************************************************************
 
-if(MKLDNN_INCLUDE_DIR)
-    link_directories(${MKLDNN_LIB_DIR})
-endif()
-
-if (NGRAPH_CPU_ENABLE)
-    set (SRC
-        nbench.cpp
-        ${PROJECT_SOURCE_DIR}/test/util/benchmark.cpp
-    )
-
-    add_executable(nbench ${SRC})
-    add_dependencies(nbench ngraph)
-
-    set(HEADER_SEARCH_DEFINES
-        "NGRAPH_HEADERS_PATH=\"${NGRAPH_INCLUDE_PATH}\""
-    )
-
-    target_link_libraries(nbench ngraph)
-    include_directories(SYSTEM ${JSON_INCLUDE_DIR})
-
-    set_source_files_properties(nbench.cpp PROPERTIES COMPILE_DEFINITIONS "${HEADER_SEARCH_DEFINES}")
-
-endif()
+add_subdirectory(nbench)

src/tools/nbench/CMakeLists.txt

+# ******************************************************************************
+# Copyright 2017-2018 Intel Corporation
+#
+# 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
+# limitations under the License.
+# ******************************************************************************
+
+if(MKLDNN_INCLUDE_DIR)
+    link_directories(${MKLDNN_LIB_DIR})
+endif()
+
+if (NGRAPH_CPU_ENABLE)
+    set (SRC
+        nbench.cpp
+        ${PROJECT_SOURCE_DIR}/test/util/benchmark.cpp
+    )
+
+    add_executable(nbench ${SRC})
+    add_dependencies(nbench ngraph)
+
+    set(HEADER_SEARCH_DEFINES
+        "NGRAPH_HEADERS_PATH=\"${NGRAPH_INCLUDE_PATH}\""
+    )
+
+    target_link_libraries(nbench ngraph)
+    include_directories("${PROJECT_SOURCE_DIR}/test")
+
+    set_source_files_properties(nbench.cpp PROPERTIES COMPILE_DEFINITIONS "${HEADER_SEARCH_DEFINES}")
+
+endif()

src/tools/nbench.cpp → src/tools/nbench/nbench.cpp

@@ -24,8 +24,8 @@
 #include <ngraph/runtime/backend.hpp>
 #include <ngraph/runtime/call_frame.hpp>
 #include <ngraph/runtime/manager.hpp>
-#include "../../test/util/benchmark.hpp"
-#include "../../test/util/test_tools.hpp"
+#include "util/benchmark.hpp"
+#include "util/test_tools.hpp"
 using namespace std;
 
 int main(int argc, char** argv)
@@ -66,16 +66,16 @@ int main(int argc, char** argv)
     if (failed)
     {
         cout << R"###(
-DESCRIPTION                                                         
-    Benchmark ngraph json model with given backend.                 
-                                                                    
-SYNOPSIS                                                            
+DESCRIPTION
+    Benchmark ngraph json model with given backend.
+
+SYNOPSIS
         nbench [-f <filename>] [-b <backend>] [-i <iterations>]
-                                                                    
-OPTIONS                                                             
-        -f          model json file to use (default: model.json)    
-        -b          Backend to use (default: INTERPRETER)           
-        -i          Iterations (default: 10)                        
+
+OPTIONS
+        -f          model json file to use (default: model.json)
+        -b          Backend to use (default: INTERPRETER)
+        -i          Iterations (default: 10)
 )###";
         return 1;
     }