move a bunch of things

kabagouda · Mar 8, 2016 · 0747a4a · 0747a4a
1 parent 9e5c795
commit 0747a4a
Show file tree

Hide file tree

Showing 18 changed files with 39 additions and 6,399 deletions.
diff --git a/Makefile b/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"
diff --git a/caffe.cloc b/caffe.cloc
diff --git a/contrib/docker-ubuntu-12.04/Dockerfile → ...e2/contrib/docker-ubuntu-12.04/Dockerfile b/contrib/docker-ubuntu-12.04/Dockerfile → ...e2/contrib/docker-ubuntu-12.04/Dockerfile
diff --git a/contrib/docker-ubuntu-14.04/Dockerfile → ...e2/contrib/docker-ubuntu-14.04/Dockerfile b/contrib/docker-ubuntu-14.04/Dockerfile → ...e2/contrib/docker-ubuntu-14.04/Dockerfile
diff --git a/caffe2/core/BREW b/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",
   ],
 )
diff --git a/caffe2/end_to_end_test/BREW b/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",
   ],
 )
diff --git a/caffe2/mpi/BREW b/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",
   ]
 )
diff --git a/caffe2/operators/BREW b/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",
   ]
 )
diff --git a/caffe2/test/BREW b/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"],
+)
diff --git a/gtest/caffe2_gtest_main.cc → caffe2/test/caffe2_gtest_main.cc b/gtest/caffe2_gtest_main.cc → caffe2/test/caffe2_gtest_main.cc
diff --git a/caffe2/utils/BREW b/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",
   ],
 )