update CI

Author: daanzu

.github/workflows/build.yml

@@ -48,11 +48,11 @@ jobs:
       - run: |
           python3 setup.py bdist_wheel
           ls -al dist/
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
-          name: wheels
+          name: wheels-macos
           path: dist/*
-          
+
   build-linux:
     runs-on: ubuntu-18.04
     if: true
@@ -81,13 +81,13 @@ jobs:
           just build-dockcross $KALDI_BRANCH $MKL_URL
           # cp dist/* wheelhouse/
           ls -al wheelhouse/
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
-          name: wheels
+          name: wheels-linux
           path: wheelhouse/*
 
   build-windows:
-    runs-on: windows-2019
+    runs-on: windows-2025
     if: true
     env:
       MKL_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/17173/w_mkl_2020.4.311.exe
@@ -119,13 +119,13 @@ jobs:
         run: |
           echo $GITHUB_WORKSPACE
           df -h
-          ls -al '/c/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Redist/MSVC/'
-          # ls -al '/c/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Redist/MSVC/14.26.28720'
-          ls -al '/c/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Redist/MSVC/v142'
-          # ls -al '/c/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Redist/MSVC/14.16.27012/x64/Microsoft.VC141.CRT'
-          ls -al '/c/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Redist/MSVC/'*/x64/Microsoft.*.CRT
-          # ls -alR /c/Program\ Files\ \(x86\)/Microsoft Visual Studio/2019/Enterprise/VC/Redist/MSVC/
-          # ls -alR '/c/Program Files (x86)/Microsoft Visual Studio/'2019/Enterprise/VC/Redist/MSVC/
+          ls -al '/c/Program Files (x86)/Microsoft Visual Studio/2022/Enterprise/VC/Redist/MSVC/'
+          # ls -al '/c/Program Files (x86)/Microsoft Visual Studio/2022/Enterprise/VC/Redist/MSVC/14.26.28720'
+          # ls -al '/c/Program Files (x86)/Microsoft Visual Studio/2022/Enterprise/VC/Redist/MSVC/v142'
+          # ls -al '/c/Program Files (x86)/Microsoft Visual Studio/2022/Enterprise/VC/Redist/MSVC/14.16.27012/x64/Microsoft.VC141.CRT'
+          ls -al '/c/Program Files (x86)/Microsoft Visual Studio/2022/Enterprise/VC/Redist/MSVC/'*/x64/Microsoft.*.CRT
+          # ls -alR /c/Program\ Files\ \(x86\)/Microsoft Visual Studio/2022/Enterprise/VC/Redist/MSVC/
+          # ls -alR '/c/Program Files (x86)/Microsoft Visual Studio/'2022/Enterprise/VC/Redist/MSVC/
           vswhere
           vswhere -find 'VC\Redist\**\VC_redist.x64.exe'
       - name: Setup Kaldi build configuration
@@ -199,16 +199,26 @@ jobs:
           # ../openfst/build_output/x64/Release/bin/{fstarcsort,fstcompile,fstinfo}.exe ../kaldi/kaldiwin_vs2019_MKL/kaldiwin/compile-graph-agf/x64/Release/compile-graph-agf.exe ../kaldi/kaldiwin_vs2019_MKL/kaldiwin/fstaddselfloops/x64/Release/fstaddselfloops.exe
           env KALDIAG_SETUP_RAW=1 python setup.py bdist_wheel
           ls -al dist/
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
-          name: wheels
+          name: wheels-windows
           path: main/dist/*
       # - name: Copy Windows vc_redist
       #   run: |
       #     mkdir -p vc_redist
-      #     cp '/c/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Redist/MSVC/14.26.28720'/vc_redist.x64.exe vc_redist/
-      #     cp '/c/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Redist/MSVC/14.26.28720'/x64/Microsoft.*.CRT/* vc_redist/
-      # - uses: actions/upload-artifact@v2
+      #     cp '/c/Program Files (x86)/Microsoft Visual Studio/2022/Enterprise/VC/Redist/MSVC/14.26.28720'/vc_redist.x64.exe vc_redist/
+      #     cp '/c/Program Files (x86)/Microsoft Visual Studio/2022/Enterprise/VC/Redist/MSVC/14.26.28720'/x64/Microsoft.*.CRT/* vc_redist/
+      # - uses: actions/upload-artifact@v4
       #   with:
       #     name: vc_redist
       #     path: vc_redist/*
+
+  merge-wheels:
+    runs-on: ubuntu-latest
+    needs: [build-macos, build-linux, build-windows]
+    steps:
+      - uses: actions/upload-artifact/merge@v4
+        with:
+          name: wheels
+          pattern: wheels-*
+          delete-merged: true  # Optional: removes the individual artifacts

CMakeLists.txt

@@ -69,7 +69,7 @@ else()
   message("Compiling with OpenBLAS")
   set(KALDI_CONFIG_FLAGS --shared --static-math --use-cuda=no --mathlib=OPENBLAS)
   set(MATHLIB_BUILD_COMMAND cd tools
-    && git clone -b v0.3.13 --single-branch https://github.com/xianyi/OpenBLAS
+    && git clone -b v0.3.13 --single-branch https://github.com/OpenMathLib/OpenBLAS
     && ${MAKE_EXE} ${MAKE_FLAGS} -C OpenBLAS DYNAMIC_ARCH=1 TARGET=GENERIC USE_LOCKING=1 USE_THREAD=0 all
     && ${MAKE_EXE} ${MAKE_FLAGS} -C OpenBLAS PREFIX=install install
     && cd ..)