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

Overload get() function for Optional type. #9748

Merged
merged 7 commits into from
Feb 16, 2022
Merged

Overload get() function for Optional type. #9748

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0c12997
upd
yzh119 Dec 15, 2021
2d54285
simplify
yzh119 Dec 15, 2021
4092a75
upd
yzh119 Dec 15, 2021
ac2aa7d
fix
yzh119 Jan 19, 2022
633f021
upd
yzh119 Jan 19, 2022
3682a0d
fix docstring
yzh119 Jan 19, 2022
6160399
merge
yzh119 Feb 11, 2022
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
5 changes: 5 additions & 0 deletions include/tvm/runtime/container/optional.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,11 @@ class Optional : public ObjectRef {
ICHECK(data_ != nullptr);
return T(data_);
}
/*!
* \return The internal object pointer with container type of T.
* \note This function do not perform not-null checking.
*/
const ContainerType* get() const { return static_cast<ContainerType*>(data_.get()); }
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note that get is not a standard API as per stl style for Optional. While get is a standard stl style name. We might want to have a longer name in this case.

How about GetContainerPtr(use CamelCase to indicate that it is not STL compatible).

The comment can be updated to explain the behavior of nullopt case(return nullptr) and non-nullopt case(returns the container ptr)

Copy link
Member

@junrushao junrushao Feb 16, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @tqchen for the valuable feedback! On the other hand, I would say this PR actually does is to simply improve the Optional::get method to return the underlying type instead of the plain Object pointer, and hence it might make sense to keep the name as it is. What do you think?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indeed, I didn't noticed that ObjectRef also have a get method. I think this sounds good to me then. Perhaps we can just add additional comments about the behavior

/*!
* \return The contained value if the Optional is not null
* otherwise return the default_value.
Expand Down
2 changes: 1 addition & 1 deletion src/tir/transforms/inject_rolling_buffer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ class RollingBufferInjector : public StmtExprMutator {

auto it{std::find_if(
bound_iter_vars.begin(), bound_iter_vars.end(),
[&](Optional<Var> var) { return var && (var.value().get() == loop_var.get()); })};
[&](Optional<Var> var) { return var && (var.get() == loop_var.get()); })};

if (it != bound_iter_vars.end()) {
auto i{std::distance(bound_iter_vars.begin(), it)};
Expand Down
2 changes: 1 addition & 1 deletion src/tir/transforms/plan_update_buffer_allocation_location.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class BufferAllocationLocator : public StmtExprMutator {
// create buffers to be allocated at each stmts
for (const auto& kv : buffer_lca) {
const Buffer& buffer = kv.first;
const StmtNode* stmt = kv.second.defined() ? kv.second.value().get() : nullptr;
const StmtNode* stmt = kv.second.get();
if (arg_buffers.count(buffer.get())) {
continue;
}
Expand Down