Rename selected_mobile_ops --> selected_op_dtypes (pytorch#1098)

Summary:
Pull Request resolved: pytorch#1098

^
Header naming can be more accurate; describing the dtypes for each operator, rather than mobile operators.

Reviewed By: larryliu0820

Differential Revision: D50677452

fbshipit-source-id: 5178ad06220494b2f8d22dcacb76e57eef4d1669

Author: lucylq

codegen/tools/gen_selected_mobile_ops.py renamed to codegen/tools/gen_selected_op_variants.py

@@ -15,12 +15,12 @@
 from torchgen.code_template import CodeTemplate
 
 
-ops_and_dtypes_template_str = """((string_view(operator_name).compare("$operator_name") == 0)\n        && ($dtype_checks))"""
+ops_and_dtypes_template_str = """((exec_aten::string_view(operator_name).compare("$operator_name") == 0)\n        && ($dtype_checks))"""
 ops_and_dtypes_template = CodeTemplate(ops_and_dtypes_template_str)
 
 selected_kernel_dtypes_h_template_str = """#pragma once
 /**
- * Generated by executorch/codegen/tools/gen_selected_mobile_ops_header.py
+ * Generated by executorch/codegen/tools/gen_selected_op_variants.py
  */
 
 inline constexpr bool should_include_kernel_dtype(
@@ -60,7 +60,7 @@
 }
 
 
-def write_selected_mobile_ops(yaml_file_path: str, output_dir: str) -> None:
+def write_selected_op_variants(yaml_file_path: str, output_dir: str) -> None:
     with open(yaml_file_path, "r") as selected_operators_file:
         # Collect et_kernel_metadata from selected_operators.yaml and extract dtypes
         # Example format: v1/6;0,1|6;0,1|6;0,1|6;0,1  # Float, 0, 1
@@ -92,8 +92,8 @@ def write_selected_mobile_ops(yaml_file_path: str, output_dir: str) -> None:
             )
             body = "\n || ".join(body_parts)
         header_contents = selected_kernel_dtypes_h_template.substitute(body=body)
-        selected_mobile_ops_path = os.path.join(output_dir, "selected_mobile_ops.h")
-        with open(selected_mobile_ops_path, "wb") as out_file:
+        selected_op_variants_path = os.path.join(output_dir, "selected_op_variants.h")
+        with open(selected_op_variants_path, "wb") as out_file:
             out_file.write(header_contents.encode("utf-8"))
 
 
@@ -109,14 +109,14 @@ def main(argv: List[Any]) -> None:
         "--output-dir",
         "--output_dir",
         help=(
-            "The directory to store the output yaml files (selected_mobile_ops.h, "
+            "The directory to store the output yaml files (selected_op_variants.h, "
             + "selected_kernel_dtypes.h, selected_operators.yaml)"
         ),
         required=True,
     )
 
     options = parser.parse_args(argv)
-    write_selected_mobile_ops(options.yaml_file_path, options.output_dir)
+    write_selected_op_variants(options.yaml_file_path, options.output_dir)
 
 
 if __name__ == "__main__":

codegen/tools/targets.bzl

@@ -119,8 +119,8 @@ def define_common_targets(is_fbcode = False):
     )
 
     runtime.python_library(
-        name = "gen_selected_mobile_ops_lib",
-        srcs = ["gen_selected_mobile_ops.py"],
+        name = "gen_selected_op_variants_lib",
+        srcs = ["gen_selected_op_variants.py"],
         base_module = "executorch.codegen.tools",
         visibility = ["//executorch/..."],
         external_deps = [
@@ -129,29 +129,29 @@ def define_common_targets(is_fbcode = False):
     )
 
     runtime.python_binary(
-        name = "gen_selected_mobile_ops",
-        main_module = "executorch.codegen.tools.gen_selected_mobile_ops",
+        name = "gen_selected_op_variants",
+        main_module = "executorch.codegen.tools.gen_selected_op_variants",
         package_style = "inplace",
         visibility = [
             "PUBLIC",
         ],
         deps = [
-            ":gen_selected_mobile_ops_lib",
+            ":gen_selected_op_variants_lib",
         ],
         _is_external_target = True,
     )
 
     runtime.python_test(
-        name = "test_gen_selected_mobile_ops",
+        name = "test_gen_selected_op_variants",
         srcs = [
-            "test/test_gen_selected_mobile_ops.py",
+            "test/test_gen_selected_op_variants.py",
         ],
         package_style = "inplace",
         visibility = [
             "PUBLIC",
         ],
         deps = [
-            ":gen_selected_mobile_ops_lib",
+            ":gen_selected_op_variants_lib",
             "fbsource//third-party/pypi/expecttest:expecttest",
         ],
         _is_external_target = True,

codegen/tools/test/test_gen_selected_mobile_ops.py renamed to codegen/tools/test/test_gen_selected_op_variants.py

@@ -8,7 +8,7 @@
 import os
 import tempfile
 
-import executorch.codegen.tools.gen_selected_mobile_ops as gen_selected_mobile_ops
+import executorch.codegen.tools.gen_selected_op_variants as gen_selected_op_variants
 import expecttest
 
 
@@ -55,29 +55,29 @@ def tearDown(self):
         self.temp_dir.cleanup()
 
     def test_generates_correct_header(self) -> None:
-        gen_selected_mobile_ops.write_selected_mobile_ops(
+        gen_selected_op_variants.write_selected_op_variants(
             os.path.join(self.temp_dir.name, "selected_operators.yaml"),
             self.temp_dir.name,
         )
         with open(
-            os.path.join(self.temp_dir.name, "selected_mobile_ops.h"), "r"
+            os.path.join(self.temp_dir.name, "selected_op_variants.h"), "r"
         ) as result:
             self.assertExpectedInline(
                 result.read(),
                 """#pragma once
 /**
- * Generated by executorch/codegen/tools/gen_selected_mobile_ops_header.py
+ * Generated by executorch/codegen/tools/gen_selected_op_variants.py
  */
 
 inline constexpr bool should_include_kernel_dtype(
   const char *operator_name,
   exec_aten::ScalarType scalar_type
 ) {
-  return ((string_view(operator_name).compare("add.out") == 0)
+  return ((exec_aten::string_view(operator_name).compare("add.out") == 0)
         && (scalar_type == exec_aten::ScalarType::Float || scalar_type == exec_aten::ScalarType::Int))
- || ((string_view(operator_name).compare("mul.out") == 0)
+ || ((exec_aten::string_view(operator_name).compare("mul.out") == 0)
         && (scalar_type == exec_aten::ScalarType::Float))
- || ((string_view(operator_name).compare("sub.out") == 0)
+ || ((exec_aten::string_view(operator_name).compare("sub.out") == 0)
         && (true));
 }
 """,
@@ -108,18 +108,18 @@ def tearDown(self):
         self.temp_dir.cleanup()
 
     def test_generates_correct_header(self) -> None:
-        gen_selected_mobile_ops.write_selected_mobile_ops(
+        gen_selected_op_variants.write_selected_op_variants(
             os.path.join(self.temp_dir.name, "selected_operators.yaml"),
             self.temp_dir.name,
         )
         with open(
-            os.path.join(self.temp_dir.name, "selected_mobile_ops.h"), "r"
+            os.path.join(self.temp_dir.name, "selected_op_variants.h"), "r"
         ) as result:
             self.assertExpectedInline(
                 result.read(),
                 """#pragma once
 /**
- * Generated by executorch/codegen/tools/gen_selected_mobile_ops_header.py
+ * Generated by executorch/codegen/tools/gen_selected_op_variants.py
  */
 
 inline constexpr bool should_include_kernel_dtype(

runtime/core/exec_aten/util/scalar_type_util.h

@@ -47,11 +47,8 @@ using string_view = torch::executor::string_view;
 } // namespace exec_aten
 #endif
 
-namespace torch {
-namespace executor {
-
 #ifdef EXECUTORCH_SELECTIVE_BUILD_DTYPE
-#include <executorch/runtime/core/exec_aten/util/selected_mobile_ops.h>
+#include <executorch/runtime/core/exec_aten/util/selected_op_variants.h>
 #else
 inline constexpr bool should_include_kernel_dtype(
     const char* /*operator_name*/,
@@ -61,6 +58,8 @@ inline constexpr bool should_include_kernel_dtype(
 }
 #endif
 
+namespace torch {
+namespace executor {
 #define ET_INTERNAL_CHECK_SELECTIVE_BUILD(enum_type)               \
   do {                                                             \
     if (!should_include_kernel_dtype(et_switch_name, enum_type)) { \

runtime/core/exec_aten/util/targets.bzl

@@ -42,13 +42,13 @@ def define_common_targets():
 
     dtype_selective_build_lib = native.read_config("executorch", "dtype_selective_build_lib", None)
     if dtype_selective_build_lib != None:
-        # retrieve selected_mobile_ops.h from codegen
-        genrule_name = dtype_selective_build_lib + "_et_op_dtype_gen[selected_mobile_ops]"
+        # retrieve selected_op_variants.h from codegen
+        genrule_name = dtype_selective_build_lib + "_et_op_dtype_gen[selected_op_variants]"
         runtime.cxx_library(
             name = "dtype_headers",
             srcs = [],
             exported_headers = {
-                "selected_mobile_ops.h": genrule_name,
+                "selected_op_variants.h": genrule_name,
             },
             visibility = [
                 "//executorch/...",

runtime/core/exec_aten/util/test/selected_mobile_ops_header_test.cpp renamed to runtime/core/exec_aten/util/test/selected_op_variants_test.cpp

@@ -17,8 +17,8 @@ def define_common_targets():
     )
 
     runtime.cxx_test(
-        name = "selected_mobile_ops_header_test",
-        srcs = ["selected_mobile_ops_header_test.cpp"],
+        name = "selected_op_variants_test",
+        srcs = ["selected_op_variants_test.cpp"],
         deps = [
             "//executorch/runtime/core/exec_aten/util:scalar_type_util_TEST_ONLY",
             "//executorch/runtime/core/portable_type:portable_type",

runtime/core/exec_aten/util/test/targets.bzl

@@ -437,15 +437,15 @@ def executorch_generated_lib(
         platforms = platforms,
     )
 
-    # genrule to generate selected_mobile_ops.h from selected_operators.yaml above
+    # genrule to generate selected_op_variants.h from selected_operators.yaml above
     oplist_header_name = name + "_et_op_dtype_gen"
     runtime.genrule(
         name = oplist_header_name,
         macros_only = False,
-        cmd = ("$(exe //executorch/codegen/tools:gen_selected_mobile_ops) " +
+        cmd = ("$(exe //executorch/codegen/tools:gen_selected_op_variants) " +
                "--yaml_file_path $(location :{}[selected_operators.yaml]) " +
                "--output_dir $OUT").format(oplist_dir_name),
-        outs = {"selected_mobile_ops": ["selected_mobile_ops.h"]},
+        outs = {"selected_op_variants": ["selected_op_variants.h"]},
         default_outs = ["."],
         platforms = platforms,
         visibility = visibility,
@@ -471,7 +471,7 @@ def executorch_generated_lib(
     # along with headers declaring custom ops `Functions.h`, `NativeFunctions.h` and `UnboxingFunctions.h`.
     header_lib = name + "_headers"
     if header_lib in libs:
-        libs[header_lib]["headers"]["selected_mobile_ops.h"] = ":{}[selected_mobile_ops]".format(oplist_header_name)
+        libs[header_lib]["headers"]["selected_op_variants.h"] = ":{}[selected_op_variants]".format(oplist_header_name)
         runtime.cxx_library(
             name = header_lib,
             srcs = [],