diff --git a/paddle/pten/CMakeLists.txt b/paddle/pten/CMakeLists.txt index 0b3bb2557039c3eced25ba39584d14df481bb44b..8fc63e8317e9e57c71c6f39ea405bfada7974991 100644 --- a/paddle/pten/CMakeLists.txt +++ b/paddle/pten/CMakeLists.txt @@ -5,8 +5,8 @@ add_subdirectory(api) add_subdirectory(core) # pten kernels for diff device add_subdirectory(kernels) -# pten infershape -add_subdirectory(infershape) +# pten infermeta +add_subdirectory(infermeta) # pten tests add_subdirectory(tests) diff --git a/paddle/pten/api/lib/manipulation.cc b/paddle/pten/api/lib/manipulation.cc index dd16f4f7f5825beb3e82f4eb5368a0b720d6f5ad..43752120e37100af3d737e629623bd76c9b23d87 100644 --- a/paddle/pten/api/lib/manipulation.cc +++ b/paddle/pten/api/lib/manipulation.cc @@ -20,7 +20,7 @@ limitations under the License. */ #include "paddle/pten/api/lib/kernel_dispatch.h" #include "paddle/pten/api/lib/utils/allocator.h" #include "paddle/pten/include/core.h" -#include "paddle/pten/infershape/unary.h" +#include "paddle/pten/infermeta/unary.h" namespace paddle { namespace experimental { diff --git a/paddle/pten/api/lib/math.cc b/paddle/pten/api/lib/math.cc index 13c74394eb215f8f1390d052b22b1ff6969acf89..3c6536af6afa9aa851c234330f36cb419a846700 100644 --- a/paddle/pten/api/lib/math.cc +++ b/paddle/pten/api/lib/math.cc @@ -22,7 +22,7 @@ limitations under the License. */ #include "paddle/pten/api/lib/utils/allocator.h" #include "paddle/pten/include/core.h" #include "paddle/pten/include/infershape.h" -#include "paddle/pten/infershape/unary.h" +#include "paddle/pten/infermeta/unary.h" namespace paddle { namespace experimental { diff --git a/paddle/pten/include/infershape.h b/paddle/pten/include/infershape.h index d8dd2837a72d920e46984e8aa81a36482822403f..151cb638d85b70a1751de4487fc5aebd1d7855cd 100644 --- a/paddle/pten/include/infershape.h +++ b/paddle/pten/include/infershape.h @@ -15,6 +15,6 @@ limitations under the License. */ #pragma once // See Note: [ How do we organize the kernel directory ] -#include "paddle/pten/infershape/binary.h" -#include "paddle/pten/infershape/nary.h" -#include "paddle/pten/infershape/unary.h" +#include "paddle/pten/infermeta/binary.h" +#include "paddle/pten/infermeta/nary.h" +#include "paddle/pten/infermeta/unary.h" diff --git a/paddle/pten/infershape/CMakeLists.txt b/paddle/pten/infermeta/CMakeLists.txt similarity index 100% rename from paddle/pten/infershape/CMakeLists.txt rename to paddle/pten/infermeta/CMakeLists.txt diff --git a/paddle/pten/infershape/binary.cc b/paddle/pten/infermeta/binary.cc similarity index 99% rename from paddle/pten/infershape/binary.cc rename to paddle/pten/infermeta/binary.cc index 671bac3165a8c99d745e58c8487ddafdc312febd..e124466a6d33afc9310a2850eddecd56378a336a 100644 --- a/paddle/pten/infershape/binary.cc +++ b/paddle/pten/infermeta/binary.cc @@ -13,8 +13,9 @@ See the License for the specific language governing permissions and limitations under the License. */ // See Note [ Why still include the fluid headers? ] -#include "paddle/pten/infershape/binary.h" +#include "paddle/pten/infermeta/binary.h" #include "paddle/pten/kernels/functions/general/elementwise_base.h" + namespace pten { DenseTensorMeta DotInferShape(const DenseTensorMeta& x_meta, diff --git a/paddle/pten/infershape/binary.h b/paddle/pten/infermeta/binary.h similarity index 100% rename from paddle/pten/infershape/binary.h rename to paddle/pten/infermeta/binary.h diff --git a/paddle/pten/infershape/nary.cc b/paddle/pten/infermeta/nary.cc similarity index 95% rename from paddle/pten/infershape/nary.cc rename to paddle/pten/infermeta/nary.cc index b8745dd9b83afcca4dcf5660bde482e5ebcb794d..0ae078b13c056af6fd4dda42ea880a2131002889 100644 --- a/paddle/pten/infershape/nary.cc +++ b/paddle/pten/infermeta/nary.cc @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. */ // See Note [ Why still include the fluid headers? ] -#include "paddle/pten/infershape/nary.h" +#include "paddle/pten/infermeta/nary.h" namespace pten { diff --git a/paddle/pten/infershape/nary.h b/paddle/pten/infermeta/nary.h similarity index 100% rename from paddle/pten/infershape/nary.h rename to paddle/pten/infermeta/nary.h diff --git a/paddle/pten/infershape/unary.cc b/paddle/pten/infermeta/unary.cc similarity index 98% rename from paddle/pten/infershape/unary.cc rename to paddle/pten/infermeta/unary.cc index 509cb3664e9a12c869a46b7ec92bd402304c868f..74b7fdf706675fa7d88b0908adeb4332a9447153 100644 --- a/paddle/pten/infershape/unary.cc +++ b/paddle/pten/infermeta/unary.cc @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. */ // See Note [ Why still include the fluid headers? ] -#include "paddle/pten/infershape/unary.h" +#include "paddle/pten/infermeta/unary.h" namespace pten { diff --git a/paddle/pten/infershape/unary.h b/paddle/pten/infermeta/unary.h similarity index 100% rename from paddle/pten/infershape/unary.h rename to paddle/pten/infermeta/unary.h diff --git a/paddle/pten/kernels/cpu/manipulation.cc b/paddle/pten/kernels/cpu/manipulation.cc index 87c76149f127feda0a9afdd00634d7767b0e5f7a..8a6ba954d8c6f53d75e4862af6aa1e0d928bb8ef 100644 --- a/paddle/pten/kernels/cpu/manipulation.cc +++ b/paddle/pten/kernels/cpu/manipulation.cc @@ -13,7 +13,7 @@ // limitations under the License. #include "paddle/pten/kernels/cpu/manipulation.h" -#include "paddle/pten/infershape/unary.h" +#include "paddle/pten/infermeta/unary.h" #include "paddle/pten/kernels/cpu/utils.h" namespace pten { diff --git a/paddle/pten/kernels/cuda/manipulation.cu b/paddle/pten/kernels/cuda/manipulation.cu index 38111f2b8c02fd37ae4063fb6d752000c6e486fd..9e8dff8c264f8a4c5fac320f208158915e3f653b 100644 --- a/paddle/pten/kernels/cuda/manipulation.cu +++ b/paddle/pten/kernels/cuda/manipulation.cu @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "paddle/pten/infershape/unary.h" +#include "paddle/pten/infermeta/unary.h" #include "paddle/pten/kernels/cuda/manipulation.h" #include "paddle/pten/kernels/cuda/utils.h" diff --git a/paddle/pten/kernels/xpu/manipulation.cc b/paddle/pten/kernels/xpu/manipulation.cc index 379e459a605150b32338f9a7d82efc4d09eeb200..4313520c8bb7cae50f162d6a09fbd4978ce39d38 100644 --- a/paddle/pten/kernels/xpu/manipulation.cc +++ b/paddle/pten/kernels/xpu/manipulation.cc @@ -13,7 +13,7 @@ // limitations under the License. #include "paddle/pten/kernels/xpu/manipulation.h" -#include "paddle/pten/infershape/unary.h" +#include "paddle/pten/infermeta/unary.h" #include "paddle/pten/kernels/xpu/utils.h" namespace pten {