Merge pull request #91 from YdrMaster/main

issue/87/refactor: 重构 cuda handle，并修改 cpu handle 和 matmul 命名空间

xmake.lua

@@ -119,8 +119,25 @@ target("infini-utils")
     add_files("src/utils/*.cc")
 target_end()
 
+target("infinirt")
+    set_kind("shared")
+
+    if has_config("cpu") then
+        add_deps("infinirt-cpu")
+    end
+    if has_config("nv-gpu") then
+        add_deps("infinirt-cuda")
+    end
+    set_languages("cxx17")
+    set_installdir(os.getenv("INFINI_ROOT") or (os.getenv(is_host("windows") and "HOMEPATH" or "HOME") .. "/.infini"))
+    add_files("src/infinirt/*.cc")
+    add_installfiles("include/infinirt.h")
+target_end()
+
 target("infiniop")
     set_kind("shared")
+    add_deps("infinirt")
+
     if has_config("cpu") then
         add_deps("infiniop-cpu")
     end
@@ -166,20 +183,6 @@ target("infiniop")
     add_installfiles("include/infinicore.h", {prefixdir = "include"})
 target_end()
 
-target("infinirt")
-    set_kind("shared")
-    if has_config("cpu") then
-        add_deps("infinirt-cpu")
-    end
-    if has_config("nv-gpu") then
-        add_deps("infinirt-cuda")
-    end
-    set_languages("cxx17")
-    set_installdir(os.getenv("INFINI_ROOT") or (os.getenv(is_host("windows") and "HOMEPATH" or "HOME") .. "/.infini"))
-    add_files("src/infinirt/*.cc")
-    add_installfiles("include/infinirt.h")
-target_end()
-
 target("all")
     set_kind("phony")
     add_deps("infiniop", "infinirt")

xmake/ascend.lua

@@ -41,15 +41,16 @@ rule_end()
 target("infiniop-ascend")
     set_kind("static")
     add_deps("infini-utils")
-    set_languages("cxx17")
     on_install(function (target) end)
-    -- Add files
+
+    add_cxflags("-lstdc++ -fPIC")
+    set_warnings("all", "error")
+
+    set_languages("cxx17")
     add_files("$(projectdir)/src/infiniop/devices/ascend/*.cc", "$(projectdir)/src/infiniop/ops/*/ascend/*.cc")
-    add_cxflags("-lstdc++ -Wall -Werror -fPIC")
 
     -- Add operator
     -- TODO: add it back after ascend-kernels is fixed
     -- add_rules("ascend-kernels")
     -- add_links(builddir.."/libascend_kernels.a")
-
 target_end()

xmake/bang.lua

@@ -31,7 +31,6 @@ rule("mlu")
         os.execv(cc, args)
         table.insert(target:objectfiles(), objectfile)
     end)
-
 rule_end()
 
 local src_dir = path.join(os.projectdir(), "src", "infiniop")
@@ -40,11 +39,14 @@ target("infiniop-cambricon")
     set_kind("static")
     add_deps("infini-utils")
     on_install(function (target) end)
+
+    add_cxflags("-lstdc++ -fPIC")
+    set_warnings("all", "error")
+
     set_languages("cxx17")
     add_files(src_dir.."/devices/bang/*.cc", src_dir.."/ops/*/bang/*.cc")
     local mlu_files = os.files(src_dir .. "/ops/*/bang/*.mlu")
     if #mlu_files > 0 then
         add_files(mlu_files, {rule = "mlu"})
     end
-    add_cxflags("-lstdc++ -Wall -Werror -fPIC")
 target_end()

xmake/cuda.lua

@@ -12,11 +12,10 @@ target("infiniop-cuda")
     set_kind("static")
     add_deps("infini-utils")
     on_install(function (target) end)
-    set_policy("build.cuda.devlink", true)
 
+    set_policy("build.cuda.devlink", true)
     set_toolchains("cuda")
-    add_links("cublas")
-    add_links("cudnn")
+    add_links("cublas", "cudnn")
     add_cugencodes("native")
 
     if is_plat("windows") then
@@ -40,7 +39,10 @@ target("infinirt-cuda")
     set_kind("static")
     add_deps("infini-utils")
     on_install(function (target) end)
+
     set_policy("build.cuda.devlink", true)
+    set_toolchains("cuda")
+    add_links("cudart")
 
     if is_plat("windows") then
         add_cuflags("-Xcompiler=/utf-8", "--expt-relaxed-constexpr", "--allow-unsupported-compiler")
@@ -50,9 +52,6 @@ target("infinirt-cuda")
         add_cxflags("-fPIC")
     end
 
-    set_toolchains("cuda")
-    add_links("cudart")
-
     set_languages("cxx17")
     add_files("../src/infinirt/cuda/*.cu")
 target_end()

xmake/kunlun.lua

@@ -10,10 +10,11 @@ add_links("xpuapi")
 target("infiniop-kunlun")
     set_kind("static")
     add_deps("infini-utils")
-    set_languages("cxx17")
     on_install(function (target) end)
-    -- Add files
-    add_files("$(projectdir)/src/infiniop/devices/kunlun/*.cc", "$(projectdir)/src/infiniop/ops/*/kunlun/*.cc")
-    add_cxflags("-lstdc++ -Wall -Werror -fPIC")
 
+    add_cxflags("-lstdc++ -fPIC")
+    set_warnings("all", "error")
+
+    set_languages("cxx17")
+    add_files("$(projectdir)/src/infiniop/devices/kunlun/*.cc", "$(projectdir)/src/infiniop/ops/*/kunlun/*.cc")
 target_end()