ExternalSourceTools as a module (#1445)

ExternalSourceTools does not fit into the concept of packages in nncc as
it does not import (or build) any external dependencies, and is always
available.

This commit converts ExternalSource as a module.

Signed-off-by: Jonghyun Park <jh1302.park@samsung.com>

diff --git a/cmake/packages/ExternalSourceToolsConfig.cmake b/cmake/modules/ExternalSourceTools.cmake
similarity index 100%
rename from cmake/packages/ExternalSourceToolsConfig.cmake
rename to cmake/modules/ExternalSourceTools.cmake

diff --git a/cmake/packages/CaffeSourceConfig.cmake b/cmake/packages/CaffeSourceConfig.cmake
index 177e9ab..58abc2a 100644 (file)
--- a/cmake/packages/CaffeSourceConfig.cmake
+++ b/cmake/packages/CaffeSourceConfig.cmake
@@ -4,7 +4,7 @@ function(_CaffeSource_import)
     return()
   endif(NOT DOWNLOAD_CAFFE)
 
-  nncc_find_package(ExternalSourceTools REQUIRED)
+  nncc_include(ExternalSourceTools)
   nncc_find_package(OptionTools REQUIRED)
 
   envoption(CAFFE_URL https://github.com/BVLC/caffe/archive/1.0.tar.gz)

diff --git a/cmake/packages/EigenSourceConfig.cmake b/cmake/packages/EigenSourceConfig.cmake
index f897137..16ea805 100644 (file)
--- a/cmake/packages/EigenSourceConfig.cmake
+++ b/cmake/packages/EigenSourceConfig.cmake
@@ -4,7 +4,7 @@ function(_EigenSource_import)
     return()
   endif(NOT DOWNLOAD_EIGEN)
 
-  nncc_find_package(ExternalSourceTools REQUIRED)
+  nncc_include(ExternalSourceTools)
   nncc_find_package(OptionTools REQUIRED)
 
   # NOTE The following URL comes from TensorFlow 1.7

diff --git a/cmake/packages/FarmhashSourceConfig.cmake b/cmake/packages/FarmhashSourceConfig.cmake
index 4f5345b..c902ab4 100644 (file)
--- a/cmake/packages/FarmhashSourceConfig.cmake
+++ b/cmake/packages/FarmhashSourceConfig.cmake
@@ -4,7 +4,7 @@ function(_FarmhashSource_import)
     return()
   endif(NOT DOWNLOAD_FARMHASH)
 
-  nncc_find_package(ExternalSourceTools REQUIRED)
+  nncc_include(ExternalSourceTools)
   nncc_find_package(OptionTools REQUIRED)
 
   # NOTE TensorFlow 1.7 downloads farmhash from the following URL

diff --git a/cmake/packages/FlatBuffersSourceConfig.cmake b/cmake/packages/FlatBuffersSourceConfig.cmake
index f8f0907..4fd19a0 100644 (file)
--- a/cmake/packages/FlatBuffersSourceConfig.cmake
+++ b/cmake/packages/FlatBuffersSourceConfig.cmake
@@ -4,7 +4,7 @@ function(_FlatBuffersSource_import)
     return()
   endif(NOT DOWNLOAD_FLATBUFFERS)
 
-  nncc_find_package(ExternalSourceTools REQUIRED)
+  nncc_include(ExternalSourceTools)
   nncc_find_package(OptionTools REQUIRED)
 
   # NOTE TensorFlow 1.7 downloads FlatBuffers from the following URL

diff --git a/cmake/packages/GEMMLowpSourceConfig.cmake b/cmake/packages/GEMMLowpSourceConfig.cmake
index f58e1ab..eaab486 100644 (file)
--- a/cmake/packages/GEMMLowpSourceConfig.cmake
+++ b/cmake/packages/GEMMLowpSourceConfig.cmake
@@ -4,7 +4,7 @@ function(_GEMMLowpSource_import)
     return()
   endif(NOT DOWNLOAD_GEMMLOWP)
 
-  nncc_find_package(ExternalSourceTools REQUIRED)
+  nncc_include(ExternalSourceTools)
   nncc_find_package(OptionTools REQUIRED)
 
   # NOTE TensorFlow 1.7 uses the following URL

diff --git a/cmake/packages/GFlagsSourceConfig.cmake b/cmake/packages/GFlagsSourceConfig.cmake
index 89d230d..13bff9d 100644 (file)
--- a/cmake/packages/GFlagsSourceConfig.cmake
+++ b/cmake/packages/GFlagsSourceConfig.cmake
@@ -4,7 +4,7 @@ function(_GFlagsSource_import)
     return()
   endif(NOT DOWNLOAD_GFLAGS)
 
-  nncc_find_package(ExternalSourceTools REQUIRED)
+  nncc_include(ExternalSourceTools)
   nncc_find_package(OptionTools REQUIRED)
 
   envoption(GFLAGS_URL https://github.com/gflags/gflags/archive/v2.2.1.tar.gz)

diff --git a/cmake/packages/GTestConfig.cmake b/cmake/packages/GTestConfig.cmake
index 6698c92..32b1142 100644 (file)
--- a/cmake/packages/GTestConfig.cmake
+++ b/cmake/packages/GTestConfig.cmake
@@ -1,5 +1,5 @@
 if(${BUILD_GTEST})
-  nncc_find_package(ExternalSourceTools REQUIRED)
+  nncc_include(ExternalSourceTools)
   nncc_find_package(ExternalProjectTools REQUIRED)
   nncc_find_package(OptionTools REQUIRED)
 

diff --git a/cmake/packages/NEON2SSESourceConfig.cmake b/cmake/packages/NEON2SSESourceConfig.cmake
index 4dff2f0..f5d25dd 100644 (file)
--- a/cmake/packages/NEON2SSESourceConfig.cmake
+++ b/cmake/packages/NEON2SSESourceConfig.cmake
@@ -4,7 +4,7 @@ function(_NEON2SSESource_import)
     return()
   endif(NOT DOWNLOAD_NEON2SSE)
 
-  nncc_find_package(ExternalSourceTools REQUIRED)
+  nncc_include(ExternalSourceTools)
   nncc_find_package(OptionTools REQUIRED)
 
   # NOTE TensorFlow 1.7 downloads NEON2SSE from the following URL

diff --git a/cmake/packages/TensorFlowSourceConfig.cmake b/cmake/packages/TensorFlowSourceConfig.cmake
index f08e23d..f8b998d 100644 (file)
--- a/cmake/packages/TensorFlowSourceConfig.cmake
+++ b/cmake/packages/TensorFlowSourceConfig.cmake
@@ -4,7 +4,7 @@ function(_TensorFlowSource_import)
     return()
   endif(NOT DOWNLOAD_TENSORFLOW)
 
-  nncc_find_package(ExternalSourceTools REQUIRED)
+  nncc_include(ExternalSourceTools)
   nncc_find_package(OptionTools REQUIRED)
 
   envoption(TENSORFLOW_URL https://github.com/tensorflow/tensorflow/archive/v1.7.0.tar.gz)