From 2c973496cf4d130bd2b8dad2479c7c68891f2580 Mon Sep 17 00:00:00 2001
From: Morgan Funtowicz <funtowiczmo@gmail.com>
Date: Wed, 29 Oct 2025 14:01:19 +0100
Subject: [PATCH] feat(windows): do not include cxx11 AbI flag when generating
 names

---
 build2cmake/src/templates/cuda/preamble.cmake | 5 ++---
 build2cmake/src/templates/windows.cmake       | 9 ++-------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/build2cmake/src/templates/cuda/preamble.cmake b/build2cmake/src/templates/cuda/preamble.cmake
index 1ad7f7b4..78cd834c 100644
--- a/build2cmake/src/templates/cuda/preamble.cmake
+++ b/build2cmake/src/templates/cuda/preamble.cmake
@@ -111,15 +111,14 @@ add_compile_definitions(_WIN32>)
 
 # Generate standardized build name
 run_python(TORCH_VERSION "import torch; print(torch.__version__.split('+')[0])" "Failed to get Torch version")
-run_python(CXX11_ABI_VALUE "import torch; print('TRUE' if torch._C._GLIBCXX_USE_CXX11_ABI else 'FALSE')" "Failed to get CXX11 ABI")
 cmake_host_system_information(RESULT HOST_ARCH QUERY OS_PLATFORM)
 
 set(SYSTEM_STRING "${HOST_ARCH}-windows")
 
 if(GPU_LANG STREQUAL "CUDA")
-  generate_build_name(BUILD_VARIANT_NAME "${TORCH_VERSION}" "${CXX11_ABI_VALUE}" "cuda" "${CUDA_VERSION}" "${SYSTEM_STRING}")
+  generate_build_name(BUILD_VARIANT_NAME "${TORCH_VERSION}" "cuda" "${CUDA_VERSION}" "${SYSTEM_STRING}")
 elseif(GPU_LANG STREQUAL "HIP")
   run_python(ROCM_VERSION "import torch.version; print(torch.version.hip.split('.')[0] + '.' + torch.version.hip.split('.')[1])" "Failed to get ROCm version")
-  generate_build_name(BUILD_VARIANT_NAME "${TORCH_VERSION}" "${CXX11_ABI_VALUE}" "rocm" "${ROCM_VERSION}" "${SYSTEM_STRING}")
+  generate_build_name(BUILD_VARIANT_NAME "${TORCH_VERSION}" "rocm" "${ROCM_VERSION}" "${SYSTEM_STRING}")
 endif()
 {% endif %}
diff --git a/build2cmake/src/templates/windows.cmake b/build2cmake/src/templates/windows.cmake
index 85fb029e..6685f97f 100644
--- a/build2cmake/src/templates/windows.cmake
+++ b/build2cmake/src/templates/windows.cmake
@@ -4,12 +4,11 @@
 # Arguments:
 #   OUT_BUILD_NAME - Output variable name
 #   TORCH_VERSION - PyTorch version (e.g., "2.7.1")
-#   CXX11_ABI - Whether C++11 ABI is enabled (TRUE/FALSE)
 #   COMPUTE_FRAMEWORK - One of: cuda, rocm, metal, xpu
 #   COMPUTE_VERSION - Version of compute framework (e.g., "12.4" for CUDA, "6.0" for ROCm)
 # Example output: torch271-cxx11-cu124-x86_64-windows
 #
-function(generate_build_name OUT_BUILD_NAME TORCH_VERSION CXX11_ABI COMPUTE_FRAMEWORK COMPUTE_VERSION)
+function(generate_build_name OUT_BUILD_NAME TORCH_VERSION COMPUTE_FRAMEWORK COMPUTE_VERSION)
     # Flatten version by removing dots and padding to 2 components
     string(REPLACE "." ";" VERSION_LIST "${TORCH_VERSION}")
     list(LENGTH VERSION_LIST VERSION_COMPONENTS)
@@ -74,11 +73,7 @@ function(generate_build_name OUT_BUILD_NAME TORCH_VERSION CXX11_ABI COMPUTE_FRAM
     endif()
 
     # Assemble the final build name
-    if(CXX11_ABI STREQUAL "" OR CXX11_ABI STREQUAL "FALSE")
-        set(BUILD_NAME "torch${FLATTENED_TORCH}-${COMPUTE_STRING}-${CPU_ARCH}-windows")
-    else()
-        set(BUILD_NAME "torch${FLATTENED_TORCH}-cxx11-${COMPUTE_STRING}-${CPU_ARCH}-windows")
-    endif()
+    set(BUILD_NAME "torch${FLATTENED_TORCH}-${COMPUTE_STRING}-${CPU_ARCH}-windows")
 
     set(${OUT_BUILD_NAME} "${BUILD_NAME}" PARENT_SCOPE)
     message(STATUS "Generated build name: ${BUILD_NAME}")