Remove whole_archieve in paddle.

Author: reyoung

cmake/util.cmake

@@ -7,44 +7,18 @@
 # Rest Arguments: libraries which link together.
 function(target_circle_link_libraries TARGET_NAME)
     if(APPLE)
-        set(LIBS)
-        set(inArchive OFF)
-        set(libsInArgn)
-
-        foreach(arg ${ARGN})
-            if(${arg} STREQUAL "ARCHIVE_START")
-                set(inArchive ON)
-            elseif(${arg} STREQUAL "ARCHIVE_END")
-                set(inArchive OFF)
-            else()
-                if(inArchive)
-                    list(APPEND LIBS "-Wl,-force_load")
-                endif()
-                list(APPEND LIBS ${arg})
-                list(APPEND libsInArgn ${arg})
-            endif()
-        endforeach()
+        set(LIBS ${ARGN})
+        set(libsInArgn ${ARGN})
+        list(REVERSE libsInArgn)
         if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
             list(APPEND LIBS "-undefined dynamic_lookup")
         endif()
-        list(REVERSE libsInArgn)
         target_link_libraries(${TARGET_NAME}
             ${LIBS}
             ${libsInArgn})
 
     else()  # LINUX
         set(LIBS)
-
-        foreach(arg ${ARGN})
-            if(${arg} STREQUAL "ARCHIVE_START")
-                list(APPEND LIBS "-Wl,--whole-archive")
-            elseif(${arg} STREQUAL "ARCHIVE_END")
-                list(APPEND LIBS "-Wl,--no-whole-archive")
-            else()
-                list(APPEND LIBS ${arg})
-            endif()
-        endforeach()
-
         target_link_libraries(${TARGET_NAME}
                 "-Wl,--start-group"
                 ${LIBS}
@@ -84,21 +58,17 @@ function(link_paddle_exe TARGET_NAME)
     if(PADDLE_WITH_INTERNAL)
         set(INTERAL_LIBS paddle_internal_gserver paddle_internal_parameter)
         target_circle_link_libraries(${TARGET_NAME}
-            ARCHIVE_START
             paddle_internal_gserver
             paddle_internal_owlqn
-            ARCHIVE_END
             paddle_internal_parameter)
     else()
         set(INTERAL_LIBS "")
     endif()
 
     target_circle_link_libraries(${TARGET_NAME}
-        ARCHIVE_START
         paddle_gserver
         paddle_function
         ${METRIC_LIBS}
-        ARCHIVE_END
         paddle_pserver
         paddle_trainer_lib
         paddle_network
@@ -165,7 +135,9 @@ endfunction()
 # TARGET_NAME: the unittest target name, same as executable file name
 # Rest Arguments: the source files to compile this unittest.
 macro(add_unittest_without_exec TARGET_NAME)
-    add_executable(${TARGET_NAME} ${ARGN})
+    add_executable(${TARGET_NAME}
+      ${PROJ_ROOT}/paddle/trainer/ForceLinkFiles.cpp
+      ${ARGN})
     link_paddle_test(${TARGET_NAME})
     add_style_check_target(${TARGET_NAME} ${ARGN})
 endmacro()

paddle/function/ContextProjectionOp.cpp

@@ -15,7 +15,7 @@ limitations under the License. */
 #include "ContextProjectionOp.h"
 #include "paddle/math/Matrix.h"
 #include "paddle/math/Vector.h"
-
+#include "paddle/utils/ForceLink.h"
 namespace paddle {
 
 template <>
@@ -371,3 +371,5 @@ REGISTER_TYPED_FUNC(ContextProjectionBackwardWeight,
                     ContextProjectionBackwardWeightFunc);
 #endif
 }  // namespace paddle
+
+PADDLE_REGISTER_FORCE_LINK_FILE(context_proj_ops);

paddle/function/CrossMapNormalOp.cpp

@@ -14,6 +14,7 @@ limitations under the License. */
 
 #include "CrossMapNormalOp.h"
 #include "paddle/math/Vector.h"
+#include "paddle/utils/ForceLink.h"
 
 namespace paddle {
 
@@ -225,3 +226,5 @@ REGISTER_TYPED_FUNC(CrossMapNormalGrad, GPU, CrossMapNormalGradFunc);
 #endif
 
 }  // namespace paddle
+
+PADDLE_REGISTER_FORCE_LINK_FILE(cross_map_norm_ops);

paddle/gserver/activations/ActivationFunction.cpp

@@ -22,9 +22,10 @@ limitations under the License. */
 #include <type_traits>
 #include "paddle/parameter/Argument.h"
 #include "paddle/utils/ClassRegistrar.h"
-
+#include "paddle/utils/ForceLink.h"
 #include "paddle/utils/Logging.h"
 
+PADDLE_REGISTER_FORCE_LINK_FILE(activations);
 namespace paddle {
 
 static ClassRegistrar<ActivationFunction> gActivationRegistrar;

paddle/gserver/dataproviders/DataProvider.cpp

@@ -17,10 +17,13 @@ limitations under the License. */
 #include <unistd.h>
 #include <algorithm>
 #include "ProtoDataProvider.h"
+#include "paddle/utils/ForceLink.h"
 #include "paddle/utils/Logging.h"
 #include "paddle/utils/StringUtil.h"
 #include "paddle/utils/Util.h"
 
+PADDLE_REGISTER_FORCE_LINK_FILE(base_data_providers);
+
 namespace paddle {
 
 void BufferBatch::swap(BufferBatch* bufBatch) {

paddle/gserver/dataproviders/MultiDataProvider.cpp

@@ -14,9 +14,12 @@ limitations under the License. */
 
 #include "MultiDataProvider.h"
 #include <algorithm>
+#include "paddle/utils/ForceLink.h"
 #include "paddle/utils/Logging.h"
 #include "paddle/utils/Util.h"
 
+PADDLE_REGISTER_FORCE_LINK_FILE(multi_data_dp);
+
 namespace paddle {
 
 using namespace std;

paddle/gserver/dataproviders/ProtoDataProvider.cpp

@@ -16,11 +16,13 @@ limitations under the License. */
 #include <algorithm>
 #include <fstream>
 #include <istream>
+#include "DataProviderGroup.h"
+#include "paddle/utils/ForceLink.h"
+#include "paddle/utils/Logging.h"
 #include "paddle/utils/StringUtil.h"
 #include "paddle/utils/Util.h"
 
-#include "DataProviderGroup.h"
-#include "paddle/utils/Logging.h"
+PADDLE_REGISTER_FORCE_LINK_FILE(proto_dp);
 
 DEFINE_double(memory_threshold_on_load_data,
               1.0,

paddle/gserver/dataproviders/PyDataProvider.cpp

@@ -15,9 +15,12 @@ limitations under the License. */
 #include "PyDataProvider.h"
 #include <fenv.h>
 #include "paddle/utils/Excepts.h"
+#include "paddle/utils/ForceLink.h"
 #include "paddle/utils/PythonUtil.h"
 #include "paddle/utils/Util.h"
 
+PADDLE_REGISTER_FORCE_LINK_FILE(py_dp);
+
 namespace paddle {
 
 #ifndef PADDLE_NO_PYTHON

paddle/gserver/dataproviders/PyDataProvider2.cpp

@@ -25,10 +25,13 @@ limitations under the License. */
 
 #include "DataProvider.h"
 
+#include "paddle/utils/ForceLink.h"
 #include "paddle/utils/Locks.h"
 #include "paddle/utils/PythonUtil.h"
 #include "paddle/utils/Stat.h"
 
+PADDLE_REGISTER_FORCE_LINK_FILE(py_dp2);
+
 namespace paddle {
 
 namespace unittest {

paddle/gserver/evaluators/CTCErrorEvaluator.cpp

@@ -14,6 +14,9 @@ limitations under the License. */
 
 #include "Evaluator.h"
 #include "paddle/gserver/gradientmachines/NeuralNetwork.h"
+#include "paddle/utils/ForceLink.h"
+
+PADDLE_REGISTER_FORCE_LINK_FILE(ctc_evaluator);
 
 namespace paddle {