Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
345b67b5
P
Paddle
项目概览
PaddlePaddle
/
Paddle
大约 1 年 前同步成功
通知
2297
Star
20931
Fork
5422
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1423
列表
看板
标记
里程碑
合并请求
543
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1,423
Issue
1,423
列表
看板
标记
里程碑
合并请求
543
合并请求
543
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
345b67b5
编写于
11月 25, 2019
作者:
Z
zhouwei25
提交者:
liuwei1031
11月 25, 2019
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
remove warning LNK4006 and warning LNK4221 (#21226)
上级
6514f52e
变更
11
显示空白变更内容
内联
并排
Showing
11 changed file
with
39 addition
and
38 deletion
+39
-38
cmake/generic.cmake
cmake/generic.cmake
+12
-11
paddle/fluid/framework/details/CMakeLists.txt
paddle/fluid/framework/details/CMakeLists.txt
+1
-1
paddle/fluid/framework/ir/memory_optimize_pass/CMakeLists.txt
...le/fluid/framework/ir/memory_optimize_pass/CMakeLists.txt
+1
-1
paddle/fluid/imperative/CMakeLists.txt
paddle/fluid/imperative/CMakeLists.txt
+3
-1
paddle/fluid/imperative/tests/CMakeLists.txt
paddle/fluid/imperative/tests/CMakeLists.txt
+7
-1
paddle/fluid/inference/analysis/CMakeLists.txt
paddle/fluid/inference/analysis/CMakeLists.txt
+3
-4
paddle/fluid/operators/detection/CMakeLists.txt
paddle/fluid/operators/detection/CMakeLists.txt
+3
-6
paddle/fluid/operators/jit/CMakeLists.txt
paddle/fluid/operators/jit/CMakeLists.txt
+1
-1
paddle/fluid/operators/reader/CMakeLists.txt
paddle/fluid/operators/reader/CMakeLists.txt
+2
-6
paddle/fluid/platform/CMakeLists.txt
paddle/fluid/platform/CMakeLists.txt
+1
-5
paddle/fluid/pybind/CMakeLists.txt
paddle/fluid/pybind/CMakeLists.txt
+5
-1
未找到文件。
cmake/generic.cmake
浏览文件 @
345b67b5
...
...
@@ -110,14 +110,12 @@ function(find_fluid_modules TARGET_NAME)
endif
()
endfunction
(
find_fluid_modules
)
function
(
common_link TARGET_NAME
)
if
(
WITH_PROFILER
)
target_link_libraries
(
${
TARGET_NAME
}
gperftools::profiler
)
endif
()
endfunction
()
# find all third_party modules is used for paddle static library
# for reduce the dependency when building the inference libs.
set_property
(
GLOBAL PROPERTY FLUID_THIRD_PARTY
)
...
...
@@ -238,7 +236,7 @@ function(merge_static_libs TARGET_NAME)
endfunction
(
merge_static_libs
)
function
(
cc_library TARGET_NAME
)
set
(
options STATIC static SHARED shared
)
set
(
options STATIC static SHARED shared
INTERFACE interface
)
set
(
oneValueArgs
""
)
set
(
multiValueArgs SRCS DEPS
)
cmake_parse_arguments
(
cc_library
"
${
options
}
"
"
${
oneValueArgs
}
"
"
${
multiValueArgs
}
"
${
ARGN
}
)
...
...
@@ -249,11 +247,14 @@ function(cc_library TARGET_NAME)
if
(
cc_library_SRCS
)
if
(
cc_library_SHARED OR cc_library_shared
)
# build *.so
add_library
(
${
TARGET_NAME
}
SHARED
${
cc_library_SRCS
}
)
elseif
(
cc_library_INTERFACE OR cc_library_interface
)
set
(
target_SRCS
${
CMAKE_CURRENT_BINARY_DIR
}
/
${
TARGET_NAME
}
_dummy.c
)
file
(
WRITE
${
target_SRCS
}
"const char *dummy_
${
TARGET_NAME
}
=
\"
${
target_SRCS
}
\"
;"
)
add_library
(
${
TARGET_NAME
}
STATIC
${
target_SRCS
}
)
else
()
add_library
(
${
TARGET_NAME
}
STATIC
${
cc_library_SRCS
}
)
find_fluid_modules
(
${
TARGET_NAME
}
)
endif
()
if
(
cc_library_DEPS
)
# Don't need link libwarpctc.so
if
(
"
${
cc_library_DEPS
}
;"
MATCHES
"warpctc;"
)
...
...
@@ -285,7 +286,6 @@ function(cc_library TARGET_NAME)
endif
(
WIN32
)
endif
()
target_link_libraries
(
${
TARGET_NAME
}
${
cc_library_DEPS
}
)
add_dependencies
(
${
TARGET_NAME
}
${
cc_library_DEPS
}
)
common_link
(
${
TARGET_NAME
}
)
endif
()
...
...
@@ -322,6 +322,7 @@ function(sep_library TARGET_NAME)
set
(
dummy_offset 1
)
# the dummy target would be consisted of limit size libraries
set
(
dummy_limit 50
)
list
(
REMOVE_DUPLICATES sep_library_DEPS
)
list
(
LENGTH sep_library_DEPS sep_all_len
)
foreach
(
v
${
sep_library_DEPS
}
)
list
(
APPEND dummy_list
${
v
}
)
...
...
paddle/fluid/framework/details/CMakeLists.txt
浏览文件 @
345b67b5
...
...
@@ -9,7 +9,7 @@ cc_library(computation_op_handle SRCS computation_op_handle.cc DEPS framework_pr
cc_library
(
share_tensor_buffer_op_handle SRCS share_tensor_buffer_op_handle.cc DEPS op_handle_base scope computation_op_handle share_tensor_buffer_functor
)
cc_library
(
rpc_op_handle SRCS rpc_op_handle.cc DEPS framework_proto scope place operator op_registry
)
cc_library
(
fetch_barrier_op_handle SRCS fetch_barrier_op_handle.cc DEPS framework_proto scope place operator op_registry
)
cc_library
(
multi_devices_helper SRCS multi_devices_helper.cc DEPS graph graph_helper
)
cc_library
(
multi_devices_helper
INTERFACE
SRCS multi_devices_helper.cc DEPS graph graph_helper
)
cc_library
(
variable_visitor SRCS variable_visitor.cc DEPS lod_tensor selected_rows
)
...
...
paddle/fluid/framework/ir/memory_optimize_pass/CMakeLists.txt
浏览文件 @
345b67b5
...
...
@@ -8,7 +8,7 @@ cc_library(reference_count_pass SRCS reference_count_pass.cc DEPS computation_op
cc_library
(
eager_deletion_pass SRCS eager_deletion_pass.cc DEPS computation_op_handle
eager_deletion_op_handle graph graph_helper pass conditional_block_op_eager_deletion_pass while_op_eager_deletion_pass recurrent_op_eager_deletion_pass reference_count_pass_helper
)
cc_library
(
memory_reuse_pass SRCS memory_reuse_pass.cc DEPS computation_op_handle reference_count_pass_helper share_tensor_buffer_op_handle
multi_devices_helper graph pass
)
cc_library
(
memory_reuse_pass SRCS memory_reuse_pass.cc DEPS computation_op_handle reference_count_pass_helper share_tensor_buffer_op_handle
graph pass multi_devices_helper
)
cc_library
(
buffer_shared_inplace_op_pass SRCS buffer_shared_inplace_op_pass.cc DEPS memory_reuse_pass
)
cc_library
(
buffer_shared_cross_op_memory_reuse_pass SRCS buffer_shared_cross_op_memory_reuse_pass.cc DEPS memory_reuse_pass
)
paddle/fluid/imperative/CMakeLists.txt
浏览文件 @
345b67b5
...
...
@@ -8,6 +8,8 @@ add_subdirectory(jit)
cc_library
(
tracer SRCS tracer.cc DEPS layer engine program_desc_tracer
)
cc_library
(
engine SRCS engine.cc DEPS layer gradient_accumulator
)
cc_library
(
imperative_profiler SRCS profiler.cc
)
cc_library
(
nccl_context SRCS nccl_context.cc DEPS device_context
)
if
(
NOT WIN32
)
cc_library
(
nccl_context SRCS nccl_context.cc DEPS device_context
)
endif
(
NOT WIN32
)
add_subdirectory
(
tests
)
paddle/fluid/imperative/tests/CMakeLists.txt
浏览文件 @
345b67b5
cc_test
(
nccl_context_test SRCS nccl_context_test.cc DEPS nccl_context
)
if
(
WIN32
)
cc_test
(
nccl_context_test SRCS nccl_context_test.cc DEPS device_context
)
else
()
cc_test
(
nccl_context_test SRCS nccl_context_test.cc DEPS nccl_context
)
endif
(
WIN32
)
cc_test
(
test_gradient_accmulator SRCS test_gradient_accmulator.cc DEPS gradient_accumulator memcpy
)
cc_test
(
test_layer SRCS test_layer.cc DEPS layer proto_desc operator op_registry variable_helper mul_op memcpy
)
cc_test
(
test_prepare_op SRCS test_prepare_op.cc DEPS prepared_operator op_info split_op layer concat_and_split assign_op place
)
...
...
paddle/fluid/inference/analysis/CMakeLists.txt
浏览文件 @
345b67b5
...
...
@@ -11,14 +11,13 @@ cc_library(analysis_helper SRCS helper.cc DEPS framework_proto proto_desc graph
cc_library
(
ir_pass_manager SRCS ir_pass_manager.cc DEPS graph pass
${
INFER_IR_PASSES
}
analysis_helper
)
cc_library
(
argument SRCS argument.cc DEPS scope proto_desc
)
cc_library
(
analysis_pass SRCS analysis_pass.cc DEPS proto_desc
)
cc_library
(
argument
INTERFACE
SRCS argument.cc DEPS scope proto_desc
)
cc_library
(
analysis_pass
INTERFACE
SRCS analysis_pass.cc DEPS proto_desc
)
cc_library
(
analysis SRCS
analyzer.cc
analysis_pass
DEPS
${
analysis_deps
}
analysis_helper
${
INFER_IR_PASSES
}
analysis_pass
${
INFER_IR_PASSES
}
)
cc_test
(
test_dot SRCS dot_tester.cc DEPS analysis
)
...
...
paddle/fluid/operators/detection/CMakeLists.txt
浏览文件 @
345b67b5
...
...
@@ -20,8 +20,6 @@ detection_library(box_coder_op SRCS box_coder_op.cc box_coder_op.cu)
detection_library
(
iou_similarity_op SRCS iou_similarity_op.cc
iou_similarity_op.cu
)
detection_library
(
mine_hard_examples_op SRCS mine_hard_examples_op.cc
)
detection_library
(
multiclass_nms_op SRCS multiclass_nms_op.cc poly_util.cc gpc.cc
)
detection_library
(
locality_aware_nms_op SRCS locality_aware_nms_op.cc poly_util.cc gpc.cc
)
detection_library
(
prior_box_op SRCS prior_box_op.cc prior_box_op.cu
)
detection_library
(
density_prior_box_op SRCS density_prior_box_op.cc density_prior_box_op.cu
)
detection_library
(
anchor_generator_op SRCS anchor_generator_op.cc
...
...
@@ -32,6 +30,8 @@ detection_library(polygon_box_transform_op SRCS polygon_box_transform_op.cc
polygon_box_transform_op.cu
)
detection_library
(
rpn_target_assign_op SRCS rpn_target_assign_op.cc
)
detection_library
(
generate_proposal_labels_op SRCS generate_proposal_labels_op.cc
)
detection_library
(
multiclass_nms_op SRCS multiclass_nms_op.cc DEPS gpc
)
detection_library
(
locality_aware_nms_op SRCS locality_aware_nms_op.cc DEPS gpc
)
detection_library
(
box_clip_op SRCS box_clip_op.cc box_clip_op.cu
)
detection_library
(
yolov3_loss_op SRCS yolov3_loss_op.cc
)
detection_library
(
yolo_box_op SRCS yolo_box_op.cc yolo_box_op.cu
)
...
...
@@ -53,10 +53,7 @@ detection_library(roi_perspective_transform_op SRCS roi_perspective_transform_op
#Export local libraries to parent
# set(DETECTION_LIBRARY ${LOCAL_DETECTION_LIBS} PARENT_SCOPE)
foreach
(
src
${
LOCAL_DETECTION_LIBS
}
)
set
(
OP_LIBRARY
${
src
}
${
OP_LIBRARY
}
CACHE INTERNAL
"op libs"
)
endforeach
()
cc_library
(
mask_util SRCS mask_util.cc DEPS memory
)
cc_test
(
mask_util_test SRCS mask_util_test.cc DEPS memory mask_util
)
cc_library
(
gpc SRCS gpc.cc DEPS op_registry
)
detection_library
(
generate_mask_labels_op SRCS generate_mask_labels_op.cc DEPS mask_util
)
paddle/fluid/operators/jit/CMakeLists.txt
浏览文件 @
345b67b5
...
...
@@ -18,7 +18,7 @@ if(WITH_XBYAK)
add_subdirectory
(
gen
)
endif
()
cc_library
(
jit_kernel_helper
SRCS
${
jit_kernel_cc_srcs
}
DEPS
${
JIT_KERNEL_DEPS
}
)
cc_library
(
jit_kernel_helper
INTERFACE SRCS
${
jit_kernel_cc_srcs
}
DEPS jit_kernel_base
${
JIT_KERNEL_DEPS
}
)
cc_test
(
jit_kernel_test SRCS test.cc DEPS jit_kernel_helper
)
if
(
NOT WIN32
)
cc_binary
(
jit_kernel_benchmark SRCS benchmark.cc DEPS jit_kernel_helper device_tracer tensor
)
...
...
paddle/fluid/operators/reader/CMakeLists.txt
浏览文件 @
345b67b5
...
...
@@ -23,12 +23,8 @@ cc_library(buffered_reader SRCS buffered_reader.cc DEPS reader simple_threadpool
reader_library
(
create_double_buffer_reader_op SRCS create_double_buffer_reader_op.cc DEPS buffered_reader
)
reader_library
(
create_py_reader_op SRCS create_py_reader_op.cc DEPS py_reader
)
op_library
(
read_op DEPS py_reader buffered_reader
)
cc_test
(
reader_blocking_queue_test SRCS reader_blocking_queue_test.cc
)
# Export local libraries to parent
# set(READER_LIBRARY ${LOCAL_READER_LIBS} PARENT_SCOPE)
op_library
(
read_op DEPS py_reader buffered_reader
)
foreach
(
src
${
LOCAL_READER_LIBS
}
)
set
(
OP_LIBRARY
${
src
}
${
OP_LIBRARY
}
CACHE INTERNAL
"op libs"
)
endforeach
()
paddle/fluid/platform/CMakeLists.txt
浏览文件 @
345b67b5
...
...
@@ -25,11 +25,7 @@ cc_library(flags SRCS flags.cc DEPS gflags)
cc_library
(
errors SRCS errors.cc DEPS error_codes_proto
)
cc_test
(
errors_test SRCS errors_test.cc DEPS errors enforce
)
if
(
WITH_GPU
)
nv_library
(
enforce SRCS enforce.cc DEPS flags errors
)
else
()
cc_library
(
enforce SRCS enforce.cc DEPS flags errors
)
endif
()
cc_library
(
enforce INTERFACE SRCS enforce.cc DEPS flags errors
)
cc_test
(
enforce_test SRCS enforce_test.cc DEPS stringpiece enforce
)
set
(
CPU_INFO_DEPS gflags glog enforce
)
...
...
paddle/fluid/pybind/CMakeLists.txt
浏览文件 @
345b67b5
set
(
PYBIND_DEPS pybind python proto_desc memory executor fleet_wrapper box_wrapper nccl_wrapper prune
feed_fetch_method pass_builder parallel_executor profiler layer tracer engine scope_pool
analysis_predictor imperative_profiler nccl_context imperative_flag save_load_util dlpack_tensor
)
analysis_predictor imperative_profiler imperative_flag save_load_util dlpack_tensor device_context
)
if
(
NOT WIN32
)
set
(
PYBIND_DEPS
${
PYBIND_DEPS
}
nccl_context
)
endif
(
NOT WIN32
)
if
(
WITH_PYTHON
)
list
(
APPEND PYBIND_DEPS py_func_op
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录