Merge pull request #2126 from gangliao/new_tensor

Add Google style conventions in Majel

.travis.yml

@@ -25,6 +25,7 @@ addons:
       - python2.7-dev
       - python-numpy
       - python-wheel
+      - libboost-dev
       - curl
       - swig
       - graphviz

paddle/majel/CMakeLists.txt

@@ -21,7 +21,7 @@ else()
 endif()
 
 ########################### Build Majel #############################
-set(MAJEL_CXX_FILES place.cpp)
+set(MAJEL_CXX_FILES place.cc)
 set(MAJEL_CUDA_FILES "")
 
 if(CUDA_FOUND)

paddle/majel/test/CMakeLists.txt

-file(GLOB_RECURSE ALL_TEST_FILES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "*.cpp" "*.cc")
+file(GLOB_RECURSE ALL_TEST_FILES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "*.cc")
 
 add_executable(majel_tests ${ALL_TEST_FILES})
 add_dependencies(majel_tests majel)
 target_link_libraries(majel_tests     
                       ${Boost_LIBRARIES}
                       ${GTEST_LIBRARIES}
+                      ${GTEST_MAIN_LIBRARIES}
                       majel
                      )
 add_test(majel_tests majel_tests)

paddle/majel/test/test_framework.cpp

-#include "gtest/gtest.h"
-
-int main(int argc, char** argv) {
-  ::testing::InitGoogleTest(&argc, argv);
-  return RUN_ALL_TESTS();
-}