Selaa lähdekoodia

Merge pull request #10 from keveman/master

Removed tensorflow submodule
Martin Wicke 9 vuotta sitten
vanhempi
commit
9a5dcf8c99
42 muutettua tiedostoa jossa 10 lisäystä ja 65 poistoa
  1. 0 3
      .gitmodules
  2. 0 37
      WORKSPACE
  3. 7 0
      inception/.gitignore
  4. 3 2
      inception/README.md
  5. 0 0
      inception/WORKSPACE
  6. 0 12
      inception/BUILD
  7. 0 0
      inception/inception/data/build_image_data.py
  8. 0 0
      inception/inception/data/build_imagenet_data.py
  9. 0 0
      inception/inception/data/download_and_preprocess_flowers.sh
  10. 0 0
      inception/inception/data/download_and_preprocess_imagenet.sh
  11. 0 0
      inception/inception/data/download_imagenet.sh
  12. 0 0
      inception/inception/data/imagenet_2012_validation_synset_labels.txt
  13. 0 0
      inception/inception/data/imagenet_lsvrc_2015_synsets.txt
  14. 0 0
      inception/inception/data/imagenet_metadata.txt
  15. 0 0
      inception/inception/data/preprocess_imagenet_validation_data.py
  16. 0 0
      inception/inception/data/process_bounding_boxes.py
  17. 0 0
      inception/inception/dataset.py
  18. 0 0
      inception/inception/flowers_data.py
  19. 0 0
      inception/inception/flowers_eval.py
  20. 0 0
      inception/inception/flowers_train.py
  21. 0 0
      inception/inception/image_processing.py
  22. 0 0
      inception/inception/imagenet_data.py
  23. 0 0
      inception/inception/imagenet_eval.py
  24. 0 0
      inception/inception/imagenet_train.py
  25. 0 0
      inception/inception/inception_eval.py
  26. 0 0
      inception/inception/inception_model.py
  27. 0 0
      inception/inception/inception_train.py
  28. 0 9
      inception/slim/BUILD
  29. 0 0
      inception/inception/slim/README.md
  30. 0 0
      inception/inception/slim/inception_model.py
  31. 0 0
      inception/inception/slim/inception_test.py
  32. 0 0
      inception/inception/slim/losses.py
  33. 0 0
      inception/inception/slim/losses_test.py
  34. 0 0
      inception/inception/slim/ops.py
  35. 0 0
      inception/inception/slim/ops_test.py
  36. 0 0
      inception/inception/slim/scopes.py
  37. 0 0
      inception/inception/slim/scopes_test.py
  38. 0 0
      inception/inception/slim/slim.py
  39. 0 0
      inception/inception/slim/variables.py
  40. 0 0
      inception/inception/slim/variables_test.py
  41. 0 1
      third_party
  42. 0 1
      tools

+ 0 - 3
.gitmodules

@@ -1,3 +0,0 @@
-[submodule "tensorflow"]
-	path = tensorflow
-	url = https://github.com/tensorflow/tensorflow.git

+ 0 - 37
WORKSPACE

@@ -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",
-)

+ 7 - 0
inception/.gitignore

@@ -0,0 +1,7 @@
+/bazel-bin
+/bazel-ci_build-cache
+/bazel-genfiles
+/bazel-out
+/bazel-inception
+/bazel-testlogs
+/bazel-tf

+ 3 - 2
inception/README.md

@@ -57,9 +57,10 @@ change over time depending on usage and subsequent research.
 
 
 ## Getting Started
 ## 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
 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
 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
 download and convert the ImageNet data to native TFRecord format. The TFRecord

+ 0 - 0
inception/WORKSPACE


+ 0 - 12
inception/BUILD

@@ -17,9 +17,6 @@ py_library(
     srcs = [
     srcs = [
         "dataset.py",
         "dataset.py",
     ],
     ],
-    deps = [
-        "@tf//tensorflow:tensorflow_py",
-    ],
 )
 )
 
 
 py_library(
 py_library(
@@ -55,7 +52,6 @@ py_library(
         "inception_model.py",
         "inception_model.py",
     ],
     ],
     deps = [
     deps = [
-        "@tf//tensorflow:tensorflow_py",
         ":dataset",
         ":dataset",
         "//inception/slim",
         "//inception/slim",
     ],
     ],
@@ -89,7 +85,6 @@ py_library(
         "inception_eval.py",
         "inception_eval.py",
     ],
     ],
     deps = [
     deps = [
-        "@tf//tensorflow:tensorflow_py",
         ":image_processing",
         ":image_processing",
         ":inception",
         ":inception",
     ],
     ],
@@ -123,7 +118,6 @@ py_library(
         "inception_train.py",
         "inception_train.py",
     ],
     ],
     deps = [
     deps = [
-        "@tf//tensorflow:tensorflow_py",
         ":image_processing",
         ":image_processing",
         ":inception",
         ":inception",
     ],
     ],
@@ -132,9 +126,6 @@ py_library(
 py_binary(
 py_binary(
     name = "build_image_data",
     name = "build_image_data",
     srcs = ["data/build_image_data.py"],
     srcs = ["data/build_image_data.py"],
-    deps = [
-        "@tf//tensorflow:tensorflow_py",
-    ],
 )
 )
 
 
 sh_binary(
 sh_binary(
@@ -162,9 +153,6 @@ sh_binary(
 py_binary(
 py_binary(
     name = "build_imagenet_data",
     name = "build_imagenet_data",
     srcs = ["data/build_imagenet_data.py"],
     srcs = ["data/build_imagenet_data.py"],
-    deps = [
-        "@tf//tensorflow:tensorflow_py",
-    ],
 )
 )
 
 
 filegroup(
 filegroup(

inception/data/build_image_data.py → inception/inception/data/build_image_data.py


inception/data/build_imagenet_data.py → inception/inception/data/build_imagenet_data.py


inception/data/download_and_preprocess_flowers.sh → inception/inception/data/download_and_preprocess_flowers.sh


inception/data/download_and_preprocess_imagenet.sh → inception/inception/data/download_and_preprocess_imagenet.sh


inception/data/download_imagenet.sh → inception/inception/data/download_imagenet.sh


inception/data/imagenet_2012_validation_synset_labels.txt → inception/inception/data/imagenet_2012_validation_synset_labels.txt


inception/data/imagenet_lsvrc_2015_synsets.txt → inception/inception/data/imagenet_lsvrc_2015_synsets.txt


inception/data/imagenet_metadata.txt → inception/inception/data/imagenet_metadata.txt


inception/data/preprocess_imagenet_validation_data.py → inception/inception/data/preprocess_imagenet_validation_data.py


inception/data/process_bounding_boxes.py → inception/inception/data/process_bounding_boxes.py


inception/dataset.py → inception/inception/dataset.py


inception/flowers_data.py → inception/inception/flowers_data.py


inception/flowers_eval.py → inception/inception/flowers_eval.py


inception/flowers_train.py → inception/inception/flowers_train.py


inception/image_processing.py → inception/inception/image_processing.py


inception/imagenet_data.py → inception/inception/imagenet_data.py


inception/imagenet_eval.py → inception/inception/imagenet_eval.py


inception/imagenet_train.py → inception/inception/imagenet_train.py


inception/inception_eval.py → inception/inception/inception_eval.py


inception/inception_model.py → inception/inception/inception_model.py


inception/inception_train.py → inception/inception/inception_train.py


+ 0 - 9
inception/slim/BUILD

@@ -10,9 +10,6 @@ exports_files(["LICENSE"])
 py_library(
 py_library(
     name = "scopes",
     name = "scopes",
     srcs = ["scopes.py"],
     srcs = ["scopes.py"],
-    deps = [
-        "@tf//tensorflow:tensorflow_py",
-    ],
 )
 )
 
 
 py_test(
 py_test(
@@ -28,7 +25,6 @@ py_library(
     name = "variables",
     name = "variables",
     srcs = ["variables.py"],
     srcs = ["variables.py"],
     deps = [
     deps = [
-        "@tf//tensorflow:tensorflow_py",
         ":scopes",
         ":scopes",
     ],
     ],
 )
 )
@@ -45,9 +41,6 @@ py_test(
 py_library(
 py_library(
     name = "losses",
     name = "losses",
     srcs = ["losses.py"],
     srcs = ["losses.py"],
-    deps = [
-        "@tf//tensorflow:tensorflow_py",
-    ],
 )
 )
 
 
 py_test(
 py_test(
@@ -63,7 +56,6 @@ py_library(
     name = "ops",
     name = "ops",
     srcs = ["ops.py"],
     srcs = ["ops.py"],
     deps = [
     deps = [
-        "@tf//tensorflow:tensorflow_py",
         ":losses",
         ":losses",
         ":scopes",
         ":scopes",
         ":variables",
         ":variables",
@@ -84,7 +76,6 @@ py_library(
     name = "inception",
     name = "inception",
     srcs = ["inception_model.py"],
     srcs = ["inception_model.py"],
     deps = [
     deps = [
-        "@tf//tensorflow:tensorflow_py",
         ":ops",
         ":ops",
         ":scopes",
         ":scopes",
     ],
     ],

inception/slim/README.md → inception/inception/slim/README.md


inception/slim/inception_model.py → inception/inception/slim/inception_model.py


inception/slim/inception_test.py → inception/inception/slim/inception_test.py


inception/slim/losses.py → inception/inception/slim/losses.py


inception/slim/losses_test.py → inception/inception/slim/losses_test.py


inception/slim/ops.py → inception/inception/slim/ops.py


inception/slim/ops_test.py → inception/inception/slim/ops_test.py


inception/slim/scopes.py → inception/inception/slim/scopes.py


inception/slim/scopes_test.py → inception/inception/slim/scopes_test.py


inception/slim/slim.py → inception/inception/slim/slim.py


inception/slim/variables.py → inception/inception/slim/variables.py


inception/slim/variables_test.py → inception/inception/slim/variables_test.py


+ 0 - 1
third_party

@@ -1 +0,0 @@
-tensorflow/third_party

+ 0 - 1
tools

@@ -1 +0,0 @@
-tensorflow/tools