From cab502ee5824969a34f60b894a7037918abdedc3 Mon Sep 17 00:00:00 2001 From: YdrMaster Date: Tue, 18 Feb 2025 12:49:47 +0800 Subject: [PATCH 1/3] =?UTF-8?q?issue/55:=20CI=20=E5=9C=A8=20Windows=20?= =?UTF-8?q?=E4=B8=8A=E6=89=A7=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: YdrMaster --- .github/workflows/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bc65cd0ac..d29b0aa67 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -9,11 +9,12 @@ on: jobs: build: name: Build - runs-on: ubuntu-latest strategy: fail-fast: false matrix: + os: [windows-latest, ubuntu-latest] type: [debug, release] + runs-on: ${{ matrix.os }} steps: - name: checkout code From 1a180f5adff6108eb40e9e4b8dff74a887b7c1a0 Mon Sep 17 00:00:00 2001 From: YdrMaster Date: Tue, 18 Feb 2025 13:09:01 +0800 Subject: [PATCH 2/3] =?UTF-8?q?issue/55:=20=E6=94=B9=E6=AD=A3=20xmake=20?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=EF=BC=8C=E5=A4=84=E7=90=86?= =?UTF-8?q?=20Windows=20=E4=B8=8A=E5=AD=97=E7=AC=A6=E7=BC=96=E7=A0=81?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=B9=B6=E6=AD=A3=E7=A1=AE=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E7=BC=96=E8=AF=91=E9=80=89=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: YdrMaster --- xmake.lua | 5 +++-- xmake/cpu.lua | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/xmake.lua b/xmake.lua index eba2acd89..bed45b3b3 100644 --- a/xmake.lua +++ b/xmake.lua @@ -5,6 +5,7 @@ local YELLOW = '\27[1;33m' local NC = '\27[0m' -- No Color add_includedirs("include") +set_encodings("utf-8") if is_mode("debug") then add_cxflags("-g -O0") @@ -84,8 +85,8 @@ option("moore-gpu") option_end() if has_config("mthreads-gpu") then - add_defines("ENABLE_MUSA_API") -end + add_defines("ENABLE_MUSA_API") +end -- 海光 option("sugon-dcu") diff --git a/xmake/cpu.lua b/xmake/cpu.lua index 484e6ce5f..7a4a0cd1c 100644 --- a/xmake/cpu.lua +++ b/xmake/cpu.lua @@ -2,7 +2,7 @@ target("infiniop-cpu") on_install(function (target) end) set_kind("static") - add_cxflags("-Wall", "-Werror") + set_warnings("all", "error") if not is_plat("windows") then add_cxflags("-fPIC") @@ -14,4 +14,4 @@ target("infiniop-cpu") add_cxflags("-fopenmp") add_ldflags("-fopenmp") end -target_end() \ No newline at end of file +target_end() From c32d59faf3b1f159a2c3d33bac1c8f8e4cc5b45f Mon Sep 17 00:00:00 2001 From: YdrMaster Date: Tue, 18 Feb 2025 13:54:25 +0800 Subject: [PATCH 3/3] =?UTF-8?q?issue/55:=20=E6=8C=89=20pr=20change=20reque?= =?UTF-8?q?st=20=E6=94=B9=E6=AD=A3=20xmake=20=E6=91=A9=E5=B0=94=E7=BA=BF?= =?UTF-8?q?=E7=A8=8B=E9=85=8D=E7=BD=AE=E7=9A=84=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: YdrMaster --- xmake.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xmake.lua b/xmake.lua index bed45b3b3..ec149faa3 100644 --- a/xmake.lua +++ b/xmake.lua @@ -84,7 +84,7 @@ option("moore-gpu") set_description("Whether to complie implementations for Moore Threads GPU") option_end() -if has_config("mthreads-gpu") then +if has_config("moore-gpu") then add_defines("ENABLE_MUSA_API") end