Merge pull request #279 from facebookresearch/modernize-tc

Modernization of TC codebase

Author: prigoyal

.jenkins/run_test.sh

@@ -13,7 +13,7 @@ source /etc/lsb-release
 if [[ "$DISTRIB_RELEASE" == 14.04 ]]; then
   echo "Running TC backend tests"
   FILTER_OUT=MLP_model ./test.sh
-  ./build/benchmarks/MLP_model --gtest_filter=-*2LUT*
+  ./build/tc/benchmarks/MLP_model --gtest_filter=-*2LUT*
   if [[ $(conda --version | wc -c) -ne 0 ]]; then
     source activate tc-env
     echo "Running TC PyTorch tests"
@@ -29,6 +29,6 @@ if [[ "$DISTRIB_RELEASE" == 16.04 ]]; then
   else
     echo "Running TC backend tests"
     FILTER_OUT=MLP_model ./test.sh
-    ./build/benchmarks/MLP_model --gtest_filter=-*2LUT*
+    ./build/tc/benchmarks/MLP_model --gtest_filter=-*2LUT*
   fi
 fi

CMakeLists.txt

@@ -247,7 +247,8 @@ message(STATUS "Found glog: ${GLOG_LIBRARIES}")
 #     message(STATUS "${_variableName}=${${_variableName}}")
 # endforeach()
 
-add_subdirectory(src)
+include_directories(BEFORE ${PROJECT_SOURCE_DIR})
+add_subdirectory(tc)
 
 # At the moment pybind is only supported in CUDA mode and compilation fails
 # for non-CUDA mode (CUDA_HOME and CUB_HOME undefined error).
@@ -261,13 +262,13 @@ enable_testing()
 add_subdirectory(test)
 
 if (WITH_CUDA)
-  add_subdirectory(examples)
+  add_subdirectory(tc/examples)
 else()
   message(STATUS "Not building examples, CUDA not available")
 endif()
 
 if (WITH_CAFFE2 AND WITH_CUDA)
-  add_subdirectory(benchmarks)
+  add_subdirectory(tc/benchmarks)
 else()
   message(STATUS "Not building benchmarks, caffe2 or CUDA not available")
 endif()

CodeOwners.md

@@ -38,8 +38,8 @@
 ################################################################################
 # Copy the proto files only
 ################################################################################
-copyfile("src/proto/compcache.proto", "tensor_comprehensions/compilation_cache.proto")
-copyfile("src/proto/mapping_options.proto", "tensor_comprehensions/mapping_options.proto")
+copyfile("tc/proto/compcache.proto", "tensor_comprehensions/compilation_cache.proto")
+copyfile("tc/proto/mapping_options.proto", "tensor_comprehensions/mapping_options.proto")
 
 ################################################################################
 # Custom override commands

setup.py

@@ -1,5 +1,4 @@
 include_directories(.)
-include_directories(../include)
 
 add_subdirectory(lang)
 add_subdirectory(proto)