[Ascend] fuj/aclnn-replace (#1195)

* fix maximum and minimum

Author: jingguo-st

impl/ascend/functions/binary.cpp

@@ -97,11 +97,21 @@ diopiError_t diopiDivInpScalar(diopiContextHandle_t ctx, diopiTensorHandle_t inp
 }
 
 diopiError_t diopiMaximum(diopiContextHandle_t ctx, diopiTensorHandle_t out, diopiConstTensorHandle_t input, diopiConstTensorHandle_t other) {
+    AscendTensor outAt(out);
+    if (outAt.numel() == 0) {
+        return diopiSuccess;
+    }
+
     DIOPI_ASCEND_CALL_ACLNN(aclnnMaximum, ctx, input, other, out);
     return diopiSuccess;
 }
 
 diopiError_t diopiMinimum(diopiContextHandle_t ctx, diopiTensorHandle_t out, diopiConstTensorHandle_t input, diopiConstTensorHandle_t other) {
+    AscendTensor outAt(out);
+    if (outAt.numel() == 0) {
+        return diopiSuccess;
+    }
+
     DIOPI_ASCEND_CALL_ACLNN(aclnnMinimum, ctx, input, other, out);
     return diopiSuccess;
 }

impl/ascend/functions/minmax.cpp

@@ -4,39 +4,40 @@
  * @copyright  (c) 2023, DeepLink.
  */
 
-#include <numeric>
-
-#include "../common/acloprunner.hpp"
+#include "../aclnn/acl_scalar.hpp"
+#include "../aclnn/adaptor.hpp"
 
 namespace impl {
 namespace ascend {
 diopiError_t diopiMax(diopiContextHandle_t ctx, diopiTensorHandle_t max, diopiTensorHandle_t maxIndices, diopiConstTensorHandle_t input, int64_t dim) {
-    AclOpRunner<1, 2>("ArgMaxWithValue", ctx).setAttr<int>("dimension", static_cast<int>(dim)).addInput(input).addOutput(maxIndices).addOutput(max).run();
+    AscendTensor inAt(input);
+    AscendTensor maxAt(max);
+    bool keepdim = false;
+    if (inAt.dim() == maxAt.dim()) {
+        keepdim = true;
+    }
+    DIOPI_ASCEND_CALL_ACLNN(aclnnMaxDim, ctx, input, dim, keepdim, max, maxIndices);
     return diopiSuccess;
 }
 
 diopiError_t diopiMaxAll(diopiContextHandle_t ctx, diopiTensorHandle_t max, diopiConstTensorHandle_t input) {
-    diopiSize_t inS;
-    diopiGetTensorShape(input, &inS);
-    std::vector<int64_t> dimAllVector(inS.len);
-    std::iota(std::begin(dimAllVector), std::end(dimAllVector), 0);
-    diopiSize_t dimAll = vectorToDiopiSize(dimAllVector);
-    AclOpRunner<2, 1>("ReduceMax", ctx).addInput(input).addConstInput(dimAll).addOutput(max).run();
+    DIOPI_ASCEND_CALL_ACLNN(aclnnMax, ctx, input, max);
     return diopiSuccess;
 }
 
 diopiError_t diopiMin(diopiContextHandle_t ctx, diopiTensorHandle_t min, diopiTensorHandle_t minIndices, diopiConstTensorHandle_t input, int64_t dim) {
-    AclOpRunner<1, 2>("ArgMinWithValue", ctx).setAttr<int>("dimension", static_cast<int>(dim)).addInput(input).addOutput(minIndices).addOutput(min).run();
+    AscendTensor inAt(input);
+    AscendTensor minAt(min);
+    bool keepdim = false;
+    if (inAt.dim() == minAt.dim()) {
+        keepdim = true;
+    }
+    DIOPI_ASCEND_CALL_ACLNN(aclnnMinDim, ctx, input, dim, keepdim, min, minIndices);
     return diopiSuccess;
 }
 
 diopiError_t diopiMinAll(diopiContextHandle_t ctx, diopiTensorHandle_t min, diopiConstTensorHandle_t input) {
-    diopiSize_t inS;
-    diopiGetTensorShape(input, &inS);
-    std::vector<int64_t> dimAllVector(inS.len);
-    std::iota(std::begin(dimAllVector), std::end(dimAllVector), 0);
-    diopiSize_t dimAll = vectorToDiopiSize(dimAllVector);
-    AclOpRunner<2, 1>("ReduceMin", ctx).addInput(input).addConstInput(dimAll).addOutput(min).run();
+    DIOPI_ASCEND_CALL_ACLNN(aclnnMin, ctx, input, min);
     return diopiSuccess;
 }
 

impl/ascend_npu/ascend_config.yaml

@@ -98,13 +98,19 @@ ascend:
 - diopiLtInp
 - diopiLtInpScalar
 - diopiLtScalar
+- diopiMax
+- diopiMaxAll
+- diopiMaximum
 - diopiMean
 - diopiMSELoss
 - diopiMSELossBackward
 - diopiMul
 - diopiMulInp
 - diopiMulInpScalar
 - diopiMulScalar
+- diopiMin
+- diopiMinAll
+- diopiMinimum
 - diopiNe
 - diopiNeInp
 - diopiNeInpScalar