move a bunch of things

Makefile

@@ -13,9 +13,9 @@ test:
 	@python build.py test
 
 lint:
-	@find caffe2 -type f -exec python cpplint.py {} \;
+	@find caffe2 -type f -exec python brewtool/cpplint.py {} \;
 
 linecount:
-	@cloc --read-lang-def=caffe.cloc caffe2 pycaffe2 || \
+	@cloc --read-lang-def=brewtool/caffe.cloc caffe2 pycaffe2 || \
 		echo "Cloc is not available on the machine. You can install cloc with " && \
 		echo "    sudo apt-get install cloc"

caffe.cloc

@@ -1,53 +0,0 @@
-Bourne Shell
-    filter remove_matches ^\s*#
-    filter remove_inline #.*$
-    extension sh
-    script_exe sh
-C
-    filter remove_matches ^\s*//
-    filter call_regexp_common C
-    filter remove_inline //.*$
-    extension c
-    extension ec
-    extension pgc
-C++
-    filter remove_matches ^\s*//
-    filter remove_inline //.*$
-    filter call_regexp_common C
-    extension C
-    extension cc
-    extension cpp
-    extension cxx
-    extension pcc
-C/C++ Header
-    filter remove_matches ^\s*//
-    filter call_regexp_common C
-    filter remove_inline //.*$
-    extension H
-    extension h
-    extension hh
-    extension hpp
-CUDA
-    filter remove_matches ^\s*//
-    filter remove_inline //.*$
-    filter call_regexp_common C
-    extension cu
-Python
-    filter remove_matches ^\s*#
-    filter docstring_to_C
-    filter call_regexp_common C
-    filter remove_inline #.*$
-    extension py
-make
-    filter remove_matches ^\s*#
-    filter remove_inline #.*$
-    extension Gnumakefile
-    extension Makefile
-    extension am
-    extension gnumakefile
-    extension makefile
-    filename Gnumakefile
-    filename Makefile
-    filename gnumakefile
-    filename makefile
-    script_exe make

caffe2/core/BREW

@@ -75,8 +75,8 @@ cc_test(
   ],
   deps = [
       ":core",
-      "//gtest:gtest",
-      "//gtest:caffe2_gtest_main",
+      "//third_party:gtest",
+      "//caffe2/test:caffe2_gtest_main",
   ],
 )
 
@@ -87,8 +87,8 @@ cc_test(
   ],
   deps = [
       ":core_gpu",
-      "//gtest:gtest",
-      "//gtest:caffe2_gtest_main",
+      "//third_party:gtest",
+      "//caffe2/test:caffe2_gtest_main",
   ],
 )
 
@@ -101,7 +101,7 @@ cc_test(
   ],
   deps = [
       ":core_gpu",
-      "//gtest:gtest",
-      "//gtest:caffe2_gtest_main",
+      "//third_party:gtest",
+      "//caffe2/test:caffe2_gtest_main",
   ],
 )

caffe2/end_to_end_test/BREW

@@ -11,6 +11,6 @@ cc_test(
       "//caffe2/utils:proto_utils",
       "//caffe2/data/toy:toy_models",
       "//caffe2/data/mnist:mnist_models",
-      "//gtest:caffe2_gtest_main",
+      "//caffe2/test:caffe2_gtest_main",
   ],
 )

caffe2/mpi/BREW

@@ -52,7 +52,7 @@ mpi_test(
   deps = [
     ":mpi_ops",
     "//caffe2:all_available_ops",
-    "//gtest:gtest",
+    "//third_party:gtest",
   ]
 )
 
@@ -64,6 +64,6 @@ mpi_test(
   deps = [
     ":mpi_ops",
     "//caffe2:all_available_ops",
-    "//gtest:gtest",
+    "//third_party:gtest",
   ]
 )

caffe2/operators/BREW

@@ -118,6 +118,6 @@ cc_test(
       ":core_ops",
       ":core_ops_gpu",
       "//caffe2/data/mnist:mnist_minidb",
-      "//gtest:caffe2_gtest_main",
+      "//caffe2/test:caffe2_gtest_main",
   ]
 )

caffe2/test/BREW

@@ -0,0 +1,14 @@
+cc_library(
+  name = "caffe2_gtest_main",
+  srcs = ["caffe2_gtest_main.cc"],
+  deps = [
+      "//third_party:gtest",
+      "//caffe2/core:core",
+  ],
+)
+
+cc_test(
+  name = "caffe2_gtest_main_binary",
+  srcs = [],
+  deps = [":caffe2_gtest_main"],
+)

caffe2/utils/BREW

@@ -45,7 +45,7 @@ cc_test(
   deps = [
       ":math",
       "//caffe2/proto:caffe2_proto",
-      "//gtest:caffe2_gtest_main",
+      "//caffe2/test:caffe2_gtest_main",
       "//caffe2/core:core",
   ],
 )
@@ -64,7 +64,7 @@ cc_test(
   ],
   deps = [
       ":simple_queue",
-      "//gtest:caffe2_gtest_main",
+      "//caffe2/test:caffe2_gtest_main",
   ],
 )
 

gtest/BREW

@@ -1,23 +0,0 @@
-cc_library(
-  name = "gtest",
-  srcs = ["gtest-all.cpp"],
-  hdrs = ["gtest.h"],
-)
-
-cc_library(
-  name = "caffe2_gtest_main",
-  srcs = ["caffe2_gtest_main.cc"],
-  deps = [
-      ":gtest",
-      "//caffe2/core:core",
-  ],
-)
-
-cc_test(
-  name = "caffe2_gtest_main_binary",
-  srcs = ["caffe2_gtest_main.cc"],
-  deps = [
-      ":gtest",
-      "//caffe2/core:core",
-  ],
-)

third_party/BREW

@@ -108,6 +108,12 @@ cc_thirdparty_target(
   cc_obj_files = ["-lglog"] if Brewery.Env.Config.USE_GLOG else [],
 )
 
+cc_thirdparty_target(
+  name = "gtest",
+  deps = ["//third_party/gtest:gtest"],
+  cc_obj_files = [],
+)
+
 cc_thirdparty_target(
   name = "leveldb",
   deps = [":snappy"],

third_party/gtest/BREW

@@ -0,0 +1,5 @@
+cc_library(
+  name = "gtest",
+  srcs = ["gtest-all.cpp"],
+  hdrs = ["gtest.h"],
+)