issue/252: C++测试添加

Author: Catheriany

.github/workflows/build.yml

@@ -52,5 +52,28 @@ jobs:
     - name: Python Test
       run: python scripts/python_test.py --cpu
 
-    - name: C++ Test
-      run: python scripts/gguf_test.py --cpu
+    - name: Gguf Generation Test
+      run: python scripts/gguf_test.py --mode gguf
+
+    - name: C++ Test on Linux
+      if: matrix.os == 'ubuntu-latest'
+      run: |
+        export LD_LIBRARY_PATH="$PWD/build/linux/x86_64/release:$LD_LIBRARY_PATH"
+        tests=(add gemm mul random_sample swiglu clip)
+        for t in "${tests[@]}"; do
+          build/linux/x86_64/release/infiniop-test \
+            test/infiniop-test/${t}.gguf \
+            --cpu \
+            --warmup 0 \
+            --run 0
+        done
+
+    - name: C++ Test on Windows
+      if: matrix.os == 'windows-latest'
+      run: |
+        $exe = ".\build\windows\x64\release\infiniop-test.exe"
+        $base = "test\infiniop-test"
+        $tests = @("add","gemm","mul","random_sample","swiglu","clip")
+        foreach ($t in $tests) {
+          & $exe "$base\$t.gguf" "--cpu" "--warmup" "0" "--run" "0"
+        }

scripts/gguf_test.py

@@ -2,59 +2,42 @@
 import sys
 import subprocess
 from set_env import set_env
+import argparse
 
-PROJECT_DIR = os.path.abspath(
-    os.path.join(os.path.dirname(__file__), "..")
-)
-os.chdir(PROJECT_DIR)
-
-def run_tests(test_names, device_type):
-    failed = []
-    base_dir = os.path.join(PROJECT_DIR, "test", "infiniop-test")
 
-    for test in test_names:
+PROJECT_DIR = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
+os.chdir(PROJECT_DIR)
 
-        # GGUF 生成阶段
-        cmd_gguf = f"python -m test_generate.testcases.{test}"
-        res = subprocess.run(
-            cmd_gguf,
-            shell=True,
-            cwd=base_dir
-        )
-        if res.returncode != 0:
-            print(f"[ FAIL ] GGUF generation failed for {test}")
-            failed.append(test)
-            continue
-        print("Files in build/linux/x86_64/release:")
-        print(os.listdir(os.path.join(PROJECT_DIR, "build/linux/x86_64/release")))
-    
-        # C++ 测试阶段
+def run(test, device, mode):
+    base = os.path.join(PROJECT_DIR, "test", "infiniop-test")
+    if mode in ("gguf", "all"):
+        if subprocess.run(f"python -m test_generate.testcases.{test}",
+                          shell=True, cwd=base).returncode:
+            return f"{test}: gguf failed"
+    if mode in ("cpp", "all"):
         exe = os.path.join(PROJECT_DIR, "build/linux/x86_64/release/infiniop-test")
-        gguf_path = os.path.join(base_dir, f"{test}.gguf")
-        print(f"exe: {exe}, exists: {os.path.isfile(exe)}")
-        print(f"gguf_path: {gguf_path}, exists: {os.path.isfile(gguf_path)}")
-        cmd_cpp = f"{exe} {gguf_path} {device_type} --warmup 20 --run 1000"
-        res = subprocess.run(
-            cmd_cpp,
-            shell=True,
-            cwd=PROJECT_DIR
-        )
-        if res.returncode != 0:
-            print(f"[ FAIL ] C++ test failed for {test}")
-            failed.append(test)
-
-    return failed
-
-if __name__ == "__main__":
+        gguf = os.path.join(base, f"{test}.gguf")
+        if subprocess.run(f"{exe} {gguf} --{device} --warmup 20 --run 1000",
+                          shell=True, cwd=PROJECT_DIR).returncode:
+            return f"{test}: cpp failed"
+    return None
+
+def main():
+    parser = argparse.ArgumentParser()
+    parser.add_argument("--device", nargs="?", default="cpu")
+    parser.add_argument("--mode", choices=["gguf", "cpp", "all"], default="all")
+    args = parser.parse_args()
 
     set_env()
-    test_names = ["add", "gemm", "mul", "random_sample", "swiglu", "clip"]
-    failed = run_tests(test_names, " ".join(sys.argv[1:]))
+    tests = ["add", "gemm", "mul", "random_sample", "swiglu", "clip"]
+    fails = [r for t in tests if (r := run(t, args.device, args.mode))]
+    
+    if not fails:
+        print("\n\033[92mAll tests passed!\033[0m")
+        sys.exit(0)
+    print("\033[91mSome tests failed:\033[0m")
+    for f in fails: print(" -", f)
+    sys.exit(1)
 
-    if len(failed) == 0:
-        print("\033[92mAll tests passed!\033[0m")
-    else:
-        print("\033[91mThe following tests failed:\033[0m")
-        for t in failed:
-            print(f" - {t}")
-    sys.exit(len(failed))
+if __name__ == "__main__":
+    main()