summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author이상규/On-Device Lab(SR)/Principal Engineer/삼성전자 <sg5.lee@samsung.com>2019-04-09 09:31:12 (GMT)
committer오형석/On-Device Lab(SR)/Staff Engineer/삼성전자 <hseok82.oh@samsung.com>2019-04-09 09:31:12 (GMT)
commite0c502c38513ed034fcc6a8c6e3059a7669b0e67 (patch)
tree2b7d2f6cd17022e9c5f1b3a190b9082a2848c3e4
parent5891251d5fedd9b3c8cb51c1a14b1139fc188c40 (diff)
downloadnnfw-e0c502c38513ed034fcc6a8c6e3059a7669b0e67.zip
nnfw-e0c502c38513ed034fcc6a8c6e3059a7669b0e67.tar.gz
nnfw-e0c502c38513ed034fcc6a8c6e3059a7669b0e67.tar.bz2
[neurun] Remove redundant virtual from override functions (#4956)
I removed `virtual` when I am sure it is our code. Otherwise, I did not removed `virtual`. Signed-off-by: Sanggyu Lee <sg5.lee@samsung.com>
-rw-r--r--runtimes/neurun/backend/acl_cl/operand/CLSubTensor.h2
-rw-r--r--runtimes/neurun/core/src/compiler/Compiler.cc2
-rw-r--r--runtimes/neurun/core/src/compiler/OperationValidator.h32
-rw-r--r--runtimes/neurun/core/src/compiler/SubTensorAnalyzer.h2
-rw-r--r--runtimes/neurun/core/src/dumper/dot/DotNodeInfo.h10
-rw-r--r--runtimes/neurun/core/src/dumper/dot/DotOperandInfo.h10
-rw-r--r--runtimes/neurun/core/src/exec/ExecutorBase.h12
-rw-r--r--runtimes/neurun/core/src/exec/FunctionSequence.h4
-rw-r--r--runtimes/neurun/core/src/graph/pass/OperandPass.h4
-rw-r--r--runtimes/neurun/core/src/graph/pass/OperationPass.h4
-rw-r--r--runtimes/neurun/core/src/graph/pass/PermutationEliminationPass.h5
-rw-r--r--runtimes/neurun/core/src/graph/pass/PermutationInsertionPass.h5
-rw-r--r--runtimes/neurun/core/src/graph/verifier/Verifier.h4
-rw-r--r--runtimes/neurun/test/graph/MockNode.h4
14 files changed, 48 insertions, 52 deletions
diff --git a/runtimes/neurun/backend/acl_cl/operand/CLSubTensor.h b/runtimes/neurun/backend/acl_cl/operand/CLSubTensor.h
index cef78c1..04f2ba1 100644
--- a/runtimes/neurun/backend/acl_cl/operand/CLSubTensor.h
+++ b/runtimes/neurun/backend/acl_cl/operand/CLSubTensor.h
@@ -49,7 +49,7 @@ public:
protected:
uint8_t *doMap(cl::CommandQueue &q, bool blocking) override;
- virtual void doUnmap(cl::CommandQueue &q) override;
+ void doUnmap(cl::CommandQueue &q) override;
private:
std::shared_ptr<arm_compute::CLSubTensor> _cl_sub_tensor;
diff --git a/runtimes/neurun/core/src/compiler/Compiler.cc b/runtimes/neurun/core/src/compiler/Compiler.cc
index 576d019..a545fb0 100644
--- a/runtimes/neurun/core/src/compiler/Compiler.cc
+++ b/runtimes/neurun/core/src/compiler/Compiler.cc
@@ -192,7 +192,7 @@ std::shared_ptr<exec::IExecutor> Compiler::createDataflowExecutor(graph::Graph &
class ExecutionBuilder : public IExecutionBuilder
{
public:
- virtual void append(std::unique_ptr<exec::IFunction> &&fn) override
+ void append(std::unique_ptr<exec::IFunction> &&fn) override
{
auto itr = _code_map.find(_next_index);
if (itr == _code_map.end())
diff --git a/runtimes/neurun/core/src/compiler/OperationValidator.h b/runtimes/neurun/core/src/compiler/OperationValidator.h
index 7b9a3d3..0194881 100644
--- a/runtimes/neurun/core/src/compiler/OperationValidator.h
+++ b/runtimes/neurun/core/src/compiler/OperationValidator.h
@@ -41,22 +41,22 @@ public:
OperationValidator(const neurun::model::operand::Set &ctx) : _ctx{ctx} {}
public:
- virtual void visit(const model::operation::CastNode &node) override;
- virtual void visit(const model::operation::ComparisonNode &node) override;
- virtual void visit(const model::operation::SoftmaxNode &node) override;
- virtual void visit(const model::operation::PermuteNode &node) override;
- virtual void visit(const model::operation::ReduceSumNode &node) override;
- virtual void visit(const model::operation::TransposeNode &node) override;
- virtual void visit(const model::operation::ReduceMaxNode &node) override;
- virtual void visit(const model::operation::SpaceToDepthNode &node) override;
- virtual void visit(const model::operation::EmbeddingLookupNode &node) override;
- virtual void visit(const model::operation::HashtableLookupNode &node) override;
- virtual void visit(const model::operation::TransposeConvNode &node) override;
- virtual void visit(const model::operation::GatherNode &node) override;
- virtual void visit(const model::operation::DequantizeNode &node) override;
- virtual void visit(const model::operation::MeanNode &node) override;
- virtual void visit(const model::operation::DepthToSpaceNode &node) override;
- virtual void visit(const model::operation::ReduceMinNode &node) override;
+ void visit(const model::operation::CastNode &node) override;
+ void visit(const model::operation::ComparisonNode &node) override;
+ void visit(const model::operation::SoftmaxNode &node) override;
+ void visit(const model::operation::PermuteNode &node) override;
+ void visit(const model::operation::ReduceSumNode &node) override;
+ void visit(const model::operation::TransposeNode &node) override;
+ void visit(const model::operation::ReduceMaxNode &node) override;
+ void visit(const model::operation::SpaceToDepthNode &node) override;
+ void visit(const model::operation::EmbeddingLookupNode &node) override;
+ void visit(const model::operation::HashtableLookupNode &node) override;
+ void visit(const model::operation::TransposeConvNode &node) override;
+ void visit(const model::operation::GatherNode &node) override;
+ void visit(const model::operation::DequantizeNode &node) override;
+ void visit(const model::operation::MeanNode &node) override;
+ void visit(const model::operation::DepthToSpaceNode &node) override;
+ void visit(const model::operation::ReduceMinNode &node) override;
private:
const neurun::model::operand::Set &_ctx;
diff --git a/runtimes/neurun/core/src/compiler/SubTensorAnalyzer.h b/runtimes/neurun/core/src/compiler/SubTensorAnalyzer.h
index 73253c1..ef4fea0 100644
--- a/runtimes/neurun/core/src/compiler/SubTensorAnalyzer.h
+++ b/runtimes/neurun/core/src/compiler/SubTensorAnalyzer.h
@@ -58,7 +58,7 @@ public:
}
public:
- virtual void visit(const model::operation::ConcatNode &) override;
+ void visit(const model::operation::ConcatNode &) override;
private:
const graph::LowerInfoMap &_lower_info;
diff --git a/runtimes/neurun/core/src/dumper/dot/DotNodeInfo.h b/runtimes/neurun/core/src/dumper/dot/DotNodeInfo.h
index 656a05a..19d88d6 100644
--- a/runtimes/neurun/core/src/dumper/dot/DotNodeInfo.h
+++ b/runtimes/neurun/core/src/dumper/dot/DotNodeInfo.h
@@ -48,11 +48,11 @@ public:
const neurun::model::operation::Node &node);
public:
- virtual std::string index_str() const override;
- virtual std::string label() const override;
- virtual std::string dot_shape() const override;
- virtual std::string bg_color_scheme() const override;
- virtual std::string bg_color() const override;
+ std::string index_str() const override;
+ std::string label() const override;
+ std::string dot_shape() const override;
+ std::string bg_color_scheme() const override;
+ std::string bg_color() const override;
private:
void addBackendLabel();
diff --git a/runtimes/neurun/core/src/dumper/dot/DotOperandInfo.h b/runtimes/neurun/core/src/dumper/dot/DotOperandInfo.h
index 882bc44..d451e41 100644
--- a/runtimes/neurun/core/src/dumper/dot/DotOperandInfo.h
+++ b/runtimes/neurun/core/src/dumper/dot/DotOperandInfo.h
@@ -63,11 +63,11 @@ public:
const neurun::graph::operand::LowerInfo *lower_info);
public:
- virtual std::string index_str() const override;
- virtual std::string label() const override;
- virtual std::string dot_shape() const override;
- virtual std::string bg_color_scheme() const override;
- virtual std::string bg_color() const override;
+ std::string index_str() const override;
+ std::string label() const override;
+ std::string dot_shape() const override;
+ std::string bg_color_scheme() const override;
+ std::string bg_color() const override;
private:
void addBackendLabel();
diff --git a/runtimes/neurun/core/src/exec/ExecutorBase.h b/runtimes/neurun/core/src/exec/ExecutorBase.h
index 1d1a8fe..5122d3f 100644
--- a/runtimes/neurun/core/src/exec/ExecutorBase.h
+++ b/runtimes/neurun/core/src/exec/ExecutorBase.h
@@ -43,15 +43,13 @@ public:
virtual ~ExecutorBase() = default;
- virtual const model::Model &model() override { return *_model; }
+ const model::Model &model() override { return *_model; }
- virtual void setInput(const model::operand::IO::Index &index,
- const model::operand::TypeInfo &type, const model::operand::Shape &shape,
- const void *buffer, size_t length) override;
+ void setInput(const model::operand::IO::Index &index, const model::operand::TypeInfo &type,
+ const model::operand::Shape &shape, const void *buffer, size_t length) override;
- virtual void setOutput(const model::operand::IO::Index &index,
- const model::operand::TypeInfo &type, const model::operand::Shape &shape,
- void *buffer, size_t length) override;
+ void setOutput(const model::operand::IO::Index &index, const model::operand::TypeInfo &type,
+ const model::operand::Shape &shape, void *buffer, size_t length) override;
void execute(void) final;
diff --git a/runtimes/neurun/core/src/exec/FunctionSequence.h b/runtimes/neurun/core/src/exec/FunctionSequence.h
index 8976c43..e3fd437 100644
--- a/runtimes/neurun/core/src/exec/FunctionSequence.h
+++ b/runtimes/neurun/core/src/exec/FunctionSequence.h
@@ -32,8 +32,8 @@ class FunctionSequence : public IFunction
public:
virtual ~FunctionSequence() = default;
- virtual void run() override;
- virtual void prepare() override;
+ void run() override;
+ void prepare() override;
/**
* @brief Appends an IFunction object to the function sequence
diff --git a/runtimes/neurun/core/src/graph/pass/OperandPass.h b/runtimes/neurun/core/src/graph/pass/OperandPass.h
index e81e2ed..abc4aa8 100644
--- a/runtimes/neurun/core/src/graph/pass/OperandPass.h
+++ b/runtimes/neurun/core/src/graph/pass/OperandPass.h
@@ -44,8 +44,8 @@ public:
using Pass::Pass;
public:
- virtual std::string id() override = 0;
- virtual void run() override final;
+ std::string id() override = 0;
+ void run() override final;
virtual void callback(const model::operand::Index &i, model::operand::Object &o) = 0;
};
diff --git a/runtimes/neurun/core/src/graph/pass/OperationPass.h b/runtimes/neurun/core/src/graph/pass/OperationPass.h
index d7d4d3e..38f8303 100644
--- a/runtimes/neurun/core/src/graph/pass/OperationPass.h
+++ b/runtimes/neurun/core/src/graph/pass/OperationPass.h
@@ -48,12 +48,12 @@ public:
*
* @return string id
*/
- virtual std::string id() override = 0;
+ std::string id() override = 0;
/**
* @brief Run the pass
*/
- virtual void run() override final;
+ void run() override final;
/**
* @brief The function that will be executed for each operations
diff --git a/runtimes/neurun/core/src/graph/pass/PermutationEliminationPass.h b/runtimes/neurun/core/src/graph/pass/PermutationEliminationPass.h
index b7aa544..6dc52db 100644
--- a/runtimes/neurun/core/src/graph/pass/PermutationEliminationPass.h
+++ b/runtimes/neurun/core/src/graph/pass/PermutationEliminationPass.h
@@ -34,10 +34,9 @@ public:
using OperandPass::OperandPass;
public:
- virtual std::string id() override { return "PermutationEliminationPass"; }
+ std::string id() override { return "PermutationEliminationPass"; }
- virtual void callback(const model::operand::Index &index,
- model::operand::Object &object) override;
+ void callback(const model::operand::Index &index, model::operand::Object &object) override;
private:
/**
diff --git a/runtimes/neurun/core/src/graph/pass/PermutationInsertionPass.h b/runtimes/neurun/core/src/graph/pass/PermutationInsertionPass.h
index f36c473..c1f84c7 100644
--- a/runtimes/neurun/core/src/graph/pass/PermutationInsertionPass.h
+++ b/runtimes/neurun/core/src/graph/pass/PermutationInsertionPass.h
@@ -34,9 +34,8 @@ public:
using OperandPass::OperandPass;
public:
- virtual std::string id() override { return "PermutationInsertionPass"; }
- virtual void callback(const model::operand::Index &index,
- model::operand::Object &object) override;
+ std::string id() override { return "PermutationInsertionPass"; }
+ void callback(const model::operand::Index &index, model::operand::Object &object) override;
/**
* @brief Insert Permute operation that has given operand as input
diff --git a/runtimes/neurun/core/src/graph/verifier/Verifier.h b/runtimes/neurun/core/src/graph/verifier/Verifier.h
index 5f1f79e..ebd9088 100644
--- a/runtimes/neurun/core/src/graph/verifier/Verifier.h
+++ b/runtimes/neurun/core/src/graph/verifier/Verifier.h
@@ -52,13 +52,13 @@ namespace verifier
class DAGChecker : public IVerifier
{
public:
- virtual bool verify(const Graph &graph) const override;
+ bool verify(const Graph &graph) const override;
};
class EdgeConsistencyChecker : public IVerifier
{
public:
- virtual bool verify(const Graph &graph) const override;
+ bool verify(const Graph &graph) const override;
};
} // namespace verifier
diff --git a/runtimes/neurun/test/graph/MockNode.h b/runtimes/neurun/test/graph/MockNode.h
index 46a6274..ad18e96 100644
--- a/runtimes/neurun/test/graph/MockNode.h
+++ b/runtimes/neurun/test/graph/MockNode.h
@@ -37,8 +37,8 @@ public:
}
public:
- virtual void accept(neurun::model::operation::NodeVisitor &&) const override {}
- virtual std::string getName() const override { return "SimpleMockNode"; }
+ void accept(neurun::model::operation::NodeVisitor &&) const override {}
+ std::string getName() const override { return "SimpleMockNode"; }
};
} // namespace graph