Update per comment. Switch to bat for Windows.

Author: python3kgae

extension/data_loader/file_data_loader.cpp

@@ -59,12 +59,10 @@ FileDataLoader::~FileDataLoader() {
   // file_name_ can be nullptr if this instance was moved from, but freeing a
   // null pointer is safe.
   std::free(const_cast<char*>(file_name_));
-  // fd_ can be -1 if this instance was moved from, but closing a negative fd is
-  // safe (though it will return an error).
-#ifdef _WIN32
-  if (fd_ == -1)
+  // fd_ can be -1 if this instance was moved from.
+  if (fd_ == -1) {
     return;
-#endif
+  }
   ::close(fd_);
 }
 

extension/llm/custom_ops/CMakeLists.txt

@@ -102,6 +102,8 @@ if(EXECUTORCH_BUILD_KERNELS_CUSTOM_AOT)
 
   target_link_libraries(custom_ops_aot_lib PUBLIC cpublas torch)
   if(WIN32)
+    # There is no direct replacement for libpthread.so on Windows.
+    # For the Windows build, link directly against pthreadpool and cpuinfo.
     target_link_libraries(custom_ops_aot_lib PUBLIC pthreadpool cpuinfo)
   endif()
   target_compile_options(

install_requirements.bat

@@ -0,0 +1,21 @@
+@ECHO OFF
+
+rem Copyright (c) Meta Platforms, Inc. and affiliates.
+rem All rights reserved.
+
+rem This batch file provides a basic functionality similar to the bash script.
+
+cd /d "%~dp0"
+
+rem Find the names of the python tools to use (replace with your actual python installation)
+if "%PYTHON_EXECUTABLE%"=="" (
+  if "%CONDA_DEFAULT_ENV%"=="" OR "%CONDA_DEFAULT_ENV%"=="base" OR NOT EXIST "python" (
+    set PYTHON_EXECUTABLE=python3
+  ) else (
+    set PYTHON_EXECUTABLE=python
+  )
+)
+
+"%PYTHON_EXECUTABLE%" install_requirements.py %*
+
+exit /b %ERRORLEVEL%

install_requirements.ps1

@@ -83,6 +83,10 @@ def python_is_compatible():
         print(f"Error: Unknown option {arg}")
         sys.exit(1)
 
+# Use ClangCL on Windows.
+if os.name == "nt":
+    CMAKE_ARGS += " -T ClangCL"
+
 # Since ExecuTorch often uses main-branch features of pytorch, only the nightly
 # pip versions will have the required features.
 #

install_requirements.py

@@ -15,11 +15,6 @@
 #include <cstddef> // size_t
 #include <limits>
 
-#ifdef _WIN32
-#include <stddef.h>
-using ssize_t = ptrdiff_t;
-#endif
-
 #include <executorch/runtime/core/array_ref.h>
 #include <executorch/runtime/core/error.h>
 #include <executorch/runtime/core/exec_aten/exec_aten.h>

runtime/core/exec_aten/util/tensor_util.h

@@ -8,13 +8,6 @@
 
 #pragma once
 
-#ifndef _WIN32
-#include <sys/types.h> // TODO(T126923429): Include size_t, ssize_t
-#else
-#include <stddef.h>
-using ssize_t = ptrdiff_t;
-#endif
-
 #include <executorch/runtime/core/array_ref.h>
 #include <executorch/runtime/core/error.h>
 #include <executorch/runtime/core/portable_type/scalar_type.h>

runtime/core/portable_type/tensor_impl.h

@@ -133,7 +133,9 @@
 #endif
 #endif // ifndef
 
-#ifdef _WIN32
+#ifndef _WIN32
+#include <sys/types.h> // TODO(T126923429): Include size_t, ssize_t
+#else
 #include <stddef.h>
 using ssize_t = ptrdiff_t;
 #endif