Fix cmake option for tests

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,5 +1,5 @@
 param (
-    [string]$editable = $false
+    [string]$buildMode = "Release"
 )
 
 Set-PSDebug -Trace 1
@@ -17,13 +17,13 @@ if ($LASTEXITCODE -ne 0) {
 New-Item -Path "test-build" -ItemType Directory
 cd "test-build"
 
-cmake .. --preset windows -B . -DCMAKE_BUILD_TESTS=ON
+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 Release
+cmake --build . -j8 --config $buildMode --verbose
 if ($LASTEXITCODE -ne 0) {
     Write-Host "CMake build was unsuccessful. Exit code: $LASTEXITCODE."
     exit $LASTEXITCODE

.github/workflows/_unittest.yml

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

CMakeLists.txt

@@ -143,9 +143,13 @@ endif()
 
 # -ffunction-sections -fdata-sections: breaks function and data into sections so
 # they can be properly gc'd. -s: strip symbol.
-set(CMAKE_CXX_FLAGS_RELEASE
-    "-ffunction-sections -fdata-sections ${CMAKE_CXX_FLAGS_RELEASE}"
-)
+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()
 if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
   set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -s")
 endif()

runtime/executor/test/CMakeLists.txt

@@ -39,7 +39,7 @@ add_custom_command(
   COMMAND
     ${PYTHON_EXECUTABLE} -m test.models.export_delegated_program --modules
     "ModuleAddMul" --backend_id "StubBackend" --outdir
-    "${CMAKE_CURRENT_BINARY_DIR}/delegated/" || true
+    "${CMAKE_CURRENT_BINARY_DIR}/delegated/"
   WORKING_DIRECTORY ${EXECUTORCH_ROOT}
 )
 

test/end2end/exported_module.py

@@ -187,7 +187,6 @@ def __init__(self, method):
                         if method_name_to_dynamic_shapes
                         else None
                     ),
-                    strict=True,
                 )
 
         exec_prog = to_edge(

test/models/export_delegated_program.py

@@ -155,9 +155,9 @@ def forward(self, *args, **kwargs):
 
     if method_name != "forward":
         # Only require wrapper module if we're exporting a specific method other than forward.
-        exported_program = export(WrapperModule(eager_module), args=inputs, strict=True)
+        exported_program = export(WrapperModule(eager_module), args=inputs)
     else:
-        exported_program = export(eager_module, args=inputs, strict=True)
+        exported_program = export(eager_module, args=inputs)
 
     edge_config = EdgeCompileConfig(_check_ir_validity=False)
     et_config = exir.ExecutorchBackendConfig(
@@ -178,7 +178,7 @@ def forward(self, *args, **kwargs):
                 module=tagged_module,
                 gen_tag_fn=lambda x: module_class.__name__,
             )
-            exported_program = export(tagged_module, args=inputs, strict=True)
+            exported_program = export(tagged_module, args=inputs)
         executorch_program = to_edge_transform_and_lower(
             exported_program,
             compile_config=edge_config,
@@ -205,7 +205,7 @@ def forward(self, *args, **kwargs):
         composite_module(*inputs)
 
         executorch_program = to_edge(
-            export(composite_module, args=inputs, strict=True)
+            export(composite_module, args=inputs)
         ).to_executorch(config=et_config)
 
     return executorch_program

tools/cmake/Utils.cmake

@@ -62,6 +62,8 @@ endfunction()
 function(target_link_options_gc_sections target_name)
   if(APPLE)
     target_link_options(${target_name} PRIVATE "LINKER:-dead_strip")
+  elseif(WIN32)
+    target_link_options(${target_name} PRIVATE "LINKER:/OPT:REF")
   else()
     target_link_options(${target_name} PRIVATE "LINKER:--gc-sections")
   endif()