Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Table refine: remove table/accessor unuseful #41400

Merged
merged 33 commits into from
Apr 5, 2022
Merged

Table refine: remove table/accessor unuseful #41400

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
2b967c7
update name
esythan Mar 30, 2022
61e6d9e
update name
esythan Mar 30, 2022
f78fbb5
fix test
esythan Mar 31, 2022
c6c7ec0
fix fleet bind
esythan Mar 31, 2022
fe93dca
update name
esythan Mar 31, 2022
9a943b6
update name
esythan Mar 31, 2022
257d224
resolve conflict
esythan Mar 31, 2022
e57e74d
Merge branch 'name' of https://github.com/esythan/Paddle into async_r…
zhaocaibei123 Mar 31, 2022
9a7a2cf
fix test
esythan Mar 31, 2022
0f4bf8b
Merge branch 'name' of https://github.com/esythan/Paddle into async_r…
zhaocaibei123 Mar 31, 2022
8fdb7ef
fix gpups wrapper
esythan Mar 31, 2022
16b94a5
remove Push/Pull/Load/Save with context in client and wrapper base class
zhaocaibei123 Mar 31, 2022
648cf62
Merge branch 'name' of https://github.com/esythan/Paddle into async_r…
zhaocaibei123 Mar 31, 2022
80f95df
fix conflict
zhaocaibei123 Mar 31, 2022
03b6c3b
Merge branch 'develop' into async_refine
zhaocaibei123 Apr 1, 2022
65c505f
fix
zhaocaibei123 Apr 1, 2022
d4ea5d1
fix
zhaocaibei123 Apr 1, 2022
1e763e4
remove some interface
zhaocaibei123 Apr 2, 2022
40c1539
fix
zhaocaibei123 Apr 2, 2022
e949912
remove
zhaocaibei123 Apr 2, 2022
e14295f
fix conflict
zhaocaibei123 Apr 2, 2022
1d808d3
code style
zhaocaibei123 Apr 2, 2022
56c9033
recover
zhaocaibei123 Apr 2, 2022
878fbc2
fix
zhaocaibei123 Apr 2, 2022
02bdabc
remove code unused
zhaocaibei123 Apr 3, 2022
701fc28
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
zhaocaibei123 Apr 3, 2022
65ac027
remove some unused table & accessor & CommonDenseTable => MemoryDense…
zhaocaibei123 Apr 3, 2022
49c6f30
fix
zhaocaibei123 Apr 3, 2022
9395987
fix
zhaocaibei123 Apr 4, 2022
cb6267a
fix
zhaocaibei123 Apr 4, 2022
865d2f9
fix conflict
zhaocaibei123 Apr 4, 2022
66cfaab
recover
zhaocaibei123 Apr 4, 2022
755d590
remove unused code
zhaocaibei123 Apr 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 3 additions & 8 deletions paddle/fluid/distributed/ps/table/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,7 @@ set_source_files_properties(${graphDir}/graph_weighted_sampler.cc PROPERTIES COM
cc_library(WeightedSampler SRCS ${graphDir}/graph_weighted_sampler.cc DEPS graph_edge)
set_source_files_properties(${graphDir}/graph_node.cc PROPERTIES COMPILE_FLAGS ${DISTRIBUTE_COMPILE_FLAGS})
cc_library(graph_node SRCS ${graphDir}/graph_node.cc DEPS WeightedSampler)
set_source_files_properties(common_dense_table.cc PROPERTIES COMPILE_FLAGS ${DISTRIBUTE_COMPILE_FLAGS})
set_source_files_properties(common_sparse_table.cc PROPERTIES COMPILE_FLAGS ${DISTRIBUTE_COMPILE_FLAGS})
set_source_files_properties(ssd_sparse_table.cc PROPERTIES COMPILE_FLAGS ${DISTRIBUTE_COMPILE_FLAGS})
set_source_files_properties(sparse_geo_table.cc PROPERTIES COMPILE_FLAGS ${DISTRIBUTE_COMPILE_FLAGS})
set_source_files_properties(memory_dense_table.cc PROPERTIES COMPILE_FLAGS ${DISTRIBUTE_COMPILE_FLAGS})
set_source_files_properties(barrier_table.cc PROPERTIES COMPILE_FLAGS ${DISTRIBUTE_COMPILE_FLAGS})
set_source_files_properties(common_graph_table.cc PROPERTIES COMPILE_FLAGS ${DISTRIBUTE_COMPILE_FLAGS})

Expand All @@ -23,10 +20,10 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp")

set(EXTERN_DEP "")
if(WITH_HETERPS)
set(TABLE_SRC common_sparse_table.cc ssd_sparse_table.cc common_dense_table.cc sparse_geo_table.cc barrier_table.cc common_graph_table.cc)
set(TABLE_SRC memory_dense_table.cc barrier_table.cc common_graph_table.cc)
set(EXTERN_DEP rocksdb)
else()
set(TABLE_SRC common_sparse_table.cc common_dense_table.cc sparse_geo_table.cc barrier_table.cc common_graph_table.cc)
set(TABLE_SRC memory_dense_table.cc barrier_table.cc common_graph_table.cc)
endif()

cc_library(common_table SRCS ${TABLE_SRC} DEPS ${TABLE_DEPS}
Expand All @@ -43,12 +40,10 @@ set_source_files_properties(sparse_sgd_rule.cc PROPERTIES COMPILE_FLAGS ${DISTRI
set_source_files_properties(ctr_double_accessor.cc PROPERTIES COMPILE_FLAGS ${DISTRIBUTE_COMPILE_FLAGS})
set_source_files_properties(ctr_accessor.cc PROPERTIES COMPILE_FLAGS ${DISTRIBUTE_COMPILE_FLAGS})
set_source_files_properties(sparse_accessor.cc PROPERTIES COMPILE_FLAGS ${DISTRIBUTE_COMPILE_FLAGS})
set_source_files_properties(downpour_ctr_accessor.cc PROPERTIES COMPILE_FLAGS ${DISTRIBUTE_COMPILE_FLAGS})
set_source_files_properties(memory_sparse_table.cc PROPERTIES COMPILE_FLAGS ${DISTRIBUTE_COMPILE_FLAGS})
cc_library(sparse_sgd_rule SRCS sparse_sgd_rule.cc DEPS ${TABLE_DEPS} ps_framework_proto)
cc_library(ctr_double_accessor SRCS ctr_double_accessor.cc DEPS ${TABLE_DEPS} ps_framework_proto sparse_sgd_rule)
cc_library(ctr_accessor SRCS ctr_accessor.cc sparse_accessor.cc DEPS ${TABLE_DEPS} ps_framework_proto sparse_sgd_rule)
cc_library(downpour_ctr_accessor SRCS downpour_ctr_accessor.cc DEPS ${TABLE_DEPS} ps_framework_proto sparse_sgd_rule)
cc_library(memory_sparse_table SRCS memory_sparse_table.cc DEPS ps_framework_proto ${TABLE_DEPS} fs afs_wrapper ctr_accessor common_table)

set_source_files_properties(memory_sparse_geo_table.cc PROPERTIES COMPILE_FLAGS ${DISTRIBUTE_COMPILE_FLAGS})
Expand Down
Loading