Merge pull request #10921 from reyoung/feature/change_optimizer_tests

Change optimizer to old paddle style

CMakeLists.txt

@@ -202,7 +202,7 @@ endif(USE_NNPACK)
 
 add_subdirectory(proto)
 
-if(NOT MOBILE_INFERENCE)
+if(NOT MOBILE_INFERENCE AND NOT WITH_FLUID_ONLY)
     # "add_subdirectory(go)" should be placed after the following loine,
     # because it depends on paddle/optimizer.
     add_subdirectory(paddle/optimizer)

paddle/optimizer/CMakeLists.txt

@@ -7,6 +7,10 @@ set(OPITMIZER_SRCS
     sgd_optimizer.cc
   )
 
-cc_library(paddle_optimizer STATIC SRCS ${OPITMIZER_SRCS} DEPS paddle_proto glog)
+add_library(paddle_optimizer ${OPITMIZER_SRCS})
-cc_test(serialization_test SRCS serialization_test.cc DEPS paddle_proto)
+target_link_libraries(paddle_optimizer paddle_proto glog)
-cc_test(parameter_optimizer_test SRCS parameter_optimizer_test.cc DEPS paddle_optimizer)
+
+if (WITH_TESTING)
+    add_unittest(serialization_test serialization_test.cc)
+    add_unittest(parameter_optimizer_test parameter_optimizer_test.cc)
+endif()