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

Minor fix of warnings raised by -Wreturn-std-move and -Wself-assign-overloaded #2669

Merged
merged 1 commit into from
Feb 24, 2019
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
2 changes: 1 addition & 1 deletion nnvm/src/pass/infer_shape_type.cc
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ Graph InferAttr(Graph &&ret,
ret.attrs[attr_name] = std::make_shared<any>(std::move(rshape));
// number of nodes who knows the shape.
ret.attrs[unknown_name] = std::make_shared<any>(num_unknown);
return ret;
return std::move(ret);
}

NNVM_REGISTER_PASS(InferShape)
Expand Down
4 changes: 2 additions & 2 deletions src/codegen/verilog/verilog_ir.cc
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ class StageInputReplacer : public IRMutator {
Var new_var(it->second->var->name_hint + ".sync", op->type);
inputs_.Set(new_var, it->second);
replace_[op] = new_var;
return new_var;
return std::move(new_var);
}
Expr Mutate_(const Load* op, const Expr& e) final {
CHECK(is_zero(op->index))
Expand All @@ -60,7 +60,7 @@ class StageInputReplacer : public IRMutator {
Var data(it->second->var->name_hint + ".load.sync", op->type);
inputs_.Set(data, it->second);
replace_[op->buffer_var.get()] = data;
return data;
return std::move(data);
}
// inputs that get replaced.
Map<Var, StageInput> inputs_;
Expand Down
2 changes: 1 addition & 1 deletion src/pass/combine_context_call.cc
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class ContextCallCombiner final : public IRMutator {
}
Var ctx_var(name, ctx.type());
ctx_map_[ctx] = ctx_var;
return ctx_var;
return std::move(ctx_var);
}
} else {
return IRMutator::Mutate_(op, e);
Expand Down
2 changes: 1 addition & 1 deletion src/relay/ir/expr_functor.cc
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@ class ExprBinder : public ExprMutator {
if (it != args_map_.end()) {
return (*it).second;
} else {
return id;
return std::move(id);
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/relay/ir/type_functor.cc
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ class TypeBinder : public TypeMutator {
if (it != args_map_.end()) {
return (*it).second;
} else {
return id;
return std::move(id);
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/relay/pass/alter_op_layout.cc
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ Expr TransformLayout(Expr raw, Layout src_layout, Layout dst_layout) {
attrs->src_layout = src_layout.name();
attrs->dst_layout = dst_layout.name();
Call transform = CallNode::make(transform_op, {raw}, Attrs{attrs});
return transform;
return std::move(transform);
}

// Memorize layout transform so we can reuse internal transformed nodes
Expand Down
2 changes: 1 addition & 1 deletion src/relay/pass/fuse_ops.cc
Original file line number Diff line number Diff line change
Expand Up @@ -773,7 +773,7 @@ class FuseMutator : private ExprMutator {
} else {
// This is an intermediate node of a fused function
// simply return the new call.
return new_call;
return std::move(new_call);
}
} else {
return ExprMutator::VisitExpr_(call);
Expand Down
2 changes: 1 addition & 1 deletion src/relay/pass/to_a_normal_form.cc
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@ class Fill : ExprFunctor<Expr(const Expr&, const Var&)> {
visited_->insert(gv);
mod_->Update(gv, Downcast<Function>(relay::ToANormalForm(mod_->Lookup(gv), mod_, visited_)));
}
return gv;
return std::move(gv);
}

Expr VisitExpr_(const OpNode* op, const Var& v) final {
Expand Down
2 changes: 1 addition & 1 deletion src/relay/pass/type_infer.cc
Original file line number Diff line number Diff line change
Expand Up @@ -724,7 +724,7 @@ Expr InferType(const Expr& expr, const Module& mod_ref) {
// FromExpr wraps a naked expression as a function, we will unbox
// it here.
if (expr.as<FunctionNode>()) {
return func;
return std::move(func);
} else {
return func->body;
}
Expand Down
2 changes: 1 addition & 1 deletion topi/include/topi/nn/l2_normalize.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ inline Tensor l2_normalize(const Tensor& data,
topi::sqrt(tvm::compute(expand_sum->shape,
[&](const Array<Var>& i){
return (max(expand_sum(i), eps));
}, name = name, tag = tag)));
}, name, tag)));
}
} // namespace nn
} // namespace topi
Expand Down