Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
机器未来
Paddle
提交
36de178a
P
Paddle
项目概览
机器未来
/
Paddle
与 Fork 源项目一致
Fork自
PaddlePaddle / Paddle
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
未验证
提交
36de178a
编写于
1月 11, 2021
作者:
W
Wilber
提交者:
GitHub
1月 11, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Cherry-pick 30194 30164 30201(#30202)
上级
55604248
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
12 addition
and
1 deletion
+12
-1
paddle/fluid/inference/api/paddle_pass_builder.cc
paddle/fluid/inference/api/paddle_pass_builder.cc
+4
-0
paddle/fluid/inference/tensorrt/CMakeLists.txt
paddle/fluid/inference/tensorrt/CMakeLists.txt
+5
-0
paddle/fluid/operators/shape_op.cc
paddle/fluid/operators/shape_op.cc
+1
-0
paddle/fluid/operators/shape_op.cu
paddle/fluid/operators/shape_op.cu
+2
-1
未找到文件。
paddle/fluid/inference/api/paddle_pass_builder.cc
浏览文件 @
36de178a
...
...
@@ -220,8 +220,12 @@ void CpuPassStrategy::EnableMKLDNN() {
// "fc_mkldnn_pass",
// "fc_act_mkldnn_fuse_pass",
"batch_norm_act_fuse_pass"
,
#ifndef _WIN32
// TODO(intel): Please fix the bug on windows.
// https://github.com/PaddlePaddle/Paddle/issues/29710
"mkldnn_inplace_pass"
,
// This pass should be activated after
// fuses
#endif
}))
{
passes_
.
push_back
(
pass
);
}
...
...
paddle/fluid/inference/tensorrt/CMakeLists.txt
浏览文件 @
36de178a
# Compiling with WITH_PYTHON=ON and WITH_TENSORRT=ON failed on windows. Temporarily add paddle_inference_api dependency to solve the problem
if
(
WIN32
)
nv_library
(
tensorrt_engine SRCS engine.cc trt_int8_calibrator.cc DEPS
${
GLOB_OPERATOR_DEPS
}
framework_proto device_context boost paddle_inference_api
)
else
()
nv_library
(
tensorrt_engine SRCS engine.cc trt_int8_calibrator.cc DEPS
${
GLOB_OPERATOR_DEPS
}
framework_proto device_context boost
)
endif
()
nv_library
(
tensorrt_op_teller SRCS op_teller.cc DEPS framework_proto device_context boost
)
nv_test
(
test_tensorrt SRCS test_tensorrt.cc DEPS dynload_cuda device_context dynamic_loader
)
nv_test
(
test_tensorrt_engine SRCS test_engine.cc DEPS dynload_cuda tensorrt_engine
)
...
...
paddle/fluid/operators/shape_op.cc
浏览文件 @
36de178a
...
...
@@ -69,5 +69,6 @@ REGISTER_OPERATOR(
paddle
::
framework
::
EmptyGradOpMaker
<
paddle
::
framework
::
OpDesc
>
,
paddle
::
framework
::
EmptyGradOpMaker
<
paddle
::
imperative
::
OpBase
>
);
REGISTER_OP_CPU_KERNEL
(
shape
,
ops
::
ShapeKernel
<
bool
>
,
ops
::
ShapeKernel
<
int
>
,
ops
::
ShapeKernel
<
int8_t
>
,
ops
::
ShapeKernel
<
uint8_t
>
,
ops
::
ShapeKernel
<
int64_t
>
,
ops
::
ShapeKernel
<
float
>
,
ops
::
ShapeKernel
<
double
>
);
paddle/fluid/operators/shape_op.cu
浏览文件 @
36de178a
...
...
@@ -16,7 +16,8 @@ limitations under the License. */
REGISTER_OP_CUDA_KERNEL
(
shape
,
paddle
::
operators
::
ShapeKernel
<
bool
>
,
paddle
::
operators
::
ShapeKernel
<
int
>
,
paddle
::
operators
::
ShapeKernel
<
int
>
,
paddle
::
operators
::
ShapeKernel
<
int8_t
>
,
paddle
::
operators
::
ShapeKernel
<
uint8_t
>
,
paddle
::
operators
::
ShapeKernel
<
int64_t
>
,
paddle
::
operators
::
ShapeKernel
<
float
>
,
paddle
::
operators
::
ShapeKernel
<
double
>
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录