From c1aefb643ee6352b8bd3123c2f5b021f1a1aa57f Mon Sep 17 00:00:00 2001
From: Fangjun Kuang <csukuangfj@gmail.com>
Date: Wed, 30 Oct 2024 12:45:45 +0800
Subject: [PATCH] Support numpy 2 0 and torch 2.5.1 (#110)

---
 .github/workflows/macos-cpu-wheels.yml          |  5 +++--
 .github/workflows/ubuntu-cpu-wheels.yml         |  5 +++--
 .github/workflows/ubuntu-cuda-wheels.yml        |  5 +++--
 .github/workflows/windows-x64-cpu-wheels.yml    |  5 +++--
 cmake/pybind11.cmake                            | 17 ++++++++---------
 scripts/github_actions/generate_build_matrix.py | 12 ++++++++++++
 6 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/macos-cpu-wheels.yml b/.github/workflows/macos-cpu-wheels.yml
index 3f01d11..5cd97a6 100644
--- a/.github/workflows/macos-cpu-wheels.yml
+++ b/.github/workflows/macos-cpu-wheels.yml
@@ -110,8 +110,9 @@ jobs:
             cd huggingface
             git pull
 
-            mkdir -p macos
-            cp -v ../wheelhouse/*.whl ./macos
+            d=cpu/1.25.5.dev20241029/macos
+            mkdir -p $d
+            cp -v ../wheelhouse/*.whl ./$d
             git status
             git lfs track "*.whl"
             git add .
diff --git a/.github/workflows/ubuntu-cpu-wheels.yml b/.github/workflows/ubuntu-cpu-wheels.yml
index cf8b072..b11c342 100644
--- a/.github/workflows/ubuntu-cpu-wheels.yml
+++ b/.github/workflows/ubuntu-cpu-wheels.yml
@@ -100,8 +100,9 @@ jobs:
             cd huggingface
             git pull
 
-            mkdir -p ubuntu-cpu
-            cp -v ../wheelhouse/*.whl ./ubuntu-cpu
+            d=cpu/1.25.5.dev20241029/linux
+            mkdir -p $d
+            cp -v ../wheelhouse/*.whl ./$d
             git status
             git lfs track "*.whl"
             git add .
diff --git a/.github/workflows/ubuntu-cuda-wheels.yml b/.github/workflows/ubuntu-cuda-wheels.yml
index 66c9965..710e37e 100644
--- a/.github/workflows/ubuntu-cuda-wheels.yml
+++ b/.github/workflows/ubuntu-cuda-wheels.yml
@@ -119,8 +119,9 @@ jobs:
             cd huggingface
             git pull
 
-            mkdir -p ubuntu-cuda
-            cp -v ../wheelhouse/*.whl ./ubuntu-cuda
+            d=cuda/1.25.5.dev20241029/linux
+            mkdir -p $d
+            cp -v ../wheelhouse/*.whl ./$d
             git status
             git lfs track "*.whl"
             git add .
diff --git a/.github/workflows/windows-x64-cpu-wheels.yml b/.github/workflows/windows-x64-cpu-wheels.yml
index cc81d14..0103c32 100644
--- a/.github/workflows/windows-x64-cpu-wheels.yml
+++ b/.github/workflows/windows-x64-cpu-wheels.yml
@@ -89,8 +89,9 @@ jobs:
             cd huggingface
             git pull
 
-            mkdir -p windows-cpu
-            cp -v ../wheelhouse/*.whl ./windows-cpu
+            d=cpu/1.25.5.dev20241029/windows
+            mkdir -p $d
+            cp -v ../wheelhouse/*.whl ./$d
             git status
             git lfs track "*.whl"
             git add .
diff --git a/cmake/pybind11.cmake b/cmake/pybind11.cmake
index 0ede964..56136ad 100644
--- a/cmake/pybind11.cmake
+++ b/cmake/pybind11.cmake
@@ -8,19 +8,18 @@ function(download_pybind11)
 
   include(FetchContent)
 
-  # latest commit as of 2022.10.31 that supports python 3.11
-  set(pybind11_URL  "https://github.com/pybind/pybind11/archive/5bc0943ed96836f46489f53961f6c438d2935357.zip")
-  set(pybind11_URL2 "https://huggingface.co/csukuangfj/k2-cmake-deps/resolve/main/pybind11-5bc0943ed96836f46489f53961f6c438d2935357.zip")
-  set(pybind11_HASH "SHA256=ff65a1a8c9e6ceec11e7ed9d296f2e22a63e9ff0c4264b3af29c72b4f18f25a0")
+  set(pybind11_URL  "https://github.com/pybind/pybind11/archive/refs/tags/v2.12.0.tar.gz")
+  set(pybind11_URL2 "https://hf-mirror.com/csukuangfj/sherpa-onnx-cmake-deps/resolve/main/pybind11-2.12.0.tar.gz")
+  set(pybind11_HASH "SHA256=bf8f242abd1abcd375d516a7067490fb71abd79519a282d22b6e4d19282185a7")
 
   # If you don't have access to the Internet,
   # please pre-download pybind11
   set(possible_file_locations
-    $ENV{HOME}/Downloads/pybind11-5bc0943ed96836f46489f53961f6c438d2935357.zip
-    ${PROJECT_SOURCE_DIR}/pybind11-5bc0943ed96836f46489f53961f6c438d2935357.zip
-    ${PROJECT_BINARY_DIR}/pybind11-5bc0943ed96836f46489f53961f6c438d2935357.zip
-    /tmp/pybind11-5bc0943ed96836f46489f53961f6c438d2935357.zip
-    /star-fj/fangjun/download/github/pybind11-5bc0943ed96836f46489f53961f6c438d2935357.zip
+    $ENV{HOME}/Downloads/pybind11-2.12.0.tar.gz
+    ${CMAKE_SOURCE_DIR}/pybind11-2.12.0.tar.gz
+    ${CMAKE_BINARY_DIR}/pybind11-2.12.0.tar.gz
+    /tmp/pybind11-2.12.0.tar.gz
+    /star-fj/fangjun/download/github/pybind11-2.12.0.tar.gz
   )
 
   foreach(f IN LISTS possible_file_locations)
diff --git a/scripts/github_actions/generate_build_matrix.py b/scripts/github_actions/generate_build_matrix.py
index bc6eb59..492e274 100755
--- a/scripts/github_actions/generate_build_matrix.py
+++ b/scripts/github_actions/generate_build_matrix.py
@@ -268,6 +268,15 @@ def generate_build_matrix(enable_cuda, for_windows, for_macos, test_only_latest_
                 else ["11.8.0", "12.1.0", "12.4.0"]
             ),
         },
+        "2.5.1": {
+            # Only Linux supports python 3.13
+            "python-version": ["3.9", "3.10", "3.11", "3.12", "3.13"],
+            "cuda": (
+                ["11.8", "12.1", "12.4"]  # default 12.4
+                if not for_windows
+                else ["11.8.0", "12.1.0", "12.4.0"]
+            ),
+        },
         # https://github.com/Jimver/cuda-toolkit/blob/master/src/links/windows-links.ts
     }
     if test_only_latest_torch:
@@ -275,6 +284,9 @@ def generate_build_matrix(enable_cuda, for_windows, for_macos, test_only_latest_
         matrix = {latest: matrix[latest]}
 
     if for_windows or for_macos:
+        if "2.5.1" in matrix:
+            matrix["2.5.1"]["python-version"].remove("3.13")
+
         if "2.5.0" in matrix:
             matrix["2.5.0"]["python-version"].remove("3.13")