Skip to content
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.

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

Add shape op and unit test #12

Merged
merged 1 commit into from
Apr 28, 2021
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
30 changes: 30 additions & 0 deletions ngraph/frontend/paddlepaddle/src/op/shape.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
//*****************************************************************************
// Copyright 2017-2021 Intel Corporation
//
// 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 <ngraph/opsets/opset6.hpp>
#include "shape.hpp"

namespace ngraph {
namespace frontend {
namespace pdpd {
namespace op {

NamedOutputs shape (const NodeContext& node) {
auto data = node.get_ng_input("Input");
return node.default_single_output_mapping({std::make_shared<ngraph::opset6::ShapeOf>(data)}, {"Out"});
}

}}}}
27 changes: 27 additions & 0 deletions ngraph/frontend/paddlepaddle/src/op/shape.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
//*****************************************************************************
// Copyright 2017-2021 Intel Corporation
//
// 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 "node_context.hpp"

namespace ngraph {
namespace frontend {
namespace pdpd {
namespace op {

NamedOutputs shape (const NodeContext& node);

}}}}
4 changes: 3 additions & 1 deletion ngraph/frontend/paddlepaddle/src/op_table.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
#include "op/greater_equal.hpp"
#include "op/log.hpp"
#include "op/fill_constant_batch_size_like.hpp"
#include "op/shape.hpp"
#include "op_table.hpp"


Expand Down Expand Up @@ -111,7 +112,8 @@ std::map<std::string, CreatorFunction> get_supported_ops() {
{"greater_equal", op::greater_equal},
{"log", op::log},
{"fill_constant_batch_size_like", op::fill_constant_batch_size_like},
{"sync_batch_norm", op::batch_norm}
{"sync_batch_norm", op::batch_norm},
{"shape", op::shape}
};
};

Expand Down
37 changes: 37 additions & 0 deletions ngraph/test/files/paddlepaddle/gen_scripts/generate_shape.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
#
# pool2d paddle model generator
#
import numpy as np
from save_model import saveModel

data_type = 'float32'

def pdpd_shape(name : str, x):
import paddle as pdpd
pdpd.enable_static()

with pdpd.static.program_guard(pdpd.static.Program(), pdpd.static.Program()):
node_x = pdpd.static.data(name='x', shape=x.shape, dtype='float32')
out = pdpd.shape(node_x)
out = pdpd.cast(out, np.float32)
cpu = pdpd.static.cpu_places(1)
exe = pdpd.static.Executor(cpu[0])
# startup program will call initializer to initialize the parameters.
exe.run(pdpd.static.default_startup_program())

outs = exe.run(
feed={'x': x},
fetch_list=[out])

saveModel(name, exe, feedkeys=['x'], fetchlist=[out], inputs=[x], outputs=[outs[0]])

return outs[0]


def main():
p=0.5
data = np.random.random(size=(2,3)).astype('float32')
pdpd_shape("shape", data)

if __name__ == "__main__":
main()
1 change: 1 addition & 0 deletions ngraph/test/files/paddlepaddle/models/models.csv
Original file line number Diff line number Diff line change
Expand Up @@ -68,3 +68,4 @@ squeeze_null_axes,
transpose2,
unsqueeze,
yolo_box_test1,
shape,
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.