Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
BaiXuePrincess
Paddle
提交
b7e120d2
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看板
未验证
提交
b7e120d2
编写于
11月 17, 2022
作者:
H
huangjiyi
提交者:
GitHub
11月 17, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
rm "paddle/phi/kernels/gpu/batch_norm_utils.h" in phi (#48057)
上级
f62bd3b4
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
3 addition
and
145 deletion
+3
-145
paddle/phi/kernels/cpu/batch_norm_grad_kernel.cc
paddle/phi/kernels/cpu/batch_norm_grad_kernel.cc
+1
-1
paddle/phi/kernels/gpu/batch_norm_grad_kernel.cu
paddle/phi/kernels/gpu/batch_norm_grad_kernel.cu
+1
-1
paddle/phi/kernels/gpu/batch_norm_kernel.cu
paddle/phi/kernels/gpu/batch_norm_kernel.cu
+1
-1
paddle/phi/kernels/gpu/batch_norm_utils.h
paddle/phi/kernels/gpu/batch_norm_utils.h
+0
-142
未找到文件。
paddle/phi/kernels/cpu/batch_norm_grad_kernel.cc
浏览文件 @
b7e120d2
...
...
@@ -16,9 +16,9 @@
#include "paddle/phi/backends/cpu/cpu_context.h"
#include "paddle/phi/core/kernel_registry.h"
#include "paddle/phi/kernels/batch_norm_kernel.h"
#include "paddle/phi/kernels/funcs/batch_norm_utils.h"
#include "paddle/phi/kernels/funcs/eigen/common.h"
#include "paddle/phi/kernels/funcs/math_function.h"
#include "paddle/phi/kernels/gpu/batch_norm_utils.h"
namespace
phi
{
...
...
paddle/phi/kernels/gpu/batch_norm_grad_kernel.cu
浏览文件 @
b7e120d2
...
...
@@ -22,10 +22,10 @@
#include "paddle/phi/core/kernel_registry.h"
#include "paddle/phi/kernels/batch_norm_kernel.h"
#include "paddle/phi/kernels/empty_kernel.h"
#include "paddle/phi/kernels/funcs/batch_norm_utils.h"
#include "paddle/phi/kernels/funcs/eigen/common.h"
#include "paddle/phi/kernels/funcs/norm_utils.h"
#include "paddle/phi/kernels/funcs/reduce_function.h"
#include "paddle/phi/kernels/gpu/batch_norm_utils.h"
#ifdef __HIPCC__
#define LAUNCH_BOUNDS(BlockDim) __launch_bounds__(BlockDim)
...
...
paddle/phi/kernels/gpu/batch_norm_kernel.cu
浏览文件 @
b7e120d2
...
...
@@ -29,10 +29,10 @@ namespace cub = hipcub;
#include "paddle/phi/common/layout.h"
#include "paddle/phi/core/kernel_registry.h"
#include "paddle/phi/kernels/batch_norm_kernel.h"
#include "paddle/phi/kernels/funcs/batch_norm_utils.h"
#include "paddle/phi/kernels/funcs/eigen/common.h"
#include "paddle/phi/kernels/funcs/norm_utils.h"
#include "paddle/phi/kernels/funcs/reduce_function.h"
#include "paddle/phi/kernels/gpu/batch_norm_utils.h"
#ifdef __HIPCC__
#define LAUNCH_BOUNDS(BlockDim) __launch_bounds__(BlockDim)
...
...
paddle/phi/kernels/gpu/batch_norm_utils.h
已删除
100644 → 0
浏览文件 @
f62bd3b4
// 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.
#pragma once
#include "paddle/phi/kernels/funcs/math_function.h"
namespace
phi
{
using
Tensor
=
DenseTensor
;
template
<
typename
DeviceContext
,
typename
T
>
inline
void
ResizeToChannelFirst
(
const
DeviceContext
&
context
,
const
Tensor
*
input
,
Tensor
*
transformed_input
)
{
int
dim
=
input
->
dims
().
size
()
-
2
;
if
(
dim
==
3
)
{
// input
transformed_input
->
Resize
(
input
->
dims
());
auto
in_dims_vec
=
phi
::
vectorize
(
input
->
dims
());
in_dims_vec
[
1
]
=
input
->
dims
()[
4
];
in_dims_vec
[
2
]
=
input
->
dims
()[
1
];
in_dims_vec
[
3
]
=
input
->
dims
()[
2
];
in_dims_vec
[
4
]
=
input
->
dims
()[
3
];
transformed_input
->
Resize
(
phi
::
make_ddim
(
in_dims_vec
));
context
.
template
Alloc
<
T
>(
transformed_input
);
}
else
if
(
dim
==
2
)
{
// input
transformed_input
->
Resize
(
input
->
dims
());
auto
in_dims_vec
=
phi
::
vectorize
(
input
->
dims
());
in_dims_vec
[
1
]
=
input
->
dims
()[
3
];
in_dims_vec
[
2
]
=
input
->
dims
()[
1
];
in_dims_vec
[
3
]
=
input
->
dims
()[
2
];
transformed_input
->
Resize
(
phi
::
make_ddim
(
in_dims_vec
));
context
.
template
Alloc
<
T
>(
transformed_input
);
}
else
if
(
dim
==
1
)
{
transformed_input
->
Resize
(
input
->
dims
());
auto
in_dims_vec
=
phi
::
vectorize
(
input
->
dims
());
in_dims_vec
[
1
]
=
input
->
dims
()[
2
];
in_dims_vec
[
2
]
=
input
->
dims
()[
1
];
transformed_input
->
Resize
(
phi
::
make_ddim
(
in_dims_vec
));
context
.
template
Alloc
<
T
>(
transformed_input
);
}
}
template
<
typename
DeviceContext
,
typename
T
>
inline
void
ResizeToChannelLast
(
const
DeviceContext
&
context
,
const
Tensor
*
input
,
Tensor
*
transformed_input
)
{
int
dim
=
input
->
dims
().
size
()
-
2
;
if
(
dim
==
3
)
{
// input
transformed_input
->
Resize
(
input
->
dims
());
auto
in_dims_vec
=
phi
::
vectorize
(
input
->
dims
());
in_dims_vec
[
1
]
=
input
->
dims
()[
2
];
in_dims_vec
[
2
]
=
input
->
dims
()[
3
];
in_dims_vec
[
3
]
=
input
->
dims
()[
4
];
in_dims_vec
[
4
]
=
input
->
dims
()[
1
];
transformed_input
->
Resize
(
phi
::
make_ddim
(
in_dims_vec
));
context
.
template
Alloc
<
T
>(
transformed_input
);
}
else
if
(
dim
==
2
)
{
// input
transformed_input
->
Resize
(
input
->
dims
());
auto
in_dims_vec
=
phi
::
vectorize
(
input
->
dims
());
in_dims_vec
[
1
]
=
input
->
dims
()[
2
];
in_dims_vec
[
2
]
=
input
->
dims
()[
3
];
in_dims_vec
[
3
]
=
input
->
dims
()[
1
];
transformed_input
->
Resize
(
phi
::
make_ddim
(
in_dims_vec
));
context
.
template
Alloc
<
T
>(
transformed_input
);
}
else
if
(
dim
==
1
)
{
transformed_input
->
Resize
(
input
->
dims
());
auto
in_dims_vec
=
phi
::
vectorize
(
input
->
dims
());
in_dims_vec
[
1
]
=
input
->
dims
()[
2
];
in_dims_vec
[
2
]
=
input
->
dims
()[
1
];
transformed_input
->
Resize
(
phi
::
make_ddim
(
in_dims_vec
));
context
.
template
Alloc
<
T
>(
transformed_input
);
}
}
template
<
typename
DeviceContext
,
typename
T
>
inline
void
TransToChannelFirst
(
const
DeviceContext
&
context
,
const
Tensor
*
input
,
Tensor
*
transformed_input
)
{
VLOG
(
5
)
<<
"Why am I called?"
;
int
dim
=
input
->
dims
().
size
()
-
2
;
if
(
dim
==
3
)
{
std
::
vector
<
int
>
axis
{
0
,
4
,
1
,
2
,
3
};
funcs
::
Transpose
<
DeviceContext
,
T
,
5
>
trans5
;
trans5
(
context
,
*
input
,
transformed_input
,
axis
);
}
else
if
(
dim
==
2
)
{
std
::
vector
<
int
>
axis
{
0
,
3
,
1
,
2
};
funcs
::
Transpose
<
DeviceContext
,
T
,
4
>
trans4
;
trans4
(
context
,
*
input
,
transformed_input
,
axis
);
}
else
if
(
dim
==
1
)
{
std
::
vector
<
int
>
axis
{
0
,
2
,
1
};
funcs
::
Transpose
<
DeviceContext
,
T
,
3
>
trans3
;
trans3
(
context
,
*
input
,
transformed_input
,
axis
);
}
}
template
<
typename
DeviceContext
,
typename
T
>
inline
void
TransToChannelLast
(
const
DeviceContext
&
context
,
const
Tensor
*
input
,
Tensor
*
transformed_input
)
{
int
dim
=
input
->
dims
().
size
()
-
2
;
if
(
dim
==
3
)
{
std
::
vector
<
int
>
axis
{
0
,
2
,
3
,
4
,
1
};
funcs
::
Transpose
<
DeviceContext
,
T
,
5
>
trans5
;
trans5
(
context
,
*
input
,
transformed_input
,
axis
);
}
else
if
(
dim
==
2
)
{
std
::
vector
<
int
>
axis
{
0
,
2
,
3
,
1
};
funcs
::
Transpose
<
DeviceContext
,
T
,
4
>
trans4
;
trans4
(
context
,
*
input
,
transformed_input
,
axis
);
}
else
if
(
dim
==
1
)
{
std
::
vector
<
int
>
axis
{
0
,
2
,
1
};
funcs
::
Transpose
<
DeviceContext
,
T
,
3
>
trans3
;
trans3
(
context
,
*
input
,
transformed_input
,
axis
);
}
}
}
// namespace phi
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录