Use std::optional/string_view

backends/cadence/fused_quant/op_add.cpp

@@ -14,10 +14,10 @@ namespace cadence {
 namespace fused_quant {
 namespace native {
 
-using executorch::aten::optional;
 using executorch::aten::ScalarType;
 using executorch::aten::Tensor;
 using executorch::runtime::KernelRuntimeContext;
+using std::optional;
 
 namespace {
 

backends/cadence/fused_quant/op_add.h

@@ -19,19 +19,18 @@ executorch::aten::Tensor& add_out(
     executorch::runtime::KernelRuntimeContext& ctx,
     const executorch::aten::Tensor& inp,
     const executorch::aten::Tensor& other,
-    const executorch::aten::optional<executorch::aten::Tensor>& inp_scale,
-    const executorch::aten::optional<executorch::aten::Tensor>& inp_zero_point,
+    const std::optional<executorch::aten::Tensor>& inp_scale,
+    const std::optional<executorch::aten::Tensor>& inp_zero_point,
     executorch::aten::ScalarType inp_dtype,
     int64_t inp_quant_min,
     int64_t inp_quant_max,
-    const executorch::aten::optional<executorch::aten::Tensor>& other_scale,
-    const executorch::aten::optional<executorch::aten::Tensor>&
-        other_zero_point,
+    const std::optional<executorch::aten::Tensor>& other_scale,
+    const std::optional<executorch::aten::Tensor>& other_zero_point,
     executorch::aten::ScalarType other_dtype,
     int64_t other_quant_min,
     int64_t other_quant_max,
-    const executorch::aten::optional<executorch::aten::Tensor>& out_scale,
-    const executorch::aten::optional<executorch::aten::Tensor>& out_zero_point,
+    const std::optional<executorch::aten::Tensor>& out_scale,
+    const std::optional<executorch::aten::Tensor>& out_zero_point,
     executorch::aten::ScalarType out_dtype,
     int64_t out_quant_min,
     int64_t out_quant_max,

backends/cadence/fused_quant/op_bmm.cpp

@@ -14,10 +14,10 @@ namespace cadence {
 namespace fused_quant {
 namespace native {
 
-using executorch::aten::optional;
 using executorch::aten::ScalarType;
 using executorch::aten::Tensor;
 using executorch::runtime::KernelRuntimeContext;
+using std::optional;
 
 namespace {
 

backends/cadence/fused_quant/op_bmm.h

@@ -19,19 +19,18 @@ executorch::aten::Tensor& bmm_out(
     executorch::runtime::KernelRuntimeContext& ctx,
     const executorch::aten::Tensor& inp,
     const executorch::aten::Tensor& other,
-    const executorch::aten::optional<executorch::aten::Tensor>& inp_scale,
-    const executorch::aten::optional<executorch::aten::Tensor>& inp_zero_point,
+    const std::optional<executorch::aten::Tensor>& inp_scale,
+    const std::optional<executorch::aten::Tensor>& inp_zero_point,
     executorch::aten::ScalarType inp_dtype,
     int64_t inp_quant_min,
     int64_t inp_quant_max,
-    const executorch::aten::optional<executorch::aten::Tensor>& other_scale,
-    const executorch::aten::optional<executorch::aten::Tensor>&
-        other_zero_point,
+    const std::optional<executorch::aten::Tensor>& other_scale,
+    const std::optional<executorch::aten::Tensor>& other_zero_point,
     executorch::aten::ScalarType other_dtype,
     int64_t other_quant_min,
     int64_t other_quant_max,
-    const executorch::aten::optional<executorch::aten::Tensor>& out_scale,
-    const executorch::aten::optional<executorch::aten::Tensor>& out_zero_point,
+    const std::optional<executorch::aten::Tensor>& out_scale,
+    const std::optional<executorch::aten::Tensor>& out_zero_point,
     executorch::aten::ScalarType out_dtype,
     int64_t out_quant_min,
     int64_t out_quant_max,

backends/cadence/fused_quant/op_hardswish.cpp

@@ -16,10 +16,10 @@ namespace cadence {
 namespace fused_quant {
 namespace native {
 
-using executorch::aten::optional;
 using executorch::aten::ScalarType;
 using executorch::aten::Tensor;
 using executorch::runtime::KernelRuntimeContext;
+using std::optional;
 
 namespace {
 

backends/cadence/fused_quant/op_hardswish.h

@@ -18,13 +18,13 @@ namespace native {
 executorch::aten::Tensor& hardswish_out(
     executorch::runtime::KernelRuntimeContext& ctx,
     const executorch::aten::Tensor& inp,
-    const executorch::aten::optional<executorch::aten::Tensor>& inp_scale,
-    const executorch::aten::optional<executorch::aten::Tensor>& inp_zero_point,
+    const std::optional<executorch::aten::Tensor>& inp_scale,
+    const std::optional<executorch::aten::Tensor>& inp_zero_point,
     executorch::aten::ScalarType inp_dtype,
     int64_t inp_quant_min,
     int64_t inp_quant_max,
-    const executorch::aten::optional<executorch::aten::Tensor>& out_scale,
-    const executorch::aten::optional<executorch::aten::Tensor>& out_zero_point,
+    const std::optional<executorch::aten::Tensor>& out_scale,
+    const std::optional<executorch::aten::Tensor>& out_zero_point,
     executorch::aten::ScalarType out_dtype,
     int64_t out_quant_min,
     int64_t out_quant_max,

backends/cadence/fused_quant/op_mul.cpp

@@ -14,10 +14,10 @@ namespace cadence {
 namespace fused_quant {
 namespace native {
 
-using executorch::aten::optional;
 using executorch::aten::ScalarType;
 using executorch::aten::Tensor;
 using executorch::runtime::KernelRuntimeContext;
+using std::optional;
 
 namespace {
 

backends/cadence/fused_quant/op_mul.h

@@ -19,19 +19,18 @@ executorch::aten::Tensor& mul_out(
     executorch::runtime::KernelRuntimeContext& ctx,
     const executorch::aten::Tensor& inp,
     const executorch::aten::Tensor& other,
-    const executorch::aten::optional<executorch::aten::Tensor>& inp_scale,
-    const executorch::aten::optional<executorch::aten::Tensor>& inp_zero_point,
+    const std::optional<executorch::aten::Tensor>& inp_scale,
+    const std::optional<executorch::aten::Tensor>& inp_zero_point,
     executorch::aten::ScalarType inp_dtype,
     int64_t inp_quant_min,
     int64_t inp_quant_max,
-    const executorch::aten::optional<executorch::aten::Tensor>& other_scale,
-    const executorch::aten::optional<executorch::aten::Tensor>&
-        other_zero_point,
+    const std::optional<executorch::aten::Tensor>& other_scale,
+    const std::optional<executorch::aten::Tensor>& other_zero_point,
     executorch::aten::ScalarType other_dtype,
     int64_t other_quant_min,
     int64_t other_quant_max,
-    const executorch::aten::optional<executorch::aten::Tensor>& out_scale,
-    const executorch::aten::optional<executorch::aten::Tensor>& out_zero_point,
+    const std::optional<executorch::aten::Tensor>& out_scale,
+    const std::optional<executorch::aten::Tensor>& out_zero_point,
     executorch::aten::ScalarType out_dtype,
     int64_t out_quant_min,
     int64_t out_quant_max,

backends/cadence/fused_quant/op_relu.cpp

@@ -16,10 +16,10 @@ namespace cadence {
 namespace fused_quant {
 namespace native {
 
-using executorch::aten::optional;
 using executorch::aten::ScalarType;
 using executorch::aten::Tensor;
 using executorch::runtime::KernelRuntimeContext;
+using std::optional;
 
 namespace {
 

backends/cadence/fused_quant/op_relu.h

@@ -18,13 +18,13 @@ namespace native {
 executorch::aten::Tensor& relu_out(
     executorch::runtime::KernelRuntimeContext& ctx,
     const executorch::aten::Tensor& inp,
-    const executorch::aten::optional<executorch::aten::Tensor>& inp_scale,
-    const executorch::aten::optional<executorch::aten::Tensor>& inp_zero_point,
+    const std::optional<executorch::aten::Tensor>& inp_scale,
+    const std::optional<executorch::aten::Tensor>& inp_zero_point,
     executorch::aten::ScalarType inp_dtype,
     int64_t inp_quant_min,
     int64_t inp_quant_max,
-    const executorch::aten::optional<executorch::aten::Tensor>& out_scale,
-    const executorch::aten::optional<executorch::aten::Tensor>& out_zero_point,
+    const std::optional<executorch::aten::Tensor>& out_scale,
+    const std::optional<executorch::aten::Tensor>& out_zero_point,
     executorch::aten::ScalarType out_dtype,
     int64_t out_quant_min,
     int64_t out_quant_max,

backends/cadence/fused_quant/quant_utils.h

@@ -64,8 +64,8 @@ struct QParams {
 };
 
 inline QParams extract_qparams(
-    const executorch::aten::optional<executorch::aten::Tensor>& scale_tensor,
-    const executorch::aten::optional<executorch::aten::Tensor>& zp_tensor,
+    const std::optional<executorch::aten::Tensor>& scale_tensor,
+    const std::optional<executorch::aten::Tensor>& zp_tensor,
     int64_t quant_min,
     int64_t quant_max,
     const executorch::aten::Tensor& data_tensor) {

backends/cadence/fused_quant/tests/test_op_add.cpp

@@ -14,10 +14,10 @@
 #include <executorch/runtime/core/exec_aten/testing_util/tensor_factory.h>
 #include <executorch/runtime/core/exec_aten/testing_util/tensor_util.h>
 
-using executorch::aten::optional;
 using executorch::aten::ScalarType;
 using executorch::aten::Tensor;
 using executorch::runtime::testing::TensorFactory;
+using std::optional;
 
 namespace {
 

backends/cadence/fused_quant/tests/test_op_bmm.cpp

@@ -14,10 +14,10 @@
 #include <executorch/runtime/core/exec_aten/testing_util/tensor_factory.h>
 #include <executorch/runtime/core/exec_aten/testing_util/tensor_util.h>
 
-using executorch::aten::optional;
 using executorch::aten::ScalarType;
 using executorch::aten::Tensor;
 using executorch::runtime::testing::TensorFactory;
+using std::optional;
 
 namespace {
 

backends/cadence/fused_quant/tests/test_op_hardswish.cpp

@@ -14,10 +14,10 @@
 #include <executorch/runtime/core/exec_aten/testing_util/tensor_factory.h>
 #include <executorch/runtime/core/exec_aten/testing_util/tensor_util.h>
 
-using executorch::aten::optional;
 using executorch::aten::ScalarType;
 using executorch::aten::Tensor;
 using executorch::runtime::testing::TensorFactory;
+using std::optional;
 
 namespace {
 

backends/cadence/fused_quant/tests/test_op_mul.cpp

@@ -14,10 +14,10 @@
 #include <executorch/runtime/core/exec_aten/testing_util/tensor_factory.h>
 #include <executorch/runtime/core/exec_aten/testing_util/tensor_util.h>
 
-using executorch::aten::optional;
 using executorch::aten::ScalarType;
 using executorch::aten::Tensor;
 using executorch::runtime::testing::TensorFactory;
+using std::optional;
 
 namespace {
 

backends/cadence/fused_quant/tests/test_op_relu.cpp

@@ -14,10 +14,10 @@
 #include <executorch/runtime/core/exec_aten/testing_util/tensor_factory.h>
 #include <executorch/runtime/core/exec_aten/testing_util/tensor_util.h>
 
-using executorch::aten::optional;
 using executorch::aten::ScalarType;
 using executorch::aten::Tensor;
 using executorch::runtime::testing::TensorFactory;
+using std::optional;
 
 namespace {
 

backends/cadence/generic/operators/op_avg_pool2d.cpp

@@ -19,11 +19,11 @@ namespace generic {
 namespace native {
 
 using ::executorch::aten::IntArrayRef;
-using ::executorch::aten::optional;
 using ::executorch::aten::ScalarType;
 using ::executorch::aten::Tensor;
 using ::executorch::runtime::getLeadingDims;
 using ::executorch::runtime::KernelRuntimeContext;
+using std::optional;
 
 // Compute the avg_pool2d for in_data in NCHW layout. IT is the input datatype,
 // and AT is the accumulation datatype. 'quantized' is true when the input is

backends/cadence/generic/operators/op_avg_pool2d.h

@@ -23,9 +23,8 @@ ::executorch::aten::Tensor& avg_pool2d_out(
     ::executorch::aten::IntArrayRef padding,
     bool ceil_mode,
     bool count_include_pad,
-    ::executorch::aten::optional<int64_t> divisor_override,
-    const ::executorch::aten::optional<::executorch::aten::Tensor>&
-        in_zero_point_t,
+    std::optional<int64_t> divisor_override,
+    const std::optional<::executorch::aten::Tensor>& in_zero_point_t,
     bool channel_last,
     ::executorch::aten::Tensor& out);
 

backends/cadence/generic/operators/op_fully_connected.cpp

@@ -15,10 +15,10 @@ namespace impl {
 namespace generic {
 namespace native {
 
-using ::executorch::aten::optional;
 using ::executorch::aten::Tensor;
 using ::executorch::runtime::getLeadingDims;
 using ::executorch::runtime::KernelRuntimeContext;
+using std::optional;
 
 void linear(
     const Tensor& input,

backends/cadence/generic/operators/op_fully_connected.h

@@ -15,9 +15,9 @@ namespace impl {
 namespace generic {
 namespace native {
 
-using ::executorch::aten::optional;
 using ::executorch::aten::Tensor;
 using ::executorch::runtime::KernelRuntimeContext;
+using std::optional;
 
 Tensor& fully_connected_out(
     KernelRuntimeContext& ctx,

backends/cadence/generic/operators/op_linalg_svd.cpp

@@ -261,7 +261,7 @@ std::tuple<Tensor&, Tensor&, Tensor&> linalg_svd_out(
     const Tensor& A,
     bool full_matrices,
     bool compute_uv,
-    ::executorch::aten::optional<::executorch::aten::string_view> driver,
+    std::optional<std::string_view> driver,
     Tensor& U,
     Tensor& S,
     Tensor& Vh) {

backends/cadence/generic/operators/op_linalg_svd.h

@@ -26,7 +26,7 @@ linalg_svd_out(
     const ::executorch::aten::Tensor& A,
     bool full_matrices,
     bool compute_uv,
-    ::executorch::aten::optional<::executorch::aten::string_view> driver,
+    std::optional<std::string_view> driver,
     ::executorch::aten::Tensor& U,
     ::executorch::aten::Tensor& S,
     ::executorch::aten::Tensor& Vh);

backends/cadence/generic/operators/op_quantized_conv1d_nlc.cpp

@@ -256,7 +256,7 @@ ::executorch::aten::Tensor& quantized_conv1d_nlc_per_tensor_out(
     int64_t output_zero_point,
     __ET_UNUSED int64_t out_multiplier,
     __ET_UNUSED int64_t out_shift,
-    __ET_UNUSED const ::executorch::aten::optional<Tensor>& offset,
+    __ET_UNUSED const std::optional<Tensor>& offset,
     Tensor& out) {
   (void)ctx;
   quantized_conv1d_nlc(

backends/cadence/generic/operators/op_quantized_conv1d_nlc.h

@@ -54,7 +54,7 @@ ::executorch::aten::Tensor& quantized_conv1d_nlc_per_tensor_out(
     int64_t output_zero_point,
     int64_t out_multiplier,
     int64_t out_shift,
-    const ::executorch::aten::optional<Tensor>& offset,
+    const std::optional<Tensor>& offset,
     Tensor& out);
 
 } // namespace native

backends/cadence/generic/operators/op_quantized_conv2d.cpp

@@ -16,11 +16,11 @@ namespace impl {
 namespace generic {
 namespace native {
 
-using ::executorch::aten::optional;
 using ::executorch::aten::ScalarType;
 using ::executorch::aten::Tensor;
 using ::executorch::runtime::KernelRuntimeContext;
 using ::impl::generic::kernels::quantize;
+using std::optional;
 
 /* This implements a generic 2d conv kernel that operates on raw pointers.
  * The quantized version handles quantized convolutions for 2D inputs.
@@ -936,7 +936,7 @@ Tensor& quantized_conv2d_nhwc_per_tensor_out(
     int64_t output_zero_point,
     ET_UNUSED int64_t out_multiplier,
     ET_UNUSED int64_t out_shift,
-    ET_UNUSED const ::executorch::aten::optional<Tensor>& offset,
+    ET_UNUSED const std::optional<Tensor>& offset,
     Tensor& out) {
   quantized_conv2d_nhwc(
       input,

backends/cadence/generic/operators/op_quantized_conv2d.h

@@ -205,7 +205,7 @@ ::executorch::aten::Tensor& quantized_conv2d_nhwc_per_tensor_out(
     int64_t output_zero_point,
     int64_t out_multiplier,
     int64_t out_shift,
-    const ::executorch::aten::optional<Tensor>& offset,
+    const std::optional<Tensor>& offset,
     Tensor& out);
 
 ::executorch::aten::Tensor& quantized_conv2d_depthwise_nhwc_out(

backends/cadence/generic/operators/op_quantized_depthwise_conv1d_nlc.cpp

@@ -57,7 +57,7 @@ ::executorch::aten::Tensor& quantized_depthwise_conv1d_nlc_per_tensor_out(
       output_zero_point,
       out_multiplier,
       out_shift,
-      ::executorch::aten::optional<Tensor>(),
+      std::optional<Tensor>(),
       out);
 }
 

backends/cadence/generic/operators/op_quantized_embedding_byte.cpp

@@ -19,11 +19,11 @@ namespace generic {
 namespace native {
 
 using ::executorch::aten::IntArrayRef;
-using ::executorch::aten::optional;
 using ::executorch::aten::Scalar;
 using ::executorch::aten::ScalarType;
 using ::executorch::aten::Tensor;
 using ::executorch::runtime::KernelRuntimeContext;
+using std::optional;
 
 #define ET_FORALL_CADENCE_QUANTIZED_TYPES(_) \
   _(uint8_t, Byte)                           \

backends/cadence/generic/operators/op_quantized_embedding_byte.h

@@ -19,8 +19,7 @@ ::executorch::aten::Tensor& quantized_embedding_byte_out(
     ::executorch::runtime::KernelRuntimeContext& ctx,
     const ::executorch::aten::Tensor& weight,
     const ::executorch::aten::Tensor& weight_scales,
-    const ::executorch::aten::optional<::executorch::aten::Tensor>&
-        weight_zero_points,
+    const std::optional<::executorch::aten::Tensor>& weight_zero_points,
     const ::executorch::aten::Tensor& indices,
     bool pruned_weights,
     ::executorch::aten::Tensor& out);