Skip to content

[Eager] Fix ocr #46124

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

Merged
JiabinYang merged 8 commits into from
Sep 20, 2022
Merged

[Eager] Fix ocr #46124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
475711b
fix linspace error in amp
JiabinYang Sep 15, 2022
4fdfff5
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
JiabinYang Sep 15, 2022
d36156c
fix log
JiabinYang Sep 15, 2022
4232b89
fix amp error
JiabinYang Sep 16, 2022
ef9df74
fix ocr error which caused by amp
JiabinYang Sep 16, 2022
7f7ee0f
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
JiabinYang Sep 19, 2022
1c8ed18
add more check
JiabinYang Sep 19, 2022
b935fd6
rename dtype ns
JiabinYang Sep 19, 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
13 changes: 13 additions & 0 deletions paddle/fluid/eager/auto_code_generator/eager_generator.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1797,6 +1797,15 @@ static std::pair<std::string, std::string> GenerateForwardFunctionContents(
generated_function_body += amp_context;
generated_function_body += "\n";
}

if (!forward_inplace_map.empty()) {
generated_function_body +=
" auto current_level = egr::Controller::Instance().GetAMPLevel();\n";
generated_function_body +=
" "
"egr::Controller::Instance().SetAMPLevel(paddle::imperative::AmpLevel::"
"O0);\n";
}
// forward ins insert
const char* FWD_INS_MAP_TEMPLATE =
" std::map<std::string, "
Expand Down Expand Up @@ -1999,6 +2008,10 @@ static std::pair<std::string, std::string> GenerateForwardFunctionContents(
}
trace_op_body_str += out_tensor_str;
}
if (!forward_inplace_map.empty()) {
trace_op_body_str +=
" egr::Controller::Instance().SetAMPLevel(current_level);\n";
}
trace_op_body_str += "\n";
VLOG(6) << "Converted Output VarBase to EagerVariable(s)";
/* ------ END Generate TraceOp ----- */
Expand Down
13 changes: 13 additions & 0 deletions paddle/fluid/pybind/eager_method.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,9 @@ typedef SSIZE_T ssize_t;
#include "pybind11/numpy.h"
#include "pybind11/pybind11.h"
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
#include "paddle/fluid/eager/amp_utils.h"
#include "paddle/fluid/eager/api/generated/eager_generated/forwards/dygraph_functions.h"
#include "paddle/fluid/eager/eager_amp_auto_cast.h"
#include "paddle/fluid/framework/python_headers.h"
#include "paddle/fluid/memory/allocation/mmap_allocator.h"
#include "paddle/fluid/pybind/tensor_py.h"
Expand Down Expand Up @@ -1171,6 +1173,17 @@ static PyObject* tensor_method__setitem_eager_tensor(TensorObject* self,
// Release gil and do tracing
py::gil_scoped_release release;
// use inplace set_value_ operator
if (value_tensor.initialized() &&
(self->tensor.dtype() != value_tensor.dtype())) {
paddle::small_vector<std::vector<paddle::experimental::Tensor>,
egr::kSlotSmallVectorSize>
tmps = {{self->tensor}, {value_tensor}};
auto amp_dtype = egr::GetAmpDestDtype("set_value", tmps);
self->tensor = egr::EagerAmpAutoCast(
self->tensor.name(), self->tensor, amp_dtype, "set_value");
value_tensor = egr::EagerAmpAutoCast(
value_tensor.name(), value_tensor, amp_dtype, "set_value");
}
self->tensor = set_value__dygraph_function(
self->tensor, value_tensor, {}, {}, {}, attrs);
}
Expand Down
3 changes: 2 additions & 1 deletion paddle/phi/kernels/cpu/set_value_grad_kernel.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,5 @@ PD_REGISTER_KERNEL(set_value_grad,
double,
int,
int64_t,
bool) {}
bool,
phi::dtype::float16) {}
6 changes: 4 additions & 2 deletions paddle/phi/kernels/cpu/set_value_kernel.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ PD_REGISTER_KERNEL(set_value,
double,
int,
int64_t,
bool) {}
bool,
phi::dtype::float16) {}
PD_REGISTER_KERNEL(set_value_with_tensor,
CPU,
ALL_LAYOUT,
Expand All @@ -35,4 +36,5 @@ PD_REGISTER_KERNEL(set_value_with_tensor,
double,
int,
int64_t,
bool) {}
bool,
phi::dtype::float16) {}
3 changes: 2 additions & 1 deletion paddle/phi/kernels/gpu/set_value_grad_kernel.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,5 @@ PD_REGISTER_KERNEL(set_value_grad,
double,
int,
int64_t,
bool) {}
bool,
phi::dtype::float16) {}
6 changes: 4 additions & 2 deletions paddle/phi/kernels/gpu/set_value_kernel.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ PD_REGISTER_KERNEL(set_value,
double,
int,
int64_t,
bool) {}
bool,
paddle::platform::float16) {}
PD_REGISTER_KERNEL(set_value_with_tensor,
GPU,
ALL_LAYOUT,
Expand All @@ -35,4 +36,5 @@ PD_REGISTER_KERNEL(set_value_with_tensor,
double,
int,
int64_t,
bool) {}
bool,
paddle::platform::float16) {}