m53297601
/
Paddle
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix distributed building

Browse Source 
test=develop
revert-16555-model_data_cryption_link_all_lib
dongdaxiang 7 years ago
parent ed31874397
commit 0030eb2a61
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File

14
paddle/fluid/framework/CMakeLists.txt
Unescape View File

@ -173,11 +173,15 @@ endif()
cc_library(executor_gc_helper SRCS executor_gc_helper.cc DEPS scope proto_desc operator garbage_collector) cc_library(executor_gc_helper SRCS executor_gc_helper.cc DEPS scope proto_desc operator garbage_collector)
if(WITH_DISTRIBUTE) if(WITH_DISTRIBUTE)
cc_library(executor SRCS executor.cc DEPS op_registry device_context scope framework_proto glog fleet_wrapper cc_library(executor SRCS executor.cc multi_trainer.cc dataset_factory.cc
lod_rank_table feed_fetch_method sendrecvop_rpc ${GLOB_DISTRIBUTE_DEPS} dist_multi_trainer.cc trainer_factory.cc trainer.cc data_feed_factory.cc
graph_to_program_pass variable_helper data_feed_proto ${NGRAPH_EXE_DEPS}) data_feed.cc device_worker.cc hogwild_worker.cc downpour_worker.cc
set(DISTRIBUTE_COMPILE_FLAGS "-Wno-non-virtual-dtor -Wno-error=non-virtual-dtor -Wno-error=delete-non-virtual-dtor") pull_dense_worker.cc device_worker_factory.cc data_set.cc DEPS op_registry
set_source_files_properties(executor.cc PROPERTIES COMPILE_FLAGS ${DISTRIBUTE_COMPILE_FLAGS}) device_context scope framework_proto glog fs shell fleet_wrapper lodtensor_printer
lod_rank_table feed_fetch_method sendrecvop_rpc ${GLOB_DISTRIBUTE_DEPS}
graph_to_program_pass variable_helper data_feed_proto ${NGRAPH_EXE_DEPS})
set(DISTRIBUTE_COMPILE_FLAGS "-Wno-non-virtual-dtor -Wno-error=non-virtual-dtor -Wno-error=delete-non-virtual-dtor")
set_source_files_properties(executor.cc PROPERTIES COMPILE_FLAGS ${DISTRIBUTE_COMPILE_FLAGS})
else() else()
cc_library(executor SRCS executor.cc multi_trainer.cc dataset_factory.cc cc_library(executor SRCS executor.cc multi_trainer.cc dataset_factory.cc
dist_multi_trainer.cc trainer_factory.cc trainer.cc data_feed_factory.cc dist_multi_trainer.cc trainer_factory.cc trainer.cc data_feed_factory.cc

2
python/paddle/fluid/trainer_desc.py
Unescape View File

@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
from paddle.fluid.proto import trainer_desc_pb2 from proto import trainer_desc_pb2
from distributed import ps_pb2 as ps_pb2 from distributed import ps_pb2 as ps_pb2
from device_worker import DeviceWorkerFactory from device_worker import DeviceWorkerFactory
from google.protobuf import text_format from google.protobuf import text_format

Write Preview
Loading…
Cancel
Save