Revert "add interpolate_like for cpu"

docs/source/nn.functional.rst

@@ -166,7 +166,6 @@ Vision functions
     deform_conv2d
     pad
     interpolate
-    interpolate_like
     upsample
     grid_sample
     affine_grid

oneflow/core/functional/functional_api.yaml

@@ -1793,11 +1793,9 @@
   bind_python: False
 
 - name: "upsample_nearest_2d"
-  signature: [
-      'Tensor (Tensor x, Double height_scale=0.0, Double width_scale=0.0, Int64List[2] output_size=None,
-       String data_format="channels_first") => UpsampleNearest2D',
-      'Tensor (Tensor x, Tensor like, String data_format="channels_first") => UpsampleNearest2D'
-    ]
+  signature:
+    'Tensor (Tensor x, Double height_scale=0.0, Double width_scale=0.0, Int64List[2] output_size=None,
+    String data_format="channels_first") => UpsampleNearest2D'
   bind_python: True
 
 - name: "upsample_nearest_2d_grad"

oneflow/core/functional/impl/array_functor.cpp

@@ -1991,24 +1991,6 @@ class UpsampleNearest2DFunctor {
   std::shared_ptr<OpExpr> op_;
 };
 
-class UpsampleNearestLike2DFunctor {
- public:
-  UpsampleNearestLike2DFunctor() {
-    op_ = CHECK_JUST(
-        one::OpBuilder("upsample_nearest_2d").Input("x").Input("like").Output("y").Build());
-  }
-  Maybe<Tensor> operator()(const std::shared_ptr<one::Tensor>& x,
-                           const std::shared_ptr<one::Tensor>& like,
-                           const std::string& data_format) const {
-    auto& attrs = THREAD_CACHED_MUTABLE_ATTR_MAP("data_format");
-    attrs.SetAllAttrs(data_format);
-    return OpInterpUtil::Dispatch<Tensor>(*op_, {x, like}, attrs);
-  }
-
- private:
-  std::shared_ptr<OpExpr> op_;
-};
-
 class UpsampleNearest2DGradFunctor {
  public:
   UpsampleNearest2DGradFunctor() {
@@ -4136,8 +4118,7 @@ ONEFLOW_FUNCTION_LIBRARY(m) {
   m.add_functor<impl::UnfoldTensorFunctor>("UnfoldTensor");
   m.add_functor<impl::UnfoldTensorGradFunctor>("UnfoldTensorGrad");
   m.add_functor<impl::UpsampleGradFunctor>("UpsampleGrad");
-  m.add_functor<impl::UpsampleNearest2DFunctor, impl::UpsampleNearestLike2DFunctor>(
-      "UpsampleNearest2D");
+  m.add_functor<impl::UpsampleNearest2DFunctor>("UpsampleNearest2D");
   m.add_functor<impl::UpsampleNearest2DGradFunctor>("UpsampleNearest2DGrad");
   m.add_functor<impl::UpsampleBilinear2DFunctor>("UpsampleBilinear2D");
   m.add_functor<impl::UpsampleBilinear2DGradFunctor>("UpsampleBilinear2DGrad");

oneflow/user/kernels/upsample_nearest_kernel.cpp

@@ -227,7 +227,7 @@ class UpsampleNearest2DCPUKernel final : public user_op::OpKernel {
     const int64_t out_height = y_tensor->shape_view().At(2);
     const int64_t out_width = y_tensor->shape_view().At(3);
     const int64_t elem_cnt = y_tensor->shape_view().elem_cnt();
-    if (!output_size.empty() || ctx->Tensor4ArgNameAndIndex("like", 0)) {
+    if (!output_size.empty()) {
       height_scale = static_cast<double>(out_height) / static_cast<double>(in_height);
       width_scale = static_cast<double>(out_width) / static_cast<double>(in_width);
     }

oneflow/user/ops/upsample_op.cpp

@@ -23,18 +23,6 @@ typename std::enable_if<(N <= 3), Maybe<void>>::type UpsamplingInferLogicalDesc(
     user_op::InferContext* ctx, const std::string& func_name) {
   const user_op::TensorDesc& x_desc = ctx->InputTensorDesc("x", 0);
   user_op::TensorDesc* y_desc = ctx->MutOutputTensorDesc("y", 0);
-  if (ctx->has_input("like", 0)) {
-    const user_op::TensorDesc& like_desc = ctx->InputTensorDesc("like", 0);
-    int64_t like_num_axes = like_desc.shape().NumAxes();
-    CHECK_GT_OR_RETURN(like_num_axes, N)
-        << "like shape size should > " << N << ", but got " << like_desc.shape().ToString();
-    Shape output_shape = x_desc.shape();
-    for (int i = 0; i < N; ++i) {
-      output_shape[i + 2] = like_desc.shape().At(like_num_axes - N + i);
-    }
-    y_desc->set_shape(output_shape);
-    return Maybe<void>::Ok();
-  }
   if (N == 1) {
     CHECK_OR_RETURN(ctx->Attr<std::string>("data_format") == "channels_first"
                     && x_desc.shape().NumAxes() == (N + 2))

python/oneflow/nn/functional/__init__.py

@@ -14,7 +14,6 @@
 limitations under the License.
 """
 from oneflow.nn.modules.interpolate import interpolate
-from oneflow.nn.modules.interpolate_like import interpolate_like
 from oneflow.nn.modules.affine_grid import affine_grid
 from oneflow.nn.modules.grid_sample import grid_sample
 from oneflow.nn.modules.sparse_softmax_cross_entropy import sparse_softmax_cross_entropy