Skip to content

Commit 5ba484e

Browse files
cyyevercyyever
committed
Remove deprecated optional aliases, migrate callers to std::optional
Migrate the remaining executorch::aten::optional callers (mostly the Cadence operators) to std::optional, then delete the deprecated torch::executor and executorch::runtime::etensor optional/nullopt aliases so they can't be reintroduced. portable_type/optional.h held only those aliases and is removed; exec_aten.h now includes <optional> directly. optional_test.cpp covered only the alias (now plain std::optional) and is dropped along with its build targets. The substantive changes are in runtime/core/exec_aten/exec_aten.h and the removal of runtime/core/portable_type/optional.h; everything under backends/cadence and kernels/ is the mechanical caller migration.
1 parent 7d87de5 commit 5ba484e

65 files changed

Lines changed: 95 additions & 289 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎backends/cadence/fused_quant/op_add.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ namespace cadence {
1414
namespace fused_quant {
1515
namespace native {
1616

17-
using executorch::aten::optional;
1817
using executorch::aten::ScalarType;
1918
using executorch::aten::Tensor;
2019
using executorch::runtime::KernelRuntimeContext;
20+
using std::optional;
2121

2222
namespace {
2323

‎backends/cadence/fused_quant/op_add.h‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,18 @@ executorch::aten::Tensor& add_out(
1919
executorch::runtime::KernelRuntimeContext& ctx,
2020
const executorch::aten::Tensor& inp,
2121
const executorch::aten::Tensor& other,
22-
const executorch::aten::optional<executorch::aten::Tensor>& inp_scale,
23-
const executorch::aten::optional<executorch::aten::Tensor>& inp_zero_point,
22+
const std::optional<executorch::aten::Tensor>& inp_scale,
23+
const std::optional<executorch::aten::Tensor>& inp_zero_point,
2424
executorch::aten::ScalarType inp_dtype,
2525
int64_t inp_quant_min,
2626
int64_t inp_quant_max,
27-
const executorch::aten::optional<executorch::aten::Tensor>& other_scale,
28-
const executorch::aten::optional<executorch::aten::Tensor>&
29-
other_zero_point,
27+
const std::optional<executorch::aten::Tensor>& other_scale,
28+
const std::optional<executorch::aten::Tensor>& other_zero_point,
3029
executorch::aten::ScalarType other_dtype,
3130
int64_t other_quant_min,
3231
int64_t other_quant_max,
33-
const executorch::aten::optional<executorch::aten::Tensor>& out_scale,
34-
const executorch::aten::optional<executorch::aten::Tensor>& out_zero_point,
32+
const std::optional<executorch::aten::Tensor>& out_scale,
33+
const std::optional<executorch::aten::Tensor>& out_zero_point,
3534
executorch::aten::ScalarType out_dtype,
3635
int64_t out_quant_min,
3736
int64_t out_quant_max,

‎backends/cadence/fused_quant/op_bmm.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ namespace cadence {
1414
namespace fused_quant {
1515
namespace native {
1616

17-
using executorch::aten::optional;
1817
using executorch::aten::ScalarType;
1918
using executorch::aten::Tensor;
2019
using executorch::runtime::KernelRuntimeContext;
20+
using std::optional;
2121

2222
namespace {
2323

‎backends/cadence/fused_quant/op_bmm.h‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,18 @@ executorch::aten::Tensor& bmm_out(
1919
executorch::runtime::KernelRuntimeContext& ctx,
2020
const executorch::aten::Tensor& inp,
2121
const executorch::aten::Tensor& other,
22-
const executorch::aten::optional<executorch::aten::Tensor>& inp_scale,
23-
const executorch::aten::optional<executorch::aten::Tensor>& inp_zero_point,
22+
const std::optional<executorch::aten::Tensor>& inp_scale,
23+
const std::optional<executorch::aten::Tensor>& inp_zero_point,
2424
executorch::aten::ScalarType inp_dtype,
2525
int64_t inp_quant_min,
2626
int64_t inp_quant_max,
27-
const executorch::aten::optional<executorch::aten::Tensor>& other_scale,
28-
const executorch::aten::optional<executorch::aten::Tensor>&
29-
other_zero_point,
27+
const std::optional<executorch::aten::Tensor>& other_scale,
28+
const std::optional<executorch::aten::Tensor>& other_zero_point,
3029
executorch::aten::ScalarType other_dtype,
3130
int64_t other_quant_min,
3231
int64_t other_quant_max,
33-
const executorch::aten::optional<executorch::aten::Tensor>& out_scale,
34-
const executorch::aten::optional<executorch::aten::Tensor>& out_zero_point,
32+
const std::optional<executorch::aten::Tensor>& out_scale,
33+
const std::optional<executorch::aten::Tensor>& out_zero_point,
3534
executorch::aten::ScalarType out_dtype,
3635
int64_t out_quant_min,
3736
int64_t out_quant_max,

‎backends/cadence/fused_quant/op_hardswish.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ namespace cadence {
1616
namespace fused_quant {
1717
namespace native {
1818

19-
using executorch::aten::optional;
2019
using executorch::aten::ScalarType;
2120
using executorch::aten::Tensor;
2221
using executorch::runtime::KernelRuntimeContext;
22+
using std::optional;
2323

2424
namespace {
2525

‎backends/cadence/fused_quant/op_hardswish.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ namespace native {
1818
executorch::aten::Tensor& hardswish_out(
1919
executorch::runtime::KernelRuntimeContext& ctx,
2020
const executorch::aten::Tensor& inp,
21-
const executorch::aten::optional<executorch::aten::Tensor>& inp_scale,
22-
const executorch::aten::optional<executorch::aten::Tensor>& inp_zero_point,
21+
const std::optional<executorch::aten::Tensor>& inp_scale,
22+
const std::optional<executorch::aten::Tensor>& inp_zero_point,
2323
executorch::aten::ScalarType inp_dtype,
2424
int64_t inp_quant_min,
2525
int64_t inp_quant_max,
26-
const executorch::aten::optional<executorch::aten::Tensor>& out_scale,
27-
const executorch::aten::optional<executorch::aten::Tensor>& out_zero_point,
26+
const std::optional<executorch::aten::Tensor>& out_scale,
27+
const std::optional<executorch::aten::Tensor>& out_zero_point,
2828
executorch::aten::ScalarType out_dtype,
2929
int64_t out_quant_min,
3030
int64_t out_quant_max,

‎backends/cadence/fused_quant/op_mul.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ namespace cadence {
1414
namespace fused_quant {
1515
namespace native {
1616

17-
using executorch::aten::optional;
1817
using executorch::aten::ScalarType;
1918
using executorch::aten::Tensor;
2019
using executorch::runtime::KernelRuntimeContext;
20+
using std::optional;
2121

2222
namespace {
2323

‎backends/cadence/fused_quant/op_mul.h‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,18 @@ executorch::aten::Tensor& mul_out(
1919
executorch::runtime::KernelRuntimeContext& ctx,
2020
const executorch::aten::Tensor& inp,
2121
const executorch::aten::Tensor& other,
22-
const executorch::aten::optional<executorch::aten::Tensor>& inp_scale,
23-
const executorch::aten::optional<executorch::aten::Tensor>& inp_zero_point,
22+
const std::optional<executorch::aten::Tensor>& inp_scale,
23+
const std::optional<executorch::aten::Tensor>& inp_zero_point,
2424
executorch::aten::ScalarType inp_dtype,
2525
int64_t inp_quant_min,
2626
int64_t inp_quant_max,
27-
const executorch::aten::optional<executorch::aten::Tensor>& other_scale,
28-
const executorch::aten::optional<executorch::aten::Tensor>&
29-
other_zero_point,
27+
const std::optional<executorch::aten::Tensor>& other_scale,
28+
const std::optional<executorch::aten::Tensor>& other_zero_point,
3029
executorch::aten::ScalarType other_dtype,
3130
int64_t other_quant_min,
3231
int64_t other_quant_max,
33-
const executorch::aten::optional<executorch::aten::Tensor>& out_scale,
34-
const executorch::aten::optional<executorch::aten::Tensor>& out_zero_point,
32+
const std::optional<executorch::aten::Tensor>& out_scale,
33+
const std::optional<executorch::aten::Tensor>& out_zero_point,
3534
executorch::aten::ScalarType out_dtype,
3635
int64_t out_quant_min,
3736
int64_t out_quant_max,

‎backends/cadence/fused_quant/op_relu.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ namespace cadence {
1616
namespace fused_quant {
1717
namespace native {
1818

19-
using executorch::aten::optional;
2019
using executorch::aten::ScalarType;
2120
using executorch::aten::Tensor;
2221
using executorch::runtime::KernelRuntimeContext;
22+
using std::optional;
2323

2424
namespace {
2525

‎backends/cadence/fused_quant/op_relu.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ namespace native {
1818
executorch::aten::Tensor& relu_out(
1919
executorch::runtime::KernelRuntimeContext& ctx,
2020
const executorch::aten::Tensor& inp,
21-
const executorch::aten::optional<executorch::aten::Tensor>& inp_scale,
22-
const executorch::aten::optional<executorch::aten::Tensor>& inp_zero_point,
21+
const std::optional<executorch::aten::Tensor>& inp_scale,
22+
const std::optional<executorch::aten::Tensor>& inp_zero_point,
2323
executorch::aten::ScalarType inp_dtype,
2424
int64_t inp_quant_min,
2525
int64_t inp_quant_max,
26-
const executorch::aten::optional<executorch::aten::Tensor>& out_scale,
27-
const executorch::aten::optional<executorch::aten::Tensor>& out_zero_point,
26+
const std::optional<executorch::aten::Tensor>& out_scale,
27+
const std::optional<executorch::aten::Tensor>& out_zero_point,
2828
executorch::aten::ScalarType out_dtype,
2929
int64_t out_quant_min,
3030
int64_t out_quant_max,

0 commit comments

Comments
 (0)