Skip to content

Fix missing move and bare new in pytree from_str_internal #6803

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

Merged
merged 2 commits into from
Nov 12, 2024
Merged

Fix missing move and bare new in pytree from_str_internal #6803

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6e97c64
Use std::variant to implement pytree Key
swolchok Nov 12, 2024
a269996
Fix missing move and bare new in pytree from_str_internal
swolchok Nov 12, 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
55 changes: 22 additions & 33 deletions extension/pytree/pytree.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
#include <cstring>
#include <memory>
#include <string>
#include <variant>

// NB: This is a local, pytree FunctionRef and not from the ExecuTorch runtime.
#include <executorch/extension/pytree/function_ref.h>
Expand Down Expand Up @@ -55,51 +56,36 @@ using KeyInt = int32_t;
struct Key {
enum class Kind : uint8_t { None, Int, Str } kind_;

KeyInt as_int_ = {};
KeyStr as_str_ = {};
private:
std::variant<std::monostate, KeyInt, KeyStr> repr_;

Key() : kind_(Kind::None) {}
/*implicit*/ Key(KeyInt key) : kind_(Kind::Int), as_int_(std::move(key)) {}
/*implicit*/ Key(KeyStr key) : kind_(Kind::Str), as_str_(std::move(key)) {}
public:
Key() {}
/*implicit*/ Key(KeyInt key) : repr_(key) {}
/*implicit*/ Key(KeyStr key) : repr_(std::move(key)) {}

const Kind& kind() const {
return kind_;
Kind kind() const {
return static_cast<Kind>(repr_.index());
}

const KeyInt& as_int() const {
pytree_assert(kind_ == Key::Kind::Int);
return as_int_;
KeyInt as_int() const {
return std::get<KeyInt>(repr_);
}

operator const KeyInt&() const {
operator KeyInt() const {
return as_int();
}

const KeyStr& as_str() const {
pytree_assert(kind_ == Key::Kind::Str);
return as_str_;
return std::get<KeyStr>(repr_);
}

operator const KeyStr&() const {
return as_str();
}

bool operator==(const Key& rhs) const {
if (kind_ != rhs.kind_) {
return false;
}
switch (kind_) {
case Kind::Str: {
return as_str_ == rhs.as_str_;
}
case Kind::Int: {
return as_int_ == rhs.as_int_;
}
case Kind::None: {
return true;
}
}
pytree_unreachable();
return repr_ == rhs.repr_;
}

bool operator!=(const Key& rhs) const {
Expand Down Expand Up @@ -153,6 +139,9 @@ struct ContainerHandle {

/*implicit*/ ContainerHandle(container_type* c) : handle(c) {}

/*implicit*/ ContainerHandle(std::unique_ptr<container_type> c)
: handle(std::move(c)) {}

void set_leaf(leaf_type* leaf) {
pytree_assert(handle->kind == Kind::Leaf);
handle->leaf = leaf;
Expand Down Expand Up @@ -500,10 +489,10 @@ TreeSpec<Aux> from_str_internal(
read_idx++;
auto layout = read_node_layout(spec, read_idx);
const auto size = layout.size();
auto c = new TreeSpecContainer<Aux>(kind, size);
auto c = std::make_unique<TreeSpecContainer<Aux>>(kind, size);

if (Kind::Custom == kind) {
c->custom_type = custom_type;
c->custom_type = std::move(custom_type);
}

size_t child_idx = 0;
Expand All @@ -523,14 +512,14 @@ TreeSpec<Aux> from_str_internal(
read_idx++;
}
c->leaves_num = leaves_offset;
return c;
return TreeSpec<Aux>(std::move(c));
}

case Config::kDict: {
read_idx++;
auto layout = read_node_layout(spec, read_idx);
const auto size = layout.size();
auto c = new TreeSpecContainer<Aux>(Kind::Dict, size);
auto c = std::make_unique<TreeSpecContainer<Aux>>(Kind::Dict, size);

size_t child_idx = 0;
size_t leaves_offset = 0;
Expand Down Expand Up @@ -563,7 +552,7 @@ TreeSpec<Aux> from_str_internal(
read_idx++;
}
c->leaves_num = leaves_offset;
return c;
return TreeSpec<Aux>(std::move(c));
}

case Config::kLeaf:
Expand Down
Loading