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

[onert] Introduce BinaryArithmetic trainable operation #12495

Merged
merged 2 commits into from
Jan 22, 2024
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
1 change: 1 addition & 0 deletions runtime/onert/core/include/ir/train/Operations.Include.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
#ifndef __ONERT_IR_TRAIN_OPERATIONS_OPERATION_INCLUDE_H__
#define __ONERT_IR_TRAIN_OPERATIONS_OPERATION_INCLUDE_H__

#include "ir/train/operation/BinaryArithmetic.h"
#include "ir/train/operation/Conv2D.h"
#include "ir/train/operation/DepthwiseConv2D.h"
#include "ir/train/operation/ElementwiseActivation.h"
Expand Down
1 change: 1 addition & 0 deletions runtime/onert/core/include/ir/train/Operations.lst
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#error Define OP before including this file
#endif

OP(BinaryArithmetic)
OP(Conv2D)
OP(DepthwiseConv2D)
OP(ElementwiseActivation)
Expand Down
51 changes: 51 additions & 0 deletions runtime/onert/core/include/ir/train/operation/BinaryArithmetic.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
/*
* Copyright (c) 2024 Samsung Electronics Co., Ltd. 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.
*/

#ifndef __ONERT_IR_TRAIN_OPERATION_BINARY_ARITHMETIC_H__
#define __ONERT_IR_TRAIN_OPERATION_BINARY_ARITHMETIC_H__

#include "ir/operation/BinaryArithmetic.h"
#include "ir/train/ITrainableOperation.h"

namespace onert
{
namespace ir
{
namespace train
{
namespace operation
{

class BinaryArithmetic : public ir::operation::BinaryArithmetic, public ITrainableOperation
{
private:
using OperationType = ir::operation::BinaryArithmetic;

public:
BinaryArithmetic(const OperationType &operation);

public:
std::unique_ptr<ITrainableOperation> clone() const override;
void accept(OperationVisitor &v) const override;
void accept(TrainableOperationVisitor &v) const override;
};

} // namespace operation
} // namespace train
} // namespace ir
} // namespace onert

#endif // __ONERT_IR_TRAIN_OPERATION_BINARY_ARITHMETIC_H__
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,11 @@ TrainableOperationConverter::TrainableOperationConverter(
UNUSED_RELEASE(_training_info);
}

void TrainableOperationConverter::visit(const ir::operation::BinaryArithmetic &node)
{
_return_op = std::make_unique<ir::train::operation::BinaryArithmetic>(node);
}

void TrainableOperationConverter::visit(const ir::operation::Conv2D &node)
{
_return_op = std::make_unique<ir::train::operation::Conv2D>(node);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ class TrainableOperationConverter : public UntrainableOperationConverter
using UntrainableOperationConverter::operator();

private:
void visit(const ir::operation::BinaryArithmetic &) override;
void visit(const ir::operation::Conv2D &) override;
void visit(const ir::operation::DepthwiseConv2D &) override;
void visit(const ir::operation::ElementwiseActivation &) override;
Expand Down
49 changes: 49 additions & 0 deletions runtime/onert/core/src/ir/train/operation/BinaryArithmetic.cc
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
/*
* Copyright (c) 2024 Samsung Electronics Co., Ltd. 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 "ir/train/operation/BinaryArithmetic.h"

#include "ir/OperationVisitor.h"
#include "ir/train/TrainableOperationVisitor.h"

namespace onert
{
namespace ir
{
namespace train
{
namespace operation
{

std::unique_ptr<ITrainableOperation> BinaryArithmetic::clone() const
{
return std::make_unique<BinaryArithmetic>(*this);
}

void BinaryArithmetic::accept(OperationVisitor &v) const { v.visit(*this); }

void BinaryArithmetic::accept(TrainableOperationVisitor &v) const { v.visit(*this); }

BinaryArithmetic::BinaryArithmetic(const OperationType &operation)
: OperationType{operation.getInputs(), operation.getOutputs(), operation.param()}
{
// DO NOTHING
}

} // namespace operation
} // namespace train
} // namespace ir
} // namespace onert