Clone submodules recursively in install_executorch.py

Somehow we still don't clone submodules recursively for some submodules, like tokenizers

Author: shoumikhin

install_executorch.py

@@ -17,11 +17,7 @@
 from contextlib import contextmanager
 from typing import List, Tuple
 
-from install_requirements import (
-    install_requirements,
-    python_is_compatible,
-    TORCH_NIGHTLY_URL,
-)
+from install_requirements import install_requirements, python_is_compatible, TORCH_URL
 
 # Set up logging
 logging.basicConfig(
@@ -53,7 +49,7 @@ def clean():
 
 
 # Please keep this insync with `ShouldBuild.pybindings` in setup.py.
-VALID_PYBINDS = ["coreml", "mps", "xnnpack", "training", "openvino"]
+VALID_PYBINDS = ["coreml", "mps", "xnnpack", "training"]
 
 
 ################################################################################
@@ -120,8 +116,8 @@ def check_folder(folder: str, file: str) -> bool:
     if missing_submodules:
         logger.warning("Some required submodules are missing. Updating submodules...")
         try:
-            subprocess.check_call(["git", "submodule", "sync"])
-            subprocess.check_call(["git", "submodule", "update", "--init"])
+            subprocess.check_call(["git", "submodule", "sync", "--recursive"])
+            subprocess.check_call(["git", "submodule", "update", "--init", "--recursive"])
         except subprocess.CalledProcessError as e:
             logger.error(f"Error updating submodules: {e}")
             exit(1)
@@ -130,13 +126,8 @@ def check_folder(folder: str, file: str) -> bool:
         for path, file in missing_submodules.items():
             if not check_folder(path, file):
                 logger.error(f"{file} not found in {path}.")
-                logger.error("Please run `git submodule update --init`.")
+                logger.error("Submodule update failed. Please run `git submodule update --init --recursive` manually.")
                 exit(1)
-    # Go into tokenizers submodule and install its submodules
-    tokenizers_path = get_required_submodule_paths().get("tokenizers", None)
-    if tokenizers_path:
-        with pushd(tokenizers_path):
-            subprocess.check_call(["git", "submodule", "update", "--init"])
     logger.info("All required submodules are present.")
 
 
@@ -207,10 +198,14 @@ def main(args):
     use_pytorch_nightly = True
 
     wants_pybindings_off, pybind_defines = _list_pybind_defines(args)
-    if wants_pybindings_off:
-        cmake_args.append("-DEXECUTORCH_BUILD_PYBIND=OFF")
-    else:
-        cmake_args += pybind_defines
+    if not wants_pybindings_off:
+        if len(pybind_defines) > 0:
+            # If the user explicitly provides a list of bindings, just use them
+            cmake_args += pybind_defines
+        else:
+            # If the user has not set pybindings off but also has not provided
+            # a list, then turn on xnnpack by default
+            cmake_args.append("-DEXECUTORCH_BUILD_XNNPACK=ON")
 
     if args.clean:
         clean()
@@ -256,7 +251,7 @@ def main(args):
             "--no-build-isolation",
             "-v",
             "--extra-index-url",
-            TORCH_NIGHTLY_URL,
+            TORCH_URL,
         ],
         check=True,
     )