From 405348050cff4d2d329669850da2a96a84946b08 Mon Sep 17 00:00:00 2001 From: Manjunath Kudlur Date: Thu, 10 Mar 2016 08:28:13 -0800 Subject: [PATCH] Removed tensorflow submodule, moved files one directory level below into inception/ Updated README --- .gitmodules | 3 -- WORKSPACE | 37 ------------------- inception/.gitignore | 7 ++++ inception/README.md | 5 ++- inception/WORKSPACE | 0 inception/{ => inception}/BUILD | 12 ------ .../{ => inception}/data/build_image_data.py | 0 .../data/build_imagenet_data.py | 0 .../data/download_and_preprocess_flowers.sh | 0 .../data/download_and_preprocess_imagenet.sh | 0 .../{ => inception}/data/download_imagenet.sh | 0 ...imagenet_2012_validation_synset_labels.txt | 0 .../data/imagenet_lsvrc_2015_synsets.txt | 0 .../data/imagenet_metadata.txt | 0 .../preprocess_imagenet_validation_data.py | 0 .../data/process_bounding_boxes.py | 0 inception/{ => inception}/dataset.py | 0 inception/{ => inception}/flowers_data.py | 0 inception/{ => inception}/flowers_eval.py | 0 inception/{ => inception}/flowers_train.py | 0 inception/{ => inception}/image_processing.py | 0 inception/{ => inception}/imagenet_data.py | 0 inception/{ => inception}/imagenet_eval.py | 0 inception/{ => inception}/imagenet_train.py | 0 inception/{ => inception}/inception_eval.py | 0 inception/{ => inception}/inception_model.py | 0 inception/{ => inception}/inception_train.py | 0 inception/{ => inception}/slim/BUILD | 9 ----- inception/{ => inception}/slim/README.md | 0 .../{ => inception}/slim/inception_model.py | 0 .../{ => inception}/slim/inception_test.py | 0 inception/{ => inception}/slim/losses.py | 0 inception/{ => inception}/slim/losses_test.py | 0 inception/{ => inception}/slim/ops.py | 0 inception/{ => inception}/slim/ops_test.py | 0 inception/{ => inception}/slim/scopes.py | 0 inception/{ => inception}/slim/scopes_test.py | 0 inception/{ => inception}/slim/slim.py | 0 inception/{ => inception}/slim/variables.py | 0 .../{ => inception}/slim/variables_test.py | 0 third_party | 1 - tools | 1 - 42 files changed, 10 insertions(+), 65 deletions(-) delete mode 100644 .gitmodules delete mode 100644 WORKSPACE create mode 100644 inception/.gitignore create mode 100644 inception/WORKSPACE rename inception/{ => inception}/BUILD (89%) rename inception/{ => inception}/data/build_image_data.py (100%) rename inception/{ => inception}/data/build_imagenet_data.py (100%) rename inception/{ => inception}/data/download_and_preprocess_flowers.sh (100%) rename inception/{ => inception}/data/download_and_preprocess_imagenet.sh (100%) rename inception/{ => inception}/data/download_imagenet.sh (100%) rename inception/{ => inception}/data/imagenet_2012_validation_synset_labels.txt (100%) rename inception/{ => inception}/data/imagenet_lsvrc_2015_synsets.txt (100%) rename inception/{ => inception}/data/imagenet_metadata.txt (100%) rename inception/{ => inception}/data/preprocess_imagenet_validation_data.py (100%) rename inception/{ => inception}/data/process_bounding_boxes.py (100%) rename inception/{ => inception}/dataset.py (100%) rename inception/{ => inception}/flowers_data.py (100%) rename inception/{ => inception}/flowers_eval.py (100%) rename inception/{ => inception}/flowers_train.py (100%) rename inception/{ => inception}/image_processing.py (100%) rename inception/{ => inception}/imagenet_data.py (100%) rename inception/{ => inception}/imagenet_eval.py (100%) rename inception/{ => inception}/imagenet_train.py (100%) rename inception/{ => inception}/inception_eval.py (100%) rename inception/{ => inception}/inception_model.py (100%) rename inception/{ => inception}/inception_train.py (100%) rename inception/{ => inception}/slim/BUILD (86%) rename inception/{ => inception}/slim/README.md (100%) rename inception/{ => inception}/slim/inception_model.py (100%) rename inception/{ => inception}/slim/inception_test.py (100%) rename inception/{ => inception}/slim/losses.py (100%) rename inception/{ => inception}/slim/losses_test.py (100%) rename inception/{ => inception}/slim/ops.py (100%) rename inception/{ => inception}/slim/ops_test.py (100%) rename inception/{ => inception}/slim/scopes.py (100%) rename inception/{ => inception}/slim/scopes_test.py (100%) rename inception/{ => inception}/slim/slim.py (100%) rename inception/{ => inception}/slim/variables.py (100%) rename inception/{ => inception}/slim/variables_test.py (100%) delete mode 120000 third_party delete mode 120000 tools diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 93ea8acd3aa..00000000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "tensorflow"] - path = tensorflow - url = https://github.com/tensorflow/tensorflow.git diff --git a/WORKSPACE b/WORKSPACE deleted file mode 100644 index 930a66c456d..00000000000 --- a/WORKSPACE +++ /dev/null @@ -1,37 +0,0 @@ -local_repository( - name = "tf", - path = __workspace_dir__ + "/tensorflow", -) - -load('//tensorflow/tensorflow:workspace.bzl', 'tf_workspace') -tf_workspace("tensorflow/") -# grpc expects //external:protobuf_clib and //external:protobuf_compiler -# to point to the protobuf's compiler library. -bind( - name = "protobuf_clib", - actual = "@tf//google/protobuf:protoc_lib", -) - -bind( - name = "protobuf_compiler", - actual = "@tf//google/protobuf:protoc_lib", -) - -git_repository( - name = "grpc", - commit = "73979f4", - init_submodules = True, - remote = "https://github.com/grpc/grpc.git", -) - -# protobuf expects //external:grpc_cpp_plugin to point to grpc's -# C++ plugin code generator. -bind( - name = "grpc_cpp_plugin", - actual = "@grpc//:grpc_cpp_plugin", -) - -bind( - name = "grpc_lib", - actual = "@grpc//:grpc++_unsecure", -) diff --git a/inception/.gitignore b/inception/.gitignore new file mode 100644 index 00000000000..58cbf2f4e0d --- /dev/null +++ b/inception/.gitignore @@ -0,0 +1,7 @@ +/bazel-bin +/bazel-ci_build-cache +/bazel-genfiles +/bazel-out +/bazel-inception +/bazel-testlogs +/bazel-tf diff --git a/inception/README.md b/inception/README.md index 082e902b5a4..669f1e802eb 100644 --- a/inception/README.md +++ b/inception/README.md @@ -57,9 +57,10 @@ change over time depending on usage and subsequent research. ## Getting Started -**NOTE** Before doing anything, we first need to build TensorFlow from source. +**NOTE** Before doing anything, we first need to build TensorFlow from source, +and installed as a PIP package. Please follow the instructions at -[Installing From Source](https://www.tensorflow.org/versions/r0.7/get_started/os_setup.html#installing-from-sources). +[Installing From Source](https://www.tensorflow.org/versions/r0.7/get_started/os_setup.html#create-the-pip-package-and-install). Before you run the training script for the first time, you will need to download and convert the ImageNet data to native TFRecord format. The TFRecord diff --git a/inception/WORKSPACE b/inception/WORKSPACE new file mode 100644 index 00000000000..e69de29bb2d diff --git a/inception/BUILD b/inception/inception/BUILD similarity index 89% rename from inception/BUILD rename to inception/inception/BUILD index f6c378291f1..3fedeea2448 100644 --- a/inception/BUILD +++ b/inception/inception/BUILD @@ -17,9 +17,6 @@ py_library( srcs = [ "dataset.py", ], - deps = [ - "@tf//tensorflow:tensorflow_py", - ], ) py_library( @@ -55,7 +52,6 @@ py_library( "inception_model.py", ], deps = [ - "@tf//tensorflow:tensorflow_py", ":dataset", "//inception/slim", ], @@ -89,7 +85,6 @@ py_library( "inception_eval.py", ], deps = [ - "@tf//tensorflow:tensorflow_py", ":image_processing", ":inception", ], @@ -123,7 +118,6 @@ py_library( "inception_train.py", ], deps = [ - "@tf//tensorflow:tensorflow_py", ":image_processing", ":inception", ], @@ -132,9 +126,6 @@ py_library( py_binary( name = "build_image_data", srcs = ["data/build_image_data.py"], - deps = [ - "@tf//tensorflow:tensorflow_py", - ], ) sh_binary( @@ -162,9 +153,6 @@ sh_binary( py_binary( name = "build_imagenet_data", srcs = ["data/build_imagenet_data.py"], - deps = [ - "@tf//tensorflow:tensorflow_py", - ], ) filegroup( diff --git a/inception/data/build_image_data.py b/inception/inception/data/build_image_data.py similarity index 100% rename from inception/data/build_image_data.py rename to inception/inception/data/build_image_data.py diff --git a/inception/data/build_imagenet_data.py b/inception/inception/data/build_imagenet_data.py similarity index 100% rename from inception/data/build_imagenet_data.py rename to inception/inception/data/build_imagenet_data.py diff --git a/inception/data/download_and_preprocess_flowers.sh b/inception/inception/data/download_and_preprocess_flowers.sh similarity index 100% rename from inception/data/download_and_preprocess_flowers.sh rename to inception/inception/data/download_and_preprocess_flowers.sh diff --git a/inception/data/download_and_preprocess_imagenet.sh b/inception/inception/data/download_and_preprocess_imagenet.sh similarity index 100% rename from inception/data/download_and_preprocess_imagenet.sh rename to inception/inception/data/download_and_preprocess_imagenet.sh diff --git a/inception/data/download_imagenet.sh b/inception/inception/data/download_imagenet.sh similarity index 100% rename from inception/data/download_imagenet.sh rename to inception/inception/data/download_imagenet.sh diff --git a/inception/data/imagenet_2012_validation_synset_labels.txt b/inception/inception/data/imagenet_2012_validation_synset_labels.txt similarity index 100% rename from inception/data/imagenet_2012_validation_synset_labels.txt rename to inception/inception/data/imagenet_2012_validation_synset_labels.txt diff --git a/inception/data/imagenet_lsvrc_2015_synsets.txt b/inception/inception/data/imagenet_lsvrc_2015_synsets.txt similarity index 100% rename from inception/data/imagenet_lsvrc_2015_synsets.txt rename to inception/inception/data/imagenet_lsvrc_2015_synsets.txt diff --git a/inception/data/imagenet_metadata.txt b/inception/inception/data/imagenet_metadata.txt similarity index 100% rename from inception/data/imagenet_metadata.txt rename to inception/inception/data/imagenet_metadata.txt diff --git a/inception/data/preprocess_imagenet_validation_data.py b/inception/inception/data/preprocess_imagenet_validation_data.py similarity index 100% rename from inception/data/preprocess_imagenet_validation_data.py rename to inception/inception/data/preprocess_imagenet_validation_data.py diff --git a/inception/data/process_bounding_boxes.py b/inception/inception/data/process_bounding_boxes.py similarity index 100% rename from inception/data/process_bounding_boxes.py rename to inception/inception/data/process_bounding_boxes.py diff --git a/inception/dataset.py b/inception/inception/dataset.py similarity index 100% rename from inception/dataset.py rename to inception/inception/dataset.py diff --git a/inception/flowers_data.py b/inception/inception/flowers_data.py similarity index 100% rename from inception/flowers_data.py rename to inception/inception/flowers_data.py diff --git a/inception/flowers_eval.py b/inception/inception/flowers_eval.py similarity index 100% rename from inception/flowers_eval.py rename to inception/inception/flowers_eval.py diff --git a/inception/flowers_train.py b/inception/inception/flowers_train.py similarity index 100% rename from inception/flowers_train.py rename to inception/inception/flowers_train.py diff --git a/inception/image_processing.py b/inception/inception/image_processing.py similarity index 100% rename from inception/image_processing.py rename to inception/inception/image_processing.py diff --git a/inception/imagenet_data.py b/inception/inception/imagenet_data.py similarity index 100% rename from inception/imagenet_data.py rename to inception/inception/imagenet_data.py diff --git a/inception/imagenet_eval.py b/inception/inception/imagenet_eval.py similarity index 100% rename from inception/imagenet_eval.py rename to inception/inception/imagenet_eval.py diff --git a/inception/imagenet_train.py b/inception/inception/imagenet_train.py similarity index 100% rename from inception/imagenet_train.py rename to inception/inception/imagenet_train.py diff --git a/inception/inception_eval.py b/inception/inception/inception_eval.py similarity index 100% rename from inception/inception_eval.py rename to inception/inception/inception_eval.py diff --git a/inception/inception_model.py b/inception/inception/inception_model.py similarity index 100% rename from inception/inception_model.py rename to inception/inception/inception_model.py diff --git a/inception/inception_train.py b/inception/inception/inception_train.py similarity index 100% rename from inception/inception_train.py rename to inception/inception/inception_train.py diff --git a/inception/slim/BUILD b/inception/inception/slim/BUILD similarity index 86% rename from inception/slim/BUILD rename to inception/inception/slim/BUILD index d28d4acdbfa..1c20b57967a 100644 --- a/inception/slim/BUILD +++ b/inception/inception/slim/BUILD @@ -10,9 +10,6 @@ exports_files(["LICENSE"]) py_library( name = "scopes", srcs = ["scopes.py"], - deps = [ - "@tf//tensorflow:tensorflow_py", - ], ) py_test( @@ -28,7 +25,6 @@ py_library( name = "variables", srcs = ["variables.py"], deps = [ - "@tf//tensorflow:tensorflow_py", ":scopes", ], ) @@ -45,9 +41,6 @@ py_test( py_library( name = "losses", srcs = ["losses.py"], - deps = [ - "@tf//tensorflow:tensorflow_py", - ], ) py_test( @@ -63,7 +56,6 @@ py_library( name = "ops", srcs = ["ops.py"], deps = [ - "@tf//tensorflow:tensorflow_py", ":losses", ":scopes", ":variables", @@ -84,7 +76,6 @@ py_library( name = "inception", srcs = ["inception_model.py"], deps = [ - "@tf//tensorflow:tensorflow_py", ":ops", ":scopes", ], diff --git a/inception/slim/README.md b/inception/inception/slim/README.md similarity index 100% rename from inception/slim/README.md rename to inception/inception/slim/README.md diff --git a/inception/slim/inception_model.py b/inception/inception/slim/inception_model.py similarity index 100% rename from inception/slim/inception_model.py rename to inception/inception/slim/inception_model.py diff --git a/inception/slim/inception_test.py b/inception/inception/slim/inception_test.py similarity index 100% rename from inception/slim/inception_test.py rename to inception/inception/slim/inception_test.py diff --git a/inception/slim/losses.py b/inception/inception/slim/losses.py similarity index 100% rename from inception/slim/losses.py rename to inception/inception/slim/losses.py diff --git a/inception/slim/losses_test.py b/inception/inception/slim/losses_test.py similarity index 100% rename from inception/slim/losses_test.py rename to inception/inception/slim/losses_test.py diff --git a/inception/slim/ops.py b/inception/inception/slim/ops.py similarity index 100% rename from inception/slim/ops.py rename to inception/inception/slim/ops.py diff --git a/inception/slim/ops_test.py b/inception/inception/slim/ops_test.py similarity index 100% rename from inception/slim/ops_test.py rename to inception/inception/slim/ops_test.py diff --git a/inception/slim/scopes.py b/inception/inception/slim/scopes.py similarity index 100% rename from inception/slim/scopes.py rename to inception/inception/slim/scopes.py diff --git a/inception/slim/scopes_test.py b/inception/inception/slim/scopes_test.py similarity index 100% rename from inception/slim/scopes_test.py rename to inception/inception/slim/scopes_test.py diff --git a/inception/slim/slim.py b/inception/inception/slim/slim.py similarity index 100% rename from inception/slim/slim.py rename to inception/inception/slim/slim.py diff --git a/inception/slim/variables.py b/inception/inception/slim/variables.py similarity index 100% rename from inception/slim/variables.py rename to inception/inception/slim/variables.py diff --git a/inception/slim/variables_test.py b/inception/inception/slim/variables_test.py similarity index 100% rename from inception/slim/variables_test.py rename to inception/inception/slim/variables_test.py diff --git a/third_party b/third_party deleted file mode 120000 index aab4d4d53e9..00000000000 --- a/third_party +++ /dev/null @@ -1 +0,0 @@ -tensorflow/third_party \ No newline at end of file diff --git a/tools b/tools deleted file mode 120000 index 19e3f35d40e..00000000000 --- a/tools +++ /dev/null @@ -1 +0,0 @@ -tensorflow/tools \ No newline at end of file