Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[phi]migrate increment addmm multinomial cholesky kernels to phi #39858

Merged
merged 5 commits into from
Feb 24, 2022
Merged

[phi]migrate increment addmm multinomial cholesky kernels to phi #39858

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
47c2aa5
migrate increment addmm multinomial cholesky kernels to phi
Aganlengzi Feb 23, 2022
2f98880
test pr39869
Aganlengzi Feb 23, 2022
b46919e
test pr39869
Aganlengzi Feb 23, 2022
3c73b30
fix style and ci
Aganlengzi Feb 23, 2022
ab436f8
Merge and fix cu compile
Aganlengzi Feb 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 3 additions & 9 deletions paddle/fluid/operators/addmm_op.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,20 @@ 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/operators/addmm_op.h"
#include <memory>
#include <string>
#include <unordered_map>
#include <vector>
#include "paddle/fluid/framework/op_registry.h"
#ifdef PADDLE_WITH_MKLDNN
#include "paddle/fluid/platform/mkldnn_helper.h"
#endif

namespace paddle {
namespace operators {

constexpr int kMULMKLDNNINT8 = 1;

using framework::OpKernelType;
using framework::Tensor;

Expand Down Expand Up @@ -227,11 +229,3 @@ REGISTER_OPERATOR(addmm, ops::AddMMOp, ops::AddMMOpMaker,
ops::AddMMOpGradMaker<paddle::imperative::OpBase>);

REGISTER_OPERATOR(addmm_grad, ops::AddMMGradOp);

REGISTER_OP_CPU_KERNEL(
addmm, ops::AddMMKernel<paddle::platform::CPUDeviceContext, float>,
ops::AddMMKernel<paddle::platform::CPUDeviceContext, double>);

REGISTER_OP_CPU_KERNEL(
addmm_grad, ops::AddMMGradKernel<paddle::platform::CPUDeviceContext, float>,
ops::AddMMGradKernel<paddle::platform::CPUDeviceContext, double>);
195 changes: 0 additions & 195 deletions paddle/fluid/operators/addmm_op.h
View file
Open in desktop

This file was deleted.

10 changes: 1 addition & 9 deletions paddle/fluid/operators/cholesky_op.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ 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/operators/cholesky_op.h"
#include "paddle/fluid/framework/op_registry.h"

namespace paddle {
namespace operators {
Expand Down Expand Up @@ -111,11 +111,3 @@ REGISTER_OPERATOR(cholesky, ops::CholeskyOp, ops::CholeskyOpMaker,
ops::CholeskyGradOpMaker<paddle::framework::OpDesc>,
ops::CholeskyGradOpMaker<paddle::imperative::OpBase>);
REGISTER_OPERATOR(cholesky_grad, ops::CholeskyGradOp);

REGISTER_OP_CPU_KERNEL(cholesky, ops::CholeskyCPUKernel<float>,
ops::CholeskyCPUKernel<double>);

REGISTER_OP_CPU_KERNEL(
cholesky_grad,
ops::CholeskyGradKernel<paddle::platform::CPUDeviceContext, float>,
ops::CholeskyGradKernel<paddle::platform::CPUDeviceContext, double>);
Loading