add mkldnn prop_kind phase for inference-only case to pooling and activations (#14278)
* add is_test to pooling and activations add prop_kind support for layers activation. conv and pooling add a pass that sets is_test to true add transpiler version of is_test pass test=develop * patch test and pass test=develop * add pass to analyzer.h test=develop * add is_test attr description & pass only on mkldnn in: activation_op.cc batch_norm_op.cc conv_op.cc dropout_op.cc lrn_op.cc pool_op.cc sequence_pool_op.cc softmax_op.cc * fix is_test handling for activation pool and conv * change description of is_test for all layers again * remove GetAttr(use_mkldnn) from pass * rename correct_mkldnn_test_phase to is_test and remove dependency on MKLDNN test=develop * review fix magic number * two if(..)s into one * Check is_test once and pass mkldnn forward prop kind * dereference shared_ptr with * (without get()) test=develop * add is_test_pass back test=developpanyx0718-patch-1
Sylwester Fraczek
6 years ago
committed by
Tao Luo
parent
82773477ae
commit
8a1eeec579
@ -0,0 +1,57 @@
|
||||
/* Copyright (c) 2018 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/framework/ir/is_test_pass.h"
|
||||
#include <string>
|
||||
#include <utility>
|
||||
|
||||
namespace paddle {
|
||||
namespace framework {
|
||||
namespace ir {
|
||||
|
||||
std::unique_ptr<ir::Graph> IsTestPass::ApplyImpl(
|
||||
std::unique_ptr<ir::Graph> graph) const {
|
||||
VLOG(3) << "Sets is_test attrbiute to true and if it is missing, inserts it "
|
||||
"for activations and pooling.";
|
||||
auto op_list = {"pool2d", "sigmoid", "logsigmoid",
|
||||
"softshrink", "exp", "brelu",
|
||||
"pow", "leaky_relu", "stanh",
|
||||
"relu", "tanh", "tanh_shrink",
|
||||
"sqrt", "abs", "ceil",
|
||||
"elu", "floor", "cos",
|
||||
"sin", "round", "reciprocal",
|
||||
"hard_shrink", "hard_sigmoid", "relu6",
|
||||
"soft_relu", "swish", "thresholded_relu",
|
||||
"log", "square", "softplus",
|
||||
"softsign"};
|
||||
for (const Node* n : graph->Nodes()) {
|
||||
if (n->IsOp()) {
|
||||
auto* op = n->Op();
|
||||
if (op->HasAttr("is_test")) {
|
||||
op->SetAttr("is_test", true);
|
||||
} else if (std::find(begin(op_list), end(op_list), op->Type()) !=
|
||||
end(op_list)) {
|
||||
op->MutableAttrMap()->insert(
|
||||
std::pair<std::string, Attribute>("is_test", true));
|
||||
}
|
||||
}
|
||||
}
|
||||
return graph;
|
||||
}
|
||||
|
||||
} // namespace ir
|
||||
} // namespace framework
|
||||
} // namespace paddle
|
||||
|
||||
REGISTER_PASS(is_test_pass, paddle::framework::ir::IsTestPass);
|
||||
@ -0,0 +1,31 @@
|
||||
/* Copyright (c) 2018 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/fluid/framework/ir/pass.h"
|
||||
|
||||
namespace paddle {
|
||||
namespace framework {
|
||||
namespace ir {
|
||||
|
||||
class IsTestPass : public Pass {
|
||||
protected:
|
||||
std::unique_ptr<ir::Graph> ApplyImpl(
|
||||
std::unique_ptr<ir::Graph> graph) const override;
|
||||
};
|
||||
|
||||
} // namespace ir
|
||||
} // namespace framework
|
||||
} // namespace paddle
|
||||
@ -0,0 +1,117 @@
|
||||
// Copyright (c) 2018 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/framework/ir/is_test_pass.h"
|
||||
|
||||
#include <gtest/gtest.h>
|
||||
|
||||
namespace paddle {
|
||||
namespace framework {
|
||||
namespace ir {
|
||||
|
||||
enum class ISTEST_STATE { FALSE, TRUE, UNSET };
|
||||
|
||||
void SetOp(ProgramDesc* prog, const std::string& type, const std::string& name,
|
||||
const std::vector<std::string>& inputs,
|
||||
const std::vector<std::string>& outputs, bool use_mkldnn = false,
|
||||
ISTEST_STATE is_test = ISTEST_STATE::UNSET) {
|
||||
auto* op = prog->MutableBlock(0)->AppendOp();
|
||||
op->SetType(type);
|
||||
op->SetAttr("name", name);
|
||||
op->SetInput("X", inputs);
|
||||
op->SetOutput("Out", outputs);
|
||||
op->SetAttr("use_mkldnn", use_mkldnn);
|
||||
if (is_test == ISTEST_STATE::UNSET)
|
||||
op->MutableAttrMap()->erase("is_test");
|
||||
else if (is_test == ISTEST_STATE::FALSE)
|
||||
op->SetAttr("is_test", false);
|
||||
else
|
||||
op->SetAttr("is_test", true);
|
||||
}
|
||||
|
||||
// a->pool2d->b
|
||||
// b->relu->c
|
||||
// c,weights1)->conv2d->d
|
||||
//
|
||||
// d->pool2d->e
|
||||
// e->hard_sigmoid->f
|
||||
// (f,weights2)->conv2d->g
|
||||
//
|
||||
// g->pool2d->h
|
||||
// h->tanh->i
|
||||
// (i,weights3)->conv2d->j
|
||||
ProgramDesc BuildProgramDesc() {
|
||||
ProgramDesc prog;
|
||||
for (auto& v :
|
||||
std::vector<std::string>({"a", "b", "c", "d", "e", "f", "g", "h", "i",
|
||||
"j", "weights1", "weights2", "weights3"})) {
|
||||
auto* var = prog.MutableBlock(0)->Var(v);
|
||||
var->SetType(proto::VarType::SELECTED_ROWS);
|
||||
if (v == "weights1" || v == "weights2" || v == "weights3") {
|
||||
var->SetPersistable(true);
|
||||
}
|
||||
}
|
||||
|
||||
SetOp(&prog, "pool2d", "pooling1", std::vector<std::string>({"a"}),
|
||||
std::vector<std::string>({"b"}), true, ISTEST_STATE::TRUE);
|
||||
SetOp(&prog, "relu", "activation1", std::vector<std::string>({"b"}),
|
||||
std::vector<std::string>({"c"}), true, ISTEST_STATE::TRUE);
|
||||
SetOp(&prog, "conv2d", "conv1", std::vector<std::string>({"c", "weights1"}),
|
||||
std::vector<std::string>({"d"}), true, ISTEST_STATE::TRUE);
|
||||
|
||||
SetOp(&prog, "pool2d", "pooling2", std::vector<std::string>({"d"}),
|
||||
std::vector<std::string>({"e"}), false, ISTEST_STATE::FALSE);
|
||||
SetOp(&prog, "hard_sigmoid", "activation2", std::vector<std::string>({"e"}),
|
||||
std::vector<std::string>({"f"}), false, ISTEST_STATE::FALSE);
|
||||
SetOp(&prog, "conv2d", "conv2", std::vector<std::string>({"f", "weights2"}),
|
||||
std::vector<std::string>({"g"}), false, ISTEST_STATE::FALSE);
|
||||
|
||||
SetOp(&prog, "pool2d", "pooling3", std::vector<std::string>({"g"}),
|
||||
std::vector<std::string>({"h"}), false, ISTEST_STATE::UNSET);
|
||||
SetOp(&prog, "tanh", "activation3", std::vector<std::string>({"h"}),
|
||||
std::vector<std::string>({"i"}), true, ISTEST_STATE::UNSET);
|
||||
SetOp(&prog, "conv2d", "conv3", std::vector<std::string>({"i", "weights3"}),
|
||||
std::vector<std::string>({"j"}), false, ISTEST_STATE::UNSET);
|
||||
|
||||
return prog;
|
||||
}
|
||||
|
||||
TEST(IsTestPass, basic) {
|
||||
auto prog = BuildProgramDesc();
|
||||
|
||||
std::unique_ptr<ir::Graph> graph(new ir::Graph(prog));
|
||||
|
||||
auto pass = PassRegistry::Instance().Get("is_test_pass");
|
||||
|
||||
graph = pass->Apply(std::move(graph));
|
||||
|
||||
for (auto* node : graph->Nodes()) {
|
||||
if (node->IsOp()) {
|
||||
auto* op = node->Op();
|
||||
auto op_name = boost::get<std::string>(op->GetAttr("name"));
|
||||
if (op_name == "conv3") {
|
||||
ASSERT_FALSE(op->HasAttr("is_test"));
|
||||
} else {
|
||||
ASSERT_TRUE(op->HasAttr("is_test"));
|
||||
EXPECT_TRUE(boost::get<bool>(op->GetAttr("is_test")));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
} // namespace ir
|
||||
} // namespace framework
|
||||
} // namespace paddle
|
||||
|
||||
USE_PASS(is_test_pass);
|
||||
Loading…
Reference in new issue