From b075dee8beeff5b1db85908a87aa5358ea10e29f Mon Sep 17 00:00:00 2001
From: zyfncg <zhangyunfei07@baidu.com>
Date: Thu, 14 Apr 2022 14:35:17 +0800
Subject: [PATCH] [PHI] Support some c++ api in paddle namespace (#41778)

* support some c++ api in paddle namespace

* change c++ api namespace in custom op
---
 paddle/phi/api/ext/tensor_compat.h            | 108 ++++++++++++++++++
 .../fluid/tests/custom_op/custom_linear_op.cc |   3 +-
 python/paddle/utils/code_gen/api.yaml         |   2 +-
 3 files changed, 110 insertions(+), 3 deletions(-)

diff --git a/paddle/phi/api/ext/tensor_compat.h b/paddle/phi/api/ext/tensor_compat.h
index e63390db06..1bcf3d78d1 100644
--- a/paddle/phi/api/ext/tensor_compat.h
+++ b/paddle/phi/api/ext/tensor_compat.h
@@ -24,6 +24,114 @@ limitations under the License. */
 namespace paddle {
 using Tensor = experimental::Tensor;
 // using several Tensor initialize functions in paddle namespace
+using experimental::abs;
+using experimental::acos;
+using experimental::acosh;
+using experimental::add;
+using experimental::allclose;
+using experimental::argsort;
+using experimental::asin;
+using experimental::asinh;
+using experimental::atan;
+using experimental::atan2;
+using experimental::atanh;
+using experimental::bernoulli;
+using experimental::ceil;
+using experimental::cholesky;
+using experimental::cholesky_solve;
+using experimental::clip;
+using experimental::concat;
+using experimental::conj;
+using experimental::cos;
+using experimental::cosh;
+using experimental::cross;
+using experimental::det;
+using experimental::diag;
+using experimental::diagonal;
+using experimental::digamma;
+using experimental::dist;
+using experimental::divide;
+using experimental::dot;
+using experimental::elu;
 using experimental::empty;
+using experimental::empty_like;
+using experimental::equal_all;
+using experimental::erf;
+using experimental::erfinv;
+using experimental::exp;
+using experimental::expand;
+using experimental::expm1;
+using experimental::flatten;
+using experimental::flip;
+using experimental::floor;
+using experimental::floor_divide;
 using experimental::full;
+using experimental::gather;
+using experimental::gather_nd;
+using experimental::gelu;
+using experimental::gumbel_softmax;
+using experimental::imag;
+using experimental::increment;
+using experimental::index_sample;
+using experimental::is_empty;
+using experimental::isclose;
+using experimental::isfinite;
+using experimental::isinf;
+using experimental::isnan;
+using experimental::kron;
+using experimental::kthvalue;
+using experimental::label_smooth;
+using experimental::lerp;
+using experimental::lgamma;
+using experimental::log;
+using experimental::log10;
+using experimental::log1p;
+using experimental::log2;
+using experimental::logit;
+using experimental::masked_select;
+using experimental::matmul;
+using experimental::matrix_power;
+using experimental::maximum;
+using experimental::maxout;
+using experimental::minimum;
+using experimental::mode;
+using experimental::multi_dot;
+using experimental::multinomial;
+using experimental::multiply;
+using experimental::mv;
+using experimental::nll_loss;
+using experimental::one_hot;
+using experimental::pixel_shuffle;
+using experimental::poisson;
+using experimental::qr;
+using experimental::real;
+using experimental::reciprocal;
+using experimental::relu;
+using experimental::reshape;
+using experimental::roll;
+using experimental::round;
+using experimental::rsqrt;
+using experimental::scatter;
+using experimental::scatter_nd_add;
+using experimental::selu;
+using experimental::sign;
+using experimental::silu;
+using experimental::sin;
+using experimental::sinh;
+using experimental::split;
+using experimental::sqrt;
+using experimental::square;
+using experimental::stack;
+using experimental::strided_slice;
+using experimental::subtract;
+using experimental::tanh;
+using experimental::thresholded_relu;
+using experimental::tile;
+using experimental::trace;
+using experimental::triangular_solve;
+using experimental::unbind;
+using experimental::unique;
+using experimental::unsqueeze;
+using experimental::where;
+
 }  // namespace paddle
diff --git a/python/paddle/fluid/tests/custom_op/custom_linear_op.cc b/python/paddle/fluid/tests/custom_op/custom_linear_op.cc
index 76158596cb..a561c845ab 100644
--- a/python/paddle/fluid/tests/custom_op/custom_linear_op.cc
+++ b/python/paddle/fluid/tests/custom_op/custom_linear_op.cc
@@ -20,8 +20,7 @@ limitations under the License. */
 std::vector<paddle::Tensor> PhiLinearForward(const paddle::Tensor& x,
                                              const paddle::Tensor& weight,
                                              const paddle::Tensor& bias) {
-  return {
-      paddle::experimental::add(paddle::experimental::matmul(x, weight), bias)};
+  return {paddle::add(paddle::matmul(x, weight), bias)};
 }
 
 std::vector<std::vector<int64_t>> LinearInferShape(
diff --git a/python/paddle/utils/code_gen/api.yaml b/python/paddle/utils/code_gen/api.yaml
index f5245d59ba..a142225e65 100644
--- a/python/paddle/utils/code_gen/api.yaml
+++ b/python/paddle/utils/code_gen/api.yaml
@@ -2167,7 +2167,7 @@
     data_type : x
 
 - api : unsqueeze
-  args : (Tensor x, IntArray axes)
+  args : (Tensor x, IntArray axis)
   output : Tensor(xshape), Tensor(out)
   infer_meta :
     func : UnsqueezeInferMeta
-- 
GitLab