merge with latest code

e80a3cfb · Peng Li · 03889bab · e80a3cfb · e80a3cfb
隐藏空白更改
内联并排

Showing with 2 addition and 3 deletion

paddle/gserver/tests/CMakeLists.txt paddle/gserver/tests/CMakeLists.txt +1 -2

paddle/gserver/tests/test_CRFLayerGrad.cpp paddle/gserver/tests/test_CRFLayerGrad.cpp +1 -1

未找到文件。
--- a/paddle/gserver/tests/CMakeLists.txt
+++ b/paddle/gserver/tests/CMakeLists.txt
@@ -21,8 +21,7 @@ add_test(NAME test_LayerGrad
 ################ test_CRFLayerGrad ####################
 add_unittest_without_exec(test_CRFLayerGrad
    test_CRFLayerGrad.cpp
-    LayerGradUtil.cpp
-    TestUtil.cpp)
+    LayerGradUtil.cpp)
 add_test(NAME test_CRFLayerGrad
    COMMAND test_CRFLayerGrad)


--- a/paddle/gserver/tests/test_CRFLayerGrad.cpp
+++ b/paddle/gserver/tests/test_CRFLayerGrad.cpp
@@ -19,7 +19,7 @@ limitations under the License. */
 #include "paddle/trainer/Trainer.h"

 #include "LayerGradUtil.h"
-#include "TestUtil.h"
+#include "paddle/testing/TestUtil.h"

 using namespace paddle;  // NOLINT