copy sdk to dev_tools, add dev_tools to visibility config

.ci/docker/ubuntu/Dockerfile

@@ -80,7 +80,7 @@ RUN rm install_android.sh
 ARG ARM_SDK
 COPY --chown=ci-user:ci-user ./arm /opt/arm
 # Set up ARM SDK if needed
-RUN if [ -n "${ARM_SDK}" ]; then git config --global user.email "ossci@example.com"; git config --global user.name "OSS CI"; bash /opt/arm/setup.sh --i-agree-to-the-contained-eula /opt/arm-sdk; chown -R ci-user:ci-user /opt/arm-sdk; fi
+RUN if [ -n "${ARM_SDK}" ]; then git config --global user.email "ossci@example.com"; git config --global user.name "OSS CI"; bash /opt/arm/setup.sh --i-agree-to-the-contained-eula /opt/arm-dev_tools; chown -R ci-user:ci-user /opt/arm-dev_tools; fi
 
 USER ci-user
 CMD ["bash"]

CMakeLists.txt

@@ -187,7 +187,7 @@ option(EXECUTORCH_BUILD_KERNELS_OPTIMIZED "Build the optimized kernels" OFF)
 
 option(EXECUTORCH_BUILD_KERNELS_QUANTIZED "Build the quantized kernels" OFF)
 
-option(EXECUTORCH_BUILD_SDK "Build the ExecuTorch SDK")
+option(EXECUTORCH_BUILD_DEV_TOOLS "Build the ExecuTorch Developer Tools")
 
 option(EXECUTORCH_BUILD_SIZE_TEST "Build the size test" OFF)
 
@@ -604,12 +604,12 @@ if(EXECUTORCH_BUILD_GTESTS)
   add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/third-party/googletest)
 endif()
 
-if(EXECUTORCH_BUILD_SDK)
+if(EXECUTORCH_BUILD_DEV_TOOLS)
   set(EXECUTORCH_BUILD_EXTENSION_DATA_LOADER
       ON
       CACHE BOOL "EXECUTORCH_BUILD_EXTENSION_DATA_LOADER" FORCE
   )
-  add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/sdk)
+  add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/dev_tools)
 endif()
 
 if(EXECUTORCH_BUILD_EXTENSION_APPLE)
@@ -663,8 +663,8 @@ if(EXECUTORCH_BUILD_PYBIND)
     add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/extension/data_loader)
   endif()
 
-  if(NOT EXECUTORCH_BUILD_SDK)
-    add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/sdk)
+  if(NOT EXECUTORCH_BUILD_DEV_TOOLS)
+    add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/dev_tools)
   endif()
 
   # find pytorch lib, to allow pybind to take at::Tensor as input/output

README.md

@@ -10,7 +10,7 @@ Key value propositions of ExecuTorch are:
 - **Portability:** Compatibility with a wide variety of computing platforms,
   from high-end mobile phones to highly constrained embedded systems and
   microcontrollers.
-- **Productivity:** Enabling developers to use the same toolchains and SDK from
+- **Productivity:** Enabling developers to use the same toolchains from
   PyTorch model authoring and conversion, to debugging and deployment to a wide
   variety of platforms.
 - **Performance:** Providing end users with a seamless and high-performance
@@ -93,7 +93,7 @@ tools.
 ├── schema                          #  ExecuTorch PTE file format flatbuffer
 schemas.
 ├── scripts                         #  Utility scripts for size management, dependency management, etc.
-├── sdk                             #  Model profiling, debugging, and introspection.
+├── dev_tools                             #  Model profiling, debugging, and introspection.
 ├── shim                            #  Compatibility layer between OSS and Internal builds
 ├── test                            #  Broad scoped end-to-end tests.
 ├── third-party                     #  Third-party dependencies.

backends/apple/coreml/CMakeLists.txt

@@ -130,7 +130,7 @@ target_include_directories(
 target_include_directories(coremldelegate PRIVATE ${EXECUTORCH_ROOT}/..)
 target_link_libraries(coremldelegate PRIVATE executorch_no_prim_ops)
 
-if(EXECUTORCH_BUILD_SDK)
+if(EXECUTORCH_BUILD_DEV_TOOLS)
   target_sources(coremldelegate PRIVATE ${SDK_SOURCES} ${PROTOBUF_SOURCES})
   target_include_directories(
     coremldelegate
@@ -166,7 +166,7 @@ endif()
 target_compile_options(coremldelegate PRIVATE "-fobjc-arc")
 target_compile_options(coremldelegate PRIVATE "-fno-exceptions")
 
-if(EXECUTORCH_BUILD_SDK)
+if(EXECUTORCH_BUILD_DEV_TOOLS)
   target_compile_options(
     executorch_no_prim_ops PUBLIC -DET_EVENT_TRACER_ENABLED
   )

backends/apple/mps/TARGETS

@@ -94,8 +94,8 @@ runtime.python_test(
         "//caffe2:torch",
         "//executorch/examples/models:models",
         "//executorch/exir/tests:models",
-        "//executorch/sdk:lib",
-        "//executorch/sdk/bundled_program/serialize:lib",
+        "//executorch/dev_tools:lib",
+        "//executorch/dev_tools/bundled_program/serialize:lib",
         "fbsource//third-party/pypi/pytest:pytest",
     ],
 )

backends/apple/mps/setup.md

@@ -111,18 +111,18 @@ python3 -m examples.apple.mps.scripts.mps_example --model_name="mv3" --no-use_fp
 ```
 
 ### Profiling:
-1. [Optional] Generate an [ETRecord](./sdk-etrecord.rst) while you're exporting your model.
+1. [Optional] Generate an [ETRecord](./dev-tools-etrecord.rst) while you're exporting your model.
 ```bash
 cd executorch
 python3 -m examples.apple.mps.scripts.mps_example --model_name="mv3" --generate_etrecord -b
 ```
-2. Run your Program on the ExecuTorch runtime and generate an [ETDump](./sdk-etdump.md).
+2. Run your Program on the ExecuTorch runtime and generate an [ETDump](./dev-tools-etdump.md).
 ```
 ./cmake-out/examples/apple/mps/mps_executor_runner --model_path mv3_mps_bundled_fp16.pte --bundled_program --dump-outputs
 ```
 3. Create an instance of the Inspector API by passing in the ETDump you have sourced from the runtime along with the optionally generated ETRecord from step 1.
 ```bash
-python3 -m sdk.inspector.inspector_cli --etdump_path etdump.etdp --etrecord_path etrecord.bin
+python3 -m dev_tools.inspector.inspector_cli --etdump_path etdump.etdp --etrecord_path etrecord.bin
 ```
 
 ## Deploying and Running on Device

backends/apple/mps/targets.bzl

@@ -47,7 +47,7 @@ def define_common_targets(is_xplat = False, platforms = []):
             "//executorch/exir/backend:backend_lib",
             "//executorch/extension/pybindings/...",
             "//executorch/runtime/backend/...",
-            "//executorch/sdk/runners/...",
+            "//executorch/dev_tools/runners/...",
             "//executorch/test/...",
             "@EXECUTORCH_CLIENTS",
         ],

backends/apple/mps/test/test_mps_utils.py

@@ -22,9 +22,9 @@
 from executorch.exir.backend.backend_details import CompileSpec
 from executorch.exir.capture._config import ExecutorchBackendConfig
 from executorch.exir.tracer import Value
-from executorch.sdk import BundledProgram
-from executorch.sdk.bundled_program.config import MethodTestCase, MethodTestSuite
-from executorch.sdk.bundled_program.serialize import (
+from executorch.dev_tools import BundledProgram
+from executorch.dev_tools.bundled_program.config import MethodTestCase, MethodTestSuite
+from executorch.dev_tools.bundled_program.serialize import (
     serialize_from_bundled_program_to_flatbuffer,
 )
 from torch.export import export, ExportedProgram

backends/qualcomm/scripts/build.sh

@@ -72,7 +72,7 @@ if [ "$BUILD_AARCH64" = true ]; then
         -DCMAKE_INSTALL_PREFIX=$BUILD_ROOT \
         -DCMAKE_BUILD_TYPE=$BUILD_TYPE \
         -DEXECUTORCH_BUILD_QNN=ON \
-        -DEXECUTORCH_BUILD_SDK=ON \
+        -DEXECUTORCH_BUILD_DEV_TOOLS=ON \
         -DEXECUTORCH_BUILD_EXTENSION_MODULE=ON \
         -DEXECUTORCH_ENABLE_EVENT_TRACER=ON \
         -DQNN_SDK_ROOT=$QNN_SDK_ROOT \

backends/qualcomm/setup.md

@@ -102,7 +102,7 @@ cd build_android
 cmake .. \
     -DCMAKE_INSTALL_PREFIX=$PWD \
     -DEXECUTORCH_BUILD_QNN=ON \
-    -DEXECUTORCH_BUILD_SDK=ON \
+    -DEXECUTORCH_BUILD_DEV_TOOLS=ON \
     -DEXECUTORCH_ENABLE_EVENT_TRACER=ON \
     -DQNN_SDK_ROOT=$QNN_SDK_ROOT \
     -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK_ROOT/build/cmake/android.toolchain.cmake \

backends/qualcomm/tests/utils.py

@@ -36,8 +36,8 @@
 from executorch.exir.pass_base import ExportPass
 from executorch.exir.passes.memory_planning_pass import MemoryPlanningPass
 from executorch.exir.program._program import ExecutorchProgram
-from executorch.sdk import generate_etrecord
-from executorch.sdk.inspector import Inspector
+from executorch.dev_tools import generate_etrecord
+from executorch.dev_tools.inspector import Inspector
 from torch.ao.quantization.quantize_pt2e import convert_pt2e, prepare_pt2e
 
 

backends/xnnpack/test/TARGETS

@@ -36,10 +36,10 @@ runtime.python_test(
     deps = [
         "//executorch/backends/xnnpack/partition:xnnpack_partitioner",
         "//executorch/backends/xnnpack/test/tester:tester",
+        "//executorch/dev_tools:lib",
+        "//executorch/dev_tools/bundled_program:config",
+        "//executorch/dev_tools/bundled_program/serialize:lib",
         "//executorch/exir/passes:constant_prop_pass",
-        "//executorch/sdk:lib",
-        "//executorch/sdk/bundled_program:config",
-        "//executorch/sdk/bundled_program/serialize:lib",
         "//pytorch/ao:torchao",  # @manual
     ],
     external_deps = [

backends/xnnpack/test/test_xnnpack_utils.py

@@ -25,6 +25,12 @@
 
 # import the xnnpack backend implementation
 from executorch.backends.xnnpack.xnnpack_preprocess import XnnpackBackend
+from executorch.dev_tools import BundledProgram
+
+from executorch.dev_tools.bundled_program.config import MethodTestCase, MethodTestSuite
+from executorch.dev_tools.bundled_program.serialize import (
+    serialize_from_bundled_program_to_flatbuffer,
+)
 from executorch.exir import ExecutorchProgram, ExirExportedProgram
 from executorch.exir.backend.backend_api import to_backend, validation_disabled
 
@@ -34,12 +40,6 @@
     _load_for_executorch_from_buffer,
 )
 from executorch.extension.pytree import tree_flatten
-from executorch.sdk import BundledProgram
-
-from executorch.sdk.bundled_program.config import MethodTestCase, MethodTestSuite
-from executorch.sdk.bundled_program.serialize import (
-    serialize_from_bundled_program_to_flatbuffer,
-)
 
 from torch.ao.quantization import (  # @manual
     default_per_channel_symmetric_qnnpack_qconfig,

build/Utils.cmake

@@ -97,7 +97,7 @@ function(executorch_print_configuration_summary)
                  "${EXECUTORCH_BUILD_KERNELS_QUANTIZED}"
   )
   message(
-    STATUS "  EXECUTORCH_BUILD_SDK                   : ${EXECUTORCH_BUILD_SDK}"
+    STATUS "  EXECUTORCH_BUILD_DEV_TOOLS                   : ${EXECUTORCH_BUILD_DEV_TOOLS}"
   )
   message(
     STATUS

sdk/CMakeLists.txt → dev_tools/CMakeLists.txt

@@ -74,8 +74,8 @@ set_property(TARGET flatccrt PROPERTY POSITION_INDEPENDENT_CODE ON)
 include(ExternalProject)
 
 # The include directory that will contain the generated schema headers.
-set(_program_schema__include_dir "${CMAKE_BINARY_DIR}/sdk/include")
-set(_bundled_schema__include_dir "${CMAKE_BINARY_DIR}/sdk/bundled_program")
+set(_program_schema__include_dir "${CMAKE_BINARY_DIR}/dev_tools/include")
+set(_bundled_schema__include_dir "${CMAKE_BINARY_DIR}/dev_tools/bundled_program")
 
 # TODO(dbort): Only enable this when cross-compiling. It can cause build race
 # conditions (libflatcc.a errors) when enabled.
@@ -110,11 +110,11 @@ set(_etdump_schema__outputs)
 foreach(fbs_file ${_etdump_schema_names})
   string(REGEX REPLACE "[.]fbs$" "_reader.h" generated "${fbs_file}")
   list(APPEND _etdump_schema__outputs
-       "${_program_schema__include_dir}/executorch/sdk/etdump/${generated}"
+       "${_program_schema__include_dir}/executorch/dev_tools/etdump/${generated}"
   )
   string(REGEX REPLACE "[.]fbs$" "_builder.h" generated "${fbs_file}")
   list(APPEND _etdump_schema__outputs
-       "${_program_schema__include_dir}/executorch/sdk/etdump/${generated}"
+       "${_program_schema__include_dir}/executorch/dev_tools/etdump/${generated}"
   )
 endforeach()
 
@@ -125,7 +125,7 @@ foreach(fbs_file ${_bundled_input_schema_names})
   list(
     APPEND
     _bundled_program_schema__outputs
-    "${_bundled_schema__include_dir}/executorch/sdk/bundled_program/schema/${generated}"
+    "${_bundled_schema__include_dir}/executorch/dev_tools/bundled_program/schema/${generated}"
   )
 endforeach()
 
@@ -137,9 +137,9 @@ add_library(
 # Ensure the host tool is built before the main project
 add_dependencies(etdump_schema flatcc_cli)
 
-file(MAKE_DIRECTORY ${_program_schema__include_dir}/executorch/sdk/etdump)
+file(MAKE_DIRECTORY ${_program_schema__include_dir}/executorch/dev_tools/etdump)
 file(MAKE_DIRECTORY
-     ${_program_schema__include_dir}/executorch/sdk/bundled_program
+     ${_program_schema__include_dir}/executorch/dev_tools/bundled_program
 )
 
 if(EXECUTORCH_SEPARATE_FLATCC_HOST_PROJECT)
@@ -177,10 +177,10 @@ add_custom_command(
     # tree instead of under the binary directory, and there's no way to change
     # that behavior.
     ${_flatcc_source_dir}/bin/flatcc -cwr -o
-    ${_program_schema__include_dir}/executorch/sdk/etdump
+    ${_program_schema__include_dir}/executorch/dev_tools/etdump
     ${_etdump_schema__srcs}
   COMMAND rm -f ${_etdump_schema_cleanup_paths}
-  WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/sdk
+  WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/dev_tools
   DEPENDS ${_etdump_schema_gen_dep}
   COMMENT "Generating etdump headers"
   VERBATIM
@@ -201,9 +201,9 @@ add_custom_command(
   OUTPUT ${_bundled_program_schema__outputs}
   COMMAND
     ${FLATC_EXECUTABLE} --cpp --cpp-std c++11 --gen-mutable --scoped-enums -o
-    "${_bundled_schema__include_dir}/executorch/sdk/bundled_program/schema"
+    "${_bundled_schema__include_dir}/executorch/dev_tools/bundled_program/schema"
     ${_bundled_program_schema__srcs}
-  WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/sdk
+  WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/dev_tools
   DEPENDS ${FLATC_EXECUTABLE} ${_bundled_program_schema__srcs}
   COMMENT "Generating bundled_program headers"
   VERBATIM

sdk/TARGETS → dev_tools/TARGETS

@@ -6,8 +6,8 @@ python_library(
     name = "lib",
     srcs = ["__init__.py"],
     deps = [
-        "//executorch/sdk/bundled_program:core",
-        "//executorch/sdk/etrecord:etrecord",
-        "//executorch/sdk/inspector:lib",
+        "//executorch/dev_tools/bundled_program:core",
+        "//executorch/dev_tools/etrecord:etrecord",
+        "//executorch/dev_tools/inspector:lib",
     ],
 )

sdk/__init__.py → dev_tools/__init__.py

@@ -4,10 +4,10 @@
 # This source code is licensed under the BSD-style license found in the
 # LICENSE file in the root directory of this source tree.
 
-import executorch.sdk.inspector as inspector
-from executorch.sdk.bundled_program.core import BundledProgram
-from executorch.sdk.etrecord import ETRecord, generate_etrecord, parse_etrecord
-from executorch.sdk.inspector import Inspector
+import executorch.dev_tools.inspector as inspector
+from executorch.dev_tools.bundled_program.core import BundledProgram
+from executorch.dev_tools.etrecord import ETRecord, generate_etrecord, parse_etrecord
+from executorch.dev_tools.inspector import Inspector
 
 __all__ = [
     "ETRecord",

sdk/bundled_program/TARGETS → dev_tools/bundled_program/TARGETS

@@ -18,10 +18,10 @@ runtime.python_library(
         ":config",
         ":version",
         "//caffe2:torch",
+        "//executorch/dev_tools/bundled_program/schema:bundled_program_schema_py",
         "//executorch/exir:schema",
         "//executorch/exir:tensor",
         "//executorch/exir/_serialize:lib",
-        "//executorch/sdk/bundled_program/schema:bundled_program_schema_py",
     ],
 )
 
@@ -46,6 +46,6 @@ runtime.python_library(
         "version.py",
     ],
     visibility = [
-        "//executorch/sdk/...",
+        "//executorch/dev_tools/...",
     ],
 )

sdk/bundled_program/bundled_program.cpp → dev_tools/bundled_program/bundled_program.cpp

@@ -6,7 +6,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#include <executorch/sdk/bundled_program/bundled_program.h>
+#include <executorch/dev_tools/bundled_program/bundled_program.h>
 
 #include <cmath>
 #include <cstddef>
@@ -16,12 +16,12 @@
 #include <ATen/ATen.h>
 #endif // USE_ATEN_LIB
 
+#include <executorch/dev_tools/bundled_program/schema/bundled_program_schema_generated.h>
 #include <executorch/runtime/core/event_tracer_hooks.h>
 #include <executorch/runtime/core/exec_aten/util/dim_order_util.h>
 #include <executorch/runtime/core/memory_allocator.h>
 #include <executorch/runtime/executor/method.h>
 #include <executorch/runtime/platform/log.h>
-#include <executorch/sdk/bundled_program/schema/bundled_program_schema_generated.h>
 
 namespace torch {
 namespace executor {

sdk/bundled_program/core.py → dev_tools/bundled_program/core.py

@@ -8,19 +8,19 @@
 import typing
 from typing import Dict, List, Optional, Sequence, Type, Union
 
-import executorch.exir.schema as core_schema
+import executorch.dev_tools.bundled_program.schema as bp_schema
 
-import executorch.sdk.bundled_program.schema as bp_schema
+import executorch.exir.schema as core_schema
 
 import torch
 import torch.fx
+from executorch.dev_tools.bundled_program.config import ConfigValue, MethodTestSuite
+
+from executorch.dev_tools.bundled_program.version import BUNDLED_PROGRAM_SCHEMA_VERSION
 
 from executorch.exir import ExecutorchProgram, ExecutorchProgramManager
 from executorch.exir._serialize import _serialize_pte_binary
 from executorch.exir.tensor import get_scalar_type, scalar_type_enum, TensorSpec
-from executorch.sdk.bundled_program.config import ConfigValue, MethodTestSuite
-
-from executorch.sdk.bundled_program.version import BUNDLED_PROGRAM_SCHEMA_VERSION
 
 # pyre-ignore
 supported_program_type_table: Dict[Type[core_schema.KernelTypes], ConfigValue] = {

sdk/bundled_program/schema/TARGETS → dev_tools/bundled_program/schema/TARGETS

@@ -15,8 +15,8 @@ runtime.python_library(
         "bundled_program_schema.py",
     ],
     visibility = [
-        "//executorch/sdk/bundled_program/...",
-        "//executorch/sdk/etrecord/...",
+        "//executorch/dev_tools/bundled_program/...",
+        "//executorch/dev_tools/etrecord/...",
     ],
     deps = [
         "//executorch/exir:scalar_type",