undo non-relevant changes

Author: SamGondelman

build/resolve_buck.py

@@ -95,12 +95,6 @@ class BuckInfo:
             "c7d378f3f307e9590f0b29a5f7f1b21b8e784f4e4bd30a0160b2a69df50d2ee0"
         ],
     ),
-    ("windows", "x86_64"): BuckInfo(
-        archive_name="buck2-x86_64-pc-windows-msvc.exe.zst",
-        target_versions=[
-            "bf1685c4c4ddd9de4592b5a955cb7326fd01e6c4d5f561643422bed961a17401"
-        ],
-    ),
 }
 
 

install_executorch.bat

@@ -7,8 +7,14 @@ rem This batch file provides a basic functionality similar to the bash script.
 
 cd /d "%~dp0"
 
-rem Under windows it's always python
-set PYTHON_EXECUTABLE=python
+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_executorch.py %*
 

runtime/platform/compiler.h

@@ -100,9 +100,14 @@
 #endif // (__cplusplus) >= 202002L
 
 /// Define a C symbol with weak linkage.
-// Building on Windows also need this. Windows build uses clang-cl compiler,
-// which supports __attribute__((weak)).
+#ifdef _MSC_VER
+// There currently doesn't seem to be a great way to do this in Windows and
+// given that weak linkage is not really critical on Windows, we'll just leave
+// it as a stub.
+#define ET_WEAK
+#else
 #define ET_WEAK __attribute__((weak))
+#endif
 
 /**
  * Annotation marking a function as printf-like, providing compiler support

setup.py

@@ -243,11 +243,7 @@ def src_path(self, installer: "InstallerBuildExt") -> Path:
             src_path = src_path.replace("%BUILD_TYPE%", cfg)
         else:
             # Remove %BUILD_TYPE% from the path.
-<<<<<<< HEAD
             src_path = src_path.replace("/%BUILD_TYPE%", "")
-=======
-            self.src = self.src.replace("%BUILD_TYPE%/", "")
->>>>>>> 038fa5307 (fix windows build issue)
 
         # Construct the full source path, resolving globs. If there are no glob
         # pattern characters, this will just ensure that the source file exists.
@@ -295,7 +291,7 @@ def __init__(
                 output is in a subdirectory named after the build type. For single-
                 config generators (like Makefile Generators or Ninja), this placeholder
                 will be removed.
-            src_name: The name of the file to install.
+            src_name: The name of the file to install
             dst: The path to install to, relative to the root of the pip
                 package. If dst ends in "/", it is treated as a directory.
                 Otherwise it is treated as a filename.
@@ -349,25 +345,20 @@ def inplace_dir(self, installer: "InstallerBuildExt") -> Path:
 class BuiltExtension(_BaseExtension):
     """An extension that installs a python extension that was built by cmake."""
 
-    def __init__(self, src_dir: str, src_name: str, modpath: str):
+    def __init__(self, src: str, modpath: str):
         """Initializes a BuiltExtension.
 
         Args:
-            src_dir: The directory of the file to install, relative to the cmake-out
-                directory. A placeholder %BUILD_TYPE% will be replaced with the build
-                type for multi-config generators (like Visual Studio) where the build
-                output is in a subdirectory named after the build type. For single-
-                config generators (like Makefile Generators or Ninja), this placeholder
-                will be removed.
-            src_name: The name of the file to install. If the path ends in `.so`,
+            src: The path to the file to install (typically a shared library),
+                relative to the cmake-out directory. May be an fnmatch-style
+                glob that matches exactly one file. If the path ends in `.so`,
                 this class will also look for similarly-named `.dylib` files.
             modpath: The dotted path of the python module that maps to the
                 extension.
         """
         assert (
             "/" not in modpath
         ), f"modpath must be a dotted python module path: saw '{modpath}'"
-        src = os.path.join(src_dir, src_name)
         # This is a real extension, so use the modpath as the name.
         super().__init__(src=f"%CMAKE_CACHE_DIR%/{src}", dst=modpath, name=modpath)
 
@@ -792,9 +783,7 @@ def get_ext_modules() -> List[Extension]:
             # portable kernels, and a selection of backends. This lets users
             # load and execute .pte files from python.
             BuiltExtension(
-                src_dir="%BUILD_TYPE%/",# Set the src directory based on build configuration for windows.
-                src_name="_portable_lib.cp*",# Rename _portable_lib.* to _portable_lib.cp* to avoid _portable_lib.lib is selected on windows.
-                modpath="executorch.extension.pybindings._portable_lib",
+                "_portable_lib.*", "executorch.extension.pybindings._portable_lib"
             )
         )
         if ShouldBuild.training():