mindspore-Ecosystem
/
mindspore
21
0
Fork 27
Code Issues Pull Requests 6 Projects Releases Wiki Activity

!19457 Optimize federated learning directory 

Merge pull request !19457 from ZPaC/change-fl-dir
This commit is contained in:
i-robot 2021-07-06 15:04:34 +00:00 committed by Gitee
parent 88190d0064 37ce5dd6a7
commit 1876a359f1
86 changed files with 217 additions and 205 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mindspore/ccsrc/CMakeLists.txt
View File

@ -224,7 +224,7 @@ set(SUB_COMP
frontend/operator frontend/operator
pipeline/jit pipeline/jit
pipeline/pynative 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) if(ENABLE_CPU AND NOT WIN32)

2
mindspore/ccsrc/armour/cipher/cipher_init.cc
View File

@ -15,7 +15,7 @@
*/ */
#include "armour/cipher/cipher_init.h" #include "armour/cipher/cipher_init.h"
#include "ps/server/common.h" #include "fl/server/common.h"
#include "armour/cipher/cipher_meta_storage.h" #include "armour/cipher/cipher_meta_storage.h"
namespace mindspore { namespace mindspore {

2
mindspore/ccsrc/armour/cipher/cipher_keys.h
View File

@ -26,7 +26,7 @@
#include "utils/log_adapter.h" #include "utils/log_adapter.h"
#include "armour/cipher/cipher_init.h" #include "armour/cipher/cipher_init.h"
#include "armour/cipher/cipher_meta_storage.h" #include "armour/cipher/cipher_meta_storage.h"
#include "ps/server/common.h" #include "fl/server/common.h"
namespace mindspore { namespace mindspore {
namespace armour { namespace armour {

4
mindspore/ccsrc/armour/cipher/cipher_meta_storage.h
View File

@ -31,8 +31,8 @@
#include "armour/secure_protocol/secret_sharing.h" #include "armour/secure_protocol/secret_sharing.h"
#include "schema/fl_job_generated.h" #include "schema/fl_job_generated.h"
#include "schema/cipher_generated.h" #include "schema/cipher_generated.h"
#include "ps/server/distributed_metadata_store.h" #include "fl/server/distributed_metadata_store.h"
#include "ps/server/common.h" #include "fl/server/common.h"
namespace mindspore { namespace mindspore {
namespace armour { namespace armour {

2
mindspore/ccsrc/armour/cipher/cipher_reconstruct.cc
View File

@ -15,7 +15,7 @@
*/ */
#include "armour/cipher/cipher_reconstruct.h" #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/random.h"
#include "armour/secure_protocol/key_agreement.h" #include "armour/secure_protocol/key_agreement.h"
#include "armour/cipher/cipher_meta_storage.h" #include "armour/cipher/cipher_meta_storage.h"

2
mindspore/ccsrc/armour/cipher/cipher_shares.cc
View File

@ -15,7 +15,7 @@
*/ */
#include "armour/cipher/cipher_shares.h" #include "armour/cipher/cipher_shares.h"
#include "ps/server/common.h" #include "fl/server/common.h"
#include "armour/cipher/cipher_meta_storage.h" #include "armour/cipher/cipher_meta_storage.h"
namespace mindspore { namespace mindspore {

4
mindspore/ccsrc/armour/cipher/cipher_unmask.cc
View File

@ -15,8 +15,8 @@
*/ */
#include "armour/cipher/cipher_unmask.h" #include "armour/cipher/cipher_unmask.h"
#include "ps/server/common.h" #include "fl/server/common.h"
#include "ps/server/local_meta_store.h" #include "fl/server/local_meta_store.h"
#include "armour/cipher/cipher_meta_storage.h" #include "armour/cipher/cipher_meta_storage.h"
namespace mindspore { namespace mindspore {

2
mindspore/ccsrc/backend/kernel_compiler/cpu/fl/fused_pull_weight_kernel.h
View File

@ -26,7 +26,7 @@
#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" #include "backend/kernel_compiler/cpu/cpu_kernel_factory.h"
#include "schema/fl_job_generated.h" #include "schema/fl_job_generated.h"
#include "ps/ps_context.h" #include "ps/ps_context.h"
#include "ps/worker/fl_worker.h" #include "fl/worker/fl_worker.h"
namespace mindspore { namespace mindspore {
namespace kernel { namespace kernel {

2
mindspore/ccsrc/backend/kernel_compiler/cpu/fl/fused_push_weight_kernel.h
View File

@ -24,7 +24,7 @@
#include "backend/kernel_compiler/cpu/cpu_kernel.h" #include "backend/kernel_compiler/cpu/cpu_kernel.h"
#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" #include "backend/kernel_compiler/cpu/cpu_kernel_factory.h"
#include "ps/ps_context.h" #include "ps/ps_context.h"
#include "ps/worker/fl_worker.h" #include "fl/worker/fl_worker.h"
namespace mindspore { namespace mindspore {
namespace kernel { namespace kernel {

44
mindspore/ccsrc/fl/CMakeLists.txt Normal file
View File

@ -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()

2
mindspore/ccsrc/ps/server/collective_ops_impl.cc → mindspore/ccsrc/fl/server/collective_ops_impl.cc
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
#include "ps/server/collective_ops_impl.h" #include "fl/server/collective_ops_impl.h"
namespace mindspore { namespace mindspore {
namespace ps { namespace ps {

2
mindspore/ccsrc/ps/server/collective_ops_impl.h → mindspore/ccsrc/fl/server/collective_ops_impl.h
View File

@ -24,7 +24,7 @@
#include "proto/ps.pb.h" #include "proto/ps.pb.h"
#include "ps/ps_context.h" #include "ps/ps_context.h"
#include "ps/core/server_node.h" #include "ps/core/server_node.h"
#include "ps/server/common.h" #include "fl/server/common.h"
namespace mindspore { namespace mindspore {
namespace ps { namespace ps {

0
mindspore/ccsrc/ps/server/common.h → mindspore/ccsrc/fl/server/common.h
View File

2
mindspore/ccsrc/ps/server/consistent_hash_ring.cc → mindspore/ccsrc/fl/server/consistent_hash_ring.cc
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
#include "ps/server/consistent_hash_ring.h" #include "fl/server/consistent_hash_ring.h"
namespace mindspore { namespace mindspore {
namespace ps { namespace ps {

0
mindspore/ccsrc/ps/server/consistent_hash_ring.h → mindspore/ccsrc/fl/server/consistent_hash_ring.h
View File

2
mindspore/ccsrc/ps/server/distributed_count_service.cc → mindspore/ccsrc/fl/server/distributed_count_service.cc
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
#include "ps/server/distributed_count_service.h" #include "fl/server/distributed_count_service.h"
#include <string> #include <string>
#include <memory> #include <memory>
#include <vector> #include <vector>

2
mindspore/ccsrc/ps/server/distributed_count_service.h → mindspore/ccsrc/fl/server/distributed_count_service.h
View File

@ -22,7 +22,7 @@
#include <memory> #include <memory>
#include <unordered_map> #include <unordered_map>
#include "proto/ps.pb.h" #include "proto/ps.pb.h"
#include "ps/server/common.h" #include "fl/server/common.h"
#include "ps/core/server_node.h" #include "ps/core/server_node.h"
#include "ps/core/communicator/tcp_communicator.h" #include "ps/core/communicator/tcp_communicator.h"

2
mindspore/ccsrc/ps/server/distributed_metadata_store.cc → mindspore/ccsrc/fl/server/distributed_metadata_store.cc
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
#include "ps/server/distributed_metadata_store.h" #include "fl/server/distributed_metadata_store.h"
#include <memory> #include <memory>
#include <string> #include <string>
#include <vector> #include <vector>

4
mindspore/ccsrc/ps/server/distributed_metadata_store.h → mindspore/ccsrc/fl/server/distributed_metadata_store.h
View File

@ -21,10 +21,10 @@
#include <memory> #include <memory>
#include <unordered_map> #include <unordered_map>
#include "proto/ps.pb.h" #include "proto/ps.pb.h"
#include "ps/server/common.h" #include "fl/server/common.h"
#include "ps/core/server_node.h" #include "ps/core/server_node.h"
#include "ps/core/communicator/tcp_communicator.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 mindspore {
namespace ps { namespace ps {

2
mindspore/ccsrc/ps/server/executor.cc → mindspore/ccsrc/fl/server/executor.cc
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
#include "ps/server/executor.h" #include "fl/server/executor.h"
#include <set> #include <set>
#include <memory> #include <memory>
#include <string> #include <string>

4
mindspore/ccsrc/ps/server/executor.h → mindspore/ccsrc/fl/server/executor.h
View File

@ -24,8 +24,8 @@
#include <vector> #include <vector>
#include <mutex> #include <mutex>
#include <condition_variable> #include <condition_variable>
#include "ps/server/common.h" #include "fl/server/common.h"
#include "ps/server/parameter_aggregator.h" #include "fl/server/parameter_aggregator.h"
#ifdef ENABLE_ARMOUR #ifdef ENABLE_ARMOUR
#include "armour/cipher/cipher_unmask.h" #include "armour/cipher/cipher_unmask.h"
#endif #endif

6
mindspore/ccsrc/ps/server/iteration.cc → mindspore/ccsrc/fl/server/iteration.cc
View File

@ -14,13 +14,13 @@
* limitations under the License. * limitations under the License.
*/ */
#include "ps/server/iteration.h" #include "fl/server/iteration.h"
#include <memory> #include <memory>
#include <string> #include <string>
#include <vector> #include <vector>
#include <numeric> #include <numeric>
#include "ps/server/model_store.h" #include "fl/server/model_store.h"
#include "ps/server/server.h" #include "fl/server/server.h"
namespace mindspore { namespace mindspore {
namespace ps { namespace ps {

6
mindspore/ccsrc/ps/server/iteration.h → mindspore/ccsrc/fl/server/iteration.h
View File

@ -21,9 +21,9 @@
#include <vector> #include <vector>
#include <string> #include <string>
#include "ps/core/communicator/communicator_base.h" #include "ps/core/communicator/communicator_base.h"
#include "ps/server/common.h" #include "fl/server/common.h"
#include "ps/server/round.h" #include "fl/server/round.h"
#include "ps/server/local_meta_store.h" #include "fl/server/local_meta_store.h"
namespace mindspore { namespace mindspore {
namespace ps { namespace ps {

2
mindspore/ccsrc/ps/server/iteration_timer.cc → mindspore/ccsrc/fl/server/iteration_timer.cc
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
#include "ps/server/iteration_timer.h" #include "fl/server/iteration_timer.h"
namespace mindspore { namespace mindspore {
namespace ps { namespace ps {

2
mindspore/ccsrc/ps/server/iteration_timer.h → mindspore/ccsrc/fl/server/iteration_timer.h
View File

@ -21,7 +21,7 @@
#include <atomic> #include <atomic>
#include <thread> #include <thread>
#include <functional> #include <functional>
#include "ps/server/common.h" #include "fl/server/common.h"
namespace mindspore { namespace mindspore {
namespace ps { namespace ps {

6
mindspore/ccsrc/ps/server/kernel/aggregation_kernel.h → mindspore/ccsrc/fl/server/kernel/aggregation_kernel.h
View File

@ -21,9 +21,9 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include "backend/kernel_compiler/cpu/cpu_kernel.h" #include "backend/kernel_compiler/cpu/cpu_kernel.h"
#include "ps/server/common.h" #include "fl/server/common.h"
#include "ps/server/memory_register.h" #include "fl/server/memory_register.h"
#include "ps/server/kernel/params_info.h" #include "fl/server/kernel/params_info.h"
namespace mindspore { namespace mindspore {
namespace ps { namespace ps {

2
mindspore/ccsrc/ps/server/kernel/aggregation_kernel_factory.cc → mindspore/ccsrc/fl/server/kernel/aggregation_kernel_factory.cc
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
#include "ps/server/kernel/aggregation_kernel_factory.h" #include "fl/server/kernel/aggregation_kernel_factory.h"
#include <utility> #include <utility>
namespace mindspore { namespace mindspore {

4
mindspore/ccsrc/ps/server/kernel/aggregation_kernel_factory.h → mindspore/ccsrc/fl/server/kernel/aggregation_kernel_factory.h
View File

@ -20,8 +20,8 @@
#include <memory> #include <memory>
#include <string> #include <string>
#include <utility> #include <utility>
#include "ps/server/kernel/kernel_factory.h" #include "fl/server/kernel/kernel_factory.h"
#include "ps/server/kernel/aggregation_kernel.h" #include "fl/server/kernel/aggregation_kernel.h"
namespace mindspore { namespace mindspore {
namespace ps { namespace ps {

2
mindspore/ccsrc/ps/server/kernel/apply_momentum_kernel.cc → mindspore/ccsrc/fl/server/kernel/apply_momentum_kernel.cc
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
#include "ps/server/kernel/apply_momentum_kernel.h" #include "fl/server/kernel/apply_momentum_kernel.h"
namespace mindspore { namespace mindspore {
namespace ps { namespace ps {

4
mindspore/ccsrc/ps/server/kernel/apply_momentum_kernel.h → mindspore/ccsrc/fl/server/kernel/apply_momentum_kernel.h
View File

@ -21,8 +21,8 @@
#include <memory> #include <memory>
#include <utility> #include <utility>
#include "backend/kernel_compiler/cpu/apply_momentum_cpu_kernel.h" #include "backend/kernel_compiler/cpu/apply_momentum_cpu_kernel.h"
#include "ps/server/kernel/optimizer_kernel.h" #include "fl/server/kernel/optimizer_kernel.h"
#include "ps/server/kernel/optimizer_kernel_factory.h" #include "fl/server/kernel/optimizer_kernel_factory.h"
namespace mindspore { namespace mindspore {
namespace ps { namespace ps {

2
mindspore/ccsrc/ps/server/kernel/dense_grad_accum_kernel.cc → mindspore/ccsrc/fl/server/kernel/dense_grad_accum_kernel.cc
View File

@ -14,7 +14,7 @@
* limitations under the License. * 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 mindspore {
namespace ps { namespace ps {

4
mindspore/ccsrc/ps/server/kernel/dense_grad_accum_kernel.h → mindspore/ccsrc/fl/server/kernel/dense_grad_accum_kernel.h
View File

@ -22,8 +22,8 @@
#include <vector> #include <vector>
#include <functional> #include <functional>
#include "backend/kernel_compiler/cpu/cpu_kernel.h" #include "backend/kernel_compiler/cpu/cpu_kernel.h"
#include "ps/server/kernel/aggregation_kernel.h" #include "fl/server/kernel/aggregation_kernel.h"
#include "ps/server/kernel/aggregation_kernel_factory.h" #include "fl/server/kernel/aggregation_kernel_factory.h"
namespace mindspore { namespace mindspore {
namespace ps { namespace ps {

2
mindspore/ccsrc/ps/server/kernel/fed_avg_kernel.cc → mindspore/ccsrc/fl/server/kernel/fed_avg_kernel.cc
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
#include "ps/server/kernel/fed_avg_kernel.h" #include "fl/server/kernel/fed_avg_kernel.h"
namespace mindspore { namespace mindspore {
namespace ps { namespace ps {

12
mindspore/ccsrc/ps/server/kernel/fed_avg_kernel.h → mindspore/ccsrc/fl/server/kernel/fed_avg_kernel.h
View File

@ -23,12 +23,12 @@
#include <vector> #include <vector>
#include <functional> #include <functional>
#include "backend/kernel_compiler/cpu/cpu_kernel.h" #include "backend/kernel_compiler/cpu/cpu_kernel.h"
#include "ps/server/common.h" #include "fl/server/common.h"
#include "ps/server/collective_ops_impl.h" #include "fl/server/collective_ops_impl.h"
#include "ps/server/distributed_count_service.h" #include "fl/server/distributed_count_service.h"
#include "ps/server/local_meta_store.h" #include "fl/server/local_meta_store.h"
#include "ps/server/kernel/aggregation_kernel.h" #include "fl/server/kernel/aggregation_kernel.h"
#include "ps/server/kernel/aggregation_kernel_factory.h" #include "fl/server/kernel/aggregation_kernel_factory.h"
namespace mindspore { namespace mindspore {
namespace ps { namespace ps {

4
mindspore/ccsrc/ps/server/kernel/kernel_factory.h → mindspore/ccsrc/fl/server/kernel/kernel_factory.h
View File

@ -22,8 +22,8 @@
#include <vector> #include <vector>
#include <utility> #include <utility>
#include <unordered_map> #include <unordered_map>
#include "ps/server/common.h" #include "fl/server/common.h"
#include "ps/server/kernel/params_info.h" #include "fl/server/kernel/params_info.h"
namespace mindspore { namespace mindspore {
namespace ps { namespace ps {

6
mindspore/ccsrc/ps/server/kernel/optimizer_kernel.h → mindspore/ccsrc/fl/server/kernel/optimizer_kernel.h
View File

@ -23,9 +23,9 @@
#include <functional> #include <functional>
#include "backend/kernel_compiler/common_utils.h" #include "backend/kernel_compiler/common_utils.h"
#include "backend/kernel_compiler/cpu/cpu_kernel.h" #include "backend/kernel_compiler/cpu/cpu_kernel.h"
#include "ps/server/common.h" #include "fl/server/common.h"
#include "ps/server/memory_register.h" #include "fl/server/memory_register.h"
#include "ps/server/kernel/params_info.h" #include "fl/server/kernel/params_info.h"
namespace mindspore { namespace mindspore {
namespace ps { namespace ps {

2
mindspore/ccsrc/ps/server/kernel/optimizer_kernel_factory.cc → mindspore/ccsrc/fl/server/kernel/optimizer_kernel_factory.cc
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
#include "ps/server/kernel/optimizer_kernel_factory.h" #include "fl/server/kernel/optimizer_kernel_factory.h"
#include <utility> #include <utility>
namespace mindspore { namespace mindspore {

4
mindspore/ccsrc/ps/server/kernel/optimizer_kernel_factory.h → mindspore/ccsrc/fl/server/kernel/optimizer_kernel_factory.h
View File

@ -20,8 +20,8 @@
#include <memory> #include <memory>
#include <string> #include <string>
#include <utility> #include <utility>
#include "ps/server/kernel/kernel_factory.h" #include "fl/server/kernel/kernel_factory.h"
#include "ps/server/kernel/optimizer_kernel.h" #include "fl/server/kernel/optimizer_kernel.h"
namespace mindspore { namespace mindspore {
namespace ps { namespace ps {

2
mindspore/ccsrc/ps/server/kernel/params_info.cc → mindspore/ccsrc/fl/server/kernel/params_info.cc
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
#include "ps/server/kernel/params_info.h" #include "fl/server/kernel/params_info.h"
#include "utils/log_adapter.h" #include "utils/log_adapter.h"
namespace mindspore { namespace mindspore {

0
mindspore/ccsrc/ps/server/kernel/params_info.h → mindspore/ccsrc/fl/server/kernel/params_info.h
View File

2
mindspore/ccsrc/ps/server/kernel/round/client_list_kernel.cc → mindspore/ccsrc/fl/server/kernel/round/client_list_kernel.cc
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
#include "ps/server/kernel/round/client_list_kernel.h" #include "fl/server/kernel/round/client_list_kernel.h"
#include <utility> #include <utility>
#include <string> #include <string>
#include <vector> #include <vector>

8
mindspore/ccsrc/ps/server/kernel/round/client_list_kernel.h → mindspore/ccsrc/fl/server/kernel/round/client_list_kernel.h
View File

@ -19,11 +19,11 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include <memory> #include <memory>
#include "ps/server/common.h" #include "fl/server/common.h"
#include "ps/server/kernel/round/round_kernel.h" #include "fl/server/kernel/round/round_kernel.h"
#include "ps/server/kernel/round/round_kernel_factory.h" #include "fl/server/kernel/round/round_kernel_factory.h"
#include "armour/cipher/cipher_init.h" #include "armour/cipher/cipher_init.h"
#include "ps/server/executor.h" #include "fl/server/executor.h"
namespace mindspore { namespace mindspore {
namespace ps { namespace ps {

2
mindspore/ccsrc/ps/server/kernel/round/exchange_keys_kernel.cc → mindspore/ccsrc/fl/server/kernel/round/exchange_keys_kernel.cc
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
#include "ps/server/kernel/round/exchange_keys_kernel.h" #include "fl/server/kernel/round/exchange_keys_kernel.h"
#include <vector> #include <vector>
#include <utility> #include <utility>
#include <memory> #include <memory>

8
mindspore/ccsrc/ps/server/kernel/round/exchange_keys_kernel.h → mindspore/ccsrc/fl/server/kernel/round/exchange_keys_kernel.h
View File

@ -18,10 +18,10 @@
#define MINDSPORE_CCSRC_PS_SERVER_KERNEL_EXCHANGE_KEYS_KERNEL_H #define MINDSPORE_CCSRC_PS_SERVER_KERNEL_EXCHANGE_KEYS_KERNEL_H
#include <vector> #include <vector>
#include "ps/server/common.h" #include "fl/server/common.h"
#include "ps/server/kernel/round/round_kernel.h" #include "fl/server/kernel/round/round_kernel.h"
#include "ps/server/kernel/round/round_kernel_factory.h" #include "fl/server/kernel/round/round_kernel_factory.h"
#include "ps/server/executor.h" #include "fl/server/executor.h"
#include "armour/cipher/cipher_keys.h" #include "armour/cipher/cipher_keys.h"
namespace mindspore { namespace mindspore {

2
mindspore/ccsrc/ps/server/kernel/round/get_keys_kernel.cc → mindspore/ccsrc/fl/server/kernel/round/get_keys_kernel.cc
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
#include "ps/server/kernel/round/get_keys_kernel.h" #include "fl/server/kernel/round/get_keys_kernel.h"
#include <vector> #include <vector>
#include <memory> #include <memory>

8
mindspore/ccsrc/ps/server/kernel/round/get_keys_kernel.h → mindspore/ccsrc/fl/server/kernel/round/get_keys_kernel.h
View File

@ -18,10 +18,10 @@
#define MINDSPORE_CCSRC_PS_SERVER_KERNEL_GET_KEYS_KERNEL_H #define MINDSPORE_CCSRC_PS_SERVER_KERNEL_GET_KEYS_KERNEL_H
#include <vector> #include <vector>
#include "ps/server/common.h" #include "fl/server/common.h"
#include "ps/server/kernel/round/round_kernel.h" #include "fl/server/kernel/round/round_kernel.h"
#include "ps/server/kernel/round/round_kernel_factory.h" #include "fl/server/kernel/round/round_kernel_factory.h"
#include "ps/server/executor.h" #include "fl/server/executor.h"
#include "armour/cipher/cipher_keys.h" #include "armour/cipher/cipher_keys.h"
namespace mindspore { namespace mindspore {

6
mindspore/ccsrc/ps/server/kernel/round/get_model_kernel.cc → mindspore/ccsrc/fl/server/kernel/round/get_model_kernel.cc
View File

@ -14,13 +14,13 @@
* limitations under the License. * limitations under the License.
*/ */
#include "ps/server/kernel/round/get_model_kernel.h" #include "fl/server/kernel/round/get_model_kernel.h"
#include <map> #include <map>
#include <memory> #include <memory>
#include <string> #include <string>
#include <vector> #include <vector>
#include "ps/server/iteration.h" #include "fl/server/iteration.h"
#include "ps/server/model_store.h" #include "fl/server/model_store.h"
namespace mindspore { namespace mindspore {
namespace ps { namespace ps {

8
mindspore/ccsrc/ps/server/kernel/round/get_model_kernel.h → mindspore/ccsrc/fl/server/kernel/round/get_model_kernel.h
View File

@ -21,10 +21,10 @@
#include <memory> #include <memory>
#include <string> #include <string>
#include <vector> #include <vector>
#include "ps/server/common.h" #include "fl/server/common.h"
#include "ps/server/executor.h" #include "fl/server/executor.h"
#include "ps/server/kernel/round/round_kernel.h" #include "fl/server/kernel/round/round_kernel.h"
#include "ps/server/kernel/round/round_kernel_factory.h" #include "fl/server/kernel/round/round_kernel_factory.h"
namespace mindspore { namespace mindspore {
namespace ps { namespace ps {

2
mindspore/ccsrc/ps/server/kernel/round/get_secrets_kernel.cc → mindspore/ccsrc/fl/server/kernel/round/get_secrets_kernel.cc
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
#include "ps/server/kernel/round/get_secrets_kernel.h" #include "fl/server/kernel/round/get_secrets_kernel.h"
#include <vector> #include <vector>
#include <memory> #include <memory>
#include <string> #include <string>

8
mindspore/ccsrc/ps/server/kernel/round/get_secrets_kernel.h → mindspore/ccsrc/fl/server/kernel/round/get_secrets_kernel.h
View File

@ -18,11 +18,11 @@
#define MINDSPORE_CCSRC_PS_SERVER_KERNEL_GET_SECRETS_KERNEL_H #define MINDSPORE_CCSRC_PS_SERVER_KERNEL_GET_SECRETS_KERNEL_H
#include <vector> #include <vector>
#include "ps/server/common.h" #include "fl/server/common.h"
#include "ps/server/kernel/round/round_kernel.h" #include "fl/server/kernel/round/round_kernel.h"
#include "ps/server/kernel/round/round_kernel_factory.h" #include "fl/server/kernel/round/round_kernel_factory.h"
#include "armour/cipher/cipher_shares.h" #include "armour/cipher/cipher_shares.h"
#include "ps/server/executor.h" #include "fl/server/executor.h"
namespace mindspore { namespace mindspore {
namespace ps { namespace ps {

4
mindspore/ccsrc/ps/server/kernel/round/pull_weight_kernel.cc → mindspore/ccsrc/fl/server/kernel/round/pull_weight_kernel.cc
View File

@ -14,12 +14,12 @@
* limitations under the License. * limitations under the License.
*/ */
#include "ps/server/kernel/round/pull_weight_kernel.h" #include "fl/server/kernel/round/pull_weight_kernel.h"
#include <map> #include <map>
#include <memory> #include <memory>
#include <string> #include <string>
#include <vector> #include <vector>
#include "ps/server/model_store.h" #include "fl/server/model_store.h"
namespace mindspore { namespace mindspore {
namespace ps { namespace ps {

8
mindspore/ccsrc/ps/server/kernel/round/pull_weight_kernel.h → mindspore/ccsrc/fl/server/kernel/round/pull_weight_kernel.h
View File

@ -21,10 +21,10 @@
#include <memory> #include <memory>
#include <string> #include <string>
#include <vector> #include <vector>
#include "ps/server/common.h" #include "fl/server/common.h"
#include "ps/server/kernel/round/round_kernel.h" #include "fl/server/kernel/round/round_kernel.h"
#include "ps/server/kernel/round/round_kernel_factory.h" #include "fl/server/kernel/round/round_kernel_factory.h"
#include "ps/server/executor.h" #include "fl/server/executor.h"
namespace mindspore { namespace mindspore {
namespace ps { namespace ps {

2
mindspore/ccsrc/ps/server/kernel/round/push_weight_kernel.cc → mindspore/ccsrc/fl/server/kernel/round/push_weight_kernel.cc
View File

@ -14,7 +14,7 @@
* limitations under the License. * 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 mindspore {
namespace ps { namespace ps {

8
mindspore/ccsrc/ps/server/kernel/round/push_weight_kernel.h → mindspore/ccsrc/fl/server/kernel/round/push_weight_kernel.h
View File

@ -21,10 +21,10 @@
#include <memory> #include <memory>
#include <string> #include <string>
#include <vector> #include <vector>
#include "ps/server/common.h" #include "fl/server/common.h"
#include "ps/server/kernel/round/round_kernel.h" #include "fl/server/kernel/round/round_kernel.h"
#include "ps/server/kernel/round/round_kernel_factory.h" #include "fl/server/kernel/round/round_kernel_factory.h"
#include "ps/server/executor.h" #include "fl/server/executor.h"
namespace mindspore { namespace mindspore {
namespace ps { namespace ps {

2
mindspore/ccsrc/ps/server/kernel/round/reconstruct_secrets_kernel.cc → mindspore/ccsrc/fl/server/kernel/round/reconstruct_secrets_kernel.cc
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
#include "ps/server/kernel/round/reconstruct_secrets_kernel.h" #include "fl/server/kernel/round/reconstruct_secrets_kernel.h"
#include <string> #include <string>
#include <vector> #include <vector>
#include <memory> #include <memory>

8
mindspore/ccsrc/ps/server/kernel/round/reconstruct_secrets_kernel.h → mindspore/ccsrc/fl/server/kernel/round/reconstruct_secrets_kernel.h
View File

@ -20,11 +20,11 @@
#include <vector> #include <vector>
#include <memory> #include <memory>
#include <string> #include <string>
#include "ps/server/common.h" #include "fl/server/common.h"
#include "ps/server/kernel/round/round_kernel.h" #include "fl/server/kernel/round/round_kernel.h"
#include "ps/server/kernel/round/round_kernel_factory.h" #include "fl/server/kernel/round/round_kernel_factory.h"
#include "armour/cipher/cipher_reconstruct.h" #include "armour/cipher/cipher_reconstruct.h"
#include "ps/server/executor.h" #include "fl/server/executor.h"
namespace mindspore { namespace mindspore {
namespace ps { namespace ps {

2
mindspore/ccsrc/ps/server/kernel/round/round_kernel.cc → mindspore/ccsrc/fl/server/kernel/round/round_kernel.cc
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
#include "ps/server/kernel/round/round_kernel.h" #include "fl/server/kernel/round/round_kernel.h"
#include <mutex> #include <mutex>
#include <queue> #include <queue>
#include <chrono> #include <chrono>

8
mindspore/ccsrc/ps/server/kernel/round/round_kernel.h → mindspore/ccsrc/fl/server/kernel/round/round_kernel.h
View File

@ -29,10 +29,10 @@
#include <unordered_map> #include <unordered_map>
#include "backend/kernel_compiler/common_utils.h" #include "backend/kernel_compiler/common_utils.h"
#include "backend/kernel_compiler/cpu/cpu_kernel.h" #include "backend/kernel_compiler/cpu/cpu_kernel.h"
#include "ps/server/common.h" #include "fl/server/common.h"
#include "ps/server/local_meta_store.h" #include "fl/server/local_meta_store.h"
#include "ps/server/distributed_count_service.h" #include "fl/server/distributed_count_service.h"
#include "ps/server/distributed_metadata_store.h" #include "fl/server/distributed_metadata_store.h"
namespace mindspore { namespace mindspore {
namespace ps { namespace ps {

2
mindspore/ccsrc/ps/server/kernel/round/round_kernel_factory.cc → mindspore/ccsrc/fl/server/kernel/round/round_kernel_factory.cc
View File

@ -14,7 +14,7 @@
* limitations under the License. * 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 mindspore {
namespace ps { namespace ps {

4
mindspore/ccsrc/ps/server/kernel/round/round_kernel_factory.h → mindspore/ccsrc/fl/server/kernel/round/round_kernel_factory.h
View File

@ -21,8 +21,8 @@
#include <string> #include <string>
#include <utility> #include <utility>
#include <unordered_map> #include <unordered_map>
#include "ps/server/common.h" #include "fl/server/common.h"
#include "ps/server/kernel/round/round_kernel.h" #include "fl/server/kernel/round/round_kernel.h"
namespace mindspore { namespace mindspore {
namespace ps { namespace ps {

2
mindspore/ccsrc/ps/server/kernel/round/share_secrets_kernel.cc → mindspore/ccsrc/fl/server/kernel/round/share_secrets_kernel.cc
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
#include "ps/server/kernel/round/share_secrets_kernel.h" #include "fl/server/kernel/round/share_secrets_kernel.h"
#include <vector> #include <vector>
#include <memory> #include <memory>

8
mindspore/ccsrc/ps/server/kernel/round/share_secrets_kernel.h → mindspore/ccsrc/fl/server/kernel/round/share_secrets_kernel.h
View File

@ -18,10 +18,10 @@
#define MINDSPORE_CCSRC_PS_SERVER_KERNEL_SHARE_SECRETS_KERNEL_H #define MINDSPORE_CCSRC_PS_SERVER_KERNEL_SHARE_SECRETS_KERNEL_H
#include <vector> #include <vector>
#include "ps/server/common.h" #include "fl/server/common.h"
#include "ps/server/executor.h" #include "fl/server/executor.h"
#include "ps/server/kernel/round/round_kernel.h" #include "fl/server/kernel/round/round_kernel.h"
#include "ps/server/kernel/round/round_kernel_factory.h" #include "fl/server/kernel/round/round_kernel_factory.h"
#include "armour/cipher/cipher_shares.h" #include "armour/cipher/cipher_shares.h"
namespace mindspore { namespace mindspore {

6
mindspore/ccsrc/ps/server/kernel/round/start_fl_job_kernel.cc → mindspore/ccsrc/fl/server/kernel/round/start_fl_job_kernel.cc
View File

@ -14,13 +14,13 @@
* limitations under the License. * 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 <map> #include <map>
#include <memory> #include <memory>
#include <string> #include <string>
#include <vector> #include <vector>
#include "ps/server/model_store.h" #include "fl/server/model_store.h"
#include "ps/server/iteration.h" #include "fl/server/iteration.h"
#ifdef ENABLE_ARMOUR #ifdef ENABLE_ARMOUR
#include "armour/cipher/cipher_init.h" #include "armour/cipher/cipher_init.h"
#endif #endif

8
mindspore/ccsrc/ps/server/kernel/round/start_fl_job_kernel.h → mindspore/ccsrc/fl/server/kernel/round/start_fl_job_kernel.h
View File

@ -21,10 +21,10 @@
#include <memory> #include <memory>
#include <string> #include <string>
#include <vector> #include <vector>
#include "ps/server/common.h" #include "fl/server/common.h"
#include "ps/server/executor.h" #include "fl/server/executor.h"
#include "ps/server/kernel/round/round_kernel.h" #include "fl/server/kernel/round/round_kernel.h"
#include "ps/server/kernel/round/round_kernel_factory.h" #include "fl/server/kernel/round/round_kernel_factory.h"
namespace mindspore { namespace mindspore {
namespace ps { namespace ps {

2
mindspore/ccsrc/ps/server/kernel/round/update_model_kernel.cc → mindspore/ccsrc/fl/server/kernel/round/update_model_kernel.cc
View File

@ -18,7 +18,7 @@
#include <memory> #include <memory>
#include <string> #include <string>
#include <vector> #include <vector>
#include "ps/server/kernel/round/update_model_kernel.h" #include "fl/server/kernel/round/update_model_kernel.h"
namespace mindspore { namespace mindspore {
namespace ps { namespace ps {

8
mindspore/ccsrc/ps/server/kernel/round/update_model_kernel.h → mindspore/ccsrc/fl/server/kernel/round/update_model_kernel.h
View File

@ -21,10 +21,10 @@
#include <memory> #include <memory>
#include <string> #include <string>
#include <vector> #include <vector>
#include "ps/server/common.h" #include "fl/server/common.h"
#include "ps/server/kernel/round/round_kernel.h" #include "fl/server/kernel/round/round_kernel.h"
#include "ps/server/kernel/round/round_kernel_factory.h" #include "fl/server/kernel/round/round_kernel_factory.h"
#include "ps/server/executor.h" #include "fl/server/executor.h"
namespace mindspore { namespace mindspore {
namespace ps { namespace ps {

2
mindspore/ccsrc/ps/server/local_meta_store.cc → mindspore/ccsrc/fl/server/local_meta_store.cc
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
#include "ps/server/local_meta_store.h" #include "fl/server/local_meta_store.h"
namespace mindspore { namespace mindspore {
namespace ps { namespace ps {

2
mindspore/ccsrc/ps/server/local_meta_store.h → mindspore/ccsrc/fl/server/local_meta_store.h
View File

@ -21,7 +21,7 @@
#include <mutex> #include <mutex>
#include <string> #include <string>
#include <unordered_map> #include <unordered_map>
#include "ps/server/common.h" #include "fl/server/common.h"
namespace mindspore { namespace mindspore {
namespace ps { namespace ps {

2
mindspore/ccsrc/ps/server/memory_register.cc → mindspore/ccsrc/fl/server/memory_register.cc
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
#include "ps/server/memory_register.h" #include "fl/server/memory_register.h"
#include <utility> #include <utility>
namespace mindspore { namespace mindspore {

2
mindspore/ccsrc/ps/server/memory_register.h → mindspore/ccsrc/fl/server/memory_register.h
View File

@ -23,7 +23,7 @@
#include <vector> #include <vector>
#include <utility> #include <utility>
#include <typeinfo> #include <typeinfo>
#include "ps/server/common.h" #include "fl/server/common.h"
namespace mindspore { namespace mindspore {
namespace ps { namespace ps {

4
mindspore/ccsrc/ps/server/model_store.cc → mindspore/ccsrc/fl/server/model_store.cc
View File

@ -14,11 +14,11 @@
* limitations under the License. * limitations under the License.
*/ */
#include "ps/server/model_store.h" #include "fl/server/model_store.h"
#include <map> #include <map>
#include <string> #include <string>
#include <memory> #include <memory>
#include "ps/server/executor.h" #include "fl/server/executor.h"
namespace mindspore { namespace mindspore {
namespace ps { namespace ps {

6
mindspore/ccsrc/ps/server/model_store.h → mindspore/ccsrc/fl/server/model_store.h
View File

@ -20,9 +20,9 @@
#include <map> #include <map>
#include <memory> #include <memory>
#include <string> #include <string>
#include "ps/server/common.h" #include "fl/server/common.h"
#include "ps/server/memory_register.h" #include "fl/server/memory_register.h"
#include "ps/server/executor.h" #include "fl/server/executor.h"
namespace mindspore { namespace mindspore {
namespace ps { namespace ps {

2
mindspore/ccsrc/ps/server/parameter_aggregator.cc → mindspore/ccsrc/fl/server/parameter_aggregator.cc
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
#include "ps/server/parameter_aggregator.h" #include "fl/server/parameter_aggregator.h"
#include <map> #include <map>
#include <memory> #include <memory>
#include <string> #include <string>

8
mindspore/ccsrc/ps/server/parameter_aggregator.h → mindspore/ccsrc/fl/server/parameter_aggregator.h
View File

@ -22,10 +22,10 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include <utility> #include <utility>
#include "ps/server/common.h" #include "fl/server/common.h"
#include "ps/server/memory_register.h" #include "fl/server/memory_register.h"
#include "ps/server/kernel/aggregation_kernel_factory.h" #include "fl/server/kernel/aggregation_kernel_factory.h"
#include "ps/server/kernel/optimizer_kernel_factory.h" #include "fl/server/kernel/optimizer_kernel_factory.h"
namespace mindspore { namespace mindspore {
namespace ps { namespace ps {

6
mindspore/ccsrc/ps/server/round.cc → mindspore/ccsrc/fl/server/round.cc
View File

@ -14,11 +14,11 @@
* limitations under the License. * limitations under the License.
*/ */
#include "ps/server/round.h" #include "fl/server/round.h"
#include <memory> #include <memory>
#include <string> #include <string>
#include "ps/server/server.h" #include "fl/server/server.h"
#include "ps/server/iteration.h" #include "fl/server/iteration.h"
namespace mindspore { namespace mindspore {
namespace ps { namespace ps {

8
mindspore/ccsrc/ps/server/round.h → mindspore/ccsrc/fl/server/round.h
View File

@ -20,10 +20,10 @@
#include <memory> #include <memory>
#include <string> #include <string>
#include "ps/core/communicator/communicator_base.h" #include "ps/core/communicator/communicator_base.h"
#include "ps/server/common.h" #include "fl/server/common.h"
#include "ps/server/iteration_timer.h" #include "fl/server/iteration_timer.h"
#include "ps/server/distributed_count_service.h" #include "fl/server/distributed_count_service.h"
#include "ps/server/kernel/round/round_kernel.h" #include "fl/server/kernel/round/round_kernel.h"
namespace mindspore { namespace mindspore {
namespace ps { namespace ps {

16
mindspore/ccsrc/ps/server/server.cc → mindspore/ccsrc/fl/server/server.cc
View File

@ -14,20 +14,20 @@
* limitations under the License. * limitations under the License.
*/ */
#include "ps/server/server.h" #include "fl/server/server.h"
#include <memory> #include <memory>
#include <string> #include <string>
#include <csignal> #include <csignal>
#ifdef ENABLE_ARMOUR #ifdef ENABLE_ARMOUR
#include "armour/secure_protocol/secret_sharing.h" #include "armour/secure_protocol/secret_sharing.h"
#endif #endif
#include "ps/server/round.h" #include "fl/server/round.h"
#include "ps/server/model_store.h" #include "fl/server/model_store.h"
#include "ps/server/iteration.h" #include "fl/server/iteration.h"
#include "ps/server/collective_ops_impl.h" #include "fl/server/collective_ops_impl.h"
#include "ps/server/distributed_metadata_store.h" #include "fl/server/distributed_metadata_store.h"
#include "ps/server/distributed_count_service.h" #include "fl/server/distributed_count_service.h"
#include "ps/server/kernel/round/round_kernel_factory.h" #include "fl/server/kernel/round/round_kernel_factory.h"
namespace mindspore { namespace mindspore {
namespace ps { namespace ps {

6
mindspore/ccsrc/ps/server/server.h → mindspore/ccsrc/fl/server/server.h
View File

@ -23,9 +23,9 @@
#include "ps/core/communicator/communicator_base.h" #include "ps/core/communicator/communicator_base.h"
#include "ps/core/communicator/tcp_communicator.h" #include "ps/core/communicator/tcp_communicator.h"
#include "ps/core/communicator/task_executor.h" #include "ps/core/communicator/task_executor.h"
#include "ps/server/common.h" #include "fl/server/common.h"
#include "ps/server/executor.h" #include "fl/server/executor.h"
#include "ps/server/iteration.h" #include "fl/server/iteration.h"
#ifdef ENABLE_ARMOUR #ifdef ENABLE_ARMOUR
#include "armour/cipher/cipher_init.h" #include "armour/cipher/cipher_init.h"
#endif #endif

2
mindspore/ccsrc/ps/worker/fl_worker.cc → mindspore/ccsrc/fl/worker/fl_worker.cc
View File

@ -18,7 +18,7 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include <utility> #include <utility>
#include "ps/worker/fl_worker.h" #include "fl/worker/fl_worker.h"
#include "utils/ms_exception.h" #include "utils/ms_exception.h"
namespace mindspore { namespace mindspore {

0
mindspore/ccsrc/ps/worker/fl_worker.h → mindspore/ccsrc/fl/worker/fl_worker.h
View File

4
mindspore/ccsrc/pipeline/jit/action.cc
View File

@ -48,8 +48,8 @@
#include "ps/parameter_server.h" #include "ps/parameter_server.h"
#include "ps/scheduler.h" #include "ps/scheduler.h"
#include "ps/worker.h" #include "ps/worker.h"
#include "ps/worker/fl_worker.h" #include "fl/worker/fl_worker.h"
#include "ps/server/server.h" #include "fl/server/server.h"
#endif #endif
namespace mindspore { namespace mindspore {

4
mindspore/ccsrc/pipeline/jit/pipeline.cc
View File

@ -59,10 +59,10 @@
#include "ps/constants.h" #include "ps/constants.h"
#include "ps/util.h" #include "ps/util.h"
#include "ps/worker.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_data/ps_data_prefetch.h"
#include "ps/ps_cache/ps_cache_manager.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 #endif
#if ((defined ENABLE_GE) || (defined ENABLE_D)) #if ((defined ENABLE_GE) || (defined ENABLE_D))

46
mindspore/ccsrc/ps/CMakeLists.txt
View File

@ -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/recovery_base.cc")
list(REMOVE_ITEM _PS_SRC_FILES "core/node_recovery.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/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() endif()
if(NOT ENABLE_D) 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") list(REMOVE_ITEM _PS_SRC_FILES "ps_cache/gpu/gpu_ps_cache.cc")
endif() 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_prefetch.cc")
list(REMOVE_ITEM _PS_SRC_FILES "ps_cache/ps_data/ps_data_channel.cc") list(REMOVE_ITEM _PS_SRC_FILES "ps_cache/ps_data/ps_data_channel.cc")
add_subdirectory(ps_cache) add_subdirectory(ps_cache)

1
mindspore/core/gvar/log_adapter_common.cc
View File

@ -44,6 +44,7 @@ static const std::vector<std::string> sub_module_names = {
"VM", // SM_VM "VM", // SM_VM
"PROFILER", // SM_PROFILER "PROFILER", // SM_PROFILER
"PS", // SM_PS "PS", // SM_PS
"FL", // SM_FL
"LITE", // SM_LITE "LITE", // SM_LITE
"ARMOUR", // SM_ARMOUR "ARMOUR", // SM_ARMOUR
"HCCL_ADPT", // SM_HCCL_ADPT "HCCL_ADPT", // SM_HCCL_ADPT

1
mindspore/core/utils/log_adapter.h
View File

@ -131,6 +131,7 @@ enum SubModuleId : int {
SM_VM, // VM SM_VM, // VM
SM_PROFILER, // profiler SM_PROFILER, // profiler
SM_PS, // Parameter Server SM_PS, // Parameter Server
SM_FL, // Federated Learning
SM_LITE, // LITE SM_LITE, // LITE
SM_ARMOUR, // ARMOUR SM_ARMOUR, // ARMOUR
SM_HCCL_ADPT, // Hccl Adapter SM_HCCL_ADPT, // Hccl Adapter

4
tests/ut/cpp/CMakeLists.txt
View File

@ -66,6 +66,7 @@ if(ENABLE_MINDDATA)
./utils/*.cc ./utils/*.cc
./vm/*.cc ./vm/*.cc
./ps/*.cc ./ps/*.cc
./fl/*.cc
./cxx_api/*.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/*.cc"
"../../../mindspore/ccsrc/transform/graph_ir/op_declare/*.cc" "../../../mindspore/ccsrc/transform/graph_ir/op_declare/*.cc"
"../../../mindspore/ccsrc/ps/*.cc" "../../../mindspore/ccsrc/ps/*.cc"
"../../../mindspore/ccsrc/fl/*.cc"
"../../../mindspore/ccsrc/profiler/device/common/*.cc" "../../../mindspore/ccsrc/profiler/device/common/*.cc"
"../../../mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/adam_fp32.c" "../../../mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/adam_fp32.c"
"../../../mindspore/ccsrc/armour/*.cc" "../../../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/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/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/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/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/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") list(REMOVE_ITEM MINDSPORE_SRC_LIST "../../../mindspore/ccsrc/backend/optimizer/gpu/batch_norm_add_relu_grad_fusion.cc")