Merge pull request tensorflow#10 from keveman/master

Removed tensorflow submodule
lukaszkaiser · Mar 10, 2016 · 9a5dcf8 · 9a5dcf8
2 parents 1a69aaa + 4053480
commit 9a5dcf8
Show file tree

Hide file tree

Showing 42 changed files with 10 additions and 65 deletions.
diff --git a/.gitmodules b/.gitmodules
diff --git a/WORKSPACE b/WORKSPACE
diff --git a/inception/.gitignore 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
@@ -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
diff --git a/inception/BUILD → inception/inception/BUILD b/inception/BUILD → 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 → inception/inception/data/build_image_data.py b/inception/data/build_image_data.py → inception/inception/data/build_image_data.py
diff --git a/inception/data/build_imagenet_data.py → ...ion/inception/data/build_imagenet_data.py b/inception/data/build_imagenet_data.py → ...ion/inception/data/build_imagenet_data.py
diff --git a/...n/data/download_and_preprocess_flowers.sh → ...n/data/download_and_preprocess_flowers.sh b/...n/data/download_and_preprocess_flowers.sh → ...n/data/download_and_preprocess_flowers.sh
diff --git a/.../data/download_and_preprocess_imagenet.sh → .../data/download_and_preprocess_imagenet.sh b/.../data/download_and_preprocess_imagenet.sh → .../data/download_and_preprocess_imagenet.sh
diff --git a/inception/data/download_imagenet.sh → ...ption/inception/data/download_imagenet.sh b/inception/data/download_imagenet.sh → ...ption/inception/data/download_imagenet.sh
diff --git a/...magenet_2012_validation_synset_labels.txt → ...magenet_2012_validation_synset_labels.txt b/...magenet_2012_validation_synset_labels.txt → ...magenet_2012_validation_synset_labels.txt
diff --git a/...tion/data/imagenet_lsvrc_2015_synsets.txt → ...tion/data/imagenet_lsvrc_2015_synsets.txt b/...tion/data/imagenet_lsvrc_2015_synsets.txt → ...tion/data/imagenet_lsvrc_2015_synsets.txt
diff --git a/inception/data/imagenet_metadata.txt → ...tion/inception/data/imagenet_metadata.txt b/inception/data/imagenet_metadata.txt → ...tion/inception/data/imagenet_metadata.txt
diff --git a/...ta/preprocess_imagenet_validation_data.py → ...ta/preprocess_imagenet_validation_data.py b/...ta/preprocess_imagenet_validation_data.py → ...ta/preprocess_imagenet_validation_data.py
diff --git a/inception/data/process_bounding_boxes.py → .../inception/data/process_bounding_boxes.py b/inception/data/process_bounding_boxes.py → .../inception/data/process_bounding_boxes.py
diff --git a/inception/dataset.py → inception/inception/dataset.py b/inception/dataset.py → inception/inception/dataset.py
diff --git a/inception/flowers_data.py → inception/inception/flowers_data.py b/inception/flowers_data.py → inception/inception/flowers_data.py
diff --git a/inception/flowers_eval.py → inception/inception/flowers_eval.py b/inception/flowers_eval.py → inception/inception/flowers_eval.py
diff --git a/inception/flowers_train.py → inception/inception/flowers_train.py b/inception/flowers_train.py → inception/inception/flowers_train.py
diff --git a/inception/image_processing.py → inception/inception/image_processing.py b/inception/image_processing.py → inception/inception/image_processing.py
diff --git a/inception/imagenet_data.py → inception/inception/imagenet_data.py b/inception/imagenet_data.py → inception/inception/imagenet_data.py
diff --git a/inception/imagenet_eval.py → inception/inception/imagenet_eval.py b/inception/imagenet_eval.py → inception/inception/imagenet_eval.py
diff --git a/inception/imagenet_train.py → inception/inception/imagenet_train.py b/inception/imagenet_train.py → inception/inception/imagenet_train.py
diff --git a/inception/inception_eval.py → inception/inception/inception_eval.py b/inception/inception_eval.py → inception/inception/inception_eval.py
diff --git a/inception/inception_model.py → inception/inception/inception_model.py b/inception/inception_model.py → inception/inception/inception_model.py
diff --git a/inception/inception_train.py → inception/inception/inception_train.py b/inception/inception_train.py → inception/inception/inception_train.py
diff --git a/inception/slim/BUILD → inception/inception/slim/BUILD b/inception/slim/BUILD → 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 → inception/inception/slim/README.md b/inception/slim/README.md → inception/inception/slim/README.md
diff --git a/inception/slim/inception_model.py → inception/inception/slim/inception_model.py b/inception/slim/inception_model.py → inception/inception/slim/inception_model.py
diff --git a/inception/slim/inception_test.py → inception/inception/slim/inception_test.py b/inception/slim/inception_test.py → inception/inception/slim/inception_test.py
diff --git a/inception/slim/losses.py → inception/inception/slim/losses.py b/inception/slim/losses.py → inception/inception/slim/losses.py
diff --git a/inception/slim/losses_test.py → inception/inception/slim/losses_test.py b/inception/slim/losses_test.py → inception/inception/slim/losses_test.py
diff --git a/inception/slim/ops.py → inception/inception/slim/ops.py b/inception/slim/ops.py → inception/inception/slim/ops.py
diff --git a/inception/slim/ops_test.py → inception/inception/slim/ops_test.py b/inception/slim/ops_test.py → inception/inception/slim/ops_test.py
diff --git a/inception/slim/scopes.py → inception/inception/slim/scopes.py b/inception/slim/scopes.py → inception/inception/slim/scopes.py
diff --git a/inception/slim/scopes_test.py → inception/inception/slim/scopes_test.py b/inception/slim/scopes_test.py → inception/inception/slim/scopes_test.py
diff --git a/inception/slim/slim.py → inception/inception/slim/slim.py b/inception/slim/slim.py → inception/inception/slim/slim.py
diff --git a/inception/slim/variables.py → inception/inception/slim/variables.py b/inception/slim/variables.py → inception/inception/slim/variables.py
diff --git a/inception/slim/variables_test.py → inception/inception/slim/variables_test.py b/inception/slim/variables_test.py → inception/inception/slim/variables_test.py
diff --git a/third_party b/third_party
diff --git a/tools b/tools