From c0db5d0907c57e1621f9ac68684cb03336efe512 Mon Sep 17 00:00:00 2001 From: c8ef Date: Sun, 11 Aug 2024 06:42:28 +0800 Subject: [PATCH] update openblas & upgrade clang ci (#4882) --- .github/workflows/ubuntu_clang.yml | 4 ++-- packages/o/openblas/xmake.lua | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ubuntu_clang.yml b/.github/workflows/ubuntu_clang.yml index e652c5d57..d35bfb85a 100644 --- a/.github/workflows/ubuntu_clang.yml +++ b/.github/workflows/ubuntu_clang.yml @@ -36,8 +36,8 @@ jobs: # https://apt.llvm.org/ wget https://apt.llvm.org/llvm.sh chmod +x llvm.sh - sudo ./llvm.sh 17 all + sudo ./llvm.sh 20 all - name: Tests run: | - xmake l ./scripts/test.lua -D --toolchain=clang-17 -k ${{ matrix.kind }} + xmake l ./scripts/test.lua -D --toolchain=clang-20 -k ${{ matrix.kind }} diff --git a/packages/o/openblas/xmake.lua b/packages/o/openblas/xmake.lua index fea5f285a..ce2edb6a4 100644 --- a/packages/o/openblas/xmake.lua +++ b/packages/o/openblas/xmake.lua @@ -47,6 +47,7 @@ package("openblas") add_versions("0.3.24", "ceadc5065da97bd92404cac7254da66cc6eb192679cf1002098688978d4d5132") add_versions("0.3.26", "4e6e4f5cb14c209262e33e6816d70221a2fe49eb69eaf0a06f065598ac602c68") add_versions("0.3.27", "aa2d68b1564fe2b13bc292672608e9cdeeeb6dc34995512e65c3b10f4599e897") + add_versions("0.3.28", "f1003466ad074e9b0c8d421a204121100b0751c96fc6fcf3d1456bd12f8a00a1") add_configs("fortran", {description = "Compile with fortran enabled.", default = not is_plat("macosx"), type = "boolean"}) add_configs("openmp", {description = "Compile with OpenMP enabled.", default = not is_plat("macosx"), type = "boolean"}) @@ -153,10 +154,10 @@ package("openblas") on_test(function (package) assert(package:check_csnippets({test = [[ void test() { - double A[6] = {1.0,2.0,1.0,-3.0,4.0,-1.0}; - double B[6] = {1.0,2.0,1.0,-3.0,4.0,-1.0}; - double C[9] = {.5,.5,.5,.5,.5,.5,.5,.5,.5}; - cblas_dgemm(CblasColMajor,CblasNoTrans,CblasTrans,3,3,2,1,A,3,B,3,2,C,3); + double A[6] = {1.0, 2.0, 1.0, -3.0, 4.0, -1.0}; + double B[6] = {1.0, 2.0, 1.0, -3.0, 4.0, -1.0}; + double C[9] = {.5, .5, .5, .5, .5, .5, .5, .5, .5}; + cblas_dgemm(CblasColMajor, CblasNoTrans, CblasTrans, 3, 3, 2, 1, A, 3, B, 3, 2, C, 3); } ]]}, {includes = "cblas.h"})) end)