Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OPTHREE
Paddle
提交
5f5f626b
P
Paddle
项目概览
OPTHREE
/
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看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
5f5f626b
编写于
1月 12, 2022
作者:
C
Chen Weihang
提交者:
GitHub
1月 12, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[PTen] Remove hybird dir (#38863)
* remove hybird dir * resolve conflit
上级
c2f825d7
变更
19
隐藏空白更改
内联
并排
Showing
19 changed file
with
15 addition
and
57 deletion
+15
-57
paddle/fluid/operators/math/math_function.cc
paddle/fluid/operators/math/math_function.cc
+1
-1
paddle/fluid/operators/math/math_function.cu
paddle/fluid/operators/math/math_function.cu
+1
-1
paddle/pten/kernels/CMakeLists.txt
paddle/pten/kernels/CMakeLists.txt
+2
-2
paddle/pten/kernels/cpu/elementwise.h
paddle/pten/kernels/cpu/elementwise.h
+1
-1
paddle/pten/kernels/cpu/reduce.h
paddle/pten/kernels/cpu/reduce.h
+2
-2
paddle/pten/kernels/funcs/CMakeLists.txt
paddle/pten/kernels/funcs/CMakeLists.txt
+0
-1
paddle/pten/kernels/funcs/eigen/CMakeLists.txt
paddle/pten/kernels/funcs/eigen/CMakeLists.txt
+0
-0
paddle/pten/kernels/funcs/eigen/common.h
paddle/pten/kernels/funcs/eigen/common.h
+0
-0
paddle/pten/kernels/funcs/transpose.cc
paddle/pten/kernels/funcs/transpose.cc
+1
-1
paddle/pten/kernels/funcs/transpose.cu
paddle/pten/kernels/funcs/transpose.cu
+1
-1
paddle/pten/kernels/funcs/transpose.h
paddle/pten/kernels/funcs/transpose.h
+1
-1
paddle/pten/kernels/gpu/dot_kernel.cu
paddle/pten/kernels/gpu/dot_kernel.cu
+1
-1
paddle/pten/kernels/hybird/eigen/CMakeLists.txt
paddle/pten/kernels/hybird/eigen/CMakeLists.txt
+0
-0
paddle/pten/kernels/hybird/eigen/sign.h
paddle/pten/kernels/hybird/eigen/sign.h
+0
-41
paddle/pten/kernels/hybird/general/CMakeLists.txt
paddle/pten/kernels/hybird/general/CMakeLists.txt
+0
-0
paddle/pten/kernels/impl/dot_grad_kernel_impl.h
paddle/pten/kernels/impl/dot_grad_kernel_impl.h
+1
-1
paddle/pten/kernels/impl/full_kernel_impl.h
paddle/pten/kernels/impl/full_kernel_impl.h
+1
-1
paddle/pten/kernels/impl/scale_kernel_impl.h
paddle/pten/kernels/impl/scale_kernel_impl.h
+1
-1
paddle/pten/kernels/impl/sign_kernel_impl.h
paddle/pten/kernels/impl/sign_kernel_impl.h
+1
-1
未找到文件。
paddle/fluid/operators/math/math_function.cc
浏览文件 @
5f5f626b
...
...
@@ -29,7 +29,7 @@ limitations under the License. */
#include "paddle/fluid/operators/math/math_function_impl.h"
#include "paddle/fluid/platform/bfloat16.h"
#include "paddle/fluid/platform/float16.h"
#include "paddle/pten/kernels/
hybird
/eigen/common.h"
#include "paddle/pten/kernels/
funcs
/eigen/common.h"
#include "unsupported/Eigen/CXX11/Tensor"
namespace
paddle
{
...
...
paddle/fluid/operators/math/math_function.cu
浏览文件 @
5f5f626b
...
...
@@ -21,7 +21,7 @@ limitations under the License. */
#include "paddle/fluid/operators/math/math_function_impl.h"
#include "paddle/fluid/platform/bfloat16.h"
#include "paddle/fluid/platform/float16.h"
#include "paddle/pten/kernels/
hybird
/eigen/common.h"
#include "paddle/pten/kernels/
funcs
/eigen/common.h"
namespace
paddle
{
namespace
operators
{
...
...
paddle/pten/kernels/CMakeLists.txt
浏览文件 @
5f5f626b
...
...
@@ -6,8 +6,8 @@ file(WRITE ${kernel_declare_file} "// Generated by the paddle/pten/kernels/CMake
# kernel primitive api
add_subdirectory
(
primitive
)
# pten
hybird
functors and functions called by kernels
add_subdirectory
(
hybird
)
# pten functors and functions called by kernels
add_subdirectory
(
funcs
)
add_subdirectory
(
cpu
)
if
(
WITH_GPU OR WITH_ROCM
)
...
...
paddle/pten/kernels/cpu/elementwise.h
浏览文件 @
5f5f626b
...
...
@@ -19,7 +19,7 @@ limitations under the License. */
#include "paddle/pten/kernels/funcs/elementwise_base.h"
#include "paddle/fluid/operators/math/blas.h"
#include "paddle/pten/kernels/
hybird
/eigen/common.h"
#include "paddle/pten/kernels/
funcs
/eigen/common.h"
namespace
pten
{
...
...
paddle/pten/kernels/cpu/reduce.h
浏览文件 @
5f5f626b
...
...
@@ -22,8 +22,8 @@
#include "paddle/pten/api/lib/utils/storage.h"
#include "paddle/pten/core/dense_tensor.h"
#include "paddle/pten/kernels/
hybird
/eigen/common.h"
#include "paddle/pten/kernels/
hybird
/transpose.h"
#include "paddle/pten/kernels/
funcs
/eigen/common.h"
#include "paddle/pten/kernels/
funcs
/transpose.h"
// See Note [ Why still include the fluid headers? ]
#include "paddle/fluid/operators/eigen/eigen_function.h"
namespace
pten
{
...
...
paddle/pten/kernels/
hybird
/CMakeLists.txt
→
paddle/pten/kernels/
funcs
/CMakeLists.txt
浏览文件 @
5f5f626b
add_subdirectory
(
eigen
)
add_subdirectory
(
general
)
cc_library
(
pten_transpose_cpu SRCS transpose.cc DEPS dense_tensor pten_context
)
if
(
WITH_GPU
)
...
...
paddle/pten/kernels/
hybird/cuda
/CMakeLists.txt
→
paddle/pten/kernels/
funcs/eigen
/CMakeLists.txt
浏览文件 @
5f5f626b
文件已移动
paddle/pten/kernels/
hybird
/eigen/common.h
→
paddle/pten/kernels/
funcs
/eigen/common.h
浏览文件 @
5f5f626b
文件已移动
paddle/pten/kernels/
hybird
/transpose.cc
→
paddle/pten/kernels/
funcs
/transpose.cc
浏览文件 @
5f5f626b
...
...
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
#include "paddle/pten/kernels/
hybird
/transpose.h"
#include "paddle/pten/kernels/
funcs
/transpose.h"
#include "paddle/fluid/framework/ddim.h"
#include "paddle/pten/backends/cpu/cpu_context.h"
#include "paddle/pten/core/dense_tensor.h"
...
...
paddle/pten/kernels/
hybird
/transpose.cu
→
paddle/pten/kernels/
funcs
/transpose.cu
浏览文件 @
5f5f626b
...
...
@@ -16,7 +16,7 @@
#include "paddle/fluid/memory/memcpy.h"
#include "paddle/pten/backends/gpu/gpu_context.h"
#include "paddle/pten/core/dense_tensor.h"
#include "paddle/pten/kernels/
hybird
/transpose.h"
#include "paddle/pten/kernels/
funcs
/transpose.h"
// See Note [ Why still include the fluid headers? ]
#include "paddle/fluid/platform/bfloat16.h"
...
...
paddle/pten/kernels/
hybird
/transpose.h
→
paddle/pten/kernels/
funcs
/transpose.h
浏览文件 @
5f5f626b
...
...
@@ -18,7 +18,7 @@
#include "paddle/pten/core/dense_tensor.h"
#include "paddle/fluid/operators/eigen/eigen_function.h"
#include "paddle/pten/kernels/
hybird
/eigen/common.h"
#include "paddle/pten/kernels/
funcs
/eigen/common.h"
namespace
pten
{
...
...
paddle/pten/kernels/gpu/dot_kernel.cu
浏览文件 @
5f5f626b
...
...
@@ -16,7 +16,7 @@
#include "paddle/pten/backends/gpu/gpu_context.h"
#include "paddle/pten/core/kernel_registry.h"
#include "paddle/pten/kernels/
hybird
/eigen/common.h"
#include "paddle/pten/kernels/
funcs
/eigen/common.h"
// See Note [ Why still include the fluid headers? ]
#include "paddle/fluid/operators/eigen/eigen_function.h"
...
...
paddle/pten/kernels/hybird/eigen/CMakeLists.txt
已删除
100644 → 0
浏览文件 @
c2f825d7
paddle/pten/kernels/hybird/eigen/sign.h
已删除
100644 → 0
浏览文件 @
c2f825d7
/* Copyright (c) 2021 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/pten/core/dense_tensor.h"
#include "paddle/pten/kernels/hybird/eigen/common.h"
// See Note [ Why still include the fluid headers? ]
#include "paddle/fluid/operators/eigen/eigen_function.h"
namespace
pten
{
namespace
eigen
{
template
<
typename
DevCtx
,
typename
T
>
void
Sign
(
const
DevCtx
&
dev_ctx
,
const
DenseTensor
&
x
,
DenseTensor
*
out
)
{
out
->
mutable_data
<
T
>
();
// TODO(chenweihang): if we design new tensor, we should support
// the low-level calc functor use new tensor as input,
// which may be a big project!
auto
eigen_out
=
pten
::
EigenVector
<
T
>::
Flatten
(
*
out
);
auto
eigen_x
=
pten
::
EigenVector
<
T
>::
Flatten
(
x
);
auto
&
dev
=
*
dev_ctx
.
eigen_device
();
paddle
::
operators
::
EigenSign
<
std
::
decay_t
<
decltype
(
dev
)
>
,
T
>::
Eval
(
dev
,
eigen_out
,
eigen_x
);
}
}
// namespace eigen
}
// namespace pten
paddle/pten/kernels/hybird/general/CMakeLists.txt
已删除
100644 → 0
浏览文件 @
c2f825d7
paddle/pten/kernels/impl/dot_grad_kernel_impl.h
浏览文件 @
5f5f626b
...
...
@@ -15,7 +15,7 @@ limitations under the License. */
#pragma once
#include "paddle/pten/core/dense_tensor.h"
#include "paddle/pten/kernels/
hybird
/eigen/common.h"
#include "paddle/pten/kernels/
funcs
/eigen/common.h"
#include "paddle/pten/kernels/complex_kernel.h"
...
...
paddle/pten/kernels/impl/full_kernel_impl.h
浏览文件 @
5f5f626b
...
...
@@ -17,7 +17,7 @@ limitations under the License. */
#include "paddle/pten/common/scalar.h"
#include "paddle/pten/common/scalar_array.h"
#include "paddle/pten/core/dense_tensor.h"
#include "paddle/pten/kernels/
hybird
/eigen/common.h"
#include "paddle/pten/kernels/
funcs
/eigen/common.h"
// See Note [ Why still include the fluid headers? ]
#include "paddle/fluid/operators/eigen/eigen_function.h"
...
...
paddle/pten/kernels/impl/scale_kernel_impl.h
浏览文件 @
5f5f626b
...
...
@@ -16,7 +16,7 @@ limitations under the License. */
#include "paddle/pten/common/scalar.h"
#include "paddle/pten/core/dense_tensor.h"
#include "paddle/pten/kernels/
hybird
/eigen/common.h"
#include "paddle/pten/kernels/
funcs
/eigen/common.h"
// See Note [ Why still include the fluid headers? ]
#include "paddle/fluid/operators/eigen/eigen_function.h"
...
...
paddle/pten/kernels/impl/sign_kernel_impl.h
浏览文件 @
5f5f626b
...
...
@@ -15,7 +15,7 @@ limitations under the License. */
#pragma once
#include "paddle/pten/core/dense_tensor.h"
#include "paddle/pten/kernels/
hybird
/eigen/common.h"
#include "paddle/pten/kernels/
funcs
/eigen/common.h"
// See Note [ Why still include the fluid headers? ]
#include "paddle/fluid/operators/eigen/eigen_function.h"
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录