Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
c64296bf
P
Paddle
项目概览
PaddlePaddle
/
Paddle
大约 1 年 前同步成功
通知
2299
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看板
未验证
提交
c64296bf
编写于
1月 31, 2023
作者:
MarDino
提交者:
GitHub
1月 31, 2023
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Bump Cutlass version to 2.11.0 (#50073)
上级
26bdea0f
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
16 addition
and
11 deletion
+16
-11
cmake/external/cutlass.cmake
cmake/external/cutlass.cmake
+1
-1
paddle/phi/kernels/fusion/cutlass/moe/default_moe_fc_traits.h
...le/phi/kernels/fusion/cutlass/moe/default_moe_fc_traits.h
+0
-0
paddle/phi/kernels/fusion/cutlass/moe/linear_combination_ft_gelu.h
...i/kernels/fusion/cutlass/moe/linear_combination_ft_gelu.h
+0
-0
paddle/phi/kernels/fusion/cutlass/moe/moe_cutlass_kernel.h
paddle/phi/kernels/fusion/cutlass/moe/moe_cutlass_kernel.h
+9
-6
paddle/phi/kernels/fusion/cutlass/moe/moe_kernel_impl.h
paddle/phi/kernels/fusion/cutlass/moe/moe_kernel_impl.h
+0
-0
paddle/phi/kernels/fusion/cutlass/moe_kernel.cu
paddle/phi/kernels/fusion/cutlass/moe_kernel.cu
+6
-4
未找到文件。
cmake/external/cutlass.cmake
浏览文件 @
c64296bf
...
@@ -17,7 +17,7 @@ include(ExternalProject)
...
@@ -17,7 +17,7 @@ include(ExternalProject)
set
(
CUTLASS_PREFIX_DIR
${
THIRD_PARTY_PATH
}
/cutlass
)
set
(
CUTLASS_PREFIX_DIR
${
THIRD_PARTY_PATH
}
/cutlass
)
set
(
CUTLASS_REPOSITORY https://github.com/NVIDIA/cutlass.git
)
set
(
CUTLASS_REPOSITORY https://github.com/NVIDIA/cutlass.git
)
set
(
CUTLASS_TAG v2.1
0
.0
)
set
(
CUTLASS_TAG v2.1
1
.0
)
include_directories
(
"
${
THIRD_PARTY_PATH
}
/cutlass/src/extern_cutlass/"
)
include_directories
(
"
${
THIRD_PARTY_PATH
}
/cutlass/src/extern_cutlass/"
)
include_directories
(
"
${
THIRD_PARTY_PATH
}
/cutlass/src/extern_cutlass/include/"
)
include_directories
(
"
${
THIRD_PARTY_PATH
}
/cutlass/src/extern_cutlass/include/"
)
...
...
paddle/phi/kernels/fusion/cutlass/default_moe_fc_traits.h
→
paddle/phi/kernels/fusion/cutlass/
moe/
default_moe_fc_traits.h
浏览文件 @
c64296bf
文件已移动
paddle/phi/kernels/fusion/cutlass/linear_combination_ft_gelu.h
→
paddle/phi/kernels/fusion/cutlass/
moe/
linear_combination_ft_gelu.h
浏览文件 @
c64296bf
文件已移动
paddle/phi/kernels/fusion/cutlass/moe_cutlass_kernel.h
→
paddle/phi/kernels/fusion/cutlass/moe
/moe
_cutlass_kernel.h
浏览文件 @
c64296bf
...
@@ -42,6 +42,7 @@
...
@@ -42,6 +42,7 @@
#include "cutlass/gemm/kernel/grouped_problem_visitor.h"
#include "cutlass/gemm/kernel/grouped_problem_visitor.h"
#include "cutlass/layout/matrix.h"
#include "cutlass/layout/matrix.h"
#include "cutlass/trace.h"
#include "cutlass/trace.h"
/////////////////////////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////////////////////////
namespace
cutlass
{
namespace
cutlass
{
...
@@ -350,14 +351,16 @@ template <typename ThreadblockShape,
...
@@ -350,14 +351,16 @@ template <typename ThreadblockShape,
int
ThreadCount
,
int
ThreadCount
,
bool
Transposed
=
false
>
bool
Transposed
=
false
>
struct
GemmMoeProblemVisitor
struct
GemmMoeProblemVisitor
:
public
MoeProblemVisitor
<
detail
::
GemmGroupedProblemSizeHelper
<
Transposed
>
,
:
public
MoeProblemVisitor
<
ThreadblockShape
,
detail
::
GemmGroupedProblemSizeHelper
<
ThreadblockShape
,
Transposed
>
,
GroupScheduleMode_
,
ThreadblockShape
,
PrefetchTileCount
,
GroupScheduleMode_
,
ThreadCount
>
{
PrefetchTileCount
,
ThreadCount
>
{
static
bool
const
kTransposed
=
Transposed
;
static
bool
const
kTransposed
=
Transposed
;
using
ProblemSizeHelper
=
detail
::
GemmGroupedProblemSizeHelper
<
Transposed
>
;
using
ProblemSizeHelper
=
detail
::
GemmGroupedProblemSizeHelper
<
ThreadblockShape
,
Transposed
>
;
using
Base
=
MoeProblemVisitor
<
ProblemSizeHelper
,
using
Base
=
MoeProblemVisitor
<
ProblemSizeHelper
,
ThreadblockShape
,
ThreadblockShape
,
GroupScheduleMode_
,
GroupScheduleMode_
,
...
...
paddle/phi/kernels/fusion/cutlass/moe_kernel_impl.h
→
paddle/phi/kernels/fusion/cutlass/moe
/moe
_kernel_impl.h
浏览文件 @
c64296bf
文件已移动
paddle/phi/kernels/fusion/cutlass/moe_kernel.cu
浏览文件 @
c64296bf
...
@@ -17,7 +17,7 @@
...
@@ -17,7 +17,7 @@
#include "paddle/phi/core/dense_tensor.h"
#include "paddle/phi/core/dense_tensor.h"
#include "paddle/phi/core/kernel_registry.h"
#include "paddle/phi/core/kernel_registry.h"
#include "paddle/phi/kernels/funcs/elementwise_base.h"
#include "paddle/phi/kernels/funcs/elementwise_base.h"
#include "paddle/phi/kernels/fusion/cutlass/moe_kernel_impl.h"
#include "paddle/phi/kernels/fusion/cutlass/moe
/moe
_kernel_impl.h"
// Ignore CUTLASS warnings about type punning
// Ignore CUTLASS warnings about type punning
#pragma GCC diagnostic push
#pragma GCC diagnostic push
...
@@ -32,13 +32,15 @@
...
@@ -32,13 +32,15 @@
#include "cutlass/gemm/kernel/default_gemm_grouped.h"
#include "cutlass/gemm/kernel/default_gemm_grouped.h"
#include "cutlass/numeric_conversion.h"
#include "cutlass/numeric_conversion.h"
#include "paddle/phi/backends/gpu/gpu_info.h"
#include "paddle/phi/backends/gpu/gpu_info.h"
#include "paddle/phi/kernels/fusion/cutlass/default_moe_fc_traits.h"
#include "paddle/phi/kernels/fusion/cutlass/
moe/
default_moe_fc_traits.h"
#include "paddle/phi/kernels/fusion/cutlass/linear_combination_ft_gelu.h"
#include "paddle/phi/kernels/fusion/cutlass/
moe/
linear_combination_ft_gelu.h"
#include "paddle/phi/kernels/fusion/cutlass/moe_cutlass_kernel.h"
#include "paddle/phi/kernels/fusion/cutlass/moe
/moe
_cutlass_kernel.h"
#pragma GCC diagnostic pop
#pragma GCC diagnostic pop
namespace
phi
{
namespace
phi
{
namespace
{
namespace
{
inline
int
getSMVersion
()
{
inline
int
getSMVersion
()
{
const
int
device
=
phi
::
backends
::
gpu
::
GetCurrentDeviceId
();
const
int
device
=
phi
::
backends
::
gpu
::
GetCurrentDeviceId
();
const
phi
::
gpuDeviceProp
prop
=
const
phi
::
gpuDeviceProp
prop
=
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录