Replace custom optional with std::optional#9068

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
swolchok merged 6 commits into from
Mar 11, 2025
Merged

Replace custom optional with std::optional #9068

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a54e050
Update
swolchok Mar 8, 2025
7364de3
Update
swolchok Mar 10, 2025
3e3c632
Update
swolchok Mar 10, 2025
7787aa7
Update
swolchok Mar 11, 2025
02b1669
Update
swolchok Mar 11, 2025
dab0a36
Update
swolchok Mar 11, 2025
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
18 changes: 0 additions & 18 deletions extension/aten_util/make_aten_functor_from_et_functor.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -166,24 +166,6 @@ struct type_convert<std::optional<F>, torch::executor::optional<T>> final {
}
};

// Optionals: ETen to ATen.
template <class F, class T>
struct type_convert<torch::executor::optional<F>, std::optional<T>> final {
public:
torch::executor::optional<F> val;
std::unique_ptr<struct type_convert<F, T>> convert_struct;
explicit type_convert(torch::executor::optional<F> value) : val(value) {}
std::optional<T> call() {
if (val.has_value()) {
convert_struct = std::make_unique<struct type_convert<F, T>>(
type_convert<F, T>(val.value()));
return std::optional<T>(convert_struct->call());
} else {
return std::optional<T>();
}
}
};

// ArrayRefs: ATen to ETen.
template <class F, class T>
struct type_convert<c10::ArrayRef<F>, torch::executor::ArrayRef<T>> final {
Expand Down
31 changes: 31 additions & 0 deletions kernels/portable/cpu/util/reduce_util.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -163,6 +163,14 @@ size_t get_reduced_dim_product(
const executorch::aten::optional<executorch::aten::ArrayRef<int64_t>>&
dim_list);

// Resolve ambiguity between the above two overloads -- ArrayRef and
// optional are both implicitly constructible from int64_t.
inline size_t get_reduced_dim_product(
const executorch::aten::Tensor& in,
int64_t dim) {
return get_reduced_dim_product(in, executorch::aten::optional<int64_t>(dim));
}

size_t get_out_numel(
const executorch::aten::Tensor& in,
const executorch::aten::optional<int64_t>& dim);
Expand All@@ -172,6 +180,12 @@ size_t get_out_numel(
const executorch::aten::optional<executorch::aten::ArrayRef<int64_t>>&
dim_list);

// Resolve ambiguity between the above two overloads -- ArrayRef and
// optional are both implicitly constructible from int64_t.
inline size_t get_out_numel(const executorch::aten::Tensor& in, int64_t dim) {
return get_out_numel(in, executorch::aten::optional<int64_t>(dim));
}

size_t get_init_index(
const executorch::aten::Tensor& in,
const executorch::aten::optional<int64_t>& dim,
Expand All@@ -183,6 +197,12 @@ size_t get_init_index(
dim_list,
const size_t out_ix);

inline size_t get_init_index(
const executorch::aten::Tensor& in,
int64_t dim,
const size_t out_ix) {
return get_init_index(in, executorch::aten::optional<int64_t>(dim), out_ix);
}
//
// Iteration Functions
//
Expand DownExpand Up@@ -614,6 +634,17 @@ Error resize_reduction_out(
bool keepdim,
executorch::aten::Tensor& out);

// Resolve ambiguity between the above two overloads -- ArrayRef and
// optional are both implicitly constructible from int64_t.
inline Error resize_reduction_out(
const executorch::aten::Tensor& in,
int64_t dim,
bool keepdim,
executorch::aten::Tensor& out) {
return resize_reduction_out(
in, executorch::aten::optional<int64_t>(dim), keepdim, out);
}

#ifndef USE_ATEN_LIB
bool check_reduction_args(
const Tensor& in,
Expand Down
2 changes: 1 addition & 1 deletion runtime/core/exec_aten/exec_aten.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -106,7 +106,7 @@ template <typename T>
using optional = torch::executor::optional<T>;
using nullopt_t = torch::executor::nullopt_t;
// NOLINTNEXTLINE(facebook-hte-NamespaceScopedStaticDeclaration)
static constexpr nullopt_t nullopt{0};
using std::nullopt;
using ScalarType = torch::executor::ScalarType;
using TensorList = ArrayRef<Tensor>;
using Scalar = torch::executor::Scalar;
Expand Down
171 changes: 7 additions & 164 deletions runtime/core/portable_type/optional.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,175 +8,18 @@

#pragma once

#include <executorch/runtime/platform/assert.h>
#include <new>
#include <utility> // std::forward and other template magic checks
#include <optional>

namespace executorch {
namespace runtime {
namespace etensor {

/// Used to indicate an optional type with uninitialized state.
struct nullopt_t final {
constexpr explicit nullopt_t(int32_t) {}
};

/// A constant of type nullopt_t that is used to indicate an optional type with
/// uninitialized state.
constexpr nullopt_t nullopt{0};

/// Leaner optional class, subset of c10, std, and boost optional APIs.
template <class T>
class optional final {
public:
/// The type wrapped by the optional class.
using value_type = T;

/// Constructs an optional object that does not contain a value.
/* implicit */ optional() noexcept : storage_(trivial_init), init_(false) {}

/// Constructs an optional object that does not contain a value.
/* implicit */ optional(nullopt_t) noexcept
: storage_(trivial_init), init_(false) {}

/// Constructs an optional object that matches the state of v.
/* implicit */ optional(const optional<T>& v)
: storage_(trivial_init), init_(v.init_) {
if (init_) {
new (&storage_.value_) T(v.storage_.value_);
}
}

/// Constructs an optional object that contains the specified value.
/* implicit */ optional(const T& v) : storage_(v), init_(true) {}

/// Constructs an optional object from v.
/* implicit */ optional(optional<T>&& v) noexcept(
std::is_nothrow_move_constructible<T>::value)
: storage_(trivial_init), init_(v.init_) {
if (init_) {
new (&storage_.value_) T(std::forward<T>(v.storage_.value_));
}
}

/// Constructs an optional object that contains the specified value.
/* implicit */ optional(T&& v) : storage_(std::forward<T>(v)), init_(true) {}

optional& operator=(const optional& rhs) {
if (init_ && !rhs.init_) {
clear();
} else if (!init_ && rhs.init_) {
init_ = true;
new (&storage_.value_) T(rhs.storage_.value_);
} else if (init_ && rhs.init_) {
storage_.value_ = rhs.storage_.value_;
}
return *this;
}

optional& operator=(optional&& rhs) noexcept(
std::is_nothrow_move_assignable<T>::value &&
std::is_nothrow_move_constructible<T>::value) {
if (init_ && !rhs.init_) {
clear();
} else if (!init_ && rhs.init_) {
init_ = true;
new (&storage_.value_) T(std::forward<T>(rhs.storage_.value_));
} else if (init_ && rhs.init_) {
storage_.value_ = std::forward<T>(rhs.storage_.value_);
}
return *this;
}

/// Destroys the stored value if there is one
~optional() {
if (init_) {
storage_.value_.~T();
}
}

optional& operator=(nullopt_t) noexcept {
clear();
return *this;
}

/// Returns true if the object contains a value, false otherwise
explicit operator bool() const noexcept {
return init_;
}

/// Returns true if the object contains a value, false otherwise
bool has_value() const noexcept {
return init_;
}

/// Returns a constant reference to the contained value. Calls ET_CHECK if
/// the object does not contain a value.
T const& value() const& {
ET_CHECK(init_);
return contained_val();
}

/// Returns a mutable reference to the contained value. Calls ET_CHECK if the
/// object does not contain a value.
T& value() & {
ET_CHECK(init_);
return contained_val();
}

/// Returns an rvalue of the contained value. Calls ET_CHECK if the object
/// does not contain a value.
T&& value() && {
ET_CHECK(init_);
return std::forward<T>(contained_val());
}

private:
// Used to invoke the dummy ctor of storage_t in the initializer lists of
// optional_base as default ctor is implicitly deleted because T is nontrivial
struct trivial_init_t {
} trivial_init{};

/**
* A wrapper type that lets us avoid constructing a T when there is no value.
* If there is a value present, the optional class must destroy it.
*/
union storage_t {
/// A small, trivially-constructable alternative to T.
unsigned char dummy_;
/// The constructed value itself, if optional::has_value_ is true.
T value_;

/* implicit */ storage_t(trivial_init_t) {
dummy_ = 0;
}

template <class... Args>
storage_t(Args&&... args) : value_(std::forward<Args>(args)...) {}

~storage_t() {}
};

const T& contained_val() const& {
return storage_.value_;
}
T&& contained_val() && {
return std::move(storage_.value_);
}
T& contained_val() & {
return storage_.value_;
}

void clear() noexcept {
if (init_) {
storage_.value_.~T();
}
init_ = false;
}

storage_t storage_;
bool init_;
};
// NOLINTNEXTLINE(misc-unused-using-decls)
using std::nullopt;
// NOLINTNEXTLINE(misc-unused-using-decls)
using std::nullopt_t;
// NOLINTNEXTLINE(misc-unused-using-decls)
using std::optional;

} // namespace etensor
} // namespace runtime
Expand Down
4 changes: 2 additions & 2 deletions runtime/core/portable_type/test/optional_test.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,11 +36,11 @@ TEST(TestOptional, NulloptHasNoValue) {
EXPECT_FALSE(o.has_value());
}

TEST(TestOptional, ValueOfEmptyOptionalShouldDie) {
TEST(TestOptional, ValueOfEmptyOptionalShouldThrow) {
optional<int32_t> o;
EXPECT_FALSE(o.has_value());

ET_EXPECT_DEATH({ (void)o.value(); }, "");
EXPECT_THROW({ (void)o.value(); }, std::bad_optional_access);
}

TEST(TestOptional, IntValue) {
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Replace custom optional with std::optional#9068

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

swolchok
merged 6 commits into

from

Mar 11, 2025
 Merged


Replace custom optional with std::optional
#9068
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
a54e050

Update


swolchok Mar 8, 2025
7364de3

Update


swolchok Mar 10, 2025
3e3c632

Update


swolchok Mar 10, 2025
7787aa7

Update


swolchok Mar 11, 2025
02b1669

Update


swolchok Mar 11, 2025
dab0a36

Update


swolchok Mar 11, 2025

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


18 changes: 0 additions & 18 deletions
extension/aten_util/make_aten_functor_from_et_functor.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -166,24 +166,6 @@ struct type_convert<std::optional<F>, torch::executor::optional<T>> final {
 }
};

// Optionals: ETen to ATen.
template <class F, class T>
struct type_convert<torch::executor::optional<F>, std::optional<T>> final {
 public:
 torch::executor::optional<F> val;
 std::unique_ptr<struct type_convert<F, T>> convert_struct;
 explicit type_convert(torch::executor::optional<F> value) : val(value) {}
 std::optional<T> call() {
 if (val.has_value()) {
 convert_struct = std::make_unique<struct type_convert<F, T>>(
 type_convert<F, T>(val.value()));
 return std::optional<T>(convert_struct->call());
 } else {
 return std::optional<T>();
 }
 }
};

// ArrayRefs: ATen to ETen.
template <class F, class T>
struct type_convert<c10::ArrayRef<F>, torch::executor::ArrayRef<T>> final {
Expand Down

31 changes: 31 additions & 0 deletions
kernels/portable/cpu/util/reduce_util.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -163,6 +163,14 @@ size_t get_reduced_dim_product(
 const executorch::aten::optional<executorch::aten::ArrayRef<int64_t>>&
 dim_list);

// Resolve ambiguity between the above two overloads -- ArrayRef and
// optional are both implicitly constructible from int64_t.
inline size_t get_reduced_dim_product(
 const executorch::aten::Tensor& in,
 int64_t dim) {
 return get_reduced_dim_product(in, executorch::aten::optional<int64_t>(dim));
}

size_t get_out_numel(
 const executorch::aten::Tensor& in,
 const executorch::aten::optional<int64_t>& dim);
Expand All@@ -172,6 +180,12 @@ size_t get_out_numel(
 const executorch::aten::optional<executorch::aten::ArrayRef<int64_t>>&
 dim_list);

// Resolve ambiguity between the above two overloads -- ArrayRef and
// optional are both implicitly constructible from int64_t.
inline size_t get_out_numel(const executorch::aten::Tensor& in, int64_t dim) {
 return get_out_numel(in, executorch::aten::optional<int64_t>(dim));
}

size_t get_init_index(
 const executorch::aten::Tensor& in,
 const executorch::aten::optional<int64_t>& dim,
Expand All@@ -183,6 +197,12 @@ size_t get_init_index(
 dim_list,
 const size_t out_ix);

inline size_t get_init_index(
 const executorch::aten::Tensor& in,
 int64_t dim,
 const size_t out_ix) {
 return get_init_index(in, executorch::aten::optional<int64_t>(dim), out_ix);
}
//
// Iteration Functions
//
Expand DownExpand Up@@ -614,6 +634,17 @@ Error resize_reduction_out(
 bool keepdim,
 executorch::aten::Tensor& out);

// Resolve ambiguity between the above two overloads -- ArrayRef and
// optional are both implicitly constructible from int64_t.
inline Error resize_reduction_out(
 const executorch::aten::Tensor& in,
 int64_t dim,
 bool keepdim,
 executorch::aten::Tensor& out) {
 return resize_reduction_out(
 in, executorch::aten::optional<int64_t>(dim), keepdim, out);
}

#ifndef USE_ATEN_LIB
bool check_reduction_args(
 const Tensor& in,
Expand Down

2 changes: 1 addition & 1 deletion
runtime/core/exec_aten/exec_aten.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -106,7 +106,7 @@ template <typename T>
using optional = torch::executor::optional<T>;
using nullopt_t = torch::executor::nullopt_t;
// NOLINTNEXTLINE(facebook-hte-NamespaceScopedStaticDeclaration)
static constexpr nullopt_t nullopt{0};
using std::nullopt;
using ScalarType = torch::executor::ScalarType;
using TensorList = ArrayRef<Tensor>;
using Scalar = torch::executor::Scalar;
Expand Down

171 changes: 7 additions & 164 deletions
runtime/core/portable_type/optional.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,175 +8,18 @@

#pragma once

#include <executorch/runtime/platform/assert.h>
#include <new>
#include <utility> // std::forward and other template magic checks
#include <optional>

namespace executorch {
namespace runtime {
namespace etensor {

/// Used to indicate an optional type with uninitialized state.
struct nullopt_t final {
 constexpr explicit nullopt_t(int32_t) {}
};

/// A constant of type nullopt_t that is used to indicate an optional type with
/// uninitialized state.
constexpr nullopt_t nullopt{0};

/// Leaner optional class, subset of c10, std, and boost optional APIs.
template <class T>
class optional final {
 public:
 /// The type wrapped by the optional class.
 using value_type = T;

 /// Constructs an optional object that does not contain a value.
 /* implicit */ optional() noexcept : storage_(trivial_init), init_(false) {}

 /// Constructs an optional object that does not contain a value.
 /* implicit */ optional(nullopt_t) noexcept
 : storage_(trivial_init), init_(false) {}

 /// Constructs an optional object that matches the state of v.
 /* implicit */ optional(const optional<T>& v)
 : storage_(trivial_init), init_(v.init_) {
 if (init_) {
 new (&storage_.value_) T(v.storage_.value_);
 }
 }

 /// Constructs an optional object that contains the specified value.
 /* implicit */ optional(const T& v) : storage_(v), init_(true) {}

 /// Constructs an optional object from v.
 /* implicit */ optional(optional<T>&& v) noexcept(
 std::is_nothrow_move_constructible<T>::value)
 : storage_(trivial_init), init_(v.init_) {
 if (init_) {
 new (&storage_.value_) T(std::forward<T>(v.storage_.value_));
 }
 }

 /// Constructs an optional object that contains the specified value.
 /* implicit */ optional(T&& v) : storage_(std::forward<T>(v)), init_(true) {}

 optional& operator=(const optional& rhs) {
 if (init_ && !rhs.init_) {
 clear();
 } else if (!init_ && rhs.init_) {
 init_ = true;
 new (&storage_.value_) T(rhs.storage_.value_);
 } else if (init_ && rhs.init_) {
 storage_.value_ = rhs.storage_.value_;
 }
 return *this;
 }

 optional& operator=(optional&& rhs) noexcept(
 std::is_nothrow_move_assignable<T>::value &&
 std::is_nothrow_move_constructible<T>::value) {
 if (init_ && !rhs.init_) {
 clear();
 } else if (!init_ && rhs.init_) {
 init_ = true;
 new (&storage_.value_) T(std::forward<T>(rhs.storage_.value_));
 } else if (init_ && rhs.init_) {
 storage_.value_ = std::forward<T>(rhs.storage_.value_);
 }
 return *this;
 }

 /// Destroys the stored value if there is one
 ~optional() {
 if (init_) {
 storage_.value_.~T();
 }
 }

 optional& operator=(nullopt_t) noexcept {
 clear();
 return *this;
 }

 /// Returns true if the object contains a value, false otherwise
 explicit operator bool() const noexcept {
 return init_;
 }

 /// Returns true if the object contains a value, false otherwise
 bool has_value() const noexcept {
 return init_;
 }

 /// Returns a constant reference to the contained value. Calls ET_CHECK if
 /// the object does not contain a value.
 T const& value() const& {
 ET_CHECK(init_);
 return contained_val();
 }

 /// Returns a mutable reference to the contained value. Calls ET_CHECK if the
 /// object does not contain a value.
 T& value() & {
 ET_CHECK(init_);
 return contained_val();
 }

 /// Returns an rvalue of the contained value. Calls ET_CHECK if the object
 /// does not contain a value.
 T&& value() && {
 ET_CHECK(init_);
 return std::forward<T>(contained_val());
 }

 private:
 // Used to invoke the dummy ctor of storage_t in the initializer lists of
 // optional_base as default ctor is implicitly deleted because T is nontrivial
 struct trivial_init_t {
 } trivial_init{};

 /**
 * A wrapper type that lets us avoid constructing a T when there is no value.
 * If there is a value present, the optional class must destroy it.
 */
 union storage_t {
 /// A small, trivially-constructable alternative to T.
 unsigned char dummy_;
 /// The constructed value itself, if optional::has_value_ is true.
 T value_;

 /* implicit */ storage_t(trivial_init_t) {
 dummy_ = 0;
 }

 template <class... Args>
 storage_t(Args&&... args) : value_(std::forward<Args>(args)...) {}

 ~storage_t() {}
 };

 const T& contained_val() const& {
 return storage_.value_;
 }
 T&& contained_val() && {
 return std::move(storage_.value_);
 }
 T& contained_val() & {
 return storage_.value_;
 }

 void clear() noexcept {
 if (init_) {
 storage_.value_.~T();
 }
 init_ = false;
 }

 storage_t storage_;
 bool init_;
};
// NOLINTNEXTLINE(misc-unused-using-decls)
using std::nullopt;
// NOLINTNEXTLINE(misc-unused-using-decls)
using std::nullopt_t;
// NOLINTNEXTLINE(misc-unused-using-decls)
using std::optional;

} // namespace etensor
} // namespace runtime
Expand Down

4 changes: 2 additions & 2 deletions
runtime/core/portable_type/test/optional_test.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,11 +36,11 @@ TEST(TestOptional, NulloptHasNoValue) {
 EXPECT_FALSE(o.has_value());
}

TEST(TestOptional, ValueOfEmptyOptionalShouldDie) {
TEST(TestOptional, ValueOfEmptyOptionalShouldThrow) {
 optional<int32_t> o;
 EXPECT_FALSE(o.has_value());

ET_EXPECT_DEATH({ (void)o.value(); }, "");
EXPECT_THROW({ (void)o.value(); }, std::bad_optional_access);
}

TEST(TestOptional, IntValue) {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Replace custom optional with std::optional#9068

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

swolchok
merged 6 commits into

from

Mar 11, 2025
 Merged


Replace custom optional with std::optional
#9068
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
a54e050

Update


swolchok Mar 8, 2025
7364de3

Update


swolchok Mar 10, 2025
3e3c632

Update


swolchok Mar 10, 2025
7787aa7

Update


swolchok Mar 11, 2025
02b1669

Update


swolchok Mar 11, 2025
dab0a36

Update


swolchok Mar 11, 2025

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


18 changes: 0 additions & 18 deletions
extension/aten_util/make_aten_functor_from_et_functor.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -166,24 +166,6 @@ struct type_convert<std::optional<F>, torch::executor::optional<T>> final {
 }
};

// Optionals: ETen to ATen.
template <class F, class T>
struct type_convert<torch::executor::optional<F>, std::optional<T>> final {
 public:
 torch::executor::optional<F> val;
 std::unique_ptr<struct type_convert<F, T>> convert_struct;
 explicit type_convert(torch::executor::optional<F> value) : val(value) {}
 std::optional<T> call() {
 if (val.has_value()) {
 convert_struct = std::make_unique<struct type_convert<F, T>>(
 type_convert<F, T>(val.value()));
 return std::optional<T>(convert_struct->call());
 } else {
 return std::optional<T>();
 }
 }
};

// ArrayRefs: ATen to ETen.
template <class F, class T>
struct type_convert<c10::ArrayRef<F>, torch::executor::ArrayRef<T>> final {
Expand Down

31 changes: 31 additions & 0 deletions
kernels/portable/cpu/util/reduce_util.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -163,6 +163,14 @@ size_t get_reduced_dim_product(
 const executorch::aten::optional<executorch::aten::ArrayRef<int64_t>>&
 dim_list);

// Resolve ambiguity between the above two overloads -- ArrayRef and
// optional are both implicitly constructible from int64_t.
inline size_t get_reduced_dim_product(
 const executorch::aten::Tensor& in,
 int64_t dim) {
 return get_reduced_dim_product(in, executorch::aten::optional<int64_t>(dim));
}

size_t get_out_numel(
 const executorch::aten::Tensor& in,
 const executorch::aten::optional<int64_t>& dim);
Expand All@@ -172,6 +180,12 @@ size_t get_out_numel(
 const executorch::aten::optional<executorch::aten::ArrayRef<int64_t>>&
 dim_list);

// Resolve ambiguity between the above two overloads -- ArrayRef and
// optional are both implicitly constructible from int64_t.
inline size_t get_out_numel(const executorch::aten::Tensor& in, int64_t dim) {
 return get_out_numel(in, executorch::aten::optional<int64_t>(dim));
}

size_t get_init_index(
 const executorch::aten::Tensor& in,
 const executorch::aten::optional<int64_t>& dim,
Expand All@@ -183,6 +197,12 @@ size_t get_init_index(
 dim_list,
 const size_t out_ix);

inline size_t get_init_index(
 const executorch::aten::Tensor& in,
 int64_t dim,
 const size_t out_ix) {
 return get_init_index(in, executorch::aten::optional<int64_t>(dim), out_ix);
}
//
// Iteration Functions
//
Expand DownExpand Up@@ -614,6 +634,17 @@ Error resize_reduction_out(
 bool keepdim,
 executorch::aten::Tensor& out);

// Resolve ambiguity between the above two overloads -- ArrayRef and
// optional are both implicitly constructible from int64_t.
inline Error resize_reduction_out(
 const executorch::aten::Tensor& in,
 int64_t dim,
 bool keepdim,
 executorch::aten::Tensor& out) {
 return resize_reduction_out(
 in, executorch::aten::optional<int64_t>(dim), keepdim, out);
}

#ifndef USE_ATEN_LIB
bool check_reduction_args(
 const Tensor& in,
Expand Down

2 changes: 1 addition & 1 deletion
runtime/core/exec_aten/exec_aten.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -106,7 +106,7 @@ template <typename T>
using optional = torch::executor::optional<T>;
using nullopt_t = torch::executor::nullopt_t;
// NOLINTNEXTLINE(facebook-hte-NamespaceScopedStaticDeclaration)
static constexpr nullopt_t nullopt{0};
using std::nullopt;
using ScalarType = torch::executor::ScalarType;
using TensorList = ArrayRef<Tensor>;
using Scalar = torch::executor::Scalar;
Expand Down

171 changes: 7 additions & 164 deletions
runtime/core/portable_type/optional.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,175 +8,18 @@

#pragma once

#include <executorch/runtime/platform/assert.h>
#include <new>
#include <utility> // std::forward and other template magic checks
#include <optional>

namespace executorch {
namespace runtime {
namespace etensor {

/// Used to indicate an optional type with uninitialized state.
struct nullopt_t final {
 constexpr explicit nullopt_t(int32_t) {}
};

/// A constant of type nullopt_t that is used to indicate an optional type with
/// uninitialized state.
constexpr nullopt_t nullopt{0};

/// Leaner optional class, subset of c10, std, and boost optional APIs.
template <class T>
class optional final {
 public:
 /// The type wrapped by the optional class.
 using value_type = T;

 /// Constructs an optional object that does not contain a value.
 /* implicit */ optional() noexcept : storage_(trivial_init), init_(false) {}

 /// Constructs an optional object that does not contain a value.
 /* implicit */ optional(nullopt_t) noexcept
 : storage_(trivial_init), init_(false) {}

 /// Constructs an optional object that matches the state of v.
 /* implicit */ optional(const optional<T>& v)
 : storage_(trivial_init), init_(v.init_) {
 if (init_) {
 new (&storage_.value_) T(v.storage_.value_);
 }
 }

 /// Constructs an optional object that contains the specified value.
 /* implicit */ optional(const T& v) : storage_(v), init_(true) {}

 /// Constructs an optional object from v.
 /* implicit */ optional(optional<T>&& v) noexcept(
 std::is_nothrow_move_constructible<T>::value)
 : storage_(trivial_init), init_(v.init_) {
 if (init_) {
 new (&storage_.value_) T(std::forward<T>(v.storage_.value_));
 }
 }

 /// Constructs an optional object that contains the specified value.
 /* implicit */ optional(T&& v) : storage_(std::forward<T>(v)), init_(true) {}

 optional& operator=(const optional& rhs) {
 if (init_ && !rhs.init_) {
 clear();
 } else if (!init_ && rhs.init_) {
 init_ = true;
 new (&storage_.value_) T(rhs.storage_.value_);
 } else if (init_ && rhs.init_) {
 storage_.value_ = rhs.storage_.value_;
 }
 return *this;
 }

 optional& operator=(optional&& rhs) noexcept(
 std::is_nothrow_move_assignable<T>::value &&
 std::is_nothrow_move_constructible<T>::value) {
 if (init_ && !rhs.init_) {
 clear();
 } else if (!init_ && rhs.init_) {
 init_ = true;
 new (&storage_.value_) T(std::forward<T>(rhs.storage_.value_));
 } else if (init_ && rhs.init_) {
 storage_.value_ = std::forward<T>(rhs.storage_.value_);
 }
 return *this;
 }

 /// Destroys the stored value if there is one
 ~optional() {
 if (init_) {
 storage_.value_.~T();
 }
 }

 optional& operator=(nullopt_t) noexcept {
 clear();
 return *this;
 }

 /// Returns true if the object contains a value, false otherwise
 explicit operator bool() const noexcept {
 return init_;
 }

 /// Returns true if the object contains a value, false otherwise
 bool has_value() const noexcept {
 return init_;
 }

 /// Returns a constant reference to the contained value. Calls ET_CHECK if
 /// the object does not contain a value.
 T const& value() const& {
 ET_CHECK(init_);
 return contained_val();
 }

 /// Returns a mutable reference to the contained value. Calls ET_CHECK if the
 /// object does not contain a value.
 T& value() & {
 ET_CHECK(init_);
 return contained_val();
 }

 /// Returns an rvalue of the contained value. Calls ET_CHECK if the object
 /// does not contain a value.
 T&& value() && {
 ET_CHECK(init_);
 return std::forward<T>(contained_val());
 }

 private:
 // Used to invoke the dummy ctor of storage_t in the initializer lists of
 // optional_base as default ctor is implicitly deleted because T is nontrivial
 struct trivial_init_t {
 } trivial_init{};

 /**
 * A wrapper type that lets us avoid constructing a T when there is no value.
 * If there is a value present, the optional class must destroy it.
 */
 union storage_t {
 /// A small, trivially-constructable alternative to T.
 unsigned char dummy_;
 /// The constructed value itself, if optional::has_value_ is true.
 T value_;

 /* implicit */ storage_t(trivial_init_t) {
 dummy_ = 0;
 }

 template <class... Args>
 storage_t(Args&&... args) : value_(std::forward<Args>(args)...) {}

 ~storage_t() {}
 };

 const T& contained_val() const& {
 return storage_.value_;
 }
 T&& contained_val() && {
 return std::move(storage_.value_);
 }
 T& contained_val() & {
 return storage_.value_;
 }

 void clear() noexcept {
 if (init_) {
 storage_.value_.~T();
 }
 init_ = false;
 }

 storage_t storage_;
 bool init_;
};
// NOLINTNEXTLINE(misc-unused-using-decls)
using std::nullopt;
// NOLINTNEXTLINE(misc-unused-using-decls)
using std::nullopt_t;
// NOLINTNEXTLINE(misc-unused-using-decls)
using std::optional;

} // namespace etensor
} // namespace runtime
Expand Down

4 changes: 2 additions & 2 deletions
runtime/core/portable_type/test/optional_test.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,11 +36,11 @@ TEST(TestOptional, NulloptHasNoValue) {
 EXPECT_FALSE(o.has_value());
}

TEST(TestOptional, ValueOfEmptyOptionalShouldDie) {
TEST(TestOptional, ValueOfEmptyOptionalShouldThrow) {
 optional<int32_t> o;
 EXPECT_FALSE(o.has_value());

ET_EXPECT_DEATH({ (void)o.value(); }, "");
EXPECT_THROW({ (void)o.value(); }, std::bad_optional_access);
}

TEST(TestOptional, IntValue) {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Replace custom optional with std::optional#9068

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

swolchok
merged 6 commits into

from

Mar 11, 2025
 Merged


Replace custom optional with std::optional
#9068
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
a54e050

Update


swolchok Mar 8, 2025
7364de3

Update


swolchok Mar 10, 2025
3e3c632

Update


swolchok Mar 10, 2025
7787aa7

Update


swolchok Mar 11, 2025
02b1669

Update


swolchok Mar 11, 2025
dab0a36

Update


swolchok Mar 11, 2025

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


18 changes: 0 additions & 18 deletions
extension/aten_util/make_aten_functor_from_et_functor.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -166,24 +166,6 @@ struct type_convert<std::optional<F>, torch::executor::optional<T>> final {
 }
};

// Optionals: ETen to ATen.
template <class F, class T>
struct type_convert<torch::executor::optional<F>, std::optional<T>> final {
 public:
 torch::executor::optional<F> val;
 std::unique_ptr<struct type_convert<F, T>> convert_struct;
 explicit type_convert(torch::executor::optional<F> value) : val(value) {}
 std::optional<T> call() {
 if (val.has_value()) {
 convert_struct = std::make_unique<struct type_convert<F, T>>(
 type_convert<F, T>(val.value()));
 return std::optional<T>(convert_struct->call());
 } else {
 return std::optional<T>();
 }
 }
};

// ArrayRefs: ATen to ETen.
template <class F, class T>
struct type_convert<c10::ArrayRef<F>, torch::executor::ArrayRef<T>> final {
Expand Down

31 changes: 31 additions & 0 deletions
kernels/portable/cpu/util/reduce_util.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -163,6 +163,14 @@ size_t get_reduced_dim_product(
 const executorch::aten::optional<executorch::aten::ArrayRef<int64_t>>&
 dim_list);

// Resolve ambiguity between the above two overloads -- ArrayRef and
// optional are both implicitly constructible from int64_t.
inline size_t get_reduced_dim_product(
 const executorch::aten::Tensor& in,
 int64_t dim) {
 return get_reduced_dim_product(in, executorch::aten::optional<int64_t>(dim));
}

size_t get_out_numel(
 const executorch::aten::Tensor& in,
 const executorch::aten::optional<int64_t>& dim);
Expand All@@ -172,6 +180,12 @@ size_t get_out_numel(
 const executorch::aten::optional<executorch::aten::ArrayRef<int64_t>>&
 dim_list);

// Resolve ambiguity between the above two overloads -- ArrayRef and
// optional are both implicitly constructible from int64_t.
inline size_t get_out_numel(const executorch::aten::Tensor& in, int64_t dim) {
 return get_out_numel(in, executorch::aten::optional<int64_t>(dim));
}

size_t get_init_index(
 const executorch::aten::Tensor& in,
 const executorch::aten::optional<int64_t>& dim,
Expand All@@ -183,6 +197,12 @@ size_t get_init_index(
 dim_list,
 const size_t out_ix);

inline size_t get_init_index(
 const executorch::aten::Tensor& in,
 int64_t dim,
 const size_t out_ix) {
 return get_init_index(in, executorch::aten::optional<int64_t>(dim), out_ix);
}
//
// Iteration Functions
//
Expand DownExpand Up@@ -614,6 +634,17 @@ Error resize_reduction_out(
 bool keepdim,
 executorch::aten::Tensor& out);

// Resolve ambiguity between the above two overloads -- ArrayRef and
// optional are both implicitly constructible from int64_t.
inline Error resize_reduction_out(
 const executorch::aten::Tensor& in,
 int64_t dim,
 bool keepdim,
 executorch::aten::Tensor& out) {
 return resize_reduction_out(
 in, executorch::aten::optional<int64_t>(dim), keepdim, out);
}

#ifndef USE_ATEN_LIB
bool check_reduction_args(
 const Tensor& in,
Expand Down

2 changes: 1 addition & 1 deletion
runtime/core/exec_aten/exec_aten.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -106,7 +106,7 @@ template <typename T>
using optional = torch::executor::optional<T>;
using nullopt_t = torch::executor::nullopt_t;
// NOLINTNEXTLINE(facebook-hte-NamespaceScopedStaticDeclaration)
static constexpr nullopt_t nullopt{0};
using std::nullopt;
using ScalarType = torch::executor::ScalarType;
using TensorList = ArrayRef<Tensor>;
using Scalar = torch::executor::Scalar;
Expand Down

171 changes: 7 additions & 164 deletions
runtime/core/portable_type/optional.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,175 +8,18 @@

#pragma once

#include <executorch/runtime/platform/assert.h>
#include <new>
#include <utility> // std::forward and other template magic checks
#include <optional>

namespace executorch {
namespace runtime {
namespace etensor {

/// Used to indicate an optional type with uninitialized state.
struct nullopt_t final {
 constexpr explicit nullopt_t(int32_t) {}
};

/// A constant of type nullopt_t that is used to indicate an optional type with
/// uninitialized state.
constexpr nullopt_t nullopt{0};

/// Leaner optional class, subset of c10, std, and boost optional APIs.
template <class T>
class optional final {
 public:
 /// The type wrapped by the optional class.
 using value_type = T;

 /// Constructs an optional object that does not contain a value.
 /* implicit */ optional() noexcept : storage_(trivial_init), init_(false) {}

 /// Constructs an optional object that does not contain a value.
 /* implicit */ optional(nullopt_t) noexcept
 : storage_(trivial_init), init_(false) {}

 /// Constructs an optional object that matches the state of v.
 /* implicit */ optional(const optional<T>& v)
 : storage_(trivial_init), init_(v.init_) {
 if (init_) {
 new (&storage_.value_) T(v.storage_.value_);
 }
 }

 /// Constructs an optional object that contains the specified value.
 /* implicit */ optional(const T& v) : storage_(v), init_(true) {}

 /// Constructs an optional object from v.
 /* implicit */ optional(optional<T>&& v) noexcept(
 std::is_nothrow_move_constructible<T>::value)
 : storage_(trivial_init), init_(v.init_) {
 if (init_) {
 new (&storage_.value_) T(std::forward<T>(v.storage_.value_));
 }
 }

 /// Constructs an optional object that contains the specified value.
 /* implicit */ optional(T&& v) : storage_(std::forward<T>(v)), init_(true) {}

 optional& operator=(const optional& rhs) {
 if (init_ && !rhs.init_) {
 clear();
 } else if (!init_ && rhs.init_) {
 init_ = true;
 new (&storage_.value_) T(rhs.storage_.value_);
 } else if (init_ && rhs.init_) {
 storage_.value_ = rhs.storage_.value_;
 }
 return *this;
 }

 optional& operator=(optional&& rhs) noexcept(
 std::is_nothrow_move_assignable<T>::value &&
 std::is_nothrow_move_constructible<T>::value) {
 if (init_ && !rhs.init_) {
 clear();
 } else if (!init_ && rhs.init_) {
 init_ = true;
 new (&storage_.value_) T(std::forward<T>(rhs.storage_.value_));
 } else if (init_ && rhs.init_) {
 storage_.value_ = std::forward<T>(rhs.storage_.value_);
 }
 return *this;
 }

 /// Destroys the stored value if there is one
 ~optional() {
 if (init_) {
 storage_.value_.~T();
 }
 }

 optional& operator=(nullopt_t) noexcept {
 clear();
 return *this;
 }

 /// Returns true if the object contains a value, false otherwise
 explicit operator bool() const noexcept {
 return init_;
 }

 /// Returns true if the object contains a value, false otherwise
 bool has_value() const noexcept {
 return init_;
 }

 /// Returns a constant reference to the contained value. Calls ET_CHECK if
 /// the object does not contain a value.
 T const& value() const& {
 ET_CHECK(init_);
 return contained_val();
 }

 /// Returns a mutable reference to the contained value. Calls ET_CHECK if the
 /// object does not contain a value.
 T& value() & {
 ET_CHECK(init_);
 return contained_val();
 }

 /// Returns an rvalue of the contained value. Calls ET_CHECK if the object
 /// does not contain a value.
 T&& value() && {
 ET_CHECK(init_);
 return std::forward<T>(contained_val());
 }

 private:
 // Used to invoke the dummy ctor of storage_t in the initializer lists of
 // optional_base as default ctor is implicitly deleted because T is nontrivial
 struct trivial_init_t {
 } trivial_init{};

 /**
 * A wrapper type that lets us avoid constructing a T when there is no value.
 * If there is a value present, the optional class must destroy it.
 */
 union storage_t {
 /// A small, trivially-constructable alternative to T.
 unsigned char dummy_;
 /// The constructed value itself, if optional::has_value_ is true.
 T value_;

 /* implicit */ storage_t(trivial_init_t) {
 dummy_ = 0;
 }

 template <class... Args>
 storage_t(Args&&... args) : value_(std::forward<Args>(args)...) {}

 ~storage_t() {}
 };

 const T& contained_val() const& {
 return storage_.value_;
 }
 T&& contained_val() && {
 return std::move(storage_.value_);
 }
 T& contained_val() & {
 return storage_.value_;
 }

 void clear() noexcept {
 if (init_) {
 storage_.value_.~T();
 }
 init_ = false;
 }

 storage_t storage_;
 bool init_;
};
// NOLINTNEXTLINE(misc-unused-using-decls)
using std::nullopt;
// NOLINTNEXTLINE(misc-unused-using-decls)
using std::nullopt_t;
// NOLINTNEXTLINE(misc-unused-using-decls)
using std::optional;

} // namespace etensor
} // namespace runtime
Expand Down

4 changes: 2 additions & 2 deletions
runtime/core/portable_type/test/optional_test.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,11 +36,11 @@ TEST(TestOptional, NulloptHasNoValue) {
 EXPECT_FALSE(o.has_value());
}

TEST(TestOptional, ValueOfEmptyOptionalShouldDie) {
TEST(TestOptional, ValueOfEmptyOptionalShouldThrow) {
 optional<int32_t> o;
 EXPECT_FALSE(o.has_value());

ET_EXPECT_DEATH({ (void)o.value(); }, "");
EXPECT_THROW({ (void)o.value(); }, std::bad_optional_access);
}

TEST(TestOptional, IntValue) {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Replace custom optional with std::optional#9068

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

swolchok
merged 6 commits into

from

Mar 11, 2025
 Merged


Replace custom optional with std::optional
#9068
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
a54e050

Update


swolchok Mar 8, 2025
7364de3

Update


swolchok Mar 10, 2025
3e3c632

Update


swolchok Mar 10, 2025
7787aa7

Update


swolchok Mar 11, 2025
02b1669

Update


swolchok Mar 11, 2025
dab0a36

Update


swolchok Mar 11, 2025

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


18 changes: 0 additions & 18 deletions
extension/aten_util/make_aten_functor_from_et_functor.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -166,24 +166,6 @@ struct type_convert<std::optional<F>, torch::executor::optional<T>> final {
 }
};

// Optionals: ETen to ATen.
template <class F, class T>
struct type_convert<torch::executor::optional<F>, std::optional<T>> final {
 public:
 torch::executor::optional<F> val;
 std::unique_ptr<struct type_convert<F, T>> convert_struct;
 explicit type_convert(torch::executor::optional<F> value) : val(value) {}
 std::optional<T> call() {
 if (val.has_value()) {
 convert_struct = std::make_unique<struct type_convert<F, T>>(
 type_convert<F, T>(val.value()));
 return std::optional<T>(convert_struct->call());
 } else {
 return std::optional<T>();
 }
 }
};

// ArrayRefs: ATen to ETen.
template <class F, class T>
struct type_convert<c10::ArrayRef<F>, torch::executor::ArrayRef<T>> final {
Expand Down

31 changes: 31 additions & 0 deletions
kernels/portable/cpu/util/reduce_util.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -163,6 +163,14 @@ size_t get_reduced_dim_product(
 const executorch::aten::optional<executorch::aten::ArrayRef<int64_t>>&
 dim_list);

// Resolve ambiguity between the above two overloads -- ArrayRef and
// optional are both implicitly constructible from int64_t.
inline size_t get_reduced_dim_product(
 const executorch::aten::Tensor& in,
 int64_t dim) {
 return get_reduced_dim_product(in, executorch::aten::optional<int64_t>(dim));
}

size_t get_out_numel(
 const executorch::aten::Tensor& in,
 const executorch::aten::optional<int64_t>& dim);
Expand All@@ -172,6 +180,12 @@ size_t get_out_numel(
 const executorch::aten::optional<executorch::aten::ArrayRef<int64_t>>&
 dim_list);

// Resolve ambiguity between the above two overloads -- ArrayRef and
// optional are both implicitly constructible from int64_t.
inline size_t get_out_numel(const executorch::aten::Tensor& in, int64_t dim) {
 return get_out_numel(in, executorch::aten::optional<int64_t>(dim));
}

size_t get_init_index(
 const executorch::aten::Tensor& in,
 const executorch::aten::optional<int64_t>& dim,
Expand All@@ -183,6 +197,12 @@ size_t get_init_index(
 dim_list,
 const size_t out_ix);

inline size_t get_init_index(
 const executorch::aten::Tensor& in,
 int64_t dim,
 const size_t out_ix) {
 return get_init_index(in, executorch::aten::optional<int64_t>(dim), out_ix);
}
//
// Iteration Functions
//
Expand DownExpand Up@@ -614,6 +634,17 @@ Error resize_reduction_out(
 bool keepdim,
 executorch::aten::Tensor& out);

// Resolve ambiguity between the above two overloads -- ArrayRef and
// optional are both implicitly constructible from int64_t.
inline Error resize_reduction_out(
 const executorch::aten::Tensor& in,
 int64_t dim,
 bool keepdim,
 executorch::aten::Tensor& out) {
 return resize_reduction_out(
 in, executorch::aten::optional<int64_t>(dim), keepdim, out);
}

#ifndef USE_ATEN_LIB
bool check_reduction_args(
 const Tensor& in,
Expand Down

2 changes: 1 addition & 1 deletion
runtime/core/exec_aten/exec_aten.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -106,7 +106,7 @@ template <typename T>
using optional = torch::executor::optional<T>;
using nullopt_t = torch::executor::nullopt_t;
// NOLINTNEXTLINE(facebook-hte-NamespaceScopedStaticDeclaration)
static constexpr nullopt_t nullopt{0};
using std::nullopt;
using ScalarType = torch::executor::ScalarType;
using TensorList = ArrayRef<Tensor>;
using Scalar = torch::executor::Scalar;
Expand Down

171 changes: 7 additions & 164 deletions
runtime/core/portable_type/optional.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,175 +8,18 @@

#pragma once

#include <executorch/runtime/platform/assert.h>
#include <new>
#include <utility> // std::forward and other template magic checks
#include <optional>

namespace executorch {
namespace runtime {
namespace etensor {

/// Used to indicate an optional type with uninitialized state.
struct nullopt_t final {
 constexpr explicit nullopt_t(int32_t) {}
};

/// A constant of type nullopt_t that is used to indicate an optional type with
/// uninitialized state.
constexpr nullopt_t nullopt{0};

/// Leaner optional class, subset of c10, std, and boost optional APIs.
template <class T>
class optional final {
 public:
 /// The type wrapped by the optional class.
 using value_type = T;

 /// Constructs an optional object that does not contain a value.
 /* implicit */ optional() noexcept : storage_(trivial_init), init_(false) {}

 /// Constructs an optional object that does not contain a value.
 /* implicit */ optional(nullopt_t) noexcept
 : storage_(trivial_init), init_(false) {}

 /// Constructs an optional object that matches the state of v.
 /* implicit */ optional(const optional<T>& v)
 : storage_(trivial_init), init_(v.init_) {
 if (init_) {
 new (&storage_.value_) T(v.storage_.value_);
 }
 }

 /// Constructs an optional object that contains the specified value.
 /* implicit */ optional(const T& v) : storage_(v), init_(true) {}

 /// Constructs an optional object from v.
 /* implicit */ optional(optional<T>&& v) noexcept(
 std::is_nothrow_move_constructible<T>::value)
 : storage_(trivial_init), init_(v.init_) {
 if (init_) {
 new (&storage_.value_) T(std::forward<T>(v.storage_.value_));
 }
 }

 /// Constructs an optional object that contains the specified value.
 /* implicit */ optional(T&& v) : storage_(std::forward<T>(v)), init_(true) {}

 optional& operator=(const optional& rhs) {
 if (init_ && !rhs.init_) {
 clear();
 } else if (!init_ && rhs.init_) {
 init_ = true;
 new (&storage_.value_) T(rhs.storage_.value_);
 } else if (init_ && rhs.init_) {
 storage_.value_ = rhs.storage_.value_;
 }
 return *this;
 }

 optional& operator=(optional&& rhs) noexcept(
 std::is_nothrow_move_assignable<T>::value &&
 std::is_nothrow_move_constructible<T>::value) {
 if (init_ && !rhs.init_) {
 clear();
 } else if (!init_ && rhs.init_) {
 init_ = true;
 new (&storage_.value_) T(std::forward<T>(rhs.storage_.value_));
 } else if (init_ && rhs.init_) {
 storage_.value_ = std::forward<T>(rhs.storage_.value_);
 }
 return *this;
 }

 /// Destroys the stored value if there is one
 ~optional() {
 if (init_) {
 storage_.value_.~T();
 }
 }

 optional& operator=(nullopt_t) noexcept {
 clear();
 return *this;
 }

 /// Returns true if the object contains a value, false otherwise
 explicit operator bool() const noexcept {
 return init_;
 }

 /// Returns true if the object contains a value, false otherwise
 bool has_value() const noexcept {
 return init_;
 }

 /// Returns a constant reference to the contained value. Calls ET_CHECK if
 /// the object does not contain a value.
 T const& value() const& {
 ET_CHECK(init_);
 return contained_val();
 }

 /// Returns a mutable reference to the contained value. Calls ET_CHECK if the
 /// object does not contain a value.
 T& value() & {
 ET_CHECK(init_);
 return contained_val();
 }

 /// Returns an rvalue of the contained value. Calls ET_CHECK if the object
 /// does not contain a value.
 T&& value() && {
 ET_CHECK(init_);
 return std::forward<T>(contained_val());
 }

 private:
 // Used to invoke the dummy ctor of storage_t in the initializer lists of
 // optional_base as default ctor is implicitly deleted because T is nontrivial
 struct trivial_init_t {
 } trivial_init{};

 /**
 * A wrapper type that lets us avoid constructing a T when there is no value.
 * If there is a value present, the optional class must destroy it.
 */
 union storage_t {
 /// A small, trivially-constructable alternative to T.
 unsigned char dummy_;
 /// The constructed value itself, if optional::has_value_ is true.
 T value_;

 /* implicit */ storage_t(trivial_init_t) {
 dummy_ = 0;
 }

 template <class... Args>
 storage_t(Args&&... args) : value_(std::forward<Args>(args)...) {}

 ~storage_t() {}
 };

 const T& contained_val() const& {
 return storage_.value_;
 }
 T&& contained_val() && {
 return std::move(storage_.value_);
 }
 T& contained_val() & {
 return storage_.value_;
 }

 void clear() noexcept {
 if (init_) {
 storage_.value_.~T();
 }
 init_ = false;
 }

 storage_t storage_;
 bool init_;
};
// NOLINTNEXTLINE(misc-unused-using-decls)
using std::nullopt;
// NOLINTNEXTLINE(misc-unused-using-decls)
using std::nullopt_t;
// NOLINTNEXTLINE(misc-unused-using-decls)
using std::optional;

} // namespace etensor
} // namespace runtime
Expand Down

4 changes: 2 additions & 2 deletions
runtime/core/portable_type/test/optional_test.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,11 +36,11 @@ TEST(TestOptional, NulloptHasNoValue) {
 EXPECT_FALSE(o.has_value());
}

TEST(TestOptional, ValueOfEmptyOptionalShouldDie) {
TEST(TestOptional, ValueOfEmptyOptionalShouldThrow) {
 optional<int32_t> o;
 EXPECT_FALSE(o.has_value());

ET_EXPECT_DEATH({ (void)o.value(); }, "");
EXPECT_THROW({ (void)o.value(); }, std::bad_optional_access);
}

TEST(TestOptional, IntValue) {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Replace custom optional with std::optional#9068

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

swolchok
merged 6 commits into

from

Mar 11, 2025
 Merged


Replace custom optional with std::optional
#9068
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
a54e050

Update


swolchok Mar 8, 2025
7364de3

Update


swolchok Mar 10, 2025
3e3c632

Update


swolchok Mar 10, 2025
7787aa7

Update


swolchok Mar 11, 2025
02b1669

Update


swolchok Mar 11, 2025
dab0a36

Update


swolchok Mar 11, 2025

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


18 changes: 0 additions & 18 deletions
extension/aten_util/make_aten_functor_from_et_functor.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -166,24 +166,6 @@ struct type_convert<std::optional<F>, torch::executor::optional<T>> final {
 }
};

// Optionals: ETen to ATen.
template <class F, class T>
struct type_convert<torch::executor::optional<F>, std::optional<T>> final {
 public:
 torch::executor::optional<F> val;
 std::unique_ptr<struct type_convert<F, T>> convert_struct;
 explicit type_convert(torch::executor::optional<F> value) : val(value) {}
 std::optional<T> call() {
 if (val.has_value()) {
 convert_struct = std::make_unique<struct type_convert<F, T>>(
 type_convert<F, T>(val.value()));
 return std::optional<T>(convert_struct->call());
 } else {
 return std::optional<T>();
 }
 }
};

// ArrayRefs: ATen to ETen.
template <class F, class T>
struct type_convert<c10::ArrayRef<F>, torch::executor::ArrayRef<T>> final {
Expand Down

31 changes: 31 additions & 0 deletions
kernels/portable/cpu/util/reduce_util.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -163,6 +163,14 @@ size_t get_reduced_dim_product(
 const executorch::aten::optional<executorch::aten::ArrayRef<int64_t>>&
 dim_list);

// Resolve ambiguity between the above two overloads -- ArrayRef and
// optional are both implicitly constructible from int64_t.
inline size_t get_reduced_dim_product(
 const executorch::aten::Tensor& in,
 int64_t dim) {
 return get_reduced_dim_product(in, executorch::aten::optional<int64_t>(dim));
}

size_t get_out_numel(
 const executorch::aten::Tensor& in,
 const executorch::aten::optional<int64_t>& dim);
Expand All@@ -172,6 +180,12 @@ size_t get_out_numel(
 const executorch::aten::optional<executorch::aten::ArrayRef<int64_t>>&
 dim_list);

// Resolve ambiguity between the above two overloads -- ArrayRef and
// optional are both implicitly constructible from int64_t.
inline size_t get_out_numel(const executorch::aten::Tensor& in, int64_t dim) {
 return get_out_numel(in, executorch::aten::optional<int64_t>(dim));
}

size_t get_init_index(
 const executorch::aten::Tensor& in,
 const executorch::aten::optional<int64_t>& dim,
Expand All@@ -183,6 +197,12 @@ size_t get_init_index(
 dim_list,
 const size_t out_ix);

inline size_t get_init_index(
 const executorch::aten::Tensor& in,
 int64_t dim,
 const size_t out_ix) {
 return get_init_index(in, executorch::aten::optional<int64_t>(dim), out_ix);
}
//
// Iteration Functions
//
Expand DownExpand Up@@ -614,6 +634,17 @@ Error resize_reduction_out(
 bool keepdim,
 executorch::aten::Tensor& out);

// Resolve ambiguity between the above two overloads -- ArrayRef and
// optional are both implicitly constructible from int64_t.
inline Error resize_reduction_out(
 const executorch::aten::Tensor& in,
 int64_t dim,
 bool keepdim,
 executorch::aten::Tensor& out) {
 return resize_reduction_out(
 in, executorch::aten::optional<int64_t>(dim), keepdim, out);
}

#ifndef USE_ATEN_LIB
bool check_reduction_args(
 const Tensor& in,
Expand Down

2 changes: 1 addition & 1 deletion
runtime/core/exec_aten/exec_aten.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -106,7 +106,7 @@ template <typename T>
using optional = torch::executor::optional<T>;
using nullopt_t = torch::executor::nullopt_t;
// NOLINTNEXTLINE(facebook-hte-NamespaceScopedStaticDeclaration)
static constexpr nullopt_t nullopt{0};
using std::nullopt;
using ScalarType = torch::executor::ScalarType;
using TensorList = ArrayRef<Tensor>;
using Scalar = torch::executor::Scalar;
Expand Down

171 changes: 7 additions & 164 deletions
runtime/core/portable_type/optional.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,175 +8,18 @@

#pragma once

#include <executorch/runtime/platform/assert.h>
#include <new>
#include <utility> // std::forward and other template magic checks
#include <optional>

namespace executorch {
namespace runtime {
namespace etensor {

/// Used to indicate an optional type with uninitialized state.
struct nullopt_t final {
 constexpr explicit nullopt_t(int32_t) {}
};

/// A constant of type nullopt_t that is used to indicate an optional type with
/// uninitialized state.
constexpr nullopt_t nullopt{0};

/// Leaner optional class, subset of c10, std, and boost optional APIs.
template <class T>
class optional final {
 public:
 /// The type wrapped by the optional class.
 using value_type = T;

 /// Constructs an optional object that does not contain a value.
 /* implicit */ optional() noexcept : storage_(trivial_init), init_(false) {}

 /// Constructs an optional object that does not contain a value.
 /* implicit */ optional(nullopt_t) noexcept
 : storage_(trivial_init), init_(false) {}

 /// Constructs an optional object that matches the state of v.
 /* implicit */ optional(const optional<T>& v)
 : storage_(trivial_init), init_(v.init_) {
 if (init_) {
 new (&storage_.value_) T(v.storage_.value_);
 }
 }

 /// Constructs an optional object that contains the specified value.
 /* implicit */ optional(const T& v) : storage_(v), init_(true) {}

 /// Constructs an optional object from v.
 /* implicit */ optional(optional<T>&& v) noexcept(
 std::is_nothrow_move_constructible<T>::value)
 : storage_(trivial_init), init_(v.init_) {
 if (init_) {
 new (&storage_.value_) T(std::forward<T>(v.storage_.value_));
 }
 }

 /// Constructs an optional object that contains the specified value.
 /* implicit */ optional(T&& v) : storage_(std::forward<T>(v)), init_(true) {}

 optional& operator=(const optional& rhs) {
 if (init_ && !rhs.init_) {
 clear();
 } else if (!init_ && rhs.init_) {
 init_ = true;
 new (&storage_.value_) T(rhs.storage_.value_);
 } else if (init_ && rhs.init_) {
 storage_.value_ = rhs.storage_.value_;
 }
 return *this;
 }

 optional& operator=(optional&& rhs) noexcept(
 std::is_nothrow_move_assignable<T>::value &&
 std::is_nothrow_move_constructible<T>::value) {
 if (init_ && !rhs.init_) {
 clear();
 } else if (!init_ && rhs.init_) {
 init_ = true;
 new (&storage_.value_) T(std::forward<T>(rhs.storage_.value_));
 } else if (init_ && rhs.init_) {
 storage_.value_ = std::forward<T>(rhs.storage_.value_);
 }
 return *this;
 }

 /// Destroys the stored value if there is one
 ~optional() {
 if (init_) {
 storage_.value_.~T();
 }
 }

 optional& operator=(nullopt_t) noexcept {
 clear();
 return *this;
 }

 /// Returns true if the object contains a value, false otherwise
 explicit operator bool() const noexcept {
 return init_;
 }

 /// Returns true if the object contains a value, false otherwise
 bool has_value() const noexcept {
 return init_;
 }

 /// Returns a constant reference to the contained value. Calls ET_CHECK if
 /// the object does not contain a value.
 T const& value() const& {
 ET_CHECK(init_);
 return contained_val();
 }

 /// Returns a mutable reference to the contained value. Calls ET_CHECK if the
 /// object does not contain a value.
 T& value() & {
 ET_CHECK(init_);
 return contained_val();
 }

 /// Returns an rvalue of the contained value. Calls ET_CHECK if the object
 /// does not contain a value.
 T&& value() && {
 ET_CHECK(init_);
 return std::forward<T>(contained_val());
 }

 private:
 // Used to invoke the dummy ctor of storage_t in the initializer lists of
 // optional_base as default ctor is implicitly deleted because T is nontrivial
 struct trivial_init_t {
 } trivial_init{};

 /**
 * A wrapper type that lets us avoid constructing a T when there is no value.
 * If there is a value present, the optional class must destroy it.
 */
 union storage_t {
 /// A small, trivially-constructable alternative to T.
 unsigned char dummy_;
 /// The constructed value itself, if optional::has_value_ is true.
 T value_;

 /* implicit */ storage_t(trivial_init_t) {
 dummy_ = 0;
 }

 template <class... Args>
 storage_t(Args&&... args) : value_(std::forward<Args>(args)...) {}

 ~storage_t() {}
 };

 const T& contained_val() const& {
 return storage_.value_;
 }
 T&& contained_val() && {
 return std::move(storage_.value_);
 }
 T& contained_val() & {
 return storage_.value_;
 }

 void clear() noexcept {
 if (init_) {
 storage_.value_.~T();
 }
 init_ = false;
 }

 storage_t storage_;
 bool init_;
};
// NOLINTNEXTLINE(misc-unused-using-decls)
using std::nullopt;
// NOLINTNEXTLINE(misc-unused-using-decls)
using std::nullopt_t;
// NOLINTNEXTLINE(misc-unused-using-decls)
using std::optional;

} // namespace etensor
} // namespace runtime
Expand Down

4 changes: 2 additions & 2 deletions
runtime/core/portable_type/test/optional_test.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,11 +36,11 @@ TEST(TestOptional, NulloptHasNoValue) {
 EXPECT_FALSE(o.has_value());
}

TEST(TestOptional, ValueOfEmptyOptionalShouldDie) {
TEST(TestOptional, ValueOfEmptyOptionalShouldThrow) {
 optional<int32_t> o;
 EXPECT_FALSE(o.has_value());

ET_EXPECT_DEATH({ (void)o.value(); }, "");
EXPECT_THROW({ (void)o.value(); }, std::bad_optional_access);
}

TEST(TestOptional, IntValue) {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Replace custom optional with std::optional#9068

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

swolchok
merged 6 commits into

from

Mar 11, 2025
 Merged


Replace custom optional with std::optional
#9068
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
a54e050

Update


swolchok Mar 8, 2025
7364de3

Update


swolchok Mar 10, 2025
3e3c632

Update


swolchok Mar 10, 2025
7787aa7

Update


swolchok Mar 11, 2025
02b1669

Update


swolchok Mar 11, 2025
dab0a36

Update


swolchok Mar 11, 2025

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


18 changes: 0 additions & 18 deletions
extension/aten_util/make_aten_functor_from_et_functor.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -166,24 +166,6 @@ struct type_convert<std::optional<F>, torch::executor::optional<T>> final {
 }
};

// Optionals: ETen to ATen.
template <class F, class T>
struct type_convert<torch::executor::optional<F>, std::optional<T>> final {
 public:
 torch::executor::optional<F> val;
 std::unique_ptr<struct type_convert<F, T>> convert_struct;
 explicit type_convert(torch::executor::optional<F> value) : val(value) {}
 std::optional<T> call() {
 if (val.has_value()) {
 convert_struct = std::make_unique<struct type_convert<F, T>>(
 type_convert<F, T>(val.value()));
 return std::optional<T>(convert_struct->call());
 } else {
 return std::optional<T>();
 }
 }
};

// ArrayRefs: ATen to ETen.
template <class F, class T>
struct type_convert<c10::ArrayRef<F>, torch::executor::ArrayRef<T>> final {
Expand Down

31 changes: 31 additions & 0 deletions
kernels/portable/cpu/util/reduce_util.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -163,6 +163,14 @@ size_t get_reduced_dim_product(
 const executorch::aten::optional<executorch::aten::ArrayRef<int64_t>>&
 dim_list);

// Resolve ambiguity between the above two overloads -- ArrayRef and
// optional are both implicitly constructible from int64_t.
inline size_t get_reduced_dim_product(
 const executorch::aten::Tensor& in,
 int64_t dim) {
 return get_reduced_dim_product(in, executorch::aten::optional<int64_t>(dim));
}

size_t get_out_numel(
 const executorch::aten::Tensor& in,
 const executorch::aten::optional<int64_t>& dim);
Expand All@@ -172,6 +180,12 @@ size_t get_out_numel(
 const executorch::aten::optional<executorch::aten::ArrayRef<int64_t>>&
 dim_list);

// Resolve ambiguity between the above two overloads -- ArrayRef and
// optional are both implicitly constructible from int64_t.
inline size_t get_out_numel(const executorch::aten::Tensor& in, int64_t dim) {
 return get_out_numel(in, executorch::aten::optional<int64_t>(dim));
}

size_t get_init_index(
 const executorch::aten::Tensor& in,
 const executorch::aten::optional<int64_t>& dim,
Expand All@@ -183,6 +197,12 @@ size_t get_init_index(
 dim_list,
 const size_t out_ix);

inline size_t get_init_index(
 const executorch::aten::Tensor& in,
 int64_t dim,
 const size_t out_ix) {
 return get_init_index(in, executorch::aten::optional<int64_t>(dim), out_ix);
}
//
// Iteration Functions
//
Expand DownExpand Up@@ -614,6 +634,17 @@ Error resize_reduction_out(
 bool keepdim,
 executorch::aten::Tensor& out);

// Resolve ambiguity between the above two overloads -- ArrayRef and
// optional are both implicitly constructible from int64_t.
inline Error resize_reduction_out(
 const executorch::aten::Tensor& in,
 int64_t dim,
 bool keepdim,
 executorch::aten::Tensor& out) {
 return resize_reduction_out(
 in, executorch::aten::optional<int64_t>(dim), keepdim, out);
}

#ifndef USE_ATEN_LIB
bool check_reduction_args(
 const Tensor& in,
Expand Down

2 changes: 1 addition & 1 deletion
runtime/core/exec_aten/exec_aten.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -106,7 +106,7 @@ template <typename T>
using optional = torch::executor::optional<T>;
using nullopt_t = torch::executor::nullopt_t;
// NOLINTNEXTLINE(facebook-hte-NamespaceScopedStaticDeclaration)
static constexpr nullopt_t nullopt{0};
using std::nullopt;
using ScalarType = torch::executor::ScalarType;
using TensorList = ArrayRef<Tensor>;
using Scalar = torch::executor::Scalar;
Expand Down

171 changes: 7 additions & 164 deletions
runtime/core/portable_type/optional.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,175 +8,18 @@

#pragma once

#include <executorch/runtime/platform/assert.h>
#include <new>
#include <utility> // std::forward and other template magic checks
#include <optional>

namespace executorch {
namespace runtime {
namespace etensor {

/// Used to indicate an optional type with uninitialized state.
struct nullopt_t final {
 constexpr explicit nullopt_t(int32_t) {}
};

/// A constant of type nullopt_t that is used to indicate an optional type with
/// uninitialized state.
constexpr nullopt_t nullopt{0};

/// Leaner optional class, subset of c10, std, and boost optional APIs.
template <class T>
class optional final {
 public:
 /// The type wrapped by the optional class.
 using value_type = T;

 /// Constructs an optional object that does not contain a value.
 /* implicit */ optional() noexcept : storage_(trivial_init), init_(false) {}

 /// Constructs an optional object that does not contain a value.
 /* implicit */ optional(nullopt_t) noexcept
 : storage_(trivial_init), init_(false) {}

 /// Constructs an optional object that matches the state of v.
 /* implicit */ optional(const optional<T>& v)
 : storage_(trivial_init), init_(v.init_) {
 if (init_) {
 new (&storage_.value_) T(v.storage_.value_);
 }
 }

 /// Constructs an optional object that contains the specified value.
 /* implicit */ optional(const T& v) : storage_(v), init_(true) {}

 /// Constructs an optional object from v.
 /* implicit */ optional(optional<T>&& v) noexcept(
 std::is_nothrow_move_constructible<T>::value)
 : storage_(trivial_init), init_(v.init_) {
 if (init_) {
 new (&storage_.value_) T(std::forward<T>(v.storage_.value_));
 }
 }

 /// Constructs an optional object that contains the specified value.
 /* implicit */ optional(T&& v) : storage_(std::forward<T>(v)), init_(true) {}

 optional& operator=(const optional& rhs) {
 if (init_ && !rhs.init_) {
 clear();
 } else if (!init_ && rhs.init_) {
 init_ = true;
 new (&storage_.value_) T(rhs.storage_.value_);
 } else if (init_ && rhs.init_) {
 storage_.value_ = rhs.storage_.value_;
 }
 return *this;
 }

 optional& operator=(optional&& rhs) noexcept(
 std::is_nothrow_move_assignable<T>::value &&
 std::is_nothrow_move_constructible<T>::value) {
 if (init_ && !rhs.init_) {
 clear();
 } else if (!init_ && rhs.init_) {
 init_ = true;
 new (&storage_.value_) T(std::forward<T>(rhs.storage_.value_));
 } else if (init_ && rhs.init_) {
 storage_.value_ = std::forward<T>(rhs.storage_.value_);
 }
 return *this;
 }

 /// Destroys the stored value if there is one
 ~optional() {
 if (init_) {
 storage_.value_.~T();
 }
 }

 optional& operator=(nullopt_t) noexcept {
 clear();
 return *this;
 }

 /// Returns true if the object contains a value, false otherwise
 explicit operator bool() const noexcept {
 return init_;
 }

 /// Returns true if the object contains a value, false otherwise
 bool has_value() const noexcept {
 return init_;
 }

 /// Returns a constant reference to the contained value. Calls ET_CHECK if
 /// the object does not contain a value.
 T const& value() const& {
 ET_CHECK(init_);
 return contained_val();
 }

 /// Returns a mutable reference to the contained value. Calls ET_CHECK if the
 /// object does not contain a value.
 T& value() & {
 ET_CHECK(init_);
 return contained_val();
 }

 /// Returns an rvalue of the contained value. Calls ET_CHECK if the object
 /// does not contain a value.
 T&& value() && {
 ET_CHECK(init_);
 return std::forward<T>(contained_val());
 }

 private:
 // Used to invoke the dummy ctor of storage_t in the initializer lists of
 // optional_base as default ctor is implicitly deleted because T is nontrivial
 struct trivial_init_t {
 } trivial_init{};

 /**
 * A wrapper type that lets us avoid constructing a T when there is no value.
 * If there is a value present, the optional class must destroy it.
 */
 union storage_t {
 /// A small, trivially-constructable alternative to T.
 unsigned char dummy_;
 /// The constructed value itself, if optional::has_value_ is true.
 T value_;

 /* implicit */ storage_t(trivial_init_t) {
 dummy_ = 0;
 }

 template <class... Args>
 storage_t(Args&&... args) : value_(std::forward<Args>(args)...) {}

 ~storage_t() {}
 };

 const T& contained_val() const& {
 return storage_.value_;
 }
 T&& contained_val() && {
 return std::move(storage_.value_);
 }
 T& contained_val() & {
 return storage_.value_;
 }

 void clear() noexcept {
 if (init_) {
 storage_.value_.~T();
 }
 init_ = false;
 }

 storage_t storage_;
 bool init_;
};
// NOLINTNEXTLINE(misc-unused-using-decls)
using std::nullopt;
// NOLINTNEXTLINE(misc-unused-using-decls)
using std::nullopt_t;
// NOLINTNEXTLINE(misc-unused-using-decls)
using std::optional;

} // namespace etensor
} // namespace runtime
Expand Down

4 changes: 2 additions & 2 deletions
runtime/core/portable_type/test/optional_test.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,11 +36,11 @@ TEST(TestOptional, NulloptHasNoValue) {
 EXPECT_FALSE(o.has_value());
}

TEST(TestOptional, ValueOfEmptyOptionalShouldDie) {
TEST(TestOptional, ValueOfEmptyOptionalShouldThrow) {
 optional<int32_t> o;
 EXPECT_FALSE(o.has_value());

ET_EXPECT_DEATH({ (void)o.value(); }, "");
EXPECT_THROW({ (void)o.value(); }, std::bad_optional_access);
}

TEST(TestOptional, IntValue) {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Replace custom optional with std::optional#9068

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

swolchok
merged 6 commits into

from

Mar 11, 2025
 Merged


Replace custom optional with std::optional
#9068
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
a54e050

Update


swolchok Mar 8, 2025
7364de3

Update


swolchok Mar 10, 2025
3e3c632

Update


swolchok Mar 10, 2025
7787aa7

Update


swolchok Mar 11, 2025
02b1669

Update


swolchok Mar 11, 2025
dab0a36

Update


swolchok Mar 11, 2025

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


18 changes: 0 additions & 18 deletions
extension/aten_util/make_aten_functor_from_et_functor.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -166,24 +166,6 @@ struct type_convert<std::optional<F>, torch::executor::optional<T>> final {
 }
};

// Optionals: ETen to ATen.
template <class F, class T>
struct type_convert<torch::executor::optional<F>, std::optional<T>> final {
 public:
 torch::executor::optional<F> val;
 std::unique_ptr<struct type_convert<F, T>> convert_struct;
 explicit type_convert(torch::executor::optional<F> value) : val(value) {}
 std::optional<T> call() {
 if (val.has_value()) {
 convert_struct = std::make_unique<struct type_convert<F, T>>(
 type_convert<F, T>(val.value()));
 return std::optional<T>(convert_struct->call());
 } else {
 return std::optional<T>();
 }
 }
};

// ArrayRefs: ATen to ETen.
template <class F, class T>
struct type_convert<c10::ArrayRef<F>, torch::executor::ArrayRef<T>> final {
Expand Down

31 changes: 31 additions & 0 deletions
kernels/portable/cpu/util/reduce_util.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -163,6 +163,14 @@ size_t get_reduced_dim_product(
 const executorch::aten::optional<executorch::aten::ArrayRef<int64_t>>&
 dim_list);

// Resolve ambiguity between the above two overloads -- ArrayRef and
// optional are both implicitly constructible from int64_t.
inline size_t get_reduced_dim_product(
 const executorch::aten::Tensor& in,
 int64_t dim) {
 return get_reduced_dim_product(in, executorch::aten::optional<int64_t>(dim));
}

size_t get_out_numel(
 const executorch::aten::Tensor& in,
 const executorch::aten::optional<int64_t>& dim);
Expand All@@ -172,6 +180,12 @@ size_t get_out_numel(
 const executorch::aten::optional<executorch::aten::ArrayRef<int64_t>>&
 dim_list);

// Resolve ambiguity between the above two overloads -- ArrayRef and
// optional are both implicitly constructible from int64_t.
inline size_t get_out_numel(const executorch::aten::Tensor& in, int64_t dim) {
 return get_out_numel(in, executorch::aten::optional<int64_t>(dim));
}

size_t get_init_index(
 const executorch::aten::Tensor& in,
 const executorch::aten::optional<int64_t>& dim,
Expand All@@ -183,6 +197,12 @@ size_t get_init_index(
 dim_list,
 const size_t out_ix);

inline size_t get_init_index(
 const executorch::aten::Tensor& in,
 int64_t dim,
 const size_t out_ix) {
 return get_init_index(in, executorch::aten::optional<int64_t>(dim), out_ix);
}
//
// Iteration Functions
//
Expand DownExpand Up@@ -614,6 +634,17 @@ Error resize_reduction_out(
 bool keepdim,
 executorch::aten::Tensor& out);

// Resolve ambiguity between the above two overloads -- ArrayRef and
// optional are both implicitly constructible from int64_t.
inline Error resize_reduction_out(
 const executorch::aten::Tensor& in,
 int64_t dim,
 bool keepdim,
 executorch::aten::Tensor& out) {
 return resize_reduction_out(
 in, executorch::aten::optional<int64_t>(dim), keepdim, out);
}

#ifndef USE_ATEN_LIB
bool check_reduction_args(
 const Tensor& in,
Expand Down

2 changes: 1 addition & 1 deletion
runtime/core/exec_aten/exec_aten.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -106,7 +106,7 @@ template <typename T>
using optional = torch::executor::optional<T>;
using nullopt_t = torch::executor::nullopt_t;
// NOLINTNEXTLINE(facebook-hte-NamespaceScopedStaticDeclaration)
static constexpr nullopt_t nullopt{0};
using std::nullopt;
using ScalarType = torch::executor::ScalarType;
using TensorList = ArrayRef<Tensor>;
using Scalar = torch::executor::Scalar;
Expand Down

171 changes: 7 additions & 164 deletions
runtime/core/portable_type/optional.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,175 +8,18 @@

#pragma once

#include <executorch/runtime/platform/assert.h>
#include <new>
#include <utility> // std::forward and other template magic checks
#include <optional>

namespace executorch {
namespace runtime {
namespace etensor {

/// Used to indicate an optional type with uninitialized state.
struct nullopt_t final {
 constexpr explicit nullopt_t(int32_t) {}
};

/// A constant of type nullopt_t that is used to indicate an optional type with
/// uninitialized state.
constexpr nullopt_t nullopt{0};

/// Leaner optional class, subset of c10, std, and boost optional APIs.
template <class T>
class optional final {
 public:
 /// The type wrapped by the optional class.
 using value_type = T;

 /// Constructs an optional object that does not contain a value.
 /* implicit */ optional() noexcept : storage_(trivial_init), init_(false) {}

 /// Constructs an optional object that does not contain a value.
 /* implicit */ optional(nullopt_t) noexcept
 : storage_(trivial_init), init_(false) {}

 /// Constructs an optional object that matches the state of v.
 /* implicit */ optional(const optional<T>& v)
 : storage_(trivial_init), init_(v.init_) {
 if (init_) {
 new (&storage_.value_) T(v.storage_.value_);
 }
 }

 /// Constructs an optional object that contains the specified value.
 /* implicit */ optional(const T& v) : storage_(v), init_(true) {}

 /// Constructs an optional object from v.
 /* implicit */ optional(optional<T>&& v) noexcept(
 std::is_nothrow_move_constructible<T>::value)
 : storage_(trivial_init), init_(v.init_) {
 if (init_) {
 new (&storage_.value_) T(std::forward<T>(v.storage_.value_));
 }
 }

 /// Constructs an optional object that contains the specified value.
 /* implicit */ optional(T&& v) : storage_(std::forward<T>(v)), init_(true) {}

 optional& operator=(const optional& rhs) {
 if (init_ && !rhs.init_) {
 clear();
 } else if (!init_ && rhs.init_) {
 init_ = true;
 new (&storage_.value_) T(rhs.storage_.value_);
 } else if (init_ && rhs.init_) {
 storage_.value_ = rhs.storage_.value_;
 }
 return *this;
 }

 optional& operator=(optional&& rhs) noexcept(
 std::is_nothrow_move_assignable<T>::value &&
 std::is_nothrow_move_constructible<T>::value) {
 if (init_ && !rhs.init_) {
 clear();
 } else if (!init_ && rhs.init_) {
 init_ = true;
 new (&storage_.value_) T(std::forward<T>(rhs.storage_.value_));
 } else if (init_ && rhs.init_) {
 storage_.value_ = std::forward<T>(rhs.storage_.value_);
 }
 return *this;
 }

 /// Destroys the stored value if there is one
 ~optional() {
 if (init_) {
 storage_.value_.~T();
 }
 }

 optional& operator=(nullopt_t) noexcept {
 clear();
 return *this;
 }

 /// Returns true if the object contains a value, false otherwise
 explicit operator bool() const noexcept {
 return init_;
 }

 /// Returns true if the object contains a value, false otherwise
 bool has_value() const noexcept {
 return init_;
 }

 /// Returns a constant reference to the contained value. Calls ET_CHECK if
 /// the object does not contain a value.
 T const& value() const& {
 ET_CHECK(init_);
 return contained_val();
 }

 /// Returns a mutable reference to the contained value. Calls ET_CHECK if the
 /// object does not contain a value.
 T& value() & {
 ET_CHECK(init_);
 return contained_val();
 }

 /// Returns an rvalue of the contained value. Calls ET_CHECK if the object
 /// does not contain a value.
 T&& value() && {
 ET_CHECK(init_);
 return std::forward<T>(contained_val());
 }

 private:
 // Used to invoke the dummy ctor of storage_t in the initializer lists of
 // optional_base as default ctor is implicitly deleted because T is nontrivial
 struct trivial_init_t {
 } trivial_init{};

 /**
 * A wrapper type that lets us avoid constructing a T when there is no value.
 * If there is a value present, the optional class must destroy it.
 */
 union storage_t {
 /// A small, trivially-constructable alternative to T.
 unsigned char dummy_;
 /// The constructed value itself, if optional::has_value_ is true.
 T value_;

 /* implicit */ storage_t(trivial_init_t) {
 dummy_ = 0;
 }

 template <class... Args>
 storage_t(Args&&... args) : value_(std::forward<Args>(args)...) {}

 ~storage_t() {}
 };

 const T& contained_val() const& {
 return storage_.value_;
 }
 T&& contained_val() && {
 return std::move(storage_.value_);
 }
 T& contained_val() & {
 return storage_.value_;
 }

 void clear() noexcept {
 if (init_) {
 storage_.value_.~T();
 }
 init_ = false;
 }

 storage_t storage_;
 bool init_;
};
// NOLINTNEXTLINE(misc-unused-using-decls)
using std::nullopt;
// NOLINTNEXTLINE(misc-unused-using-decls)
using std::nullopt_t;
// NOLINTNEXTLINE(misc-unused-using-decls)
using std::optional;

} // namespace etensor
} // namespace runtime
Expand Down

4 changes: 2 additions & 2 deletions
runtime/core/portable_type/test/optional_test.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,11 +36,11 @@ TEST(TestOptional, NulloptHasNoValue) {
 EXPECT_FALSE(o.has_value());
}

TEST(TestOptional, ValueOfEmptyOptionalShouldDie) {
TEST(TestOptional, ValueOfEmptyOptionalShouldThrow) {
 optional<int32_t> o;
 EXPECT_FALSE(o.has_value());

ET_EXPECT_DEATH({ (void)o.value(); }, "");
EXPECT_THROW({ (void)o.value(); }, std::bad_optional_access);
}

TEST(TestOptional, IntValue) {
Expand Down