Remove deprecated string_view aliases, migrate callers to std::string_view

cyyever · cyyever · commit f9616a7be998 · 2026-06-12T09:20:58.000+08:00
Migrate the remaining executorch::aten::string_view callers (the data-map
APIs and op_linalg_svd) to std::string_view, then delete the deprecated
torch::executor and executorch::runtime::etensor string_view aliases.
portable_type/string_view.h held only those aliases and is removed;
exec_aten.h and scalar_type_util.h now include &lt;string_view&gt; directly.

This parallels the optional cleanup in the previous commit. The data-map
header signatures (NamedDataMap and its overrides) move together since
the underlying type is unchanged.
diff --git a/backends/cadence/generic/operators/op_linalg_svd.cpp b/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,
-    std::optional<::executorch::aten::string_view> driver,
+    std::optional<std::string_view> driver,
     Tensor& U,
     Tensor& S,
     Tensor& Vh) {
diff --git a/backends/cadence/generic/operators/op_linalg_svd.h b/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,
-    std::optional<::executorch::aten::string_view> driver,
+    std::optional<std::string_view> driver,
     ::executorch::aten::Tensor& U,
     ::executorch::aten::Tensor& S,
     ::executorch::aten::Tensor& Vh);
diff --git a/extension/flat_tensor/flat_tensor_data_map.cpp b/extension/flat_tensor/flat_tensor_data_map.cpp
@@ -49,7 +49,7 @@ bool is_aligned(const void* data) {
 }
 
 Result<const flat_tensor_flatbuffer::NamedData*> get_named_data(
-    executorch::aten::string_view key,
+    std::string_view key,
     const flatbuffers::Vector<
         flatbuffers::Offset<flat_tensor_flatbuffer::NamedData>>* named_data,
     const flatbuffers::Vector<
@@ -127,7 +127,7 @@ Result<const TensorLayout> create_tensor_layout(
 } // namespace
 
 ET_NODISCARD Result<const TensorLayout> FlatTensorDataMap::get_tensor_layout(
-    executorch::aten::string_view key) const {
+    std::string_view key) const {
   Result<uint64_t> segment_end_offset = get_segment_end_offset(header_);
   if (!segment_end_offset.ok()) {
     return segment_end_offset.error();
@@ -144,7 +144,7 @@ ET_NODISCARD Result<const TensorLayout> FlatTensorDataMap::get_tensor_layout(
 }
 
 ET_NODISCARD Result<FreeableBuffer> FlatTensorDataMap::get_data(
-    executorch::aten::string_view key) const {
+    std::string_view key) const {
   Result<uint64_t> segment_end_offset = get_segment_end_offset(header_);
   if (!segment_end_offset.ok()) {
     return segment_end_offset.error();
@@ -170,7 +170,7 @@ ET_NODISCARD Result<FreeableBuffer> FlatTensorDataMap::get_data(
 }
 
 ET_NODISCARD Error FlatTensorDataMap::load_data_into(
-    ET_UNUSED executorch::aten::string_view key,
+    ET_UNUSED std::string_view key,
     ET_UNUSED void* buffer,
     ET_UNUSED size_t size) const {
   Result<uint64_t> segment_end_offset = get_segment_end_offset(header_);
diff --git a/extension/flat_tensor/flat_tensor_data_map.h b/extension/flat_tensor/flat_tensor_data_map.h
@@ -54,7 +54,7 @@ class FlatTensorDataMap final
   ET_NODISCARD
   executorch::runtime::Result<
       const executorch::ET_RUNTIME_NAMESPACE::TensorLayout>
-  get_tensor_layout(executorch::aten::string_view key) const override;
+  get_tensor_layout(std::string_view key) const override;
 
   /**
    * Retrieve read-only data for the specified key.
@@ -65,7 +65,7 @@ class FlatTensorDataMap final
    */
   ET_NODISCARD
   executorch::runtime::Result<executorch::runtime::FreeableBuffer> get_data(
-      executorch::aten::string_view key) const override;
+      std::string_view key) const override;
 
   /**
    * Loads the data of the specified tensor into the provided buffer.
@@ -78,7 +78,7 @@ class FlatTensorDataMap final
    * @returns an Error indicating if the load was successful.
    */
   ET_NODISCARD executorch::runtime::Error load_data_into(
-      executorch::aten::string_view key,
+      std::string_view key,
       void* buffer,
       size_t size) const override;
 
diff --git a/extension/named_data_map/merged_data_map.cpp b/extension/named_data_map/merged_data_map.cpp
@@ -12,13 +12,13 @@
 #include <unordered_map>
 #include <vector>
 
-using executorch::aten::string_view;
 using executorch::ET_RUNTIME_NAMESPACE::NamedDataMap;
 using executorch::ET_RUNTIME_NAMESPACE::TensorLayout;
 using executorch::runtime::Error;
 using executorch::runtime::FreeableBuffer;
 using executorch::runtime::Result;
 using executorch::runtime::Span;
+using std::string_view;
 
 namespace executorch::extension {
 namespace ET_MERGED_DATA_MAP_NAMESPACE {
diff --git a/extension/named_data_map/merged_data_map.h b/extension/named_data_map/merged_data_map.h
@@ -48,7 +48,7 @@ class MergedDataMap final
   ET_NODISCARD
   executorch::runtime::Result<
       const executorch::ET_RUNTIME_NAMESPACE::TensorLayout>
-  get_tensor_layout(executorch::aten::string_view key) const override;
+  get_tensor_layout(std::string_view key) const override;
 
   /**
    * Retrieve read-only data for the specified key.
@@ -59,7 +59,7 @@ class MergedDataMap final
    */
   ET_NODISCARD
   executorch::runtime::Result<executorch::runtime::FreeableBuffer> get_data(
-      executorch::aten::string_view key) const override;
+      std::string_view key) const override;
 
   /**
    * Loads the data of the specified tensor into the provided buffer.
@@ -72,7 +72,7 @@ class MergedDataMap final
    * @returns an Error indicating if the load was successful.
    */
   ET_NODISCARD executorch::runtime::Error load_data_into(
-      executorch::aten::string_view key,
+      std::string_view key,
       void* buffer,
       size_t size) const override;
 
diff --git a/runtime/core/exec_aten/exec_aten.h b/runtime/core/exec_aten/exec_aten.h
@@ -9,6 +9,7 @@
 #pragma once
 
 #include <optional>
+#include <string_view>
 
 #include <executorch/runtime/core/error.h> // @manual
 #include <executorch/runtime/core/result.h> // @manual
@@ -46,7 +47,6 @@
 #include <executorch/runtime/core/portable_type/qint_types.h> // @manual
 #include <executorch/runtime/core/portable_type/scalar.h> // @manual
 #include <executorch/runtime/core/portable_type/scalar_type.h> // @manual
-#include <executorch/runtime/core/portable_type/string_view.h> // @manual
 #include <executorch/runtime/core/portable_type/tensor.h> // @manual
 #include <executorch/runtime/core/portable_type/tensor_options.h> // @manual
 
diff --git a/runtime/core/exec_aten/util/scalar_type_util.h b/runtime/core/exec_aten/util/scalar_type_util.h
@@ -47,7 +47,7 @@ using ScalarType = at::ScalarType;
 } // namespace executorch
 #else // !USE_ATEN_LIB
 #include <executorch/runtime/core/portable_type/scalar_type.h>
-#include <executorch/runtime/core/portable_type/string_view.h>
+#include <string_view>
 namespace executorch {
 namespace aten {
 using ScalarType = torch::executor::ScalarType;
diff --git a/runtime/core/named_data_map.h b/runtime/core/named_data_map.h
@@ -31,15 +31,15 @@ class NamedDataMap {
    * @return Result containing TensorLayout.
    */
   ET_NODISCARD virtual Result<const TensorLayout> get_tensor_layout(
-      executorch::aten::string_view key) const = 0;
+      std::string_view key) const = 0;
   /**
    * Get data by key.
    *
    * @param key Name of the data.
    * @return Result containing a FreeableBuffer.
    */
   ET_NODISCARD virtual Result<FreeableBuffer> get_data(
-      executorch::aten::string_view key) const = 0;
+      std::string_view key) const = 0;
 
   /**
    * Loads data corresponding to the key into the provided buffer.
@@ -51,10 +51,8 @@ class NamedDataMap {
    * `size` bytes of memory.
    * @returns an Error indicating if the load was successful.
    */
-  ET_NODISCARD virtual Error load_data_into(
-      executorch::aten::string_view key,
-      void* buffer,
-      size_t size) const = 0;
+  ET_NODISCARD virtual Error
+  load_data_into(std::string_view key, void* buffer, size_t size) const = 0;
 
   /**
    * Get the number of keys in the NamedDataMap.
diff --git a/runtime/core/portable_type/string_view.h b/runtime/core/portable_type/string_view.h
diff --git a/runtime/core/portable_type/targets.bzl b/runtime/core/portable_type/targets.bzl
@@ -17,7 +17,6 @@ def define_common_targets():
             "scalar.h",
             "tensor.h",
             "tensor_impl.h",
-            "string_view.h",
             "device.h",
         ],
         # Only should be depended on by kernel_types:kernel_types, but various suffixes like Android and Static
diff --git a/runtime/executor/merged_data_map.h b/runtime/executor/merged_data_map.h
@@ -57,7 +57,7 @@ class MergedDataMap final : public NamedDataMap {
    */
   ET_NODISCARD
   Result<const TensorLayout> get_tensor_layout(
-      executorch::aten::string_view key) const override {
+      std::string_view key) const override {
     auto layout = first_->get_tensor_layout(key);
     if (layout.ok()) {
       return layout.get();
@@ -76,8 +76,7 @@ class MergedDataMap final : public NamedDataMap {
    * @return error if the key is not present or data cannot be loaded.
    */
   ET_NODISCARD
-  Result<FreeableBuffer> get_data(
-      executorch::aten::string_view key) const override {
+  Result<FreeableBuffer> get_data(std::string_view key) const override {
     auto data = first_->get_data(key);
     if (data.error() != Error::NotFound) {
       return data;
@@ -97,7 +96,7 @@ class MergedDataMap final : public NamedDataMap {
    * @returns an Error indicating if the load was successful.
    */
   ET_NODISCARD Error load_data_into(
-      ET_UNUSED executorch::aten::string_view key,
+      ET_UNUSED std::string_view key,
       ET_UNUSED void* buffer,
       ET_UNUSED size_t size) const override {
     return Error::NotImplemented;
diff --git a/runtime/executor/pte_data_map.cpp b/runtime/executor/pte_data_map.cpp
@@ -26,8 +26,7 @@ namespace internal {
 }
 
 ET_NODISCARD
-Result<FreeableBuffer> PteDataMap::get_data(
-    executorch::aten::string_view key) const {
+Result<FreeableBuffer> PteDataMap::get_data(std::string_view key) const {
   for (uint32_t i = 0; i < named_data_->size(); i++) {
     const auto* named_data_item = named_data_->Get(i);
     ET_CHECK_OR_RETURN_ERROR(
diff --git a/runtime/executor/pte_data_map.h b/runtime/executor/pte_data_map.h
@@ -79,7 +79,7 @@ class PteDataMap final : public NamedDataMap {
    */
   ET_NODISCARD
   Result<const TensorLayout> get_tensor_layout(
-      ET_UNUSED executorch::aten::string_view key) const override {
+      ET_UNUSED std::string_view key) const override {
     return Error::NotImplemented;
   }
 
@@ -91,14 +91,13 @@ class PteDataMap final : public NamedDataMap {
    * @return error if the key is not present or data cannot be loaded.
    */
   ET_NODISCARD
-  Result<FreeableBuffer> get_data(
-      executorch::aten::string_view key) const override;
+  Result<FreeableBuffer> get_data(std::string_view key) const override;
 
   /**
    * The PteDataMap currently does not implement load_into.
    */
   ET_NODISCARD Error load_data_into(
-      ET_UNUSED executorch::aten::string_view key,
+      ET_UNUSED std::string_view key,
       ET_UNUSED void* buffer,
       ET_UNUSED size_t size) const override {
     return Error::NotImplemented;
diff --git a/runtime/executor/test/method_meta_test.cpp b/runtime/executor/test/method_meta_test.cpp
@@ -38,7 +38,7 @@ class TensorInfoTestFriend final {
       Span<const uint8_t> dim_order,
       executorch::aten::ScalarType scalar_type,
       const bool is_memory_planned,
-      executorch::aten::string_view name) {
+      std::string_view name) {
     return TensorInfo::create(
                Span<const int32_t>(sizes.data(), sizes.size()),
                Span<const uint8_t>(dim_order.data(), dim_order.size()),
@@ -236,7 +236,7 @@ TEST_F(MethodMetaTest, TensorInfoSizeOverflow) {
           Span<const uint8_t>(dim_order.data(), dim_order.size()),
           executorch::aten::ScalarType::Float,
           false, // is_memory_planned
-          executorch::aten::string_view{nullptr, 0}),
+          std::string_view{nullptr, 0}),
       "");
 }
 
