[cmake治理]cmake optimization of paddle/framework direcotry (#58960)

risemeup1 · web-flow · commit 7814fde9eac7 · 2023-11-15T11:15:58.000+08:00
* optimization cmake

* mv test to test/cpp/framework

* mv test to test/cpp/framework

* mv test to test/cpp/framework
diff --git a/paddle/fluid/distributed/common/CMakeLists.txt b/paddle/fluid/distributed/common/CMakeLists.txt
@@ -1,6 +1,6 @@
 cc_library(
   afs_wrapper
   SRCS afs_warpper.cc
-  DEPS fs ps_framework_proto)
+  DEPS framework_io ps_framework_proto)
 
 #set_property(GLOBAL PROPERTY COMMON_DEPS afs_warpper)
diff --git a/paddle/fluid/distributed/index_dataset/CMakeLists.txt b/paddle/fluid/distributed/index_dataset/CMakeLists.txt
@@ -2,7 +2,7 @@ proto_library(index_dataset_proto SRCS index_dataset.proto)
 cc_library(
   index_wrapper
   SRCS index_wrapper.cc
-  DEPS index_dataset_proto fs)
+  DEPS index_dataset_proto framework_io)
 if(WITH_MKLDNN)
   cc_library(
     index_sampler
diff --git a/paddle/fluid/distributed/ps/table/CMakeLists.txt b/paddle/fluid/distributed/ps/table/CMakeLists.txt
@@ -91,7 +91,7 @@ cc_library(
        device_context
        phi
        glog
-       fs
+       framework_io
        afs_wrapper
        rocksdb
        eigen3)
diff --git a/paddle/fluid/distributed/ps/wrapper/CMakeLists.txt b/paddle/fluid/distributed/ps/wrapper/CMakeLists.txt
@@ -11,8 +11,7 @@ cc_library(
        variable_helper
        scope
        op_registry
-       fs
-       shell
+       framework_io
        ps_gpu_wrapper
        ${RPC_DEPS})
 
diff --git a/paddle/fluid/framework/CMakeLists.txt b/paddle/fluid/framework/CMakeLists.txt
@@ -580,8 +580,7 @@ if(WITH_DISTRIBUTE)
            framework_proto
            trainer_desc_proto
            glog
-           fs
-           shell
+           framework_io
            heter_wrapper
            ps_gpu_wrapper
            box_wrapper
@@ -619,7 +618,7 @@ if(WITH_DISTRIBUTE)
     #         pull_dense_worker.cc section_worker.cc heter_section_worker.cc device_worker_factory.cc data_set.cc DEPS op_registry
     #         device_context scope framework_proto data_feed_proto heter_service_proto trainer_desc_proto glog
     #         index_sampler index_wrapper sampler index_dataset_proto
-    #         lod_rank_table fs shell fleet_wrapper heter_wrapper box_wrapper metrics lodtensor_printer feed_fetch_method
+    #         lod_rank_table framework_io fleet_wrapper heter_wrapper box_wrapper metrics lodtensor_printer feed_fetch_method
     #         graph_to_program_pass variable_helper timer monitor
     #         heter_service_proto fleet heter_server brpc fleet_executor
     #         graph_gpu_wrapper)
@@ -663,8 +662,7 @@ if(WITH_DISTRIBUTE)
            sampler
            index_dataset_proto
            lod_rank_table
-           fs
-           shell
+           framework_io
            fleet_wrapper
            heter_wrapper
            box_wrapper
@@ -736,8 +734,7 @@ if(WITH_DISTRIBUTE)
            trainer_desc_proto
            glog
            lod_rank_table
-           fs
-           shell
+           framework_io
            fleet_wrapper
            heter_wrapper
            ps_gpu_wrapper
@@ -797,8 +794,7 @@ elseif(WITH_PSLIB)
          trainer_desc_proto
          glog
          lod_rank_table
-         fs
-         shell
+         framework_io
          fleet_wrapper
          heter_wrapper
          ps_gpu_wrapper
@@ -845,8 +841,7 @@ else()
          trainer_desc_proto
          glog
          lod_rank_table
-         fs
-         shell
+         framework_io
          fleet_wrapper
          heter_wrapper
          ps_gpu_wrapper
diff --git a/paddle/fluid/framework/fleet/CMakeLists.txt b/paddle/fluid/framework/fleet/CMakeLists.txt
@@ -119,8 +119,3 @@ cc_library(
   heter_wrapper
   SRCS heter_wrapper.cc
   DEPS framework_proto device_context heter_service_proto ${BRPC_DEPS})
-
-cc_test(
-  test_fleet_cc
-  SRCS test_fleet.cc
-  DEPS fleet_wrapper gloo_wrapper fs shell)
diff --git a/paddle/fluid/framework/io/CMakeLists.txt b/paddle/fluid/framework/io/CMakeLists.txt
@@ -1,16 +1,15 @@
-cc_library(
-  shell
-  SRCS shell.cc
-  DEPS string_helper glog timer enforce)
-cc_library(
-  fs
-  SRCS fs.cc
-  DEPS string_helper glog enforce shell)
+file(GLOB framework_io_srcs "*.cc")
+if(WITH_CRYPTO)
+  file(GLOB framework_io_crypto_srcs "crypto/*.cc")
+  set(framework_io_srcs ${framework_io_srcs} ${framework_io_crypto_srcs})
+endif()
 
-cc_test(
-  test_fs
-  SRCS test_fs.cc
-  DEPS fs shell)
+set(framework_io_deps glog timer)
 if(WITH_CRYPTO)
-  add_subdirectory(crypto)
+  set(framework_io_deps ${framework_io_deps} cryptopp)
 endif()
+
+cc_library(
+  framework_io
+  SRCS ${framework_io_srcs}
+  DEPS ${framework_io_deps})
diff --git a/paddle/fluid/framework/io/crypto/CMakeLists.txt b/paddle/fluid/framework/io/crypto/CMakeLists.txt
diff --git a/paddle/fluid/framework/new_executor/interpreter/CMakeLists.txt b/paddle/fluid/framework/new_executor/interpreter/CMakeLists.txt
@@ -14,8 +14,8 @@ set(INTERPRETER_DEPS
     trainer_desc_proto
     glog
     lod_rank_table
-    fs
-    shell
+    framework_io
+    string_helper
     fleet_wrapper
     heter_wrapper
     ps_gpu_wrapper
diff --git a/paddle/fluid/inference/CMakeLists.txt b/paddle/fluid/inference/CMakeLists.txt
@@ -110,7 +110,7 @@ if(NOT WIN32)
 endif()
 
 if(WITH_CRYPTO)
-  set(SHARED_INFERENCE_DEPS ${SHARED_INFERENCE_DEPS} paddle_crypto)
+  set(SHARED_INFERENCE_DEPS ${SHARED_INFERENCE_DEPS} framework_io)
 endif()
 
 if(WITH_PSCORE)
diff --git a/paddle/fluid/inference/api/CMakeLists.txt b/paddle/fluid/inference/api/CMakeLists.txt
@@ -36,7 +36,7 @@ set(paddle_inference_api_deps
     scope)
 
 if(WITH_CRYPTO)
-  list(APPEND paddle_inference_api_deps paddle_crypto)
+  list(APPEND paddle_inference_api_deps framework_io)
 endif()
 if(WITH_CUSTOM_DEVICE)
   set(paddle_inference_api_deps ${paddle_inference_api_deps} phi)
diff --git a/paddle/fluid/pybind/CMakeLists.txt b/paddle/fluid/pybind/CMakeLists.txt
@@ -191,7 +191,7 @@ if(WITH_GLOO)
 endif()
 
 if(WITH_CRYPTO)
-  set(PYBIND_DEPS ${PYBIND_DEPS} paddle_crypto)
+  set(PYBIND_DEPS ${PYBIND_DEPS} framework_io)
   set(PYBIND_SRCS ${PYBIND_SRCS} crypto.cc)
 endif()
 
diff --git a/test/cpp/fluid/framework/CMakeLists.txt b/test/cpp/fluid/framework/CMakeLists.txt
@@ -287,3 +287,24 @@ cc_test(
   DEPS phi_utils)
 
 cc_test(convert_utils_test SRCS convert_utils_test.cc)
+
+cc_test(
+  test_fs
+  SRCS io/test_fs.cc
+  DEPS framework_io string_helper)
+
+if(WITH_CRYPTO)
+  cc_test(
+    aes_cipher_test
+    SRCS io/aes_cipher_test.cc
+    DEPS framework_io)
+  cc_test(
+    cipher_utils_test
+    SRCS io/cipher_utils_test.cc
+    DEPS framework_io)
+endif()
+
+cc_test(
+  test_fleet_cc
+  SRCS fleet/test_fleet.cc
+  DEPS fleet_wrapper gloo_wrapper framework_io string_helper)
diff --git a/test/cpp/fluid/framework/fleet/test_fleet.cc b/test/cpp/fluid/framework/fleet/test_fleet.cc
diff --git a/test/cpp/fluid/framework/io/aes_cipher_test.cc b/test/cpp/fluid/framework/io/aes_cipher_test.cc
diff --git a/test/cpp/fluid/framework/io/cipher_utils_test.cc b/test/cpp/fluid/framework/io/cipher_utils_test.cc
diff --git a/test/cpp/fluid/framework/io/test_fs.cc b/test/cpp/fluid/framework/io/test_fs.cc
diff --git a/test/cpp/imperative/CMakeLists.txt b/test/cpp/imperative/CMakeLists.txt
@@ -18,8 +18,7 @@ else()
            gloo_context
            gloo_wrapper
            gloo
-           fs
-           shell)
+           framework_io)
     #set_tests_properties(heter_ccl_context_test PROPERTIES LABELS "RUN_TYPE=DIST")
   endif()
   if(WITH_XPU_BKCL)
