Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
PaddleDetection
提交
3ddc9971
P
PaddleDetection
项目概览
PaddlePaddle
/
PaddleDetection
12 个月 前同步成功
通知
692
Star
11112
Fork
2696
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
184
列表
看板
标记
里程碑
合并请求
40
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
PaddleDetection
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
184
Issue
184
列表
看板
标记
里程碑
合并请求
40
合并请求
40
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
3ddc9971
编写于
3月 07, 2018
作者:
L
Luo Tao
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
rename concat_functor to concat, refine CMakeLists based on comments
上级
1ef97fa7
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
20 addition
and
23 deletion
+20
-23
paddle/fluid/operators/CMakeLists.txt
paddle/fluid/operators/CMakeLists.txt
+1
-1
paddle/fluid/operators/math/CMakeLists.txt
paddle/fluid/operators/math/CMakeLists.txt
+19
-21
paddle/fluid/operators/math/sequence2batch.cc
paddle/fluid/operators/math/sequence2batch.cc
+0
-1
未找到文件。
paddle/fluid/operators/CMakeLists.txt
浏览文件 @
3ddc9971
...
...
@@ -201,7 +201,7 @@ op_library(save_op DEPS lod_tensor)
op_library
(
load_op DEPS lod_tensor
)
op_library
(
save_combine_op DEPS lod_tensor
)
op_library
(
load_combine_op DEPS lod_tensor
)
op_library
(
concat_op DEPS concat
_functor
)
op_library
(
concat_op DEPS concat
)
list
(
REMOVE_ITEM GENERAL_OPS
${
DEPS_OPS
}
)
foreach
(
src
${
GENERAL_OPS
}
)
...
...
paddle/fluid/operators/math/CMakeLists.txt
浏览文件 @
3ddc9971
...
...
@@ -6,8 +6,8 @@ function(math_library TARGET)
# But it handle split GPU/CPU code and link some common library.
set
(
cc_srcs
)
set
(
cu_srcs
)
set
(
math_common_deps device_context
framework_proto
)
set
(
multiValueArgs
SRCS
DEPS
)
set
(
math_common_deps device_context
)
set
(
multiValueArgs DEPS
)
cmake_parse_arguments
(
math_library
"
${
options
}
"
"
${
oneValueArgs
}
"
"
${
multiValueArgs
}
"
${
ARGN
}
)
...
...
@@ -18,36 +18,34 @@ function(math_library TARGET)
list
(
APPEND cu_srcs
${
TARGET
}
.cu
)
endif
()
list
(
LENGTH cc_srcs cc_srcs_len
)
if
(
WITH_GPU
)
nv_library
(
${
TARGET
}
SRCS
${
cc_srcs
}
${
cu_srcs
}
DEPS
${
math_library_DEPS
}
${
math_common_deps
}
)
else
(
)
else
if
(
${
cc_srcs_len
}
GREATER 0
)
cc_library
(
${
TARGET
}
SRCS
${
cc_srcs
}
DEPS
${
math_library_DEPS
}
${
math_common_deps
}
)
endif
()
endfunction
()
math_library
(
math_function DEPS cblas
)
math_library
(
im2col
)
math_library
(
selected_rows_functor DEPS selected_rows
)
math_library
(
softmax
)
# please add new math_library in alphabetical order
math_library
(
concat
)
math_library
(
context_project DEPS im2col math_function
)
math_library
(
cross_entropy
)
math_library
(
cos_sim_functor
)
math_library
(
depthwise_conv
)
math_library
(
gru_compute DEPS activation_functions math_function
)
math_library
(
im2col
)
math_library
(
lstm_compute DEPS activation_functions
)
math_library
(
math_function DEPS cblas framework_proto
)
math_library
(
maxouting
)
math_library
(
pooling
)
math_library
(
sequence_pooling
)
math_library
(
vol2col
)
math_library
(
context_project
)
math_library
(
selected_rows_functor DEPS selected_rows
)
math_library
(
sequence2batch
)
math_library
(
sequence_padding
)
math_library
(
sequence_pooling DEPS math_function
)
math_library
(
sequence_scale
)
math_library
(
maxouting
)
math_library
(
softmax
)
math_library
(
unpooling
)
math_library
(
cos_sim_functor
)
math_library
(
lstm_compute DEPS activation_functions
)
math_library
(
gru_compute DEPS activation_functions
)
if
(
WITH_GPU
)
nv_library
(
depthwise_conv SRCS depthwise_conv.cu DEPS device_context
)
nv_library
(
concat_functor SRCS concat.cc concat.cu DEPS device_context tensor
)
else
()
cc_library
(
concat_functor SRCS concat.cc DEPS device_context tensor
)
endif
()
math_library
(
vol2col
)
cc_test
(
math_function_test SRCS math_function_test.cc
)
cc_test
(
selected_rows_functor_test SRCS selected_rows_functor_test.cc DEPS selected_rows_functor
)
...
...
@@ -58,4 +56,4 @@ if(WITH_GPU)
nv_test
(
math_function_gpu_test SRCS math_function_test.cu
)
nv_test
(
selected_rows_functor_gpu_test SRCS selected_rows_functor_test.cu DEPS selected_rows_functor
)
endif
()
cc_test
(
concat_test SRCS concat_test.cc DEPS concat
_functor tensor
)
cc_test
(
concat_test SRCS concat_test.cc DEPS concat
)
paddle/fluid/operators/math/sequence2batch.cc
浏览文件 @
3ddc9971
...
...
@@ -13,7 +13,6 @@ See the License for the specific language governing permissions and
limitations under the License. */
#include "paddle/fluid/operators/math/sequence2batch.h"
#include "paddle/fluid/operators/math/math_function.h"
namespace
paddle
{
namespace
operators
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录