update smoke test

Author: jathu

.ci/scripts/wheel/__init__.py

@@ -0,0 +1,11 @@
+# Copyright (c) Meta Platforms, Inc. and affiliates.
+# All rights reserved.
+#
+# This source code is licensed under the BSD-style license found in the
+# LICENSE file in the root directory of this source tree.
+
+# This file is sourced into the environment before building a pip wheel. It
+# should typically only contain shell variable assignments. Be sure to export
+# any variables so that subprocesses will see them.
+
+source "${GITHUB_WORKSPACE}/${REPOSITORY}/.ci/scripts/wheel/envvar_base.sh"

build/packaging/env_var_script_linux.sh renamed to .ci/scripts/wheel/envvar_base.sh

@@ -8,16 +8,7 @@
 # should typically only contain shell variable assignments. Be sure to export
 # any variables so that subprocesses will see them.
 
-# Enable pybindings so that users can execute ExecuTorch programs from python.
-export EXECUTORCH_BUILD_PYBIND=1
-
-# Ensure that CMAKE_ARGS is defined before referencing it. Defaults to empty
-# if not defined.
-export CMAKE_ARGS="${CMAKE_ARGS:-}"
-
-# Link the XNNPACK backend into the pybindings runtime so that users can execute
-# ExecuTorch programs that delegate to it.
-CMAKE_ARGS="${CMAKE_ARGS} -DEXECUTORCH_BUILD_XNNPACK=ON"
+source "${GITHUB_WORKSPACE}/${REPOSITORY}/.ci/scripts/wheel/envvar_base.sh"
 
 # When building for macOS, link additional backends into the pybindings runtime.
 CMAKE_ARGS="${CMAKE_ARGS} -DEXECUTORCH_BUILD_COREML=ON"

.ci/scripts/wheel/envvar_linux.sh

@@ -14,4 +14,4 @@ set -euxo pipefail
 # which does install them. Though we'd need to disable build isolation to be
 # able to see the installed torch package.
 
-pip install --progress-bar off -r requirements-dev.txt
+"${GITHUB_WORKSPACE}/${REPOSITORY}/install_requirements.sh"

build/packaging/env_var_script_macos.sh renamed to .ci/scripts/wheel/envvar_macos.sh

@@ -0,0 +1,72 @@
+# Copyright (c) Meta Platforms, Inc. and affiliates.
+# All rights reserved.
+#
+# This source code is licensed under the BSD-style license found in the
+# LICENSE file in the root directory of this source tree.
+
+import os
+import subprocess
+import sys
+from functools import lru_cache
+from typing import List
+from dataclasses import dataclass
+from enum import Enum
+
+
+class Model(str, Enum):
+    Mv3 = "mv3"
+
+    def __str__(self) -> str:
+       return self.value
+
+class Backend(str, Enum):
+    XnnpackQuantizationDelegation = "xnnpack-quantization-delegation"
+
+    def __str__(self) -> str:
+       return self.value
+
+@dataclass
+class ModelTest:
+    model: Model
+    backend: Backend
+
+
+@lru_cache()
+def _repository_root_dir() -> str:
+  workspace_dir = os.getenv("GITHUB_WORKSPACE")
+  if workspace_dir is None:
+    print("GITHUB_WORKSPACE is not set")
+    sys.exit(1)
+
+  repository_dir = os.getenv("REPOSITORY")
+  if repository_dir is None:
+    print("REPOSITORY is not set")
+    sys.exit(1)
+
+  return os.path.join(workspace_dir, repository_dir)
+
+
+def run_tests(model_tests: List[ModelTest]) -> None:
+  # Why are we doing this envvar shenanigans? Since we build the testers, which
+  # uses buck, we cannot run as root. This is a sneaky of getting around that
+  # test.
+  #
+  # This can be reverted if either:
+  #   - We remove usage of buck in our builds
+  #   - We stop running the Docker image as root: https://github.com/pytorch/test-infra/issues/5091
+  envvars = os.environ.copy()
+  envvars.pop("HOME")
+
+  for model_test in model_tests:
+    subprocess.run(
+        [
+          os.path.join(_repository_root_dir(), ".ci/scripts/test_model.sh"),
+          str(model_test.model),
+          # What to build `executor_runner` with for testing.
+          "cmake",
+          str(model_test.backend),
+        ],
+        env=envvars,
+        check=True,
+        cwd=_repository_root_dir(),
+    )

build/packaging/post_build_script.sh renamed to .ci/scripts/wheel/post_build_script.sh

@@ -0,0 +1,16 @@
+#!/usr/bin/env python
+# Copyright (c) Meta Platforms, Inc. and affiliates.
+# All rights reserved.
+#
+# This source code is licensed under the BSD-style license found in the
+# LICENSE file in the root directory of this source tree.
+
+from test_base import run_tests, ModelTest, Model, Backend
+
+if __name__ == "__main__":
+    run_tests(model_tests=[
+        ModelTest(
+            model=Model.Mv3,
+            backend=Backend.XnnpackQuantizationDelegation,
+        )
+    ])

build/packaging/pre_build_script.sh renamed to .ci/scripts/wheel/pre_build_script.sh

@@ -0,0 +1,16 @@
+#!/usr/bin/env python
+# Copyright (c) Meta Platforms, Inc. and affiliates.
+# All rights reserved.
+#
+# This source code is licensed under the BSD-style license found in the
+# LICENSE file in the root directory of this source tree.
+
+from test_base import run_tests, ModelTest, Model, Backend
+
+if __name__ == "__main__":
+    run_tests(model_tests=[
+        ModelTest(
+            model=Model.Mv3,
+            backend=Backend.XnnpackQuantizationDelegation,
+        )
+    ])

.ci/scripts/wheel/test_base.py

@@ -4,7 +4,7 @@ name: Build Linux Wheels
 on:
   pull_request:
     paths:
-      - build/packaging/**
+      - .ci/**/*
       - .github/workflows/build-wheels-linux.yml
   push:
     branches:
@@ -39,9 +39,9 @@ jobs:
       matrix:
         include:
           - repository: pytorch/executorch
-            pre-script: build/packaging/pre_build_script.sh
-            post-script: build/packaging/post_build_script.sh
-            smoke-test-script: build/packaging/smoke_test.py
+            pre-script: .ci/scripts/wheel/pre_build_script.sh
+            post-script: .ci/scripts/wheel/post_build_script.sh
+            smoke-test-script: .ci/scripts/wheel/test_linux.py
             package-name: executorch
     name: ${{ matrix.repository }}
     uses: pytorch/test-infra/.github/workflows/build_wheels_linux.yml@main
@@ -51,11 +51,8 @@ jobs:
       test-infra-repository: pytorch/test-infra
       test-infra-ref: main
       build-matrix: ${{ needs.generate-matrix.outputs.matrix }}
-      # ExecuTorch only needs the first layer of submodules; override the
-      # "recursive" default to do less work, and to give the buck daemon fewer
-      # files to look at.
-      submodules: true
-      env-var-script: build/packaging/env_var_script_linux.sh
+      submodules: recursive
+      env-var-script: .ci/scripts/wheel/envvar_linux.sh
       pre-script: ${{ matrix.pre-script }}
       post-script: ${{ matrix.post-script }}
       package-name: ${{ matrix.package-name }}

.ci/scripts/wheel/test_linux.py

@@ -4,7 +4,7 @@ name: Build macOS Wheels
 on:
   pull_request:
     paths:
-      - build/packaging/**
+      - .ci/**/*
       - .github/workflows/build-wheels-macos.yml
   push:
     branches:
@@ -39,9 +39,9 @@ jobs:
       matrix:
         include:
           - repository: pytorch/executorch
-            pre-script: build/packaging/pre_build_script.sh
-            post-script: build/packaging/post_build_script.sh
-            smoke-test-script: build/packaging/smoke_test.py
+            pre-script: .ci/scripts/wheel/pre_build_script.sh
+            post-script: .ci/scripts/wheel/post_build_script.sh
+            smoke-test-script: .ci/scripts/wheel/test_macos.py
             package-name: executorch
     name: ${{ matrix.repository }}
     uses: pytorch/test-infra/.github/workflows/build_wheels_macos.yml@main
@@ -51,12 +51,9 @@ jobs:
       test-infra-repository: pytorch/test-infra
       test-infra-ref: main
       build-matrix: ${{ needs.generate-matrix.outputs.matrix }}
-      # ExecuTorch only needs the first layer of submodules; override the
-      # "recursive" default to do less work, and to give the buck daemon fewer
-      # files to look at.
-      submodules: true
+      submodules: recursive
       delocate-wheel: false
-      env-var-script: build/packaging/env_var_script_macos.sh
+      env-var-script: .ci/scripts/wheel/envvar_macos.sh
       pre-script: ${{ matrix.pre-script }}
       post-script: ${{ matrix.post-script }}
       package-name: ${{ matrix.package-name }}

.ci/scripts/wheel/test_macos.py

@@ -1,4 +1,4 @@
-cmake  # For building binary targets in the wheel.
+cmake>=3.19  # For building binary targets in the wheel.
 pip>=23  # For building the pip package.
 pyyaml  # Imported by the kernel codegen tools.
 setuptools>=63  # For building the pip package contents.