Merge pull request #326 from YdrMaster/main

issue/291/fix: 改正 conv 中的编译错误和 xmake 中的一些问题

src/infiniop/ops/conv/nvidia/conv_nvidia.cu

@@ -262,12 +262,12 @@ public:
           workspace_size(other.workspace_size)
     // clang-format off
 #ifdef ENABLE_CUDNN_API
-          , x_desc(other.x_desc),
-          , y_desc(other.y_desc),
-          , w_desc(other.w_desc),
-          , b_desc(other.b_desc),
-          , act_desc(other.act_desc),
-          , conv_desc(other.conv_desc),
+          , x_desc(other.x_desc)
+          , y_desc(other.y_desc)
+          , w_desc(other.w_desc)
+          , b_desc(other.b_desc)
+          , act_desc(other.act_desc)
+          , conv_desc(other.conv_desc)
           , algo(other.algo)
 #endif
     // clang-format on

xmake.lua

@@ -49,7 +49,7 @@ option_end()
 
 if has_config("nv-gpu") then
     add_defines("ENABLE_NVIDIA_API")
-    includes("xmake/cuda.lua")
+    includes("xmake/nvidia.lua")
 end
 
 option("cudnn")
@@ -187,7 +187,7 @@ target("infinirt")
         add_deps("infinirt-cpu")
     end
     if has_config("nv-gpu") then
-        add_deps("infinirt-cuda")
+        add_deps("infinirt-nvidia")
     end
     if has_config("cambricon-mlu") then
         add_deps("infinirt-cambricon")
@@ -221,7 +221,7 @@ target("infiniop")
         add_deps("infiniop-cpu")
     end
     if has_config("nv-gpu") then
-        add_deps("infiniop-cuda")
+        add_deps("infiniop-nvidia")
     end
     if has_config("iluvatar-gpu") then
         add_deps("infiniop-iluvatar")
@@ -235,9 +235,9 @@ target("infiniop")
         )
         add_shflags("-s", "-shared", "-fPIC")
         add_links("cublas", "cudnn", "cudadevrt", "cudart_static", "rt", "pthread", "dl")
-        -- Using -linfiniop-cuda will fail, manually link the target using full path
+        -- Using -linfiniop-nvidia will fail, manually link the target using full path
         add_deps("nv-gpu", {inherit = false})
-        add_links(builddir.."/libinfiniop-cuda.a")
+        add_links(builddir.."/libinfiniop-nvidia.a")
         set_toolchains("sugon-dcu-linker")
     end
 
@@ -273,7 +273,7 @@ target("infiniccl")
     add_deps("infinirt")
 
     if has_config("nv-gpu") then
-        add_deps("infiniccl-cuda")
+        add_deps("infiniccl-nvidia")
     end
     if has_config("ascend-npu") then
         add_deps("infiniccl-ascend")

xmake/cuda.lua → xmake/nvidia.lua

@@ -3,7 +3,7 @@ if CUDNN_ROOT ~= nil then
     add_includedirs(CUDNN_ROOT .. "/include")
 end
 
-target("infiniop-cuda")
+target("infiniop-nvidia")
     set_kind("static")
     add_deps("infini-utils")
     on_install(function (target) end)
@@ -46,10 +46,10 @@ target("infiniop-cuda")
     add_cuflags("-Xcompiler=-Wno-error=deprecated-declarations")
 
     set_languages("cxx17")
-    add_files("../src/infiniop/devices/nvidia/*.cu", "../src/infiniop/ops/*/cuda/*.cu", "../src/infiniop/ops/*/nvidia/*.cu", "../build/ninetoothed/*.c")
+    add_files("../src/infiniop/devices/nvidia/*.cu", "../src/infiniop/ops/*/nvidia/*.cu", "../build/ninetoothed/*.c")
 target_end()
 
-target("infinirt-cuda")
+target("infinirt-nvidia")
     set_kind("static")
     add_deps("infini-utils")
     on_install(function (target) end)
@@ -71,7 +71,7 @@ target("infinirt-cuda")
     add_files("../src/infinirt/cuda/*.cu")
 target_end()
 
-target("infiniccl-cuda")
+target("infiniccl-nvidia")
     set_kind("static")
     add_deps("infinirt")
     on_install(function (target) end)