File tree Expand file tree Collapse file tree 3 files changed +21
-4
lines changed Expand file tree Collapse file tree 3 files changed +21
-4
lines changed Original file line number Diff line number Diff line change @@ -109,7 +109,7 @@ jobs:
109
109
strategy :
110
110
fail-fast : false
111
111
matrix :
112
- preset : [windows] # TODO (gjcomer) Re-enable pybind once functional
112
+ preset : [pybind, windows]
113
113
with :
114
114
job-name : build
115
115
ref : ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
@@ -127,7 +127,7 @@ jobs:
127
127
conda activate et
128
128
129
129
python install_requirements.py
130
- cmake --preset ${{ matrix.preset }}
130
+ cmake --preset ${{ matrix.preset }} -T ClangCL
131
131
if (\$LASTEXITCODE -ne 0) {
132
132
Write-Host "CMake configuration was unsuccessful. Exit code: \$LASTEXITCODE."
133
133
exit \$LASTEXITCODE
Original file line number Diff line number Diff line change @@ -24,6 +24,11 @@ if(NOT ET_HAVE_SYS_MMAN_H AND NOT WIN32)
24
24
"extension/data_loader/mmap_data_loader.cpp"
25
25
)
26
26
endif ()
27
+ if (WIN32 )
28
+ list (APPEND _extension_data_loader__srcs
29
+ "extension/data_loader/mman_windows.cpp"
30
+ )
31
+ endif ()
27
32
list (TRANSFORM _extension_data_loader__srcs PREPEND "${EXECUTORCH_ROOT} /" )
28
33
add_library (extension_data_loader ${_extension_data_loader__srcs} )
29
34
target_link_libraries (extension_data_loader executorch_core )
Original file line number Diff line number Diff line change @@ -21,16 +21,28 @@ set_overridable_option(EXECUTORCH_BUILD_EXTENSION_FLAT_TENSOR ON)
21
21
set_overridable_option (EXECUTORCH_BUILD_EXTENSION_DATA_LOADER ON )
22
22
set_overridable_option (EXECUTORCH_BUILD_KERNELS_OPTIMIZED ON )
23
23
set_overridable_option (EXECUTORCH_BUILD_EXTENSION_MODULE ON )
24
- set_overridable_option (EXECUTORCH_BUILD_EXTENSION_TRAINING ON )
25
24
26
25
if (CMAKE_SYSTEM_NAME STREQUAL "Darwin" )
27
26
set_overridable_option (EXECUTORCH_BUILD_COREML ON )
27
+ set_overridable_option (EXECUTORCH_BUILD_EXTENSION_TRAINING ON )
28
28
elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux" )
29
29
set_overridable_option (EXECUTORCH_BUILD_COREML ON )
30
+ set_overridable_option (EXECUTORCH_BUILD_EXTENSION_TRAINING ON )
30
31
elseif (CMAKE_SYSTEM_NAME STREQUAL "Windows" OR CMAKE_SYSTEM_NAME STREQUAL
31
32
"WIN32"
32
33
)
33
- # Windows or other OS-specific code here
34
+ if (NOT CMAKE_GENERATOR_TOOLSET MATCHES "ClangCL" )
35
+ message (
36
+ FATAL_ERROR
37
+ "ExecuTorch requires the ClangCL toolset on Windows. Please configure with -T ClangCL."
38
+ )
39
+ endif ()
40
+
41
+ # These XNNPACK options don't currently build on Windows with Clang.
42
+ set_overridable_option (XNNPACK_ENABLE_AVX256SKX OFF )
43
+ set_overridable_option (XNNPACK_ENABLE_AVX256VNNI OFF )
44
+ set_overridable_option (XNNPACK_ENABLE_AVX256VNNIGFNI OFF )
45
+ set_overridable_option (XNNPACK_ENABLE_AVX512BF16 OFF )
34
46
else ()
35
47
message (
36
48
FATAL_ERROR "Unsupported CMAKE_SYSTEM_NAME for pybind: ${CMAKE_SYSTEM_NAME} "
You can’t perform that action at this time.
0 commit comments