Missing Windows knobs to make it compatible with kernels

build2cmake/src/templates/windows.cmake

@@ -103,36 +103,27 @@ function(add_kernels_install_target TARGET_NAME PACKAGE_NAME BUILD_VARIANT_NAME)
         set(ARG_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
     endif()
 
-    # Create the kernels_install target if it doesn't exist
-    if(NOT TARGET kernels_install)
-        add_custom_target(kernels_install ALL
-                COMMENT "Installing all kernels to hub-compatible layout"
-                VERBATIM)
-    endif()
-
-    # Create a custom target for this specific kernel
-    set(KERNEL_INSTALL_TARGET "${TARGET_NAME}_kernel_install")
+    # Set the installation directory
     set(KERNEL_INSTALL_DIR "${ARG_INSTALL_PREFIX}/${BUILD_VARIANT_NAME}/${PACKAGE_NAME}")
 
-    add_custom_target(${KERNEL_INSTALL_TARGET} ALL
-            COMMAND ${CMAKE_COMMAND} -E make_directory "${KERNEL_INSTALL_DIR}"
-            COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:${TARGET_NAME}> "${KERNEL_INSTALL_DIR}/"
-            COMMAND ${CMAKE_COMMAND} -E copy_directory
-            "${CMAKE_SOURCE_DIR}/torch-ext/${PACKAGE_NAME}"
-            "${KERNEL_INSTALL_DIR}/"
-            DEPENDS ${TARGET_NAME}
-            COMMENT "Installing ${TARGET_NAME} to ${KERNEL_INSTALL_DIR}"
-            VERBATIM)
-
-    # Make kernels_install depend on this specific kernel's install
-    add_dependencies(kernels_install ${KERNEL_INSTALL_TARGET})
-
-    # Set folder for IDE organization
-    if(MSVC OR XCODE)
-        set_target_properties(${KERNEL_INSTALL_TARGET} PROPERTIES FOLDER "Install")
-    endif()
+    message(STATUS "Using PACKAGE_NAME: ${PACKAGE_NAME}")
+
+    # Install the compiled extension using CMake's install() command
+    # This will be triggered by the standard INSTALL target
+    install(TARGETS ${TARGET_NAME}
+        LIBRARY DESTINATION "${KERNEL_INSTALL_DIR}"
+        RUNTIME DESTINATION "${KERNEL_INSTALL_DIR}"
+        COMPONENT ${TARGET_NAME})
 
-    message(STATUS "Added kernels_install target for ${TARGET_NAME} -> ${BUILD_VARIANT_NAME}/${PACKAGE_NAME}")
+    # Glob Python files to install
+    file(GLOB PYTHON_FILES "${CMAKE_SOURCE_DIR}/torch-ext/${PACKAGE_NAME}/*.py")
+
+    # Install Python files (__init__.py and _ops.py)
+    install(FILES ${PYTHON_FILES}
+        DESTINATION "${KERNEL_INSTALL_DIR}"
+        COMPONENT ${TARGET_NAME})
+
+    message(STATUS "Added install rules for ${TARGET_NAME} -> ${BUILD_VARIANT_NAME}/${PACKAGE_NAME}")
 endfunction()
 
 #
@@ -181,4 +172,4 @@ function(add_local_install_target TARGET_NAME PACKAGE_NAME BUILD_VARIANT_NAME)
 
     file(MAKE_DIRECTORY ${LOCAL_INSTALL_DIR})
     message(STATUS "Added install rules for ${TARGET_NAME} -> build/${BUILD_VARIANT_NAME}/${PACKAGE_NAME}")
-endfunction()
+endfunction()

build2cmake/src/torch/cuda.rs

@@ -384,6 +384,7 @@ pub fn render_extension(
             context! {
                 name => name,
                 ops_name => ops_name,
+                platform => std::env::consts::OS,
             },
             &mut *write,
         )

build2cmake/src/torch/xpu.rs

@@ -262,6 +262,7 @@ pub fn render_extension(
             context! {
                 name => name,
                 ops_name => ops_name,
+                platform => std::env::consts::OS
             },
             &mut *write,
         )

scripts/windows/builder.ps1

@@ -365,7 +365,9 @@ function Invoke-CMakeTarget {
     )
 
     Write-Status "Running $DisplayName..." -Type Info
-    cmake --build . --target $Target --config $BuildConfig
+
+    # Use cmake --build with proper escaping for Visual Studio generator
+    cmake --build . --config $BuildConfig --target $Target
 
     if ($LASTEXITCODE -ne 0) {
         throw "$DisplayName failed with exit code $LASTEXITCODE"
@@ -418,13 +420,13 @@ function Invoke-CMakeBuild {
 
         Write-Status "Build completed successfully!" -Type Success
 
-        # Run install targets if requested
+        # Run install target if requested
         if ($RunLocalInstall) {
-            Invoke-CMakeTarget -Target 'local_install' -BuildConfig $BuildConfig -DisplayName 'install target (local development layout)'
+            Invoke-CMakeTarget -Target 'INSTALL' -BuildConfig $BuildConfig -DisplayName 'install target (local development layout)'
         }
 
         if ($RunKernelsInstall) {
-            Invoke-CMakeTarget -Target 'kernels_install' -BuildConfig $BuildConfig -DisplayName 'kernels_install target'
+            Invoke-CMakeTarget -Target 'INSTALL' -BuildConfig $BuildConfig -DisplayName 'install target'
         }
     }
     finally {