Unify graphdef and graphdump (#453)

This commit unifies graphdef and graphdump projects into tf_model_tools
(to make it easy to understand what they are).

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

diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index cf71ba7..3956899 100644 (file)
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -1,7 +1,4 @@
-# TODO add graphdump for arm cross build
-if(ROOTFS_ARM STREQUAL "")
-  add_subdirectory(graphdump)
-endif()
+add_subdirectory(tf_model_tools)
 add_subdirectory(tflite_run)
 add_subdirectory(tflite_benchmark)
 add_subdirectory(tflite_examples)

diff --git a/tools/graphdump/CMakeLists.txt b/tools/graphdump/CMakeLists.txt
deleted file mode 100644 (file)
index 7d6a462..0000000
--- a/tools/graphdump/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-# NOTE Graph dump uses libtensorflow_graphdef
-# TODO Reduce indentation level
-  list(APPEND SRCS "src/graphdump.cc")
-
-  add_executable(graphdump ${SRCS})
-  target_link_libraries(graphdump tensorflow_graphdef)

diff --git a/tools/tf_model_tools/CMakeLists.txt b/tools/tf_model_tools/CMakeLists.txt
new file mode 100644 (file)
index 0000000..92a9a6d
--- /dev/null
+++ b/tools/tf_model_tools/CMakeLists.txt
@@ -0,0 +1,8 @@
+# NOTE Graph dump uses libtensorflow_graphdef
+# TODO Reduce indentation level
+if(TARGET tensorflow_graphdef)
+  list(APPEND SRCS "tf_model_dump.cc")
+
+  add_executable(tf_model_dump ${SRCS})
+  target_link_libraries(tf_model_dump tensorflow_graphdef)
+endif(TARGET tensorflow_graphdef)

diff --git a/tools/graphdef/README.md b/tools/tf_model_tools/scripts/README.md
similarity index 100%
rename from tools/graphdef/README.md
rename to tools/tf_model_tools/scripts/README.md

diff --git a/tools/graphdef/decode.sh b/tools/tf_model_tools/scripts/decode.sh
similarity index 77%
rename from tools/graphdef/decode.sh
rename to tools/tf_model_tools/scripts/decode.sh
index 80b7f54..e428f50 100755 (executable)
--- a/tools/graphdef/decode.sh
+++ b/tools/tf_model_tools/scripts/decode.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 TOOLCHAIN_BASE="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-TENSORFLOW_BASE="${TOOLCHAIN_BASE}/../../externals/tensorflow"
+TENSORFLOW_BASE="${TOOLCHAIN_BASE}/../../../externals/tensorflow"
 
 PROTOC="protoc"
 

diff --git a/tools/graphdef/encode.sh b/tools/tf_model_tools/scripts/encode.sh
similarity index 77%
rename from tools/graphdef/encode.sh
rename to tools/tf_model_tools/scripts/encode.sh
index 68f03c7..33137be 100755 (executable)
--- a/tools/graphdef/encode.sh
+++ b/tools/tf_model_tools/scripts/encode.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 TOOLCHAIN_BASE="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-TENSORFLOW_BASE="${TOOLCHAIN_BASE}/../../externals/tensorflow"
+TENSORFLOW_BASE="${TOOLCHAIN_BASE}/../../../externals/tensorflow"
 
 PROTOC="protoc"
 

diff --git a/tools/graphdump/src/graphdump.cc b/tools/tf_model_tools/tf_model_dump.cc
similarity index 100%
rename from tools/graphdump/src/graphdump.cc
rename to tools/tf_model_tools/tf_model_dump.cc