diff --git a/mindspore/ccsrc/CMakeLists.txt b/mindspore/ccsrc/CMakeLists.txt index 4dfe300f726..143fea769e3 100644 --- a/mindspore/ccsrc/CMakeLists.txt +++ b/mindspore/ccsrc/CMakeLists.txt @@ -224,7 +224,7 @@ set(SUB_COMP frontend/operator pipeline/jit pipeline/pynative - common debug pybind_api utils vm profiler ps + common debug pybind_api utils vm profiler ps fl ) if(ENABLE_CPU AND NOT WIN32) diff --git a/mindspore/ccsrc/armour/cipher/cipher_init.cc b/mindspore/ccsrc/armour/cipher/cipher_init.cc index 81f27b414c7..880c996ca48 100644 --- a/mindspore/ccsrc/armour/cipher/cipher_init.cc +++ b/mindspore/ccsrc/armour/cipher/cipher_init.cc @@ -15,7 +15,7 @@ */ #include "armour/cipher/cipher_init.h" -#include "ps/server/common.h" +#include "fl/server/common.h" #include "armour/cipher/cipher_meta_storage.h" namespace mindspore { diff --git a/mindspore/ccsrc/armour/cipher/cipher_keys.h b/mindspore/ccsrc/armour/cipher/cipher_keys.h index 58578eed9d6..80cf0f08d5c 100644 --- a/mindspore/ccsrc/armour/cipher/cipher_keys.h +++ b/mindspore/ccsrc/armour/cipher/cipher_keys.h @@ -26,7 +26,7 @@ #include "utils/log_adapter.h" #include "armour/cipher/cipher_init.h" #include "armour/cipher/cipher_meta_storage.h" -#include "ps/server/common.h" +#include "fl/server/common.h" namespace mindspore { namespace armour { diff --git a/mindspore/ccsrc/armour/cipher/cipher_meta_storage.h b/mindspore/ccsrc/armour/cipher/cipher_meta_storage.h index 85c7f85ada6..f33ae737f93 100644 --- a/mindspore/ccsrc/armour/cipher/cipher_meta_storage.h +++ b/mindspore/ccsrc/armour/cipher/cipher_meta_storage.h @@ -31,8 +31,8 @@ #include "armour/secure_protocol/secret_sharing.h" #include "schema/fl_job_generated.h" #include "schema/cipher_generated.h" -#include "ps/server/distributed_metadata_store.h" -#include "ps/server/common.h" +#include "fl/server/distributed_metadata_store.h" +#include "fl/server/common.h" namespace mindspore { namespace armour { diff --git a/mindspore/ccsrc/armour/cipher/cipher_reconstruct.cc b/mindspore/ccsrc/armour/cipher/cipher_reconstruct.cc index aacaa55c8a4..e3e91cf292d 100644 --- a/mindspore/ccsrc/armour/cipher/cipher_reconstruct.cc +++ b/mindspore/ccsrc/armour/cipher/cipher_reconstruct.cc @@ -15,7 +15,7 @@ */ #include "armour/cipher/cipher_reconstruct.h" -#include "ps/server/common.h" +#include "fl/server/common.h" #include "armour/secure_protocol/random.h" #include "armour/secure_protocol/key_agreement.h" #include "armour/cipher/cipher_meta_storage.h" diff --git a/mindspore/ccsrc/armour/cipher/cipher_shares.cc b/mindspore/ccsrc/armour/cipher/cipher_shares.cc index 4caaf4c2550..e1badcb571d 100644 --- a/mindspore/ccsrc/armour/cipher/cipher_shares.cc +++ b/mindspore/ccsrc/armour/cipher/cipher_shares.cc @@ -15,7 +15,7 @@ */ #include "armour/cipher/cipher_shares.h" -#include "ps/server/common.h" +#include "fl/server/common.h" #include "armour/cipher/cipher_meta_storage.h" namespace mindspore { diff --git a/mindspore/ccsrc/armour/cipher/cipher_unmask.cc b/mindspore/ccsrc/armour/cipher/cipher_unmask.cc index a126f108172..a9666d6423c 100644 --- a/mindspore/ccsrc/armour/cipher/cipher_unmask.cc +++ b/mindspore/ccsrc/armour/cipher/cipher_unmask.cc @@ -15,8 +15,8 @@ */ #include "armour/cipher/cipher_unmask.h" -#include "ps/server/common.h" -#include "ps/server/local_meta_store.h" +#include "fl/server/common.h" +#include "fl/server/local_meta_store.h" #include "armour/cipher/cipher_meta_storage.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/fl/fused_pull_weight_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/cpu/fl/fused_pull_weight_kernel.h index 697208e85b0..a40dea4b92b 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/fl/fused_pull_weight_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/fl/fused_pull_weight_kernel.h @@ -26,7 +26,7 @@ #include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" #include "schema/fl_job_generated.h" #include "ps/ps_context.h" -#include "ps/worker/fl_worker.h" +#include "fl/worker/fl_worker.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/fl/fused_push_weight_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/cpu/fl/fused_push_weight_kernel.h index 6436c63bbce..5ed47a73f0e 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/fl/fused_push_weight_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/fl/fused_push_weight_kernel.h @@ -24,7 +24,7 @@ #include "backend/kernel_compiler/cpu/cpu_kernel.h" #include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" #include "ps/ps_context.h" -#include "ps/worker/fl_worker.h" +#include "fl/worker/fl_worker.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/fl/CMakeLists.txt b/mindspore/ccsrc/fl/CMakeLists.txt new file mode 100644 index 00000000000..d05c1e66847 --- /dev/null +++ b/mindspore/ccsrc/fl/CMakeLists.txt @@ -0,0 +1,44 @@ +file(GLOB_RECURSE _FL_SRC_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.cc") + +if(NOT ENABLE_CPU OR WIN32) + list(REMOVE_ITEM _FL_SRC_FILES "server/kernel/apply_momentum_kernel.cc") + list(REMOVE_ITEM _FL_SRC_FILES "server/kernel/aggregation_kernel_factory.cc") + list(REMOVE_ITEM _FL_SRC_FILES "server/kernel/dense_grad_accum_kernel.cc") + list(REMOVE_ITEM _FL_SRC_FILES "server/kernel/fed_avg_kernel.cc") + list(REMOVE_ITEM _FL_SRC_FILES "server/kernel/optimizer_kernel_factory.cc") + list(REMOVE_ITEM _FL_SRC_FILES "server/kernel/round/round_kernel_factory.cc") + list(REMOVE_ITEM _FL_SRC_FILES "server/kernel/round/round_kernel.cc") + list(REMOVE_ITEM _FL_SRC_FILES "server/kernel/round/start_fl_job_kernel.cc") + list(REMOVE_ITEM _FL_SRC_FILES "server/kernel/round/update_model_kernel.cc") + list(REMOVE_ITEM _FL_SRC_FILES "server/kernel/round/get_model_kernel.cc") + list(REMOVE_ITEM _FL_SRC_FILES "server/kernel/round/pull_weight_kernel.cc") + list(REMOVE_ITEM _FL_SRC_FILES "server/kernel/round/push_weight_kernel.cc") + list(REMOVE_ITEM _FL_SRC_FILES "server/kernel/round/client_list_kernel.cc") + list(REMOVE_ITEM _FL_SRC_FILES "server/kernel/round/exchange_keys_kernel.cc") + list(REMOVE_ITEM _FL_SRC_FILES "server/kernel/round/get_keys_kernel.cc") + list(REMOVE_ITEM _FL_SRC_FILES "server/kernel/round/get_secrets_kernel.cc") + list(REMOVE_ITEM _FL_SRC_FILES "server/kernel/round/reconstruct_secrets_kernel.cc") + list(REMOVE_ITEM _FL_SRC_FILES "server/kernel/round/share_secrets_kernel.cc") + list(REMOVE_ITEM _FL_SRC_FILES "server/kernel/params_info.cc") + list(REMOVE_ITEM _FL_SRC_FILES "server/consistent_hash_ring.cc") + list(REMOVE_ITEM _FL_SRC_FILES "server/iteration_timer.cc") + list(REMOVE_ITEM _FL_SRC_FILES "server/local_meta_store.cc") + list(REMOVE_ITEM _FL_SRC_FILES "server/memory_register.cc") + list(REMOVE_ITEM _FL_SRC_FILES "server/parameter_aggregator.cc") + list(REMOVE_ITEM _FL_SRC_FILES "server/executor.cc") + list(REMOVE_ITEM _FL_SRC_FILES "server/collective_ops_impl.cc") + list(REMOVE_ITEM _FL_SRC_FILES "server/distributed_count_service.cc") + list(REMOVE_ITEM _FL_SRC_FILES "server/distributed_metadata_store.cc") + list(REMOVE_ITEM _FL_SRC_FILES "server/iteration.cc") + list(REMOVE_ITEM _FL_SRC_FILES "server/model_store.cc") + list(REMOVE_ITEM _FL_SRC_FILES "server/round.cc") + list(REMOVE_ITEM _FL_SRC_FILES "server/server.cc") + list(REMOVE_ITEM _FL_SRC_FILES "worker/fl_worker.cc") +endif() + +list(LENGTH _FL_SRC_FILES fl_file_num) +if(NOT fl_file_num EQUAL 0) + set_property(SOURCE ${_FL_SRC_FILES} PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_FL) + add_library(_mindspore_fl_obj OBJECT ${_FL_SRC_FILES}) + target_link_libraries(_mindspore_fl_obj mindspore::flatbuffers) +endif() diff --git a/mindspore/ccsrc/ps/server/collective_ops_impl.cc b/mindspore/ccsrc/fl/server/collective_ops_impl.cc similarity index 99% rename from mindspore/ccsrc/ps/server/collective_ops_impl.cc rename to mindspore/ccsrc/fl/server/collective_ops_impl.cc index e4aba56252f..d9ab5cdce60 100644 --- a/mindspore/ccsrc/ps/server/collective_ops_impl.cc +++ b/mindspore/ccsrc/fl/server/collective_ops_impl.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "ps/server/collective_ops_impl.h" +#include "fl/server/collective_ops_impl.h" namespace mindspore { namespace ps { diff --git a/mindspore/ccsrc/ps/server/collective_ops_impl.h b/mindspore/ccsrc/fl/server/collective_ops_impl.h similarity index 98% rename from mindspore/ccsrc/ps/server/collective_ops_impl.h rename to mindspore/ccsrc/fl/server/collective_ops_impl.h index 0d596e8b62e..5bd15b8d735 100644 --- a/mindspore/ccsrc/ps/server/collective_ops_impl.h +++ b/mindspore/ccsrc/fl/server/collective_ops_impl.h @@ -24,7 +24,7 @@ #include "proto/ps.pb.h" #include "ps/ps_context.h" #include "ps/core/server_node.h" -#include "ps/server/common.h" +#include "fl/server/common.h" namespace mindspore { namespace ps { diff --git a/mindspore/ccsrc/ps/server/common.h b/mindspore/ccsrc/fl/server/common.h similarity index 100% rename from mindspore/ccsrc/ps/server/common.h rename to mindspore/ccsrc/fl/server/common.h diff --git a/mindspore/ccsrc/ps/server/consistent_hash_ring.cc b/mindspore/ccsrc/fl/server/consistent_hash_ring.cc similarity index 97% rename from mindspore/ccsrc/ps/server/consistent_hash_ring.cc rename to mindspore/ccsrc/fl/server/consistent_hash_ring.cc index cc6e8986f26..2b477885678 100644 --- a/mindspore/ccsrc/ps/server/consistent_hash_ring.cc +++ b/mindspore/ccsrc/fl/server/consistent_hash_ring.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "ps/server/consistent_hash_ring.h" +#include "fl/server/consistent_hash_ring.h" namespace mindspore { namespace ps { diff --git a/mindspore/ccsrc/ps/server/consistent_hash_ring.h b/mindspore/ccsrc/fl/server/consistent_hash_ring.h similarity index 100% rename from mindspore/ccsrc/ps/server/consistent_hash_ring.h rename to mindspore/ccsrc/fl/server/consistent_hash_ring.h diff --git a/mindspore/ccsrc/ps/server/distributed_count_service.cc b/mindspore/ccsrc/fl/server/distributed_count_service.cc similarity index 99% rename from mindspore/ccsrc/ps/server/distributed_count_service.cc rename to mindspore/ccsrc/fl/server/distributed_count_service.cc index 6dfdf16fd88..644a728be5d 100644 --- a/mindspore/ccsrc/ps/server/distributed_count_service.cc +++ b/mindspore/ccsrc/fl/server/distributed_count_service.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "ps/server/distributed_count_service.h" +#include "fl/server/distributed_count_service.h" #include #include #include diff --git a/mindspore/ccsrc/ps/server/distributed_count_service.h b/mindspore/ccsrc/fl/server/distributed_count_service.h similarity index 99% rename from mindspore/ccsrc/ps/server/distributed_count_service.h rename to mindspore/ccsrc/fl/server/distributed_count_service.h index be387718cc3..4df8af528a7 100644 --- a/mindspore/ccsrc/ps/server/distributed_count_service.h +++ b/mindspore/ccsrc/fl/server/distributed_count_service.h @@ -22,7 +22,7 @@ #include #include #include "proto/ps.pb.h" -#include "ps/server/common.h" +#include "fl/server/common.h" #include "ps/core/server_node.h" #include "ps/core/communicator/tcp_communicator.h" diff --git a/mindspore/ccsrc/ps/server/distributed_metadata_store.cc b/mindspore/ccsrc/fl/server/distributed_metadata_store.cc similarity index 99% rename from mindspore/ccsrc/ps/server/distributed_metadata_store.cc rename to mindspore/ccsrc/fl/server/distributed_metadata_store.cc index 90aca8c8081..7609874b609 100644 --- a/mindspore/ccsrc/ps/server/distributed_metadata_store.cc +++ b/mindspore/ccsrc/fl/server/distributed_metadata_store.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "ps/server/distributed_metadata_store.h" +#include "fl/server/distributed_metadata_store.h" #include #include #include diff --git a/mindspore/ccsrc/ps/server/distributed_metadata_store.h b/mindspore/ccsrc/fl/server/distributed_metadata_store.h similarity index 98% rename from mindspore/ccsrc/ps/server/distributed_metadata_store.h rename to mindspore/ccsrc/fl/server/distributed_metadata_store.h index 6e86318bd7d..0559401fc44 100644 --- a/mindspore/ccsrc/ps/server/distributed_metadata_store.h +++ b/mindspore/ccsrc/fl/server/distributed_metadata_store.h @@ -21,10 +21,10 @@ #include #include #include "proto/ps.pb.h" -#include "ps/server/common.h" +#include "fl/server/common.h" #include "ps/core/server_node.h" #include "ps/core/communicator/tcp_communicator.h" -#include "ps/server/consistent_hash_ring.h" +#include "fl/server/consistent_hash_ring.h" namespace mindspore { namespace ps { diff --git a/mindspore/ccsrc/ps/server/executor.cc b/mindspore/ccsrc/fl/server/executor.cc similarity index 99% rename from mindspore/ccsrc/ps/server/executor.cc rename to mindspore/ccsrc/fl/server/executor.cc index ce2c5602afb..fb5db0559c4 100644 --- a/mindspore/ccsrc/ps/server/executor.cc +++ b/mindspore/ccsrc/fl/server/executor.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "ps/server/executor.h" +#include "fl/server/executor.h" #include #include #include diff --git a/mindspore/ccsrc/ps/server/executor.h b/mindspore/ccsrc/fl/server/executor.h similarity index 98% rename from mindspore/ccsrc/ps/server/executor.h rename to mindspore/ccsrc/fl/server/executor.h index 893d34d8b70..0c6de802acd 100644 --- a/mindspore/ccsrc/ps/server/executor.h +++ b/mindspore/ccsrc/fl/server/executor.h @@ -24,8 +24,8 @@ #include #include #include -#include "ps/server/common.h" -#include "ps/server/parameter_aggregator.h" +#include "fl/server/common.h" +#include "fl/server/parameter_aggregator.h" #ifdef ENABLE_ARMOUR #include "armour/cipher/cipher_unmask.h" #endif diff --git a/mindspore/ccsrc/ps/server/iteration.cc b/mindspore/ccsrc/fl/server/iteration.cc similarity index 99% rename from mindspore/ccsrc/ps/server/iteration.cc rename to mindspore/ccsrc/fl/server/iteration.cc index 53c358ced2d..fb3aea1f4bc 100644 --- a/mindspore/ccsrc/ps/server/iteration.cc +++ b/mindspore/ccsrc/fl/server/iteration.cc @@ -14,13 +14,13 @@ * limitations under the License. */ -#include "ps/server/iteration.h" +#include "fl/server/iteration.h" #include #include #include #include -#include "ps/server/model_store.h" -#include "ps/server/server.h" +#include "fl/server/model_store.h" +#include "fl/server/server.h" namespace mindspore { namespace ps { diff --git a/mindspore/ccsrc/ps/server/iteration.h b/mindspore/ccsrc/fl/server/iteration.h similarity index 98% rename from mindspore/ccsrc/ps/server/iteration.h rename to mindspore/ccsrc/fl/server/iteration.h index bb92365c972..3f30a51d84e 100644 --- a/mindspore/ccsrc/ps/server/iteration.h +++ b/mindspore/ccsrc/fl/server/iteration.h @@ -21,9 +21,9 @@ #include #include #include "ps/core/communicator/communicator_base.h" -#include "ps/server/common.h" -#include "ps/server/round.h" -#include "ps/server/local_meta_store.h" +#include "fl/server/common.h" +#include "fl/server/round.h" +#include "fl/server/local_meta_store.h" namespace mindspore { namespace ps { diff --git a/mindspore/ccsrc/ps/server/iteration_timer.cc b/mindspore/ccsrc/fl/server/iteration_timer.cc similarity index 97% rename from mindspore/ccsrc/ps/server/iteration_timer.cc rename to mindspore/ccsrc/fl/server/iteration_timer.cc index 19233339575..bcbf77f2ca2 100644 --- a/mindspore/ccsrc/ps/server/iteration_timer.cc +++ b/mindspore/ccsrc/fl/server/iteration_timer.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "ps/server/iteration_timer.h" +#include "fl/server/iteration_timer.h" namespace mindspore { namespace ps { diff --git a/mindspore/ccsrc/ps/server/iteration_timer.h b/mindspore/ccsrc/fl/server/iteration_timer.h similarity index 98% rename from mindspore/ccsrc/ps/server/iteration_timer.h rename to mindspore/ccsrc/fl/server/iteration_timer.h index 8054e23a687..6b44af629cc 100644 --- a/mindspore/ccsrc/ps/server/iteration_timer.h +++ b/mindspore/ccsrc/fl/server/iteration_timer.h @@ -21,7 +21,7 @@ #include #include #include -#include "ps/server/common.h" +#include "fl/server/common.h" namespace mindspore { namespace ps { diff --git a/mindspore/ccsrc/ps/server/kernel/aggregation_kernel.h b/mindspore/ccsrc/fl/server/kernel/aggregation_kernel.h similarity index 97% rename from mindspore/ccsrc/ps/server/kernel/aggregation_kernel.h rename to mindspore/ccsrc/fl/server/kernel/aggregation_kernel.h index f5b2f8b1757..937f5be91df 100644 --- a/mindspore/ccsrc/ps/server/kernel/aggregation_kernel.h +++ b/mindspore/ccsrc/fl/server/kernel/aggregation_kernel.h @@ -21,9 +21,9 @@ #include #include #include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "ps/server/common.h" -#include "ps/server/memory_register.h" -#include "ps/server/kernel/params_info.h" +#include "fl/server/common.h" +#include "fl/server/memory_register.h" +#include "fl/server/kernel/params_info.h" namespace mindspore { namespace ps { diff --git a/mindspore/ccsrc/ps/server/kernel/aggregation_kernel_factory.cc b/mindspore/ccsrc/fl/server/kernel/aggregation_kernel_factory.cc similarity index 97% rename from mindspore/ccsrc/ps/server/kernel/aggregation_kernel_factory.cc rename to mindspore/ccsrc/fl/server/kernel/aggregation_kernel_factory.cc index f2179e4252e..f648eb1d056 100644 --- a/mindspore/ccsrc/ps/server/kernel/aggregation_kernel_factory.cc +++ b/mindspore/ccsrc/fl/server/kernel/aggregation_kernel_factory.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "ps/server/kernel/aggregation_kernel_factory.h" +#include "fl/server/kernel/aggregation_kernel_factory.h" #include namespace mindspore { diff --git a/mindspore/ccsrc/ps/server/kernel/aggregation_kernel_factory.h b/mindspore/ccsrc/fl/server/kernel/aggregation_kernel_factory.h similarity index 97% rename from mindspore/ccsrc/ps/server/kernel/aggregation_kernel_factory.h rename to mindspore/ccsrc/fl/server/kernel/aggregation_kernel_factory.h index 87c0ead82f7..b1768791b12 100644 --- a/mindspore/ccsrc/ps/server/kernel/aggregation_kernel_factory.h +++ b/mindspore/ccsrc/fl/server/kernel/aggregation_kernel_factory.h @@ -20,8 +20,8 @@ #include #include #include -#include "ps/server/kernel/kernel_factory.h" -#include "ps/server/kernel/aggregation_kernel.h" +#include "fl/server/kernel/kernel_factory.h" +#include "fl/server/kernel/aggregation_kernel.h" namespace mindspore { namespace ps { diff --git a/mindspore/ccsrc/ps/server/kernel/apply_momentum_kernel.cc b/mindspore/ccsrc/fl/server/kernel/apply_momentum_kernel.cc similarity index 96% rename from mindspore/ccsrc/ps/server/kernel/apply_momentum_kernel.cc rename to mindspore/ccsrc/fl/server/kernel/apply_momentum_kernel.cc index 218fd982bea..82c65c72f73 100644 --- a/mindspore/ccsrc/ps/server/kernel/apply_momentum_kernel.cc +++ b/mindspore/ccsrc/fl/server/kernel/apply_momentum_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "ps/server/kernel/apply_momentum_kernel.h" +#include "fl/server/kernel/apply_momentum_kernel.h" namespace mindspore { namespace ps { diff --git a/mindspore/ccsrc/ps/server/kernel/apply_momentum_kernel.h b/mindspore/ccsrc/fl/server/kernel/apply_momentum_kernel.h similarity index 95% rename from mindspore/ccsrc/ps/server/kernel/apply_momentum_kernel.h rename to mindspore/ccsrc/fl/server/kernel/apply_momentum_kernel.h index 3aef67af78f..c9a1c6e4034 100644 --- a/mindspore/ccsrc/ps/server/kernel/apply_momentum_kernel.h +++ b/mindspore/ccsrc/fl/server/kernel/apply_momentum_kernel.h @@ -21,8 +21,8 @@ #include #include #include "backend/kernel_compiler/cpu/apply_momentum_cpu_kernel.h" -#include "ps/server/kernel/optimizer_kernel.h" -#include "ps/server/kernel/optimizer_kernel_factory.h" +#include "fl/server/kernel/optimizer_kernel.h" +#include "fl/server/kernel/optimizer_kernel_factory.h" namespace mindspore { namespace ps { diff --git a/mindspore/ccsrc/ps/server/kernel/dense_grad_accum_kernel.cc b/mindspore/ccsrc/fl/server/kernel/dense_grad_accum_kernel.cc similarity index 94% rename from mindspore/ccsrc/ps/server/kernel/dense_grad_accum_kernel.cc rename to mindspore/ccsrc/fl/server/kernel/dense_grad_accum_kernel.cc index 61c51f24e6e..7a74ed29ff5 100644 --- a/mindspore/ccsrc/ps/server/kernel/dense_grad_accum_kernel.cc +++ b/mindspore/ccsrc/fl/server/kernel/dense_grad_accum_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "ps/server/kernel/dense_grad_accum_kernel.h" +#include "fl/server/kernel/dense_grad_accum_kernel.h" namespace mindspore { namespace ps { diff --git a/mindspore/ccsrc/ps/server/kernel/dense_grad_accum_kernel.h b/mindspore/ccsrc/fl/server/kernel/dense_grad_accum_kernel.h similarity index 96% rename from mindspore/ccsrc/ps/server/kernel/dense_grad_accum_kernel.h rename to mindspore/ccsrc/fl/server/kernel/dense_grad_accum_kernel.h index c8cd522d76c..2ce89f99f43 100644 --- a/mindspore/ccsrc/ps/server/kernel/dense_grad_accum_kernel.h +++ b/mindspore/ccsrc/fl/server/kernel/dense_grad_accum_kernel.h @@ -22,8 +22,8 @@ #include #include #include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "ps/server/kernel/aggregation_kernel.h" -#include "ps/server/kernel/aggregation_kernel_factory.h" +#include "fl/server/kernel/aggregation_kernel.h" +#include "fl/server/kernel/aggregation_kernel_factory.h" namespace mindspore { namespace ps { diff --git a/mindspore/ccsrc/ps/server/kernel/fed_avg_kernel.cc b/mindspore/ccsrc/fl/server/kernel/fed_avg_kernel.cc similarity index 96% rename from mindspore/ccsrc/ps/server/kernel/fed_avg_kernel.cc rename to mindspore/ccsrc/fl/server/kernel/fed_avg_kernel.cc index 30a8d806c77..2b379217036 100644 --- a/mindspore/ccsrc/ps/server/kernel/fed_avg_kernel.cc +++ b/mindspore/ccsrc/fl/server/kernel/fed_avg_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "ps/server/kernel/fed_avg_kernel.h" +#include "fl/server/kernel/fed_avg_kernel.h" namespace mindspore { namespace ps { diff --git a/mindspore/ccsrc/ps/server/kernel/fed_avg_kernel.h b/mindspore/ccsrc/fl/server/kernel/fed_avg_kernel.h similarity index 96% rename from mindspore/ccsrc/ps/server/kernel/fed_avg_kernel.h rename to mindspore/ccsrc/fl/server/kernel/fed_avg_kernel.h index e1a150e02d2..edbe187e347 100644 --- a/mindspore/ccsrc/ps/server/kernel/fed_avg_kernel.h +++ b/mindspore/ccsrc/fl/server/kernel/fed_avg_kernel.h @@ -23,12 +23,12 @@ #include #include #include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "ps/server/common.h" -#include "ps/server/collective_ops_impl.h" -#include "ps/server/distributed_count_service.h" -#include "ps/server/local_meta_store.h" -#include "ps/server/kernel/aggregation_kernel.h" -#include "ps/server/kernel/aggregation_kernel_factory.h" +#include "fl/server/common.h" +#include "fl/server/collective_ops_impl.h" +#include "fl/server/distributed_count_service.h" +#include "fl/server/local_meta_store.h" +#include "fl/server/kernel/aggregation_kernel.h" +#include "fl/server/kernel/aggregation_kernel_factory.h" namespace mindspore { namespace ps { diff --git a/mindspore/ccsrc/ps/server/kernel/kernel_factory.h b/mindspore/ccsrc/fl/server/kernel/kernel_factory.h similarity index 97% rename from mindspore/ccsrc/ps/server/kernel/kernel_factory.h rename to mindspore/ccsrc/fl/server/kernel/kernel_factory.h index 2490c7c95c9..4d7d3768e5b 100644 --- a/mindspore/ccsrc/ps/server/kernel/kernel_factory.h +++ b/mindspore/ccsrc/fl/server/kernel/kernel_factory.h @@ -22,8 +22,8 @@ #include #include #include -#include "ps/server/common.h" -#include "ps/server/kernel/params_info.h" +#include "fl/server/common.h" +#include "fl/server/kernel/params_info.h" namespace mindspore { namespace ps { diff --git a/mindspore/ccsrc/ps/server/kernel/optimizer_kernel.h b/mindspore/ccsrc/fl/server/kernel/optimizer_kernel.h similarity index 97% rename from mindspore/ccsrc/ps/server/kernel/optimizer_kernel.h rename to mindspore/ccsrc/fl/server/kernel/optimizer_kernel.h index 7bc45ca6b5c..3d4bb362ebc 100644 --- a/mindspore/ccsrc/ps/server/kernel/optimizer_kernel.h +++ b/mindspore/ccsrc/fl/server/kernel/optimizer_kernel.h @@ -23,9 +23,9 @@ #include #include "backend/kernel_compiler/common_utils.h" #include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "ps/server/common.h" -#include "ps/server/memory_register.h" -#include "ps/server/kernel/params_info.h" +#include "fl/server/common.h" +#include "fl/server/memory_register.h" +#include "fl/server/kernel/params_info.h" namespace mindspore { namespace ps { diff --git a/mindspore/ccsrc/ps/server/kernel/optimizer_kernel_factory.cc b/mindspore/ccsrc/fl/server/kernel/optimizer_kernel_factory.cc similarity index 97% rename from mindspore/ccsrc/ps/server/kernel/optimizer_kernel_factory.cc rename to mindspore/ccsrc/fl/server/kernel/optimizer_kernel_factory.cc index 98465490931..f06ecc2c606 100644 --- a/mindspore/ccsrc/ps/server/kernel/optimizer_kernel_factory.cc +++ b/mindspore/ccsrc/fl/server/kernel/optimizer_kernel_factory.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "ps/server/kernel/optimizer_kernel_factory.h" +#include "fl/server/kernel/optimizer_kernel_factory.h" #include namespace mindspore { diff --git a/mindspore/ccsrc/ps/server/kernel/optimizer_kernel_factory.h b/mindspore/ccsrc/fl/server/kernel/optimizer_kernel_factory.h similarity index 96% rename from mindspore/ccsrc/ps/server/kernel/optimizer_kernel_factory.h rename to mindspore/ccsrc/fl/server/kernel/optimizer_kernel_factory.h index 987a93a0a52..b486bafd9a3 100644 --- a/mindspore/ccsrc/ps/server/kernel/optimizer_kernel_factory.h +++ b/mindspore/ccsrc/fl/server/kernel/optimizer_kernel_factory.h @@ -20,8 +20,8 @@ #include #include #include -#include "ps/server/kernel/kernel_factory.h" -#include "ps/server/kernel/optimizer_kernel.h" +#include "fl/server/kernel/kernel_factory.h" +#include "fl/server/kernel/optimizer_kernel.h" namespace mindspore { namespace ps { diff --git a/mindspore/ccsrc/ps/server/kernel/params_info.cc b/mindspore/ccsrc/fl/server/kernel/params_info.cc similarity index 98% rename from mindspore/ccsrc/ps/server/kernel/params_info.cc rename to mindspore/ccsrc/fl/server/kernel/params_info.cc index e68b7f2a700..693754b19f2 100644 --- a/mindspore/ccsrc/ps/server/kernel/params_info.cc +++ b/mindspore/ccsrc/fl/server/kernel/params_info.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "ps/server/kernel/params_info.h" +#include "fl/server/kernel/params_info.h" #include "utils/log_adapter.h" namespace mindspore { diff --git a/mindspore/ccsrc/ps/server/kernel/params_info.h b/mindspore/ccsrc/fl/server/kernel/params_info.h similarity index 100% rename from mindspore/ccsrc/ps/server/kernel/params_info.h rename to mindspore/ccsrc/fl/server/kernel/params_info.h diff --git a/mindspore/ccsrc/ps/server/kernel/round/client_list_kernel.cc b/mindspore/ccsrc/fl/server/kernel/round/client_list_kernel.cc similarity index 99% rename from mindspore/ccsrc/ps/server/kernel/round/client_list_kernel.cc rename to mindspore/ccsrc/fl/server/kernel/round/client_list_kernel.cc index 6f0d003cd81..be4852705d4 100644 --- a/mindspore/ccsrc/ps/server/kernel/round/client_list_kernel.cc +++ b/mindspore/ccsrc/fl/server/kernel/round/client_list_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "ps/server/kernel/round/client_list_kernel.h" +#include "fl/server/kernel/round/client_list_kernel.h" #include #include #include diff --git a/mindspore/ccsrc/ps/server/kernel/round/client_list_kernel.h b/mindspore/ccsrc/fl/server/kernel/round/client_list_kernel.h similarity index 92% rename from mindspore/ccsrc/ps/server/kernel/round/client_list_kernel.h rename to mindspore/ccsrc/fl/server/kernel/round/client_list_kernel.h index 36992fe7598..b1c50d6ebbd 100644 --- a/mindspore/ccsrc/ps/server/kernel/round/client_list_kernel.h +++ b/mindspore/ccsrc/fl/server/kernel/round/client_list_kernel.h @@ -19,11 +19,11 @@ #include #include #include -#include "ps/server/common.h" -#include "ps/server/kernel/round/round_kernel.h" -#include "ps/server/kernel/round/round_kernel_factory.h" +#include "fl/server/common.h" +#include "fl/server/kernel/round/round_kernel.h" +#include "fl/server/kernel/round/round_kernel_factory.h" #include "armour/cipher/cipher_init.h" -#include "ps/server/executor.h" +#include "fl/server/executor.h" namespace mindspore { namespace ps { diff --git a/mindspore/ccsrc/ps/server/kernel/round/exchange_keys_kernel.cc b/mindspore/ccsrc/fl/server/kernel/round/exchange_keys_kernel.cc similarity index 98% rename from mindspore/ccsrc/ps/server/kernel/round/exchange_keys_kernel.cc rename to mindspore/ccsrc/fl/server/kernel/round/exchange_keys_kernel.cc index 98f1251cc17..8b75bee217a 100644 --- a/mindspore/ccsrc/ps/server/kernel/round/exchange_keys_kernel.cc +++ b/mindspore/ccsrc/fl/server/kernel/round/exchange_keys_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "ps/server/kernel/round/exchange_keys_kernel.h" +#include "fl/server/kernel/round/exchange_keys_kernel.h" #include #include #include diff --git a/mindspore/ccsrc/ps/server/kernel/round/exchange_keys_kernel.h b/mindspore/ccsrc/fl/server/kernel/round/exchange_keys_kernel.h similarity index 89% rename from mindspore/ccsrc/ps/server/kernel/round/exchange_keys_kernel.h rename to mindspore/ccsrc/fl/server/kernel/round/exchange_keys_kernel.h index 977b140eebc..25814529cba 100644 --- a/mindspore/ccsrc/ps/server/kernel/round/exchange_keys_kernel.h +++ b/mindspore/ccsrc/fl/server/kernel/round/exchange_keys_kernel.h @@ -18,10 +18,10 @@ #define MINDSPORE_CCSRC_PS_SERVER_KERNEL_EXCHANGE_KEYS_KERNEL_H #include -#include "ps/server/common.h" -#include "ps/server/kernel/round/round_kernel.h" -#include "ps/server/kernel/round/round_kernel_factory.h" -#include "ps/server/executor.h" +#include "fl/server/common.h" +#include "fl/server/kernel/round/round_kernel.h" +#include "fl/server/kernel/round/round_kernel_factory.h" +#include "fl/server/executor.h" #include "armour/cipher/cipher_keys.h" namespace mindspore { diff --git a/mindspore/ccsrc/ps/server/kernel/round/get_keys_kernel.cc b/mindspore/ccsrc/fl/server/kernel/round/get_keys_kernel.cc similarity index 98% rename from mindspore/ccsrc/ps/server/kernel/round/get_keys_kernel.cc rename to mindspore/ccsrc/fl/server/kernel/round/get_keys_kernel.cc index c32ab7d9e27..607645cd7f1 100644 --- a/mindspore/ccsrc/ps/server/kernel/round/get_keys_kernel.cc +++ b/mindspore/ccsrc/fl/server/kernel/round/get_keys_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "ps/server/kernel/round/get_keys_kernel.h" +#include "fl/server/kernel/round/get_keys_kernel.h" #include #include diff --git a/mindspore/ccsrc/ps/server/kernel/round/get_keys_kernel.h b/mindspore/ccsrc/fl/server/kernel/round/get_keys_kernel.h similarity index 89% rename from mindspore/ccsrc/ps/server/kernel/round/get_keys_kernel.h rename to mindspore/ccsrc/fl/server/kernel/round/get_keys_kernel.h index 3902bb664b1..7cc8ed46fe4 100644 --- a/mindspore/ccsrc/ps/server/kernel/round/get_keys_kernel.h +++ b/mindspore/ccsrc/fl/server/kernel/round/get_keys_kernel.h @@ -18,10 +18,10 @@ #define MINDSPORE_CCSRC_PS_SERVER_KERNEL_GET_KEYS_KERNEL_H #include -#include "ps/server/common.h" -#include "ps/server/kernel/round/round_kernel.h" -#include "ps/server/kernel/round/round_kernel_factory.h" -#include "ps/server/executor.h" +#include "fl/server/common.h" +#include "fl/server/kernel/round/round_kernel.h" +#include "fl/server/kernel/round/round_kernel_factory.h" +#include "fl/server/executor.h" #include "armour/cipher/cipher_keys.h" namespace mindspore { diff --git a/mindspore/ccsrc/ps/server/kernel/round/get_model_kernel.cc b/mindspore/ccsrc/fl/server/kernel/round/get_model_kernel.cc similarity index 97% rename from mindspore/ccsrc/ps/server/kernel/round/get_model_kernel.cc rename to mindspore/ccsrc/fl/server/kernel/round/get_model_kernel.cc index 8b4c5cae843..c0a362000d6 100644 --- a/mindspore/ccsrc/ps/server/kernel/round/get_model_kernel.cc +++ b/mindspore/ccsrc/fl/server/kernel/round/get_model_kernel.cc @@ -14,13 +14,13 @@ * limitations under the License. */ -#include "ps/server/kernel/round/get_model_kernel.h" +#include "fl/server/kernel/round/get_model_kernel.h" #include #include #include #include -#include "ps/server/iteration.h" -#include "ps/server/model_store.h" +#include "fl/server/iteration.h" +#include "fl/server/model_store.h" namespace mindspore { namespace ps { diff --git a/mindspore/ccsrc/ps/server/kernel/round/get_model_kernel.h b/mindspore/ccsrc/fl/server/kernel/round/get_model_kernel.h similarity index 91% rename from mindspore/ccsrc/ps/server/kernel/round/get_model_kernel.h rename to mindspore/ccsrc/fl/server/kernel/round/get_model_kernel.h index 10d0cc15ff3..98ca3ca1d2e 100644 --- a/mindspore/ccsrc/ps/server/kernel/round/get_model_kernel.h +++ b/mindspore/ccsrc/fl/server/kernel/round/get_model_kernel.h @@ -21,10 +21,10 @@ #include #include #include -#include "ps/server/common.h" -#include "ps/server/executor.h" -#include "ps/server/kernel/round/round_kernel.h" -#include "ps/server/kernel/round/round_kernel_factory.h" +#include "fl/server/common.h" +#include "fl/server/executor.h" +#include "fl/server/kernel/round/round_kernel.h" +#include "fl/server/kernel/round/round_kernel_factory.h" namespace mindspore { namespace ps { diff --git a/mindspore/ccsrc/ps/server/kernel/round/get_secrets_kernel.cc b/mindspore/ccsrc/fl/server/kernel/round/get_secrets_kernel.cc similarity index 98% rename from mindspore/ccsrc/ps/server/kernel/round/get_secrets_kernel.cc rename to mindspore/ccsrc/fl/server/kernel/round/get_secrets_kernel.cc index bb1dc2c084a..b0c6a822c85 100644 --- a/mindspore/ccsrc/ps/server/kernel/round/get_secrets_kernel.cc +++ b/mindspore/ccsrc/fl/server/kernel/round/get_secrets_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "ps/server/kernel/round/get_secrets_kernel.h" +#include "fl/server/kernel/round/get_secrets_kernel.h" #include #include #include diff --git a/mindspore/ccsrc/ps/server/kernel/round/get_secrets_kernel.h b/mindspore/ccsrc/fl/server/kernel/round/get_secrets_kernel.h similarity index 89% rename from mindspore/ccsrc/ps/server/kernel/round/get_secrets_kernel.h rename to mindspore/ccsrc/fl/server/kernel/round/get_secrets_kernel.h index 8e9d5c5e997..d86f781d5d5 100644 --- a/mindspore/ccsrc/ps/server/kernel/round/get_secrets_kernel.h +++ b/mindspore/ccsrc/fl/server/kernel/round/get_secrets_kernel.h @@ -18,11 +18,11 @@ #define MINDSPORE_CCSRC_PS_SERVER_KERNEL_GET_SECRETS_KERNEL_H #include -#include "ps/server/common.h" -#include "ps/server/kernel/round/round_kernel.h" -#include "ps/server/kernel/round/round_kernel_factory.h" +#include "fl/server/common.h" +#include "fl/server/kernel/round/round_kernel.h" +#include "fl/server/kernel/round/round_kernel_factory.h" #include "armour/cipher/cipher_shares.h" -#include "ps/server/executor.h" +#include "fl/server/executor.h" namespace mindspore { namespace ps { diff --git a/mindspore/ccsrc/ps/server/kernel/round/pull_weight_kernel.cc b/mindspore/ccsrc/fl/server/kernel/round/pull_weight_kernel.cc similarity index 98% rename from mindspore/ccsrc/ps/server/kernel/round/pull_weight_kernel.cc rename to mindspore/ccsrc/fl/server/kernel/round/pull_weight_kernel.cc index 0e71039c6d7..847d3830bc5 100644 --- a/mindspore/ccsrc/ps/server/kernel/round/pull_weight_kernel.cc +++ b/mindspore/ccsrc/fl/server/kernel/round/pull_weight_kernel.cc @@ -14,12 +14,12 @@ * limitations under the License. */ -#include "ps/server/kernel/round/pull_weight_kernel.h" +#include "fl/server/kernel/round/pull_weight_kernel.h" #include #include #include #include -#include "ps/server/model_store.h" +#include "fl/server/model_store.h" namespace mindspore { namespace ps { diff --git a/mindspore/ccsrc/ps/server/kernel/round/pull_weight_kernel.h b/mindspore/ccsrc/fl/server/kernel/round/pull_weight_kernel.h similarity index 91% rename from mindspore/ccsrc/ps/server/kernel/round/pull_weight_kernel.h rename to mindspore/ccsrc/fl/server/kernel/round/pull_weight_kernel.h index bd7b438c1f3..62cca7f3f99 100644 --- a/mindspore/ccsrc/ps/server/kernel/round/pull_weight_kernel.h +++ b/mindspore/ccsrc/fl/server/kernel/round/pull_weight_kernel.h @@ -21,10 +21,10 @@ #include #include #include -#include "ps/server/common.h" -#include "ps/server/kernel/round/round_kernel.h" -#include "ps/server/kernel/round/round_kernel_factory.h" -#include "ps/server/executor.h" +#include "fl/server/common.h" +#include "fl/server/kernel/round/round_kernel.h" +#include "fl/server/kernel/round/round_kernel_factory.h" +#include "fl/server/executor.h" namespace mindspore { namespace ps { diff --git a/mindspore/ccsrc/ps/server/kernel/round/push_weight_kernel.cc b/mindspore/ccsrc/fl/server/kernel/round/push_weight_kernel.cc similarity index 99% rename from mindspore/ccsrc/ps/server/kernel/round/push_weight_kernel.cc rename to mindspore/ccsrc/fl/server/kernel/round/push_weight_kernel.cc index e631588d36f..fb472c8548e 100644 --- a/mindspore/ccsrc/ps/server/kernel/round/push_weight_kernel.cc +++ b/mindspore/ccsrc/fl/server/kernel/round/push_weight_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "ps/server/kernel/round/push_weight_kernel.h" +#include "fl/server/kernel/round/push_weight_kernel.h" namespace mindspore { namespace ps { diff --git a/mindspore/ccsrc/ps/server/kernel/round/push_weight_kernel.h b/mindspore/ccsrc/fl/server/kernel/round/push_weight_kernel.h similarity index 91% rename from mindspore/ccsrc/ps/server/kernel/round/push_weight_kernel.h rename to mindspore/ccsrc/fl/server/kernel/round/push_weight_kernel.h index 49c577457ef..4bea60c5ced 100644 --- a/mindspore/ccsrc/ps/server/kernel/round/push_weight_kernel.h +++ b/mindspore/ccsrc/fl/server/kernel/round/push_weight_kernel.h @@ -21,10 +21,10 @@ #include #include #include -#include "ps/server/common.h" -#include "ps/server/kernel/round/round_kernel.h" -#include "ps/server/kernel/round/round_kernel_factory.h" -#include "ps/server/executor.h" +#include "fl/server/common.h" +#include "fl/server/kernel/round/round_kernel.h" +#include "fl/server/kernel/round/round_kernel_factory.h" +#include "fl/server/executor.h" namespace mindspore { namespace ps { diff --git a/mindspore/ccsrc/ps/server/kernel/round/reconstruct_secrets_kernel.cc b/mindspore/ccsrc/fl/server/kernel/round/reconstruct_secrets_kernel.cc similarity index 99% rename from mindspore/ccsrc/ps/server/kernel/round/reconstruct_secrets_kernel.cc rename to mindspore/ccsrc/fl/server/kernel/round/reconstruct_secrets_kernel.cc index 764df9e714f..57ea9ac33bb 100644 --- a/mindspore/ccsrc/ps/server/kernel/round/reconstruct_secrets_kernel.cc +++ b/mindspore/ccsrc/fl/server/kernel/round/reconstruct_secrets_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "ps/server/kernel/round/reconstruct_secrets_kernel.h" +#include "fl/server/kernel/round/reconstruct_secrets_kernel.h" #include #include #include diff --git a/mindspore/ccsrc/ps/server/kernel/round/reconstruct_secrets_kernel.h b/mindspore/ccsrc/fl/server/kernel/round/reconstruct_secrets_kernel.h similarity index 91% rename from mindspore/ccsrc/ps/server/kernel/round/reconstruct_secrets_kernel.h rename to mindspore/ccsrc/fl/server/kernel/round/reconstruct_secrets_kernel.h index 934f6316460..6703922dc5a 100644 --- a/mindspore/ccsrc/ps/server/kernel/round/reconstruct_secrets_kernel.h +++ b/mindspore/ccsrc/fl/server/kernel/round/reconstruct_secrets_kernel.h @@ -20,11 +20,11 @@ #include #include #include -#include "ps/server/common.h" -#include "ps/server/kernel/round/round_kernel.h" -#include "ps/server/kernel/round/round_kernel_factory.h" +#include "fl/server/common.h" +#include "fl/server/kernel/round/round_kernel.h" +#include "fl/server/kernel/round/round_kernel_factory.h" #include "armour/cipher/cipher_reconstruct.h" -#include "ps/server/executor.h" +#include "fl/server/executor.h" namespace mindspore { namespace ps { diff --git a/mindspore/ccsrc/ps/server/kernel/round/round_kernel.cc b/mindspore/ccsrc/fl/server/kernel/round/round_kernel.cc similarity index 98% rename from mindspore/ccsrc/ps/server/kernel/round/round_kernel.cc rename to mindspore/ccsrc/fl/server/kernel/round/round_kernel.cc index 36206c96884..1127b3f0015 100644 --- a/mindspore/ccsrc/ps/server/kernel/round/round_kernel.cc +++ b/mindspore/ccsrc/fl/server/kernel/round/round_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "ps/server/kernel/round/round_kernel.h" +#include "fl/server/kernel/round/round_kernel.h" #include #include #include diff --git a/mindspore/ccsrc/ps/server/kernel/round/round_kernel.h b/mindspore/ccsrc/fl/server/kernel/round/round_kernel.h similarity index 96% rename from mindspore/ccsrc/ps/server/kernel/round/round_kernel.h rename to mindspore/ccsrc/fl/server/kernel/round/round_kernel.h index 17ca9e60956..511f97930c3 100644 --- a/mindspore/ccsrc/ps/server/kernel/round/round_kernel.h +++ b/mindspore/ccsrc/fl/server/kernel/round/round_kernel.h @@ -29,10 +29,10 @@ #include #include "backend/kernel_compiler/common_utils.h" #include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "ps/server/common.h" -#include "ps/server/local_meta_store.h" -#include "ps/server/distributed_count_service.h" -#include "ps/server/distributed_metadata_store.h" +#include "fl/server/common.h" +#include "fl/server/local_meta_store.h" +#include "fl/server/distributed_count_service.h" +#include "fl/server/distributed_metadata_store.h" namespace mindspore { namespace ps { diff --git a/mindspore/ccsrc/ps/server/kernel/round/round_kernel_factory.cc b/mindspore/ccsrc/fl/server/kernel/round/round_kernel_factory.cc similarity index 95% rename from mindspore/ccsrc/ps/server/kernel/round/round_kernel_factory.cc rename to mindspore/ccsrc/fl/server/kernel/round/round_kernel_factory.cc index d669b74d879..efdebbf7554 100644 --- a/mindspore/ccsrc/ps/server/kernel/round/round_kernel_factory.cc +++ b/mindspore/ccsrc/fl/server/kernel/round/round_kernel_factory.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "ps/server/kernel/round/round_kernel_factory.h" +#include "fl/server/kernel/round/round_kernel_factory.h" namespace mindspore { namespace ps { diff --git a/mindspore/ccsrc/ps/server/kernel/round/round_kernel_factory.h b/mindspore/ccsrc/fl/server/kernel/round/round_kernel_factory.h similarity index 96% rename from mindspore/ccsrc/ps/server/kernel/round/round_kernel_factory.h rename to mindspore/ccsrc/fl/server/kernel/round/round_kernel_factory.h index 45c4226ad8e..37412c4f994 100644 --- a/mindspore/ccsrc/ps/server/kernel/round/round_kernel_factory.h +++ b/mindspore/ccsrc/fl/server/kernel/round/round_kernel_factory.h @@ -21,8 +21,8 @@ #include #include #include -#include "ps/server/common.h" -#include "ps/server/kernel/round/round_kernel.h" +#include "fl/server/common.h" +#include "fl/server/kernel/round/round_kernel.h" namespace mindspore { namespace ps { diff --git a/mindspore/ccsrc/ps/server/kernel/round/share_secrets_kernel.cc b/mindspore/ccsrc/fl/server/kernel/round/share_secrets_kernel.cc similarity index 98% rename from mindspore/ccsrc/ps/server/kernel/round/share_secrets_kernel.cc rename to mindspore/ccsrc/fl/server/kernel/round/share_secrets_kernel.cc index 262c7d83265..4f183f106a4 100644 --- a/mindspore/ccsrc/ps/server/kernel/round/share_secrets_kernel.cc +++ b/mindspore/ccsrc/fl/server/kernel/round/share_secrets_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "ps/server/kernel/round/share_secrets_kernel.h" +#include "fl/server/kernel/round/share_secrets_kernel.h" #include #include diff --git a/mindspore/ccsrc/ps/server/kernel/round/share_secrets_kernel.h b/mindspore/ccsrc/fl/server/kernel/round/share_secrets_kernel.h similarity index 89% rename from mindspore/ccsrc/ps/server/kernel/round/share_secrets_kernel.h rename to mindspore/ccsrc/fl/server/kernel/round/share_secrets_kernel.h index fd06c03f342..4db87469011 100644 --- a/mindspore/ccsrc/ps/server/kernel/round/share_secrets_kernel.h +++ b/mindspore/ccsrc/fl/server/kernel/round/share_secrets_kernel.h @@ -18,10 +18,10 @@ #define MINDSPORE_CCSRC_PS_SERVER_KERNEL_SHARE_SECRETS_KERNEL_H #include -#include "ps/server/common.h" -#include "ps/server/executor.h" -#include "ps/server/kernel/round/round_kernel.h" -#include "ps/server/kernel/round/round_kernel_factory.h" +#include "fl/server/common.h" +#include "fl/server/executor.h" +#include "fl/server/kernel/round/round_kernel.h" +#include "fl/server/kernel/round/round_kernel_factory.h" #include "armour/cipher/cipher_shares.h" namespace mindspore { diff --git a/mindspore/ccsrc/ps/server/kernel/round/start_fl_job_kernel.cc b/mindspore/ccsrc/fl/server/kernel/round/start_fl_job_kernel.cc similarity index 98% rename from mindspore/ccsrc/ps/server/kernel/round/start_fl_job_kernel.cc rename to mindspore/ccsrc/fl/server/kernel/round/start_fl_job_kernel.cc index 8d31bfbebdc..ef31b07c2a7 100644 --- a/mindspore/ccsrc/ps/server/kernel/round/start_fl_job_kernel.cc +++ b/mindspore/ccsrc/fl/server/kernel/round/start_fl_job_kernel.cc @@ -14,13 +14,13 @@ * limitations under the License. */ -#include "ps/server/kernel/round/start_fl_job_kernel.h" +#include "fl/server/kernel/round/start_fl_job_kernel.h" #include #include #include #include -#include "ps/server/model_store.h" -#include "ps/server/iteration.h" +#include "fl/server/model_store.h" +#include "fl/server/iteration.h" #ifdef ENABLE_ARMOUR #include "armour/cipher/cipher_init.h" #endif diff --git a/mindspore/ccsrc/ps/server/kernel/round/start_fl_job_kernel.h b/mindspore/ccsrc/fl/server/kernel/round/start_fl_job_kernel.h similarity index 94% rename from mindspore/ccsrc/ps/server/kernel/round/start_fl_job_kernel.h rename to mindspore/ccsrc/fl/server/kernel/round/start_fl_job_kernel.h index 2e9cba4857e..2355113c27a 100644 --- a/mindspore/ccsrc/ps/server/kernel/round/start_fl_job_kernel.h +++ b/mindspore/ccsrc/fl/server/kernel/round/start_fl_job_kernel.h @@ -21,10 +21,10 @@ #include #include #include -#include "ps/server/common.h" -#include "ps/server/executor.h" -#include "ps/server/kernel/round/round_kernel.h" -#include "ps/server/kernel/round/round_kernel_factory.h" +#include "fl/server/common.h" +#include "fl/server/executor.h" +#include "fl/server/kernel/round/round_kernel.h" +#include "fl/server/kernel/round/round_kernel_factory.h" namespace mindspore { namespace ps { diff --git a/mindspore/ccsrc/ps/server/kernel/round/update_model_kernel.cc b/mindspore/ccsrc/fl/server/kernel/round/update_model_kernel.cc similarity index 99% rename from mindspore/ccsrc/ps/server/kernel/round/update_model_kernel.cc rename to mindspore/ccsrc/fl/server/kernel/round/update_model_kernel.cc index 607e3e17f9e..e4bcd0604f7 100644 --- a/mindspore/ccsrc/ps/server/kernel/round/update_model_kernel.cc +++ b/mindspore/ccsrc/fl/server/kernel/round/update_model_kernel.cc @@ -18,7 +18,7 @@ #include #include #include -#include "ps/server/kernel/round/update_model_kernel.h" +#include "fl/server/kernel/round/update_model_kernel.h" namespace mindspore { namespace ps { diff --git a/mindspore/ccsrc/ps/server/kernel/round/update_model_kernel.h b/mindspore/ccsrc/fl/server/kernel/round/update_model_kernel.h similarity index 93% rename from mindspore/ccsrc/ps/server/kernel/round/update_model_kernel.h rename to mindspore/ccsrc/fl/server/kernel/round/update_model_kernel.h index 007aa4a4d70..62e8c89a9fe 100644 --- a/mindspore/ccsrc/ps/server/kernel/round/update_model_kernel.h +++ b/mindspore/ccsrc/fl/server/kernel/round/update_model_kernel.h @@ -21,10 +21,10 @@ #include #include #include -#include "ps/server/common.h" -#include "ps/server/kernel/round/round_kernel.h" -#include "ps/server/kernel/round/round_kernel_factory.h" -#include "ps/server/executor.h" +#include "fl/server/common.h" +#include "fl/server/kernel/round/round_kernel.h" +#include "fl/server/kernel/round/round_kernel_factory.h" +#include "fl/server/executor.h" namespace mindspore { namespace ps { diff --git a/mindspore/ccsrc/ps/server/local_meta_store.cc b/mindspore/ccsrc/fl/server/local_meta_store.cc similarity index 97% rename from mindspore/ccsrc/ps/server/local_meta_store.cc rename to mindspore/ccsrc/fl/server/local_meta_store.cc index aab873d8989..32c02e873c4 100644 --- a/mindspore/ccsrc/ps/server/local_meta_store.cc +++ b/mindspore/ccsrc/fl/server/local_meta_store.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "ps/server/local_meta_store.h" +#include "fl/server/local_meta_store.h" namespace mindspore { namespace ps { diff --git a/mindspore/ccsrc/ps/server/local_meta_store.h b/mindspore/ccsrc/fl/server/local_meta_store.h similarity index 98% rename from mindspore/ccsrc/ps/server/local_meta_store.h rename to mindspore/ccsrc/fl/server/local_meta_store.h index 5cbcc238a1b..1d3ab1208eb 100644 --- a/mindspore/ccsrc/ps/server/local_meta_store.h +++ b/mindspore/ccsrc/fl/server/local_meta_store.h @@ -21,7 +21,7 @@ #include #include #include -#include "ps/server/common.h" +#include "fl/server/common.h" namespace mindspore { namespace ps { diff --git a/mindspore/ccsrc/ps/server/memory_register.cc b/mindspore/ccsrc/fl/server/memory_register.cc similarity index 97% rename from mindspore/ccsrc/ps/server/memory_register.cc rename to mindspore/ccsrc/fl/server/memory_register.cc index 1a02da0be35..91c00ab9fa4 100644 --- a/mindspore/ccsrc/ps/server/memory_register.cc +++ b/mindspore/ccsrc/fl/server/memory_register.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "ps/server/memory_register.h" +#include "fl/server/memory_register.h" #include namespace mindspore { diff --git a/mindspore/ccsrc/ps/server/memory_register.h b/mindspore/ccsrc/fl/server/memory_register.h similarity index 99% rename from mindspore/ccsrc/ps/server/memory_register.h rename to mindspore/ccsrc/fl/server/memory_register.h index 1b48c341d7b..1eea82424a9 100644 --- a/mindspore/ccsrc/ps/server/memory_register.h +++ b/mindspore/ccsrc/fl/server/memory_register.h @@ -23,7 +23,7 @@ #include #include #include -#include "ps/server/common.h" +#include "fl/server/common.h" namespace mindspore { namespace ps { diff --git a/mindspore/ccsrc/ps/server/model_store.cc b/mindspore/ccsrc/fl/server/model_store.cc similarity index 98% rename from mindspore/ccsrc/ps/server/model_store.cc rename to mindspore/ccsrc/fl/server/model_store.cc index 39338c127fc..ba61f8c56d6 100644 --- a/mindspore/ccsrc/ps/server/model_store.cc +++ b/mindspore/ccsrc/fl/server/model_store.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "ps/server/model_store.h" +#include "fl/server/model_store.h" #include #include #include -#include "ps/server/executor.h" +#include "fl/server/executor.h" namespace mindspore { namespace ps { diff --git a/mindspore/ccsrc/ps/server/model_store.h b/mindspore/ccsrc/fl/server/model_store.h similarity index 96% rename from mindspore/ccsrc/ps/server/model_store.h rename to mindspore/ccsrc/fl/server/model_store.h index 38826d37a7b..a5fd9d8e5d7 100644 --- a/mindspore/ccsrc/ps/server/model_store.h +++ b/mindspore/ccsrc/fl/server/model_store.h @@ -20,9 +20,9 @@ #include #include #include -#include "ps/server/common.h" -#include "ps/server/memory_register.h" -#include "ps/server/executor.h" +#include "fl/server/common.h" +#include "fl/server/memory_register.h" +#include "fl/server/executor.h" namespace mindspore { namespace ps { diff --git a/mindspore/ccsrc/ps/server/parameter_aggregator.cc b/mindspore/ccsrc/fl/server/parameter_aggregator.cc similarity index 99% rename from mindspore/ccsrc/ps/server/parameter_aggregator.cc rename to mindspore/ccsrc/fl/server/parameter_aggregator.cc index 0d6eca5b2a8..820b73b7969 100644 --- a/mindspore/ccsrc/ps/server/parameter_aggregator.cc +++ b/mindspore/ccsrc/fl/server/parameter_aggregator.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "ps/server/parameter_aggregator.h" +#include "fl/server/parameter_aggregator.h" #include #include #include diff --git a/mindspore/ccsrc/ps/server/parameter_aggregator.h b/mindspore/ccsrc/fl/server/parameter_aggregator.h similarity index 97% rename from mindspore/ccsrc/ps/server/parameter_aggregator.h rename to mindspore/ccsrc/fl/server/parameter_aggregator.h index d2dd818fbe6..d595e51acac 100644 --- a/mindspore/ccsrc/ps/server/parameter_aggregator.h +++ b/mindspore/ccsrc/fl/server/parameter_aggregator.h @@ -22,10 +22,10 @@ #include #include #include -#include "ps/server/common.h" -#include "ps/server/memory_register.h" -#include "ps/server/kernel/aggregation_kernel_factory.h" -#include "ps/server/kernel/optimizer_kernel_factory.h" +#include "fl/server/common.h" +#include "fl/server/memory_register.h" +#include "fl/server/kernel/aggregation_kernel_factory.h" +#include "fl/server/kernel/optimizer_kernel_factory.h" namespace mindspore { namespace ps { diff --git a/mindspore/ccsrc/ps/server/round.cc b/mindspore/ccsrc/fl/server/round.cc similarity index 98% rename from mindspore/ccsrc/ps/server/round.cc rename to mindspore/ccsrc/fl/server/round.cc index a3cc8a33ce6..88a51db54b3 100644 --- a/mindspore/ccsrc/ps/server/round.cc +++ b/mindspore/ccsrc/fl/server/round.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "ps/server/round.h" +#include "fl/server/round.h" #include #include -#include "ps/server/server.h" -#include "ps/server/iteration.h" +#include "fl/server/server.h" +#include "fl/server/iteration.h" namespace mindspore { namespace ps { diff --git a/mindspore/ccsrc/ps/server/round.h b/mindspore/ccsrc/fl/server/round.h similarity index 95% rename from mindspore/ccsrc/ps/server/round.h rename to mindspore/ccsrc/fl/server/round.h index fdd07b4a257..8b1e60f4198 100644 --- a/mindspore/ccsrc/ps/server/round.h +++ b/mindspore/ccsrc/fl/server/round.h @@ -20,10 +20,10 @@ #include #include #include "ps/core/communicator/communicator_base.h" -#include "ps/server/common.h" -#include "ps/server/iteration_timer.h" -#include "ps/server/distributed_count_service.h" -#include "ps/server/kernel/round/round_kernel.h" +#include "fl/server/common.h" +#include "fl/server/iteration_timer.h" +#include "fl/server/distributed_count_service.h" +#include "fl/server/kernel/round/round_kernel.h" namespace mindspore { namespace ps { diff --git a/mindspore/ccsrc/ps/server/server.cc b/mindspore/ccsrc/fl/server/server.cc similarity index 98% rename from mindspore/ccsrc/ps/server/server.cc rename to mindspore/ccsrc/fl/server/server.cc index 1b86871ffa8..7a7590e81f9 100644 --- a/mindspore/ccsrc/ps/server/server.cc +++ b/mindspore/ccsrc/fl/server/server.cc @@ -14,20 +14,20 @@ * limitations under the License. */ -#include "ps/server/server.h" +#include "fl/server/server.h" #include #include #include #ifdef ENABLE_ARMOUR #include "armour/secure_protocol/secret_sharing.h" #endif -#include "ps/server/round.h" -#include "ps/server/model_store.h" -#include "ps/server/iteration.h" -#include "ps/server/collective_ops_impl.h" -#include "ps/server/distributed_metadata_store.h" -#include "ps/server/distributed_count_service.h" -#include "ps/server/kernel/round/round_kernel_factory.h" +#include "fl/server/round.h" +#include "fl/server/model_store.h" +#include "fl/server/iteration.h" +#include "fl/server/collective_ops_impl.h" +#include "fl/server/distributed_metadata_store.h" +#include "fl/server/distributed_count_service.h" +#include "fl/server/kernel/round/round_kernel_factory.h" namespace mindspore { namespace ps { diff --git a/mindspore/ccsrc/ps/server/server.h b/mindspore/ccsrc/fl/server/server.h similarity index 98% rename from mindspore/ccsrc/ps/server/server.h rename to mindspore/ccsrc/fl/server/server.h index 06595a83bce..74227498f8f 100644 --- a/mindspore/ccsrc/ps/server/server.h +++ b/mindspore/ccsrc/fl/server/server.h @@ -23,9 +23,9 @@ #include "ps/core/communicator/communicator_base.h" #include "ps/core/communicator/tcp_communicator.h" #include "ps/core/communicator/task_executor.h" -#include "ps/server/common.h" -#include "ps/server/executor.h" -#include "ps/server/iteration.h" +#include "fl/server/common.h" +#include "fl/server/executor.h" +#include "fl/server/iteration.h" #ifdef ENABLE_ARMOUR #include "armour/cipher/cipher_init.h" #endif diff --git a/mindspore/ccsrc/ps/worker/fl_worker.cc b/mindspore/ccsrc/fl/worker/fl_worker.cc similarity index 99% rename from mindspore/ccsrc/ps/worker/fl_worker.cc rename to mindspore/ccsrc/fl/worker/fl_worker.cc index 8046d67ee81..b0de5a8b490 100644 --- a/mindspore/ccsrc/ps/worker/fl_worker.cc +++ b/mindspore/ccsrc/fl/worker/fl_worker.cc @@ -18,7 +18,7 @@ #include #include #include -#include "ps/worker/fl_worker.h" +#include "fl/worker/fl_worker.h" #include "utils/ms_exception.h" namespace mindspore { diff --git a/mindspore/ccsrc/ps/worker/fl_worker.h b/mindspore/ccsrc/fl/worker/fl_worker.h similarity index 100% rename from mindspore/ccsrc/ps/worker/fl_worker.h rename to mindspore/ccsrc/fl/worker/fl_worker.h diff --git a/mindspore/ccsrc/pipeline/jit/action.cc b/mindspore/ccsrc/pipeline/jit/action.cc index 40e9613e0db..351f9a7d830 100644 --- a/mindspore/ccsrc/pipeline/jit/action.cc +++ b/mindspore/ccsrc/pipeline/jit/action.cc @@ -48,8 +48,8 @@ #include "ps/parameter_server.h" #include "ps/scheduler.h" #include "ps/worker.h" -#include "ps/worker/fl_worker.h" -#include "ps/server/server.h" +#include "fl/worker/fl_worker.h" +#include "fl/server/server.h" #endif namespace mindspore { diff --git a/mindspore/ccsrc/pipeline/jit/pipeline.cc b/mindspore/ccsrc/pipeline/jit/pipeline.cc index 87ed0511bb4..772062add84 100644 --- a/mindspore/ccsrc/pipeline/jit/pipeline.cc +++ b/mindspore/ccsrc/pipeline/jit/pipeline.cc @@ -59,10 +59,10 @@ #include "ps/constants.h" #include "ps/util.h" #include "ps/worker.h" -#include "ps/worker/fl_worker.h" #include "ps/ps_cache/ps_data/ps_data_prefetch.h" #include "ps/ps_cache/ps_cache_manager.h" -#include "ps/server/server.h" +#include "fl/server/server.h" +#include "fl/worker/fl_worker.h" #endif #if ((defined ENABLE_GE) || (defined ENABLE_D)) diff --git a/mindspore/ccsrc/ps/CMakeLists.txt b/mindspore/ccsrc/ps/CMakeLists.txt index 3afad4e5f10..f3c5ca3e105 100644 --- a/mindspore/ccsrc/ps/CMakeLists.txt +++ b/mindspore/ccsrc/ps/CMakeLists.txt @@ -30,6 +30,11 @@ if(NOT ENABLE_CPU OR WIN32) list(REMOVE_ITEM _PS_SRC_FILES "core/recovery_base.cc") list(REMOVE_ITEM _PS_SRC_FILES "core/node_recovery.cc") list(REMOVE_ITEM _PS_SRC_FILES "core/scheduler_recovery.cc") + list(REMOVE_ITEM _PS_SRC_FILES "core/communicator/communicator_base.cc") + list(REMOVE_ITEM _PS_SRC_FILES "core/communicator/http_communicator.cc") + list(REMOVE_ITEM _PS_SRC_FILES "core/communicator/tcp_communicator.cc") + list(REMOVE_ITEM _PS_SRC_FILES "core/communicator/http_msg_handler.cc") + list(REMOVE_ITEM _PS_SRC_FILES "core/communicator/tcp_msg_handler.cc") endif() if(NOT ENABLE_D) @@ -40,47 +45,6 @@ if(NOT ENABLE_GPU) list(REMOVE_ITEM _PS_SRC_FILES "ps_cache/gpu/gpu_ps_cache.cc") endif() -if(NOT ENABLE_CPU OR WIN32) - list(REMOVE_ITEM _PS_SRC_FILES "core/communicator/communicator_base.cc") - list(REMOVE_ITEM _PS_SRC_FILES "core/communicator/http_communicator.cc") - list(REMOVE_ITEM _PS_SRC_FILES "core/communicator/tcp_communicator.cc") - list(REMOVE_ITEM _PS_SRC_FILES "core/communicator/http_msg_handler.cc") - list(REMOVE_ITEM _PS_SRC_FILES "core/communicator/tcp_msg_handler.cc") - list(REMOVE_ITEM _PS_SRC_FILES "server/kernel/apply_momentum_kernel.cc") - list(REMOVE_ITEM _PS_SRC_FILES "server/kernel/aggregation_kernel_factory.cc") - list(REMOVE_ITEM _PS_SRC_FILES "server/kernel/dense_grad_accum_kernel.cc") - list(REMOVE_ITEM _PS_SRC_FILES "server/kernel/fed_avg_kernel.cc") - list(REMOVE_ITEM _PS_SRC_FILES "server/kernel/optimizer_kernel_factory.cc") - list(REMOVE_ITEM _PS_SRC_FILES "server/kernel/round/round_kernel_factory.cc") - list(REMOVE_ITEM _PS_SRC_FILES "server/kernel/round/round_kernel.cc") - list(REMOVE_ITEM _PS_SRC_FILES "server/kernel/round/start_fl_job_kernel.cc") - list(REMOVE_ITEM _PS_SRC_FILES "server/kernel/round/update_model_kernel.cc") - list(REMOVE_ITEM _PS_SRC_FILES "server/kernel/round/get_model_kernel.cc") - list(REMOVE_ITEM _PS_SRC_FILES "server/kernel/round/pull_weight_kernel.cc") - list(REMOVE_ITEM _PS_SRC_FILES "server/kernel/round/push_weight_kernel.cc") - list(REMOVE_ITEM _PS_SRC_FILES "server/kernel/round/client_list_kernel.cc") - list(REMOVE_ITEM _PS_SRC_FILES "server/kernel/round/exchange_keys_kernel.cc") - list(REMOVE_ITEM _PS_SRC_FILES "server/kernel/round/get_keys_kernel.cc") - list(REMOVE_ITEM _PS_SRC_FILES "server/kernel/round/get_secrets_kernel.cc") - list(REMOVE_ITEM _PS_SRC_FILES "server/kernel/round/reconstruct_secrets_kernel.cc") - list(REMOVE_ITEM _PS_SRC_FILES "server/kernel/round/share_secrets_kernel.cc") - list(REMOVE_ITEM _PS_SRC_FILES "server/kernel/params_info.cc") - list(REMOVE_ITEM _PS_SRC_FILES "server/consistent_hash_ring.cc") - list(REMOVE_ITEM _PS_SRC_FILES "server/iteration_timer.cc") - list(REMOVE_ITEM _PS_SRC_FILES "server/local_meta_store.cc") - list(REMOVE_ITEM _PS_SRC_FILES "server/memory_register.cc") - list(REMOVE_ITEM _PS_SRC_FILES "server/parameter_aggregator.cc") - list(REMOVE_ITEM _PS_SRC_FILES "server/executor.cc") - list(REMOVE_ITEM _PS_SRC_FILES "server/collective_ops_impl.cc") - list(REMOVE_ITEM _PS_SRC_FILES "server/distributed_count_service.cc") - list(REMOVE_ITEM _PS_SRC_FILES "server/distributed_metadata_store.cc") - list(REMOVE_ITEM _PS_SRC_FILES "server/iteration.cc") - list(REMOVE_ITEM _PS_SRC_FILES "server/model_store.cc") - list(REMOVE_ITEM _PS_SRC_FILES "server/round.cc") - list(REMOVE_ITEM _PS_SRC_FILES "server/server.cc") - list(REMOVE_ITEM _PS_SRC_FILES "worker/fl_worker.cc") -endif() - list(REMOVE_ITEM _PS_SRC_FILES "ps_cache/ps_data/ps_data_prefetch.cc") list(REMOVE_ITEM _PS_SRC_FILES "ps_cache/ps_data/ps_data_channel.cc") add_subdirectory(ps_cache) diff --git a/mindspore/core/gvar/log_adapter_common.cc b/mindspore/core/gvar/log_adapter_common.cc index 4526ecb25ff..2967285e8ff 100644 --- a/mindspore/core/gvar/log_adapter_common.cc +++ b/mindspore/core/gvar/log_adapter_common.cc @@ -44,6 +44,7 @@ static const std::vector sub_module_names = { "VM", // SM_VM "PROFILER", // SM_PROFILER "PS", // SM_PS + "FL", // SM_FL "LITE", // SM_LITE "ARMOUR", // SM_ARMOUR "HCCL_ADPT", // SM_HCCL_ADPT diff --git a/mindspore/core/utils/log_adapter.h b/mindspore/core/utils/log_adapter.h index d2bf4f875ce..0a3a6a366f1 100644 --- a/mindspore/core/utils/log_adapter.h +++ b/mindspore/core/utils/log_adapter.h @@ -131,6 +131,7 @@ enum SubModuleId : int { SM_VM, // VM SM_PROFILER, // profiler SM_PS, // Parameter Server + SM_FL, // Federated Learning SM_LITE, // LITE SM_ARMOUR, // ARMOUR SM_HCCL_ADPT, // Hccl Adapter diff --git a/tests/ut/cpp/CMakeLists.txt b/tests/ut/cpp/CMakeLists.txt index f90d2930f27..a9fba6490de 100644 --- a/tests/ut/cpp/CMakeLists.txt +++ b/tests/ut/cpp/CMakeLists.txt @@ -66,6 +66,7 @@ if(ENABLE_MINDDATA) ./utils/*.cc ./vm/*.cc ./ps/*.cc + ./fl/*.cc ./cxx_api/*.cc ) @@ -157,6 +158,7 @@ file(GLOB_RECURSE MINDSPORE_SRC_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "../../../mindspore/ccsrc/transform/graph_ir/*.cc" "../../../mindspore/ccsrc/transform/graph_ir/op_declare/*.cc" "../../../mindspore/ccsrc/ps/*.cc" + "../../../mindspore/ccsrc/fl/*.cc" "../../../mindspore/ccsrc/profiler/device/common/*.cc" "../../../mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/adam_fp32.c" "../../../mindspore/ccsrc/armour/*.cc" @@ -173,7 +175,7 @@ list(REMOVE_ITEM MINDSPORE_SRC_LIST "../../../mindspore/ccsrc/ps/parameter_serve list(REMOVE_ITEM MINDSPORE_SRC_LIST "../../../mindspore/ccsrc/ps/ps_cache/gpu/gpu_ps_cache.cc") list(REMOVE_ITEM MINDSPORE_SRC_LIST "../../../mindspore/ccsrc/ps/ps_cache/ascend/ascend_ps_cache.cc") list(REMOVE_ITEM MINDSPORE_SRC_LIST "../../../mindspore/ccsrc/ps/ps_cache/ps_cache_manager.cc") -list(REMOVE_ITEM MINDSPORE_SRC_LIST "../../../mindspore/ccsrc/ps/server/kernel/apply_momentum_kernel.cc") +list(REMOVE_ITEM MINDSPORE_SRC_LIST "../../../mindspore/ccsrc/fl/server/kernel/apply_momentum_kernel.cc") list(REMOVE_ITEM MINDSPORE_SRC_LIST "../../../mindspore/ccsrc/backend/optimizer/gpu/batch_norm_add_relu_fusion.cc") list(REMOVE_ITEM MINDSPORE_SRC_LIST "../../../mindspore/ccsrc/backend/optimizer/gpu/post_batch_norm_add_relu_fusion.cc") list(REMOVE_ITEM MINDSPORE_SRC_LIST "../../../mindspore/ccsrc/backend/optimizer/gpu/batch_norm_add_relu_grad_fusion.cc")