Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
62 changes: 62 additions & 0 deletions paddle/fluid/operators/ngraph/ops/cast_op.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
/*Copyright (c) 2019 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 <functional>
#include <memory>
#include <string>
#include <unordered_map>

#include "ngraph/ngraph.hpp"
#include "paddle/fluid/operators/ngraph/ops/op_bridge.h"
#include "paddle/fluid/platform/ngraph_helper.h"

namespace paddle {
namespace operators {
namespace ngraphs {

static void BuildCastNode(
const std::shared_ptr<framework::OperatorBase>& op,
std::shared_ptr<
std::unordered_map<std::string, std::shared_ptr<ngraph::Node>>>
ngb_node_map) {
auto input = platform::GetInputNode(op, "X", ngb_node_map);
auto op_attrs = framework::AttrReader(op->Attrs());
auto ng_dtype =
platform::GetNgType(static_cast<paddle::framework::proto::VarType::Type>(
op_attrs.Get<int>("out_dtype")));
auto out = std::make_shared<ngraph::op::Convert>(input, ng_dtype);
paddle::platform::SetOutputNode(op, "Out", out, ngb_node_map);
}

static void BuildCastGradNode(
const std::shared_ptr<framework::OperatorBase>& op,
std::shared_ptr<
std::unordered_map<std::string, std::shared_ptr<ngraph::Node>>>
ngb_node_map) {
auto input = platform::GetInputNode(op, "Out@GRAD", ngb_node_map);
auto op_attrs = framework::AttrReader(op->Attrs());
auto ng_dtype =
platform::GetNgType(static_cast<paddle::framework::proto::VarType::Type>(
op_attrs.Get<int>("out_dtype")));
auto out = std::make_shared<ngraph::op::Convert>(input, ng_dtype);
platform::SetOutputNode(op, "X@GRAD", out, ngb_node_map);
}
} // namespace ngraphs
} // namespace operators
} // namespace paddle

REGISTER_NG_OP(cast, BuildCastNode);
REGISTER_NG_OP(cast_grad, BuildCastGradNode);
17 changes: 3 additions & 14 deletions paddle/fluid/operators/ngraph/ops/fill_constant_op.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,20 +38,9 @@ void BuildFillConstantNode(
shape.push_back(sp);
}
float value = op_attrs.Get<float>("value");
ngraph::element::Type ng_dtype;
auto data_type = static_cast<paddle::framework::proto::VarType::Type>(
op_attrs.Get<int>("dtype"));
if (data_type == paddle::framework::proto::VarType::FP32) {
ng_dtype = ngraph::element::f32;
} else if (data_type == paddle::framework::proto::VarType::FP64) {
ng_dtype = ngraph::element::f64;
} else if (data_type == paddle::framework::proto::VarType::INT64) {
ng_dtype = ngraph::element::i64;
} else if (data_type == paddle::framework::proto::VarType::INT32) {
ng_dtype = ngraph::element::i32;
} else {
PADDLE_THROW("unsupported data type: %s", data_type);
}
auto ng_dtype =
platform::GetNgType(static_cast<paddle::framework::proto::VarType::Type>(
op_attrs.Get<int>("dtype")));
auto out = ngraph::op::Constant::create(ng_dtype, shape, {value});
paddle::platform::SetOutputNode(op, "Out", out, ngb_node_map);
}
Expand Down
21 changes: 21 additions & 0 deletions python/paddle/fluid/tests/unittests/ngraph/test_cast_ngraph_op.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# Copyright (c) 2019 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.

from __future__ import print_function

import unittest
from paddle.fluid.tests.unittests.test_cast_op import TestCastOp1
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why just only import the first one?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

testcase2 and 3 involve fp16 which is not supported.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK


if __name__ == '__main__':
unittest.main()