Merge pull request #328 from YdrMaster/main

issue/158/refactor: 分离天数和英伟达的算子定义

src/infinirt/cuda/infinirt_cuda.cu

@@ -38,7 +38,7 @@ infiniStatus_t streamSynchronize(infinirtStream_t stream) {
 }
 
 infiniStatus_t streamWaitEvent(infinirtStream_t stream, infinirtEvent_t event) {
-#ifdef ENABLE_ILUVATAR_CUDA_API
+#ifdef ENABLE_ILUVATAR_API
     return INFINI_STATUS_NOT_IMPLEMENTED;
 #else
     CHECK_CUDART(cudaStreamWaitEvent((cudaStream_t)stream, (cudaEvent_t)event));

src/infinirt/cuda/infinirt_cuda.cuh

@@ -3,7 +3,7 @@
 #include "../infinirt_impl.h"
 
 namespace infinirt::cuda {
-#ifdef ENABLE_NVIDIA_API
+#if defined(ENABLE_NVIDIA_API) || defined(ENABLE_ILUVATAR_API)
 INFINIRT_DEVICE_API_IMPL
 #else
 INFINIRT_DEVICE_API_NOOP

test/infiniop/libinfiniop/utils.py

@@ -262,6 +262,11 @@ def get_args():
         action="store_true",
         help="Run NVIDIA GPU test",
     )
+    parser.add_argument(
+        "--iluvatar",
+        action="store_true",
+        help="Run Iluvatar GPU test",
+    )
     parser.add_argument(
         "--cambricon",
         action="store_true",
@@ -566,6 +571,8 @@ def get_test_devices(args):
         devices_to_test.append(InfiniDeviceEnum.CPU)
     if args.nvidia:
         devices_to_test.append(InfiniDeviceEnum.NVIDIA)
+    if args.iluvatar:
+        devices_to_test.append(InfiniDeviceEnum.ILUVATAR)
     if args.cambricon:
         import torch_mlu
 

xmake.lua

@@ -94,8 +94,7 @@ option("iluvatar-gpu")
 option_end()
 
 if has_config("iluvatar-gpu") then
-    add_defines("ENABLE_NVIDIA_API")
-    add_defines("ENABLE_ILUVATAR_CUDA_API")
+    add_defines("ENABLE_ILUVATAR_API")
     includes("xmake/iluvatar.lua")
 end
 

xmake/iluvatar.lua

@@ -42,12 +42,13 @@ target("infiniop-iluvatar")
     add_links("cudart", "cublas", "cudnn")
 
     set_warnings("all", "error")
+    add_cuflags("-Wno-error=unused-private-field")
     add_cuflags("-fPIC", "-x", "ivcore", "-std=c++17", {force = true})
     add_culdflags("-fPIC")
     add_cxflags("-fPIC")
 
     -- set_languages("cxx17") 天数似乎不能用这个配置
-    add_files("../src/infiniop/devices/cuda/*.cu", "../src/infiniop/ops/*/cuda/*.cu")
+    add_files("../src/infiniop/devices/nvidia/*.cu", "../src/infiniop/ops/*/nvidia/*.cu")
 target_end()
 
 target("infinirt-iluvatar")