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.

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

Jump to bottom

[luci/service] migrate Range shape inference rule to sinf::Algorithm #13987

Merged
merged 6 commits into from
Sep 12, 2024
Merged

[luci/service] migrate Range shape inference rule to sinf::Algorithm #13987

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ffa0ce8
[luci/service] migrate Range shape inference rule to sinf::Algorithm
kyeong8139 Sep 11, 2024
a1d4c75
[luci/service] add include
kyeong8139 Sep 11, 2024
1f3e0fd
[luci/service] copy own_shape function with non-const params
kyeong8139 Sep 11, 2024
297a187
[luci/service] add tests for range with const param
kyeong8139 Sep 11, 2024
5c474bc
[luci/service] remove comment
kyeong8139 Sep 11, 2024
2ea01be
[luci/service] revise comment
kyeong8139 Sep 11, 2024
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
2 changes: 1 addition & 1 deletion compiler/luci/service/include/luci/Service/CircleShapeInference.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ class Algorithm final : public luci::CircleNodeVisitor<loco::TensorShape>
// loco::TensorShape visit(const luci::CirclePow *node) final;
// loco::TensorShape visit(const luci::CirclePRelu *node) final;
loco::TensorShape visit(const luci::CircleQuantize *node) final;
// loco::TensorShape visit(const luci::CircleRange *node) final;
loco::TensorShape visit(const luci::CircleRange *node) final;
// loco::TensorShape visit(const luci::CircleRank *node) final;
// loco::TensorShape visit(const luci::CircleReduceAny *node) final;
// loco::TensorShape visit(const luci::CircleReduceMax *node) final;
Expand Down
45 changes: 0 additions & 45 deletions compiler/luci/service/src/CircleShapeInferenceRule.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -911,49 +911,6 @@ loco::NodeShape infer_p_relu(const luci::CirclePRelu *node)
return loco::NodeShape{output_shape};
}

loco::NodeShape infer_range(const luci::CircleRange *node)
{
loco::TensorShape output_shape;
output_shape.rank(1);

auto start_node = dynamic_cast<luci::CircleConst *>(node->start());
auto limit_node = dynamic_cast<luci::CircleConst *>(node->limit());
auto delta_node = dynamic_cast<luci::CircleConst *>(node->delta());

if (start_node == nullptr || limit_node == nullptr || delta_node == nullptr)
{
return use_own(node);
}

double start = 0, limit = 0, delta = 0;

#define GET_RANGE_PARAM(DT) \
start = start_node->scalar<DT>(); \
limit = limit_node->scalar<DT>(); \
delta = delta_node->scalar<DT>();

switch (start_node->dtype())
{
case loco::DataType::FLOAT32:
GET_RANGE_PARAM(loco::DataType::FLOAT32)
break;
case loco::DataType::S32:
GET_RANGE_PARAM(loco::DataType::S32)
break;
default:
INTERNAL_EXN("Range data type not supported");
}

#undef GET_RANGE_PARAM

if (delta == 0)
INTERNAL_EXN("Delta can not be zero");

output_shape.dim(0) = ceil((limit - start) / delta);

return loco::NodeShape{output_shape};
}

loco::NodeShape infer_reshape(const luci::CircleReshape *node)
{
LOGGER(l);
Expand Down Expand Up @@ -2104,8 +2061,6 @@ class ShapeInferenceAlgorithm final : public luci::CircleNodeVisitor<loco::NodeS

loco::NodeShape visit(const luci::CirclePRelu *node) final { return infer_p_relu(node); }

loco::NodeShape visit(const luci::CircleRange *node) final { return infer_range(node); }

loco::NodeShape visit(const luci::CircleRank *) final
{
loco::TensorShape shape_output;
Expand Down
53 changes: 53 additions & 0 deletions compiler/luci/service/src/Nodes/CircleRange.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,12 @@
* limitations under the License.
*/

#include "luci/Service/CircleShapeInference.h"

#include "CircleCloneNode.h"
#include "CircleShapeInferenceHelper.h"

#include <cmath>

namespace luci
{
Expand All @@ -24,4 +29,52 @@ luci::CircleNode *CloneNodeLet<CN::OPQR>::visit(const luci::CircleRange *)
return _graph->nodes()->create<luci::CircleRange>();
}

namespace sinf
{

loco::TensorShape Algorithm::visit(const luci::CircleRange *node)
{
loco::TensorShape output_shape;
output_shape.rank(1);

auto start_node = dynamic_cast<luci::CircleConst *>(node->start());
auto limit_node = dynamic_cast<luci::CircleConst *>(node->limit());
auto delta_node = dynamic_cast<luci::CircleConst *>(node->delta());

if (start_node == nullptr || limit_node == nullptr || delta_node == nullptr)
{
return output_shape;
zetwhite marked this conversation as resolved.
Show resolved Hide resolved
}

double start = 0, limit = 0, delta = 0;

#define GET_RANGE_PARAM(DT) \
start = start_node->scalar<DT>(); \
limit = limit_node->scalar<DT>(); \
delta = delta_node->scalar<DT>();

switch (start_node->dtype())
{
case loco::DataType::FLOAT32:
GET_RANGE_PARAM(loco::DataType::FLOAT32)
break;
case loco::DataType::S32:
GET_RANGE_PARAM(loco::DataType::S32)
break;
default:
INTERNAL_EXN("Range data type not supported");
}

#undef GET_RANGE_PARAM

if (delta == 0)
INTERNAL_EXN("Delta can not be zero");

output_shape.dim(0) = ceil((limit - start) / delta);
zetwhite marked this conversation as resolved.
Show resolved Hide resolved

return output_shape;
}

} // namespace sinf

} // namespace luci