Revert "[Windows] Run native unit tests in CI (#13923)" (#14286)

This reverts commit f1ca55a.

Author: GregoryComer

.ci/scripts/setup-windows.ps1

@@ -1,5 +1,5 @@
 param (
-    [string]$editable = "false"
+    [string]$editable = $false
 )
 
 conda create --yes --quiet -n et python=3.12

.ci/scripts/unittest-windows.ps1

@@ -1,38 +1,15 @@
 param (
-    [string]$buildMode = "Release"
+    [string]$editable = $false
 )
 
 Set-PSDebug -Trace 1
 $ErrorActionPreference = 'Stop'
 $PSNativeCommandUseErrorActionPreference = $true
 
-# Run native unit tests (via ctest)
-New-Item -Path "test-build" -ItemType Directory
-cd "test-build"
-
-cmake .. --preset windows -B . -DEXECUTORCH_BUILD_TESTS=ON -DCMAKE_BUILD_TYPE=$buildMode
-if ($LASTEXITCODE -ne 0) {
-    Write-Host "CMake configuration was unsuccessful. Exit code: $LASTEXITCODE."
-    exit $LASTEXITCODE
-}
-
-cmake --build . -j8 --config $buildMode --verbose
-if ($LASTEXITCODE -ne 0) {
-    Write-Host "CMake build was unsuccessful. Exit code: $LASTEXITCODE."
-    exit $LASTEXITCODE
-}
-
-ctest -j8 . --build-config $buildMode --output-on-failure -E "method_test|tensor_parser_test"
-if ($LASTEXITCODE -ne 0) {
-    Write-Host "CTest run was unsuccessful. Exit code: $LASTEXITCODE."
-    exit $LASTEXITCODE
-}
-
-cd ..
-
-# Run pytest
-pytest -v -c pytest-windows.ini
+# Run pytest with coverage
+# pytest -n auto --cov=./ --cov-report=xml
+pytest -v --full-trace -c pytest-windows.ini
 if ($LASTEXITCODE -ne 0) {
     Write-Host "Pytest invocation was unsuccessful. Exit code: $LASTEXITCODE."
     exit $LASTEXITCODE
-}
+}

.github/workflows/_unittest.yml

@@ -69,15 +69,7 @@ jobs:
           \$ErrorActionPreference = 'Stop'
           \$PSNativeCommandUseErrorActionPreference = \$true
 
-          .ci/scripts/setup-windows.ps1 -editable "${{ inputs.editable }}"
-          if (\$LASTEXITCODE -ne 0) {
-              Write-Host "Setup failed. Exit code: \$LASTEXITCODE."
-              exit \$LASTEXITCODE
-          }
+          .ci/scripts/setup-windows.ps1       
 
-          .ci/scripts/unittest-windows.ps1 -buildMode "${{ inputs.build-mode }}"
-          if (\$LASTEXITCODE -ne 0) {
-              Write-Host "Unit tests failed. Exit code: \$LASTEXITCODE."
-              exit \$LASTEXITCODE
-          }
+          powershell .ci/scripts/unittest-windows.ps1 -editable "${{ inputs.editable }}"
         }"

.github/workflows/trunk.yml

@@ -1032,5 +1032,5 @@ jobs:
 
           .ci/scripts/setup-windows.ps1
 
-          .ci/scripts/test_model.ps1 -modelName ${{ matrix.model }} -backend ${{ matrix.backend }}
+          powershell .ci/scripts/test_model.ps1 -modelName ${{ matrix.model }} -backend ${{ matrix.backend }}
         }"

CMakeLists.txt

@@ -143,13 +143,9 @@ endif()
 
 # -ffunction-sections -fdata-sections: breaks function and data into sections so
 # they can be properly gc'd. -s: strip symbol.
-if(WIN32)
-  set(CMAKE_CXX_FLAGS_RELEASE "/Gy /Gw ${CMAKE_CXX_FLAGS_RELEASE}")
-else()
-  set(CMAKE_CXX_FLAGS_RELEASE
-      "-ffunction-sections -fdata-sections ${CMAKE_CXX_FLAGS_RELEASE}"
-  )
-endif()
+set(CMAKE_CXX_FLAGS_RELEASE
+    "-ffunction-sections -fdata-sections ${CMAKE_CXX_FLAGS_RELEASE}"
+)
 if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
   set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -s")
 endif()

backends/xnnpack/CMakeLists.txt

@@ -59,7 +59,7 @@ foreach(fbs_file ${_xnnpack_schema__srcs})
   )
 endforeach()
 
-if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")
+if(WIN32 AND NOT CMAKE_CROSSCOMPILING)
   set(MV_COMMAND
       powershell -Command
       "Move-Item -Path ${_xnnpack_flatbuffer__outputs} -Destination ${_xnnpack_schema__outputs} -Force"

export/target_recipes.py

@@ -11,32 +11,26 @@
 selection and combine multiple backends optimally for target hardware.
 """
 
-import sys
 from typing import Dict, List
 
-if sys.platform != "win32":
-    import coremltools as ct
-    from executorch.backends.apple.coreml.recipes import CoreMLRecipeType
+import coremltools as ct
 
 # pyre-ignore
+from executorch.backends.apple.coreml.recipes import CoreMLRecipeType
 from executorch.backends.xnnpack.recipes import XNNPackRecipeType
 from executorch.export.recipe import ExportRecipe, RecipeType
 
 
 ## IOS Target configs
 # The following list of recipes are not exhaustive for CoreML; refer to CoreMLRecipeType for more detailed recipes.
-IOS_CONFIGS: Dict[str, List[RecipeType]] = (
-    {
-        # pyre-ignore
-        "ios-arm64-coreml-fp32": [CoreMLRecipeType.FP32, XNNPackRecipeType.FP32],
-        # pyre-ignore
-        "ios-arm64-coreml-fp16": [CoreMLRecipeType.FP16],
-        # pyre-ignore
-        "ios-arm64-coreml-int8": [CoreMLRecipeType.PT2E_INT8_STATIC],
-    }
-    if sys.platform != "win32"
-    else {}
-)
+IOS_CONFIGS: Dict[str, List[RecipeType]] = {
+    # pyre-ignore
+    "ios-arm64-coreml-fp32": [CoreMLRecipeType.FP32, XNNPackRecipeType.FP32],
+    # pyre-ignore
+    "ios-arm64-coreml-fp16": [CoreMLRecipeType.FP16],
+    # pyre-ignore
+    "ios-arm64-coreml-int8": [CoreMLRecipeType.PT2E_INT8_STATIC],
+}
 
 
 def _create_target_recipe(

export/tests/test_target_recipes.py

@@ -7,22 +7,17 @@
 # pyre-strict
 
 import logging
-import sys
 import unittest
 
 import torch
+from executorch.backends.apple.coreml.recipes import CoreMLRecipeProvider  # pyre-ignore
 from executorch.backends.xnnpack.recipes.xnnpack_recipe_provider import (
     XNNPACKRecipeProvider,
 )
 from executorch.export import export, recipe_registry
 from executorch.export.target_recipes import get_ios_recipe
 from executorch.runtime import Runtime
 
-if sys.platform != "win32":
-    from executorch.backends.apple.coreml.recipes import (  # pyre-ignore
-        CoreMLRecipeProvider,
-    )
-
 
 class TestTargetRecipes(unittest.TestCase):
     """Test target recipes."""
@@ -31,14 +26,12 @@ def setUp(self) -> None:
         torch._dynamo.reset()
         super().setUp()
         recipe_registry.register_backend_recipe_provider(XNNPACKRecipeProvider())
-        if sys.platform != "win32":
-            # pyre-ignore
-            recipe_registry.register_backend_recipe_provider(CoreMLRecipeProvider())
+        # pyre-ignore
+        recipe_registry.register_backend_recipe_provider(CoreMLRecipeProvider())
 
     def tearDown(self) -> None:
         super().tearDown()
 
-    @unittest.skipIf(sys.platform == "win32", "Core ML is not available on Windows.")
     def test_ios_fp32_recipe_with_xnnpack_fallback(self) -> None:
         # Linear ops skipped by coreml but handled by xnnpack
         class Model(torch.nn.Module):
@@ -114,7 +107,6 @@ def forward(self, x, y):
             et_output = session.run_method("forward", example_inputs[0])
             logging.info(f"et output {et_output}")
 
-    @unittest.skipIf(sys.platform == "win32", "Core ML is not available on Windows.")
     def test_ios_quant_recipes(self) -> None:
         class Model(torch.nn.Module):
             def __init__(self):

extension/evalue_util/test/print_evalue_test.cpp

@@ -267,7 +267,7 @@ TEST(PrintEvalueTest, UnelidedBoolLists) {
   // case; the other scalar types use the same underlying code, so they don't
   // need to test this again.
   {
-    EValue value(ArrayRef<bool>(list.data(), static_cast<size_t>(0ul)));
+    EValue value(ArrayRef<bool>(list.data(), 0ul));
     expect_output(value, "(len=0)[]");
   }
   {
@@ -419,7 +419,7 @@ TEST(PrintEvalueTest, UnelidedDoubleLists) {
   std::array<double, 6> list = {-2.2, -1, 0, INFINITY, NAN, 3.3};
 
   {
-    EValue value(ArrayRef<double>(list.data(), static_cast<size_t>(0ul)));
+    EValue value(ArrayRef<double>(list.data(), 0ul));
     expect_output(value, "(len=0)[]");
   }
   {

extension/flat_tensor/test/CMakeLists.txt

@@ -23,7 +23,7 @@ add_custom_command(
          "${CMAKE_CURRENT_BINARY_DIR}/ModuleAddMulProgram.ptd"
   COMMAND
     ${PYTHON_EXECUTABLE} -m test.models.export_program --modules "ModuleAddMul"
-    --external-constants --outdir "${CMAKE_CURRENT_BINARY_DIR}"
+    --external-constants --outdir "${CMAKE_CURRENT_BINARY_DIR}" 2> /dev/null
   WORKING_DIRECTORY ${EXECUTORCH_ROOT}
 )