Commit 377f6e20 authored by Zimin Li's avatar Zimin Li
Browse files

issue/46: Restore non-cpu platforms' switch-cases to the original

parent ee8ca13a
...@@ -5,21 +5,6 @@ ...@@ -5,21 +5,6 @@
#ifdef ENABLE_CPU_API #ifdef ENABLE_CPU_API
#include "cpu/swiglu_cpu.h" #include "cpu/swiglu_cpu.h"
#endif #endif
#ifdef ENABLE_CUDA_API
#include "cuda/swiglu_cuda.cuh"
#endif
#ifdef ENABLE_CAMBRICON_API
#include "bang/swiglu_bang.h"
#endif
#ifdef ENABLE_ASCEND_API
#include "ascend/swiglu_ascend.h"
#endif
#ifdef ENABLE_METAX_API
#include "maca/swiglu_maca.h"
#endif
#ifdef ENABLE_KUNLUN_API
#include "kunlun/swiglu_kunlun.h"
#endif
__C infiniStatus_t infiniopCreateSwiGLUDescriptor( __C infiniStatus_t infiniopCreateSwiGLUDescriptor(
infiniopHandle_t handle, infiniopHandle_t handle,
...@@ -42,20 +27,36 @@ __C infiniStatus_t infiniopCreateSwiGLUDescriptor( ...@@ -42,20 +27,36 @@ __C infiniStatus_t infiniopCreateSwiGLUDescriptor(
#ifdef ENABLE_CPU_API #ifdef ENABLE_CPU_API
CREATE(INFINI_DEVICE_CPU, cpu); CREATE(INFINI_DEVICE_CPU, cpu);
#endif #endif
#ifdef ENABLE_CUDA_API #ifdef ENABLE_NV_GPU
CREATE(INFINI_DEVICE_NVIDIA, cuda); case DevNvGpu:
#endif return cudaCreateSwiGLUDescriptor((CudaHandle_t)handle,
#ifdef ENABLE_CAMBRICON_API (SwiGLUCudaDescriptor_t *)desc_ptr,
CREATE(INFINI_DEVICE_CAMBRICON, bang); c_desc, a_desc, b_desc);
#endif #endif
#ifdef ENABLE_ASCEND_API #ifdef ENABLE_CAMBRICON_MLU
CREATE(INFINI_DEVICE_ASCEND, ascend); case DevCambriconMlu: {
return bangCreateSwiGLUDescriptor((BangHandle_t)handle,
(SwiGLUBangDescriptor_t *)desc_ptr,
c_desc, a_desc, b_desc);
}
#endif #endif
#ifdef ENABLE_METAX_API #ifdef ENABLE_ASCEND_NPU
CREATE(INFINI_DEVICE_METAX, maca); case DevAscendNpu:
return ascendCreateSwiGLUDescriptor(
(AscendHandle_t)handle, (SwiGLUAscendDescriptor_t *)desc_ptr,
c_desc, a_desc, b_desc);
#endif
#ifdef ENABLE_METAX_GPU
case DevMetaxGpu: {
return macaCreateSwiGLUDescriptor((MacaHandle_t)handle,
(SwiGLUMacaDescriptor_t *)desc_ptr,
c_desc, a_desc, b_desc);
}
#endif #endif
#ifdef ENABLE_KUNLUN_API #ifdef ENABLE_MTHREADS_GPU
CREATE(INFINI_DEVICE_KUNLUN, kunlun); case DevMthreadsGpu:
return musaCreateSwiGLUDescriptor(
handle, (SwiGLUMusaDescriptor_t *)desc_ptr, c_desc, a_desc, b_desc);
#endif #endif
default: default:
...@@ -82,20 +83,26 @@ __C infiniStatus_t infiniopSwiGLU( ...@@ -82,20 +83,26 @@ __C infiniStatus_t infiniopSwiGLU(
#ifdef ENABLE_CPU_API #ifdef ENABLE_CPU_API
CALCULATE(INFINI_DEVICE_CPU, cpu); CALCULATE(INFINI_DEVICE_CPU, cpu);
#endif #endif
#ifdef ENABLE_CUDA_API #ifdef ENABLE_NV_GPU
CALCULATE(INFINI_DEVICE_NVIDIA, cuda); case DevNvGpu:
return cudaSwiGLU((SwiGLUCudaDescriptor_t)desc, c, a, b, stream);
#endif #endif
#ifdef ENABLE_CAMBRICON_API #ifdef ENABLE_CAMBRICON_MLU
CALCULATE(INFINI_DEVICE_CAMBRICON, bang); case DevCambriconMlu: {
return bangSwiGLU((SwiGLUBangDescriptor_t)desc, c, a, b, stream);
}
#endif #endif
#ifdef ENABLE_ASCEND_API #ifdef ENABLE_ASCEND_NPU
CALCULATE(INFINI_DEVICE_ASCEND, ascend); case DevAscendNpu:
return ascendSwiGLU((SwiGLUAscendDescriptor_t)desc, c, a, b, stream);
#endif #endif
#ifdef ENABLE_METAX_API #ifdef ENABLE_METAX_GPU
CALCULATE(INFINI_DEVICE_METAX, maca); case DevMetaxGpu:
return macaSwiGLU((SwiGLUMacaDescriptor_t)desc, c, a, b, stream);
#endif #endif
#ifdef ENABLE_KUNLUN_API #ifdef ENABLE_MTHREADS_GPU
CALCULATE(INFINI_DEVICE_KUNLUN, kunlun); case DevMthreadsGpu:
return musaSwiGLU((SwiGLUMusaDescriptor_t)desc, c, a, b, stream);
#endif #endif
default: default:
...@@ -118,20 +125,26 @@ infiniopDestroySwiGLUDescriptor(infiniopSwiGLUDescriptor_t desc) { ...@@ -118,20 +125,26 @@ infiniopDestroySwiGLUDescriptor(infiniopSwiGLUDescriptor_t desc) {
#ifdef ENABLE_CPU_API #ifdef ENABLE_CPU_API
DELETE(INFINI_DEVICE_CPU, cpu); DELETE(INFINI_DEVICE_CPU, cpu);
#endif #endif
#ifdef ENABLE_CUDA_API #ifdef ENABLE_NV_GPU
DELETE(INFINI_DEVICE_NVIDIA, cuda); case DevNvGpu:
return cudaDestroySwiGLUDescriptor((SwiGLUCudaDescriptor_t)desc);
#endif #endif
#ifdef ENABLE_CAMBRICON_API #ifdef ENABLE_CAMBRICON_MLU
DELETE(INFINI_DEVICE_CAMBRICON, bang); case DevCambriconMlu: {
return bangDestroySwiGLUDescriptor((SwiGLUBangDescriptor_t)desc);
}
#endif #endif
#ifdef ENABLE_ASCEND_API #ifdef ENABLE_ASCEND_NPU
DELETE(INFINI_DEVICE_ASCEND, ascend); case DevAscendNpu:
return ascendDestroySwiGLUDescriptor((SwiGLUAscendDescriptor_t)desc);
#endif #endif
#ifdef ENABLE_METAX_API #ifdef ENABLE_METAX_GPU
DELETE(INFINI_DEVICE_METAX, maca); case DevMetaxGpu:
return macaDestroySwiGLUDescriptor((SwiGLUMacaDescriptor_t)desc);
#endif #endif
#ifdef ENABLE_KUNLUN_API #ifdef ENABLE_MTHREADS_GPU
DELETE(INFINI_DEVICE_KUNLUN, kunlun); case DevMthreadsGpu:
return musaDestroySwiGLUDescriptor((SwiGLUMusaDescriptor_t)desc);
#endif #endif
default: default:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment