Merge pull request #651 from gongchensu/feature/metax_op_fixed

Issue/648 - Remove metax device support for layer_norm, softmax, and …

src/infiniop/ops/layer_norm/metax/layer_norm_metax.maca

 #include "../../../devices/metax/metax_common.h"
 #include "layer_norm_metax.h"
+#ifdef ENABLE_METAX_API
+#include <mccub/block/block_reduce.cuh>
+#else
 #include <hccub/block/block_reduce.cuh>
+#endif
 #include "../../../devices/metax/metax_kernel_common.h"
 #include "../../../reduce/cuda/reduce.cuh"
 #include "../cuda/kernel.cuh"

src/infiniop/ops/softmax/operator.cc

@@ -5,21 +5,6 @@
 #if defined(ENABLE_NVIDIA_API) || defined(ENABLE_ILUVATAR_API) || defined(ENABLE_QY_API) || defined(ENABLE_HYGON_API)
 #include "nvidia/softmax_nvidia.cuh"
 #endif
-#ifdef ENABLE_METAX_API
-#include "metax/softmax_metax.h"
-#endif
-#ifdef ENABLE_ASCEND_API
-#include "ascend/softmax_ascend.h"
-#endif
-#ifdef ENABLE_CAMBRICON_API
-#include "bang/softmax_bang.h"
-#endif
-#ifdef ENABLE_KUNLUN_API
-#include "kunlun/softmax_kunlun.h"
-#endif
-#ifdef ENABLE_MOORE_API
-#include "moore/softmax_moore.h"
-#endif
 
 __C infiniStatus_t infiniopCreateSoftmaxDescriptor(
     infiniopHandle_t handle,
@@ -48,21 +33,6 @@ __C infiniStatus_t infiniopCreateSoftmaxDescriptor(
 #endif
 #ifdef ENABLE_HYGON_API
         CREATE(INFINI_DEVICE_HYGON, nvidia);
-#endif
-#ifdef ENABLE_CAMBRICON_API
-        CREATE(INFINI_DEVICE_CAMBRICON, bang)
-#endif
-#ifdef ENABLE_METAX_API
-        CREATE(INFINI_DEVICE_METAX, metax)
-#endif
-#ifdef ENABLE_ASCEND_API
-        CREATE(INFINI_DEVICE_ASCEND, ascend)
-#endif
-#ifdef ENABLE_KUNLUN_API
-        CREATE(INFINI_DEVICE_KUNLUN, kunlun)
-#endif
-#ifdef ENABLE_MOORE_API
-        CREATE(INFINI_DEVICE_MOORE, moore)
 #endif
     }
     return INFINI_STATUS_DEVICE_TYPE_NOT_SUPPORTED;
@@ -87,21 +57,6 @@ __C infiniStatus_t infiniopGetSoftmaxWorkspaceSize(infiniopSoftmaxDescriptor_t d
 #endif
 #ifdef ENABLE_HYGON_API
         GET(INFINI_DEVICE_HYGON, nvidia);
-#endif
-#ifdef ENABLE_METAX_API
-        GET(INFINI_DEVICE_METAX, metax)
-#endif
-#ifdef ENABLE_ASCEND_API
-        GET(INFINI_DEVICE_ASCEND, ascend)
-#endif
-#ifdef ENABLE_CAMBRICON_API
-        GET(INFINI_DEVICE_CAMBRICON, bang)
-#endif
-#ifdef ENABLE_KUNLUN_API
-        GET(INFINI_DEVICE_KUNLUN, kunlun)
-#endif
-#ifdef ENABLE_MOORE_API
-        GET(INFINI_DEVICE_MOORE, moore)
 #endif
     }
     return INFINI_STATUS_DEVICE_TYPE_NOT_SUPPORTED;
@@ -131,21 +86,6 @@ __C infiniStatus_t infiniopSoftmax(
 #endif
 #ifdef ENABLE_HYGON_API
         CALCULATE(INFINI_DEVICE_HYGON, nvidia);
-#endif
-#ifdef ENABLE_CAMBRICON_API
-        CALCULATE(INFINI_DEVICE_CAMBRICON, bang)
-#endif
-#ifdef ENABLE_METAX_API
-        CALCULATE(INFINI_DEVICE_METAX, metax)
-#endif
-#ifdef ENABLE_ASCEND_API
-        CALCULATE(INFINI_DEVICE_ASCEND, ascend)
-#endif
-#ifdef ENABLE_KUNLUN_API
-        CALCULATE(INFINI_DEVICE_KUNLUN, kunlun)
-#endif
-#ifdef ENABLE_MOORE_API
-        CALCULATE(INFINI_DEVICE_MOORE, moore)
 #endif
     }
     return INFINI_STATUS_DEVICE_TYPE_NOT_SUPPORTED;
@@ -170,21 +110,6 @@ __C infiniStatus_t infiniopDestroySoftmaxDescriptor(infiniopSoftmaxDescriptor_t
 #endif
 #ifdef ENABLE_HYGON_API
         DESTROY(INFINI_DEVICE_HYGON, nvidia);
-#endif
-#ifdef ENABLE_CAMBRICON_API
-        DESTROY(INFINI_DEVICE_CAMBRICON, bang)
-#endif
-#ifdef ENABLE_METAX_API
-        DESTROY(INFINI_DEVICE_METAX, metax)
-#endif
-#ifdef ENABLE_ASCEND_API
-        DESTROY(INFINI_DEVICE_ASCEND, ascend)
-#endif
-#ifdef ENABLE_KUNLUN_API
-        DESTROY(INFINI_DEVICE_KUNLUN, kunlun)
-#endif
-#ifdef ENABLE_MOORE_API
-        DESTROY(INFINI_DEVICE_MOORE, moore)
 #endif
     }
     return INFINI_STATUS_DEVICE_TYPE_NOT_SUPPORTED;

src/infiniop/ops/tanh/operator.cc

@@ -8,9 +8,9 @@
 #if defined(ENABLE_NVIDIA_API) || defined(ENABLE_ILUVATAR_API) || defined(ENABLE_QY_API)
 #include "nvidia/tanh_nvidia.cuh"
 #endif
-#ifdef ENABLE_METAX_API
-#include "metax/tanh_metax.h"
-#endif
+// #ifdef ENABLE_METAX_API
+// #include "metax/tanh_metax.h"
+// #endif
 
 __C infiniStatus_t infiniopCreateTanhDescriptor(
     infiniopHandle_t handle,
@@ -40,9 +40,9 @@ __C infiniStatus_t infiniopCreateTanhDescriptor(
 #ifdef ENABLE_QY_API
         CREATE(INFINI_DEVICE_QY, nvidia);
 #endif
-#ifdef ENABLE_METAX_API
-        CREATE(INFINI_DEVICE_METAX, metax);
-#endif
+        // #ifdef ENABLE_METAX_API
+        //         CREATE(INFINI_DEVICE_METAX, metax);
+        // #endif
 
     default:
         return INFINI_STATUS_DEVICE_TYPE_NOT_SUPPORTED;
@@ -71,9 +71,9 @@ __C infiniStatus_t infiniopGetTanhWorkspaceSize(infiniopTanhDescriptor_t desc, s
 #ifdef ENABLE_QY_API
         GET(INFINI_DEVICE_QY, nvidia);
 #endif
-#ifdef ENABLE_METAX_API
-        GET(INFINI_DEVICE_METAX, metax);
-#endif
+        // #ifdef ENABLE_METAX_API
+        //         GET(INFINI_DEVICE_METAX, metax);
+        // #endif
     default:
         return INFINI_STATUS_DEVICE_TYPE_NOT_SUPPORTED;
     }
@@ -109,9 +109,9 @@ __C infiniStatus_t infiniopTanh(
 #ifdef ENABLE_QY_API
         CALCULATE(INFINI_DEVICE_QY, nvidia);
 #endif
-#ifdef ENABLE_METAX_API
-        CALCULATE(INFINI_DEVICE_METAX, metax);
-#endif
+        // #ifdef ENABLE_METAX_API
+        //         CALCULATE(INFINI_DEVICE_METAX, metax);
+        // #endif
 
     default:
         return INFINI_STATUS_DEVICE_TYPE_NOT_SUPPORTED;
@@ -142,9 +142,9 @@ infiniopDestroyTanhDescriptor(infiniopTanhDescriptor_t desc) {
 #ifdef ENABLE_QY_API
         DELETE(INFINI_DEVICE_QY, nvidia);
 #endif
-#ifdef ENABLE_METAX_API
-        DELETE(INFINI_DEVICE_METAX, metax);
-#endif
+        // #ifdef ENABLE_METAX_API
+        //         DELETE(INFINI_DEVICE_METAX, metax);
+        // #endif
 
     default:
         return INFINI_STATUS_DEVICE_TYPE_NOT_SUPPORTED;

test/infinicore/ops/multi_margin_loss.py

@@ -35,13 +35,11 @@ _TEST_CASES_DATA = [
 
 # Tolerance configuration
 _TOLERANCE_MAP = {
-    infinicore.float16: {"atol": 1e-3, "rtol": 1e-2},
     infinicore.float32: {"atol": 1e-5, "rtol": 1e-4},
-    infinicore.bfloat16: {"atol": 1e-2, "rtol": 5e-2},
 }
 
 # Data types to test
-_TENSOR_DTYPES = [infinicore.float16, infinicore.bfloat16, infinicore.float32]
+_TENSOR_DTYPES = [infinicore.float32]
 
 
 def parse_test_cases():