diff --git a/paddle/fluid/framework/fleet/heter_ps/CMakeLists.txt b/paddle/fluid/framework/fleet/heter_ps/CMakeLists.txt index 8c313694b7e60e15b893c36f0f9904a92626d314..edbeac9047997489f77f0d3a28f95f0a3d175a73 100644 --- a/paddle/fluid/framework/fleet/heter_ps/CMakeLists.txt +++ b/paddle/fluid/framework/fleet/heter_ps/CMakeLists.txt @@ -22,13 +22,16 @@ IF(WITH_GPU) # target_link_libraries(test_sample_rate graph_gpu_ps graph_sampler) # nv_test(test_graph_xx SRCS test_xx.cu DEPS graph_gpu_ps graph_sampler) endif() - ENDIF() IF(WITH_XPU_KP) SET(HETERPS_DEPS device_context) xpu_library(heter_comm_kernel SRCS heter_comm_kernel.h heter_comm_kernel.kps feature_value.h) xpu_library(hashtable_kernel SRCS hashtable.h hashtable_kernel.kps) cc_library(heter_comm SRCS heter_comm.h heter_resource.cc DEPS ${HETERPS_DEPS} heter_comm_kernel hashtable_kernel) + # Change heter_ps.cu file suffix + # NOTE(zhangminxu): If we compile with XPU_KP, we directly copy heter_ps.cu to heter_ps.cc + file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/heter_ps.cu DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/) + file(RENAME ${CMAKE_CURRENT_BINARY_DIR}/heter_ps.cu ${CMAKE_CURRENT_BINARY_DIR}/heter_ps.cc) cc_library(heter_ps SRCS heter_ps.cc DEPS heter_comm) # xpu_library(heter_comm SRCS heter_comm.h heter_comm_kernel.kps feature_value.h heter_resource.cc heter_resource.h hashtable.h mem_pool.h DEPS ${HETERPS_DEPS}) ENDIF() diff --git a/paddle/fluid/framework/fleet/heter_ps/heter_ps.cc b/paddle/fluid/framework/fleet/heter_ps/heter_ps.cc deleted file mode 100644 index 3d375209ed14e91156dea7748bf3e656f1258457..0000000000000000000000000000000000000000 --- a/paddle/fluid/framework/fleet/heter_ps/heter_ps.cc +++ /dev/null @@ -1,61 +0,0 @@ -/* Copyright (c) 2020 PaddlePaddle Authors. All Rights Reserved. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. */ - -#include "paddle/fluid/framework/fleet/heter_ps/heter_ps.h" -#include - -#ifdef PADDLE_WITH_HETERPS - -namespace paddle { -namespace framework { - -HeterPsBase* HeterPsBase::get_instance( - size_t capacity, std::shared_ptr resource) { - return new HeterPs(capacity, resource); -} - -HeterPs::HeterPs(size_t capacity, std::shared_ptr resource) { - comm_ = - std::make_shared>( - capacity, resource); -} - -HeterPs::~HeterPs() {} - -void HeterPs::pull_sparse(int num, FeatureKey* d_keys, FeatureValue* d_vals, - size_t len) { - comm_->pull_sparse(num, d_keys, d_vals, len); -} - -void HeterPs::build_ps(int num, FeatureKey* h_keys, FeatureValue* h_vals, - size_t len, size_t chunk_size, int stream_num) { - comm_->build_ps(num, h_keys, h_vals, len, chunk_size, stream_num); -} - -int HeterPs::get_index_by_devid(int devid) { - return comm_->get_index_by_devid(devid); -} - -void HeterPs::end_pass() { comm_->end_pass(); } - -void HeterPs::show_one_table(int gpu_num) { comm_->show_one_table(gpu_num); } - -void HeterPs::push_sparse(int num, FeatureKey* d_keys, - FeaturePushValue* d_grads, size_t len) { - // comm_->push_sparse_multi_node(num, d_keys, d_grads, len, opt_); -} - -} // end namespace framework -} // end namespace paddle -#endif