-
Notifications
You must be signed in to change notification settings - Fork 5.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' of github.com:PaddlePaddle/Paddle into support…
…_while_quant_post
- Loading branch information
Showing
26 changed files
with
795 additions
and
571 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| // 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. | ||
|
|
||
| #include "paddle/fluid/operators/ipu_runtime_op.h" | ||
|
|
||
| namespace paddle { | ||
| namespace operators { | ||
|
|
||
| class IpuRuntimeOp : public framework::OperatorWithKernel { | ||
| public: | ||
| using framework::OperatorWithKernel::OperatorWithKernel; | ||
| void InferShape(framework::InferShapeContext* ctx) const override {} | ||
|
|
||
| protected: | ||
| framework::OpKernelType GetExpectedKernelType( | ||
| const framework::ExecutionContext& ctx) const override { | ||
| return framework::OpKernelType( | ||
| framework::proto::VarType::Type(ctx.Attr<int>("dtype")), | ||
| ctx.device_context()); | ||
| } | ||
| }; | ||
|
|
||
| class IpuRuntimeOpMaker : public framework::OpProtoAndCheckerMaker { | ||
| public: | ||
| void Make() override { | ||
| AddInput("FeedList", "FeedList of Graph").AsDuplicable(); | ||
| AddOutput("FetchList", "FetchList of Graph").AsDuplicable(); | ||
| AddAttr<int>("dtype", | ||
| "(int, default 5 (FP32)) " | ||
| "Output data type") | ||
| .SetDefault(framework::proto::VarType::FP32); | ||
| AddComment(R"DOC( | ||
| Run graph by PopART runtime. | ||
| )DOC"); | ||
| } | ||
| }; | ||
|
|
||
| } // namespace operators | ||
| } // namespace paddle | ||
|
|
||
| namespace ops = paddle::operators; | ||
| REGISTER_OPERATOR(ipu_runtime, ops::IpuRuntimeOp, ops::IpuRuntimeOpMaker); | ||
|
|
||
| REGISTER_OP_IPU_KERNEL(ipu_runtime, ops::IpuRuntimeKernel<float>, | ||
| ops::IpuRuntimeKernel<double>, | ||
| ops::IpuRuntimeKernel<int>, | ||
| ops::IpuRuntimeKernel<int64_t>, | ||
| ops::IpuRuntimeKernel<bool>, | ||
| ops::IpuRuntimeKernel<int8_t>, | ||
| ops::IpuRuntimeKernel<paddle::platform::float16>); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| // 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 <memory> | ||
| #include <vector> | ||
|
|
||
| #include "paddle/fluid/framework/op_registry.h" | ||
| #ifdef PADDLE_WITH_IPU | ||
| #include "paddle/fluid/framework/ipu/ipu_backend.h" | ||
| #include "paddle/fluid/framework/tensor.h" | ||
| #endif | ||
|
|
||
| namespace paddle { | ||
| namespace operators { | ||
|
|
||
| template <typename T> | ||
| class IpuRuntimeKernel : public framework::OpKernel<T> { | ||
| public: | ||
| void Compute(const framework::ExecutionContext& ctx) const override { | ||
| #ifdef PADDLE_WITH_IPU | ||
| auto ipu_backend = framework::ipu::IpuBackend::GetInstance(); | ||
| if (!ipu_backend->DeviceIsAttached()) { | ||
| const platform::IPUDeviceContext& ipu_ctx = | ||
| reinterpret_cast<const platform::IPUDeviceContext&>( | ||
| ctx.device_context()); | ||
| ipu_backend->AttachDevice(ipu_ctx.DeviceId()); | ||
| } | ||
|
|
||
| auto inputs = ctx.MultiInput<framework::Tensor>("FeedList"); | ||
| auto outputs = ctx.MultiOutput<framework::Tensor>("FetchList"); | ||
| auto output_names = ctx.OutputNames("FetchList"); | ||
| VLOG(4) << "IpuRuntime Kernel, begin to run graph"; | ||
| ipu_backend->Run(inputs, outputs, ctx); | ||
|
|
||
| // post-run | ||
| // resize tensor when tensor.dims() is empty | ||
| for (size_t i = 0; i < outputs.size(); ++i) { | ||
| auto* out = outputs[i]; | ||
| if (out->dims().size() == 0) { | ||
| auto tensor_dtype = out->type(); | ||
| auto sizeof_dtype = framework::SizeOfType(tensor_dtype); | ||
| int64_t dim = out->memory_size() / sizeof_dtype; | ||
| out->Resize({dim}); | ||
| VLOG(10) << "set ipu_runtime_op output: " << output_names[i] | ||
| << " dims from () to: " | ||
| << "(" << dim << ")"; | ||
| } | ||
| } | ||
| #else | ||
| PADDLE_THROW(platform::errors::PreconditionNotMet( | ||
| "Please compile WITH_IPU option to enable ipu_runtime op")); | ||
| #endif | ||
| } | ||
| }; | ||
|
|
||
| } // namespace operators | ||
| } // namespace paddle |
Oops, something went wrong.
51d466aThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🕵️ CI failures summary
🔍 PR: #37498 Commit ID: 51d466a contains failed CI.
🔹 Failed: PR-CI-Windows-Inference
Unknown Failed