Enabling the ability to build nbench at command line (#204)

tensorflow · Oct 2, 2018 · b65e834 · b65e834
1 parent 83fe3e7
commit b65e834
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -128,7 +128,7 @@ ExternalProject_Add(
         -DNGRAPH_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/ngraph/ngraph_dist 
         -DNGRAPH_USE_CXX_ABI=${TensorFlow_CXX_ABI}
         -DNGRAPH_UNIT_TEST_ENABLE=FALSE
-        -DNGRAPH_TOOLS_ENABLE=FALSE 
+        -DNGRAPH_TOOLS_ENABLE=${NGRAPH_TOOLS_ENABLE}
         -DNGRAPH_DEX_ONLY=TRUE         
         -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
         -DNGRAPH_GPU_ENABLE=${NGRAPH_GPU_ENABLE}

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -74,6 +74,11 @@ install(TARGETS ${LIB_NAME} DESTINATION "${CMAKE_INSTALL_PREFIX}/lib")
 # Next install all the other prerequisites
 install(DIRECTORY ${NGRAPH_INSTALL_DIR}/lib/ DESTINATION "${CMAKE_INSTALL_PREFIX}/lib" )
 
+#Install nbench if we built
+if(DEFINED NGRAPH_TOOLS_ENABLE)
+	install(DIRECTORY ${NGRAPH_INSTALL_DIR}/bin/ DESTINATION "${CMAKE_INSTALL_PREFIX}/bin" )
+endif()
+
 # Now create the Python pip package
 install(CODE "set(NGTF_INSTALL_DIR \"${CMAKE_INSTALL_PREFIX}/lib\")")
 install(CODE "set(TensorFlow_GIT_VERSION \"${TensorFlow_GIT_VERSION}\")")