make win-arm64 build more like upstream

Author: mattip

.github/workflows/windows-arm.yml

@@ -48,14 +48,20 @@ jobs:
 
     - name: Download and install LLVM installer
       run: |
-        Invoke-WebRequest https://github.com/llvm/llvm-project/releases/download/llvmorg-19.1.5/LLVM-19.1.5-woa64.exe -UseBasicParsing -OutFile LLVM-woa64.exe
+        Invoke-WebRequest https://github.com/llvm/llvm-project/releases/download/llvmorg-20.1.8/LLVM-20.1.8-woa64.exe -UseBasicParsing -OutFile LLVM-woa64.exe
         Start-Process -FilePath ".\LLVM-woa64.exe" -ArgumentList "/S" -Wait
         echo "C:\Program Files\LLVM\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
 
-    - name: Update CMake for WoA
-      run: |
-        pip install cmake
-        get-command cmake
+    - name: Install CMake and Ninja for Win-ARM64
+        shell: pwsh
+        run: |
+          Invoke-WebRequest https://github.com/Kitware/CMake/releases/download/v3.29.4/cmake-3.29.4-windows-arm64.msi -OutFile cmake-arm64.msi
+          Start-Process msiexec.exe -ArgumentList "/i cmake-arm64.msi /quiet /norestart" -Wait
+          echo "C:\Program Files\CMake\bin" >> $env:GITHUB_PATH
+          
+          Invoke-WebRequest https://github.com/ninja-build/ninja/releases/download/v1.13.1/ninja-winarm64.zip -OutFile ninja-winarm64.zip
+          Expand-Archive ninja-winarm64.zip -DestinationPath ninja
+          Copy-Item ninja\ninja.exe -Destination "C:\Windows\System32"
 
     - name: Set env variables
       run: |

.github/workflows/windows.yml

@@ -131,7 +131,7 @@ jobs:
         cat tools/LICENSE_win32.txt >> LICENSE.txt
         python -m pip wheel -w dist -vv .
         # move the mis-named scipy_openblas64-none-any.whl to a platform-specific name
-		if [ -e dist/*any*.whl ]; then
+		if [[ -e dist/*any*.whl ]]; then
 		  for f in dist/*.whl; do mv $f "${f/%any.whl/$WHEEL_PLAT.whl}"; done
 		fi
 

tools/build_steps_win_arm64.bat

@@ -91,19 +91,32 @@ mkdir build || exit /b 1 & cd build || exit /b 1
 echo Setting up ARM64 Developer Command Prompt and running CMake...
 
 :: Initialize VS ARM64 environment
-for /f "usebackq tokens=*" %%i in (`"C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe" -latest -property installationPath`) do call "%%i\VC\Auxiliary\Build\vcvarsall.bat" arm64
+CALL "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsarm64.bat"
 
 :: Prefer LLVM flang
 PATH=C:\Program Files\LLVM\bin;%PATH%
 
 :: Run CMake and Ninja build
+
 set CFLAGS=-Wno-reserved-macro-identifier -Wno-unsafe-buffer-usage
-cmake .. -G Ninja -DCMAKE_BUILD_TYPE=Release -DUSE_THREADS=1 -DNUM_THREADS=24 -DTARGET=ARMV8 -DBUILD_SHARED_LIBS=ON -DARCH=arm64 ^
--DBINARY=%build_bits% -DCMAKE_SYSTEM_PROCESSOR=ARM64 -DCMAKE_C_COMPILER=clang-cl ^
--DCMAKE_Fortran_COMPILER=flang-new -DSYMBOLPREFIX="scipy_" -DLIBNAMEPREFIX="scipy_" %interface_flags%
+cmake .. -G Ninja ^
+ -DCMAKE_BUILD_TYPE=Release ^
+ -DTARGET=ARMV8 ^
+ -DBINARY=%build_bits% ^
+ -DCMAKE_C_COMPILER=clang-cl ^
+ -DCMAKE_Fortran_COMPILER=flang-new ^
+ -DBUILD_SHARED_LIBS=ON ^
+ -DCMAKE_SYSTEM_PROCESSOR=arm64 ^
+ -DCMAKE_SYSTEM_NAME=Windows ^
+ -DSYMBOLPREFIX="scipy_" ^
+ -DLIBNAMEPREFIX="scipy_" ^
+ -DUSE_THREADS=1 ^
+ -DNUM_THREADS=24 ^
+ %interface_flags%
+
 if errorlevel 1 exit /b 1
 
-ninja
+ninja -j 16
 if errorlevel 1 exit /b 1
 
 echo Build complete. Returning to Batch.