Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
BaiXuePrincess
Paddle
提交
2190ea09
P
Paddle
项目概览
BaiXuePrincess
/
Paddle
与 Fork 源项目一致
Fork自
PaddlePaddle / Paddle
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
未验证
提交
2190ea09
编写于
12月 15, 2022
作者:
Z
Zhang Jun
提交者:
GitHub
12月 15, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[inference] move IsFloatVar() from tensorrt/ to api/ (#49070)
* move IsFloatVar() from tensorrt/ to api/
上级
c9951dfc
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
51 addition
and
10 deletion
+51
-10
paddle/fluid/inference/analysis/ir_passes/tensorrt_subgraph_pass.cc
...id/inference/analysis/ir_passes/tensorrt_subgraph_pass.cc
+2
-1
paddle/fluid/inference/api/CMakeLists.txt
paddle/fluid/inference/api/CMakeLists.txt
+5
-0
paddle/fluid/inference/api/helper.h
paddle/fluid/inference/api/helper.h
+9
-0
paddle/fluid/inference/api/helper_test.cc
paddle/fluid/inference/api/helper_test.cc
+35
-0
paddle/fluid/inference/tensorrt/helper.h
paddle/fluid/inference/tensorrt/helper.h
+0
-9
未找到文件。
paddle/fluid/inference/analysis/ir_passes/tensorrt_subgraph_pass.cc
浏览文件 @
2190ea09
...
...
@@ -28,6 +28,7 @@
#include "paddle/fluid/framework/op_version_registry.h"
#include "paddle/fluid/inference/analysis/helper.h"
#include "paddle/fluid/inference/analysis/passes/convert_to_mixed_precision.h"
#include "paddle/fluid/inference/api/helper.h"
#include "paddle/fluid/inference/tensorrt/convert/op_converter.h"
#include "paddle/fluid/inference/tensorrt/engine.h"
#include "paddle/fluid/inference/tensorrt/op_teller.h"
...
...
@@ -74,7 +75,7 @@ void OutputProcess(framework::ir::Graph *graph,
for
(
auto
*
var_node
:
op_node
->
outputs
)
{
if
(
!
trt_outputs
.
count
(
var_node
))
continue
;
if
(
!
var_node
->
Var
()
->
Persistable
()
&&
tensorrt
::
IsFloatVar
(
var_node
->
Var
()
->
GetDataType
())
&&
IsFloatVar
(
var_node
->
Var
()
->
GetDataType
())
&&
var_node
->
Var
()
->
GetDataType
()
!=
framework
::
proto
::
VarType
::
FP32
)
{
for
(
auto
*
next_op
:
var_node
->
outputs
)
{
// if next_op support mixed_precision, we need to add cast op.
...
...
paddle/fluid/inference/api/CMakeLists.txt
浏览文件 @
2190ea09
...
...
@@ -102,6 +102,11 @@ cc_test(
SRCS api_tester.cc
DEPS paddle_inference_api
)
cc_test
(
inference_api_helper_test
SRCS helper_test.cc
DEPS paddle_inference_api
)
if
(
WITH_ONNXRUNTIME AND WIN32
)
# Copy onnxruntime for some c++ test in Windows, since the test will
# be build only in CI, so suppose the generator in Windows is Ninja.
...
...
paddle/fluid/inference/api/helper.h
浏览文件 @
2190ea09
...
...
@@ -81,6 +81,15 @@ inline PaddleDType ConvertToPaddleDType(
}
}
inline
bool
IsFloatVar
(
framework
::
proto
::
VarType
::
Type
t
)
{
if
(
t
==
framework
::
proto
::
VarType
::
FP16
||
t
==
framework
::
proto
::
VarType
::
FP32
||
t
==
framework
::
proto
::
VarType
::
FP64
||
t
==
framework
::
proto
::
VarType
::
BF16
)
return
true
;
return
false
;
}
using
paddle
::
framework
::
DataTypeToString
;
// Timer for timer
...
...
paddle/fluid/inference/api/helper_test.cc
0 → 100644
浏览文件 @
2190ea09
/* Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License. */
#include "paddle/fluid/inference/api/helper.h"
#include "gtest/gtest.h"
namespace
paddle
{
TEST
(
inference_api_helper
,
DataType
)
{
ASSERT_TRUE
(
paddle
::
inference
::
IsFloatVar
(
paddle
::
framework
::
proto
::
VarType
::
FP64
));
ASSERT_TRUE
(
paddle
::
inference
::
IsFloatVar
(
paddle
::
framework
::
proto
::
VarType
::
FP32
));
ASSERT_TRUE
(
paddle
::
inference
::
IsFloatVar
(
paddle
::
framework
::
proto
::
VarType
::
FP16
));
ASSERT_TRUE
(
paddle
::
inference
::
IsFloatVar
(
paddle
::
framework
::
proto
::
VarType
::
BF16
));
ASSERT_FALSE
(
paddle
::
inference
::
IsFloatVar
(
paddle
::
framework
::
proto
::
VarType
::
INT32
));
}
}
// namespace paddle
paddle/fluid/inference/tensorrt/helper.h
浏览文件 @
2190ea09
...
...
@@ -22,7 +22,6 @@
#include <utility>
#include <vector>
#include "paddle/fluid/framework/framework.pb.h"
#include "paddle/fluid/platform/dynload/tensorrt.h"
#include "paddle/fluid/platform/enforce.h"
#include "paddle/phi/common/data_type.h"
...
...
@@ -215,14 +214,6 @@ static inline nvinfer1::DataType PhiType2NvType(phi::DataType type) {
return
nv_type
;
}
static
bool
IsFloatVar
(
framework
::
proto
::
VarType
::
Type
t
)
{
if
(
t
==
framework
::
proto
::
VarType
::
FP16
||
t
==
framework
::
proto
::
VarType
::
FP32
||
t
==
framework
::
proto
::
VarType
::
FP64
||
t
==
framework
::
proto
::
VarType
::
BF16
)
return
true
;
return
false
;
}
}
// namespace tensorrt
}
// namespace inference
}
// namespace paddle
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录