Skip to content

Commit 82d94f3

Browse files
committed
Fix codes
1 parent 9fcbe2c commit 82d94f3

File tree

4 files changed

+233
-219
lines changed

4 files changed

+233
-219
lines changed

paddle/fluid/framework/operator.cc

+10-10
Original file line numberDiff line numberDiff line change
@@ -1562,9 +1562,9 @@ void OperatorWithKernel::ParseInputDataType(
15621562
proto::VarType::Type default_data_type =
15631563
static_cast<proto::VarType::Type>(-1);
15641564
const std::vector<Variable*> vars = ctx.MultiInputVar(name);
1565-
if (vars.size() == 161) {
1566-
std::cout << "vars.size(): " << vars.size() << std::endl;
1567-
}
1565+
// if (vars.size() == 161) {
1566+
// std::cout << "vars.size(): " << vars.size() << std::endl;
1567+
// }
15681568
for (size_t i = 0; i < vars.size(); ++i) {
15691569
const Variable* var = vars[i];
15701570
if (var != nullptr) {
@@ -1592,13 +1592,13 @@ void OperatorWithKernel::ParseInputDataType(
15921592
Type(), name, ctx.InputNames(name).at(i)));
15931593
proto::VarType::Type tmp = t->type();
15941594

1595-
int a = static_cast<int>(default_data_type);
1596-
int b = static_cast<int>(*data_type);
1597-
int c = static_cast<int>(tmp);
1598-
std::cout << i << "th op." << std::endl;
1599-
std::cout << "default_data_type :" << a << std::endl;
1600-
std::cout << "data_type :" << b << std::endl;
1601-
std::cout << "tmp_type :" << c << std::endl;
1595+
// int a = static_cast<int>(default_data_type);
1596+
// int b = static_cast<int>(*data_type);
1597+
// int c = static_cast<int>(tmp);
1598+
// std::cout << i << "th op." << std::endl;
1599+
// std::cout << "default_data_type :" << a << std::endl;
1600+
// std::cout << "data_type :" << b << std::endl;
1601+
// std::cout << "tmp_type :" << c << std::endl;
16021602

16031603
PADDLE_ENFORCE(
16041604
tmp == *data_type || *data_type == default_data_type,

paddle/fluid/operators/optimizers/lars_momentum_op.cc

+4
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,10 @@ class LarsMomentumOpMaker : public framework::OpProtoAndCheckerMaker {
167167
"(bool, default false) "
168168
"Whether to use multi-precision during weight updating.")
169169
.SetDefault(false);
170+
AddAttr<bool>("merge_operation",
171+
"(bool, default false) "
172+
"Whether to merge all lars optimizer into one kernel.")
173+
.SetDefault(false);
170174
AddAttr<float>(
171175
"rescale_grad",
172176
"(float, default 1.0) Multiply the gradient with `rescale_grad`"

0 commit comments

Comments
 (0)