[TOPI] Remove cpp upsampling and resize op (#4769)

* remove cpp upsampling

* remove cpp resize

topi/include/topi/detail/tensor_utils.h

@@ -25,6 +25,8 @@
 #define TOPI_DETAIL_TENSOR_UTILS_H_
 
 
+#include <tvm/te/operation.h>
+
 namespace topi {
 namespace detail {
 using namespace tvm;
@@ -50,7 +52,45 @@ inline bool is_empty_shape(const Array<PrimExpr>& x) {
   return is_empty;
 }
 
+/*!
+ * \brief Sample a point in a tensor using bilinear interpolation.
+ *
+ * \param input The input tensor.
+ * \param indices The index of the target point, which can be fractional
+ * \param max_y The maximum of y dimension
+ * \param max_x The maximum of x dimension
+ *
+ * \return The interpolated value in the given index.
+ */
+inline PrimExpr bilinear_sample_nchw(const Tensor& input, const Array<PrimExpr>& indices,
+                                 const PrimExpr max_y, const PrimExpr max_x) {
+  auto in_y = indices[2];
+  auto yf = tvm::floor(in_y);
+  auto yc = tvm::cast(DataType::Int(32), tvm::ceil(in_y));
+
+  auto y0 = tvm::cast(DataType::Int(32), tvm::floor(in_y));
+  auto y1 = tvm::if_then_else((yc > max_y), max_y, yc);
+  auto y_lerp = in_y - yf;
+
+  auto in_x = indices[3];
+  auto xf = tvm::floor(in_x);
+  auto xc = tvm::cast(DataType::Int(32), tvm::ceil(in_x));
+
+  auto x0 = tvm::cast(DataType::Int(32), tvm::floor(in_x));
+  auto x1 = tvm::if_then_else((xc > max_x), max_x, xc);
+  auto x_lerp = in_x - xf;
+
+  auto A = input(indices[0], indices[1], y0, x0);
+  auto B = input(indices[0], indices[1], y0, x1);
+  auto C = input(indices[0], indices[1], y1, x0);
+  auto D = input(indices[0], indices[1], y1, x1);
+
+  return A * ( 1 - x_lerp) * ( 1 - y_lerp) +
+         B * x_lerp * (1 - y_lerp) +
+         C * (1 - x_lerp) * y_lerp +
+         D * x_lerp * y_lerp;
+}
+
 }  // namespace detail
 }  // namespace topi
 #endif  // TOPI_DETAIL_TENSOR_UTILS_H_
-

topi/include/topi/nn/upsampling.h

-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/*!
- * \file topi/nn/upsampling.h
- * \brief upsampling op constructors
- */
-#ifndef TOPI_NN_UPSAMPLING_H_
-#define TOPI_NN_UPSAMPLING_H_
-
-#include <string>
-#include <vector>
-#include <iterator>
-#include <algorithm>
-
-#include "topi/image/resize.h"
-
-namespace topi {
-namespace nn {
-using namespace tvm;
-using namespace tvm::te;
-using namespace topi::image;
-
-/*!
-* \brief Upsample given tensor to given shape
-*
-* \param input The input tensor.
-* \param shape Output shape to upsample.
-* \param layout input layout
-* \param mode Algorithm to use (NEAREST_NEIGHBOR / BILINEAR)
-* \param name Name of the operation
-* \param tag The tag to mark the operation
-*
-* \return A Tensor upsampled to given shape
-*/
-inline Tensor upsampling(const Tensor& input,
-                         const Array<PrimExpr> shape,
-                         std::string layout = "NCHW",
-                         std::string mode = "NEAREST_NEIGHBOR",
-                         std::string name = "tensor",
-                         std::string tag = kInjective) {
-  return resize(input, shape, layout, false, mode);
-}
-
-}  // namespace nn
-}  // namespace topi
-#endif  // TOPI_NN_UPSAMPLING_H_

topi/python/topi/cpp/__init__.py

@@ -23,5 +23,4 @@ from . import vision
 from . import x86
 from . import generic
 from . import rocm
-from . import image
 from . import util

topi/python/topi/cpp/image.py

-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-"""FFI for image TOPI ops and schedules"""
-
-from tvm._ffi.function import _init_api_prefix
-
-_init_api_prefix("topi.cpp.image", "topi.image")

topi/python/topi/nn/deformable_conv2d.py

@@ -20,7 +20,7 @@ import tvm
 
 from .util import get_pad_tuple
 from ..util import get_const_tuple
-from ..cpp.image import bilinear_sample_nchw
+from ..cpp.util import bilinear_sample_nchw
 
 @tvm.target.generic_func
 def deformable_conv2d_nchw(data, offset, kernel, strides, padding, dilation, deformable_groups,

topi/python/topi/vision/rcnn/roi_align.py

@@ -18,7 +18,7 @@
 """Roi align operator"""
 import tvm
 from ...util import get_const_tuple
-from ...cpp.image import bilinear_sample_nchw
+from ...cpp.util import bilinear_sample_nchw
 
 
 @tvm.target.generic_func

topi/src/topi.cc

@@ -43,13 +43,11 @@
 #include <topi/nn/mapping.h>
 #include <topi/nn/pooling.h>
 #include <topi/nn/softmax.h>
-#include <topi/nn/upsampling.h>
 #include <topi/nn/l2_normalize.h>
 #include <topi/nn/local_response_norm.h>
 #include <topi/nn/batch_matmul.h>
 
 #include <topi/vision/reorg.h>
-#include <topi/image/resize.h>
 #include <topi/generic/default.h>
 #include <topi/generic/extern.h>
 #include <topi/generic/injective.h>
@@ -451,12 +449,6 @@ TVM_REGISTER_GLOBAL("topi.one_hot")
   *rv = one_hot(args[0], args[1], args[2], depth, axis, dtype);
   });
 
-/* Ops from nn/upsampling.h */
-TVM_REGISTER_GLOBAL("topi.nn.upsampling")
-.set_body([](TVMArgs args, TVMRetValue *rv) {
-  *rv = nn::upsampling(args[0], args[1], args[2], args[3]);
-  });
-
 /* Ops from nn/bnn.h */
 TVM_REGISTER_GLOBAL("topi.nn.binarize_pack")
 .set_body([](TVMArgs args, TVMRetValue *rv) {
@@ -581,17 +573,6 @@ TVM_REGISTER_GLOBAL("topi.vision.reorg")
   *rv = vision::reorg(args[0], args[1]);
   });
 
-/* Ops from image/resize.h */
-TVM_REGISTER_GLOBAL("topi.image.bilinear_sample_nchw")
-.set_body([](TVMArgs args, TVMRetValue *rv) {
-  *rv = image::bilinear_sample_nchw(args[0], args[1], args[2], args[3]);
-  });
-
-TVM_REGISTER_GLOBAL("topi.image.resize")
-.set_body([](TVMArgs args, TVMRetValue *rv) {
-  *rv = image::resize(args[0], args[1], args[2], args[3], args[4]);
-  });
-
 /* Generic schedules */
 TVM_REGISTER_GLOBAL("topi.generic.default_schedule")
 .set_body([](TVMArgs args, TVMRetValue *rv) {
@@ -755,6 +736,11 @@ TVM_REGISTER_GLOBAL("topi.util.is_empty_shape")
   *rv = topi::detail::is_empty_shape(args[0]);
   });
 
+TVM_REGISTER_GLOBAL("topi.util.bilinear_sample_nchw")
+.set_body([](TVMArgs args, TVMRetValue *rv) {
+  *rv = detail::bilinear_sample_nchw(args[0], args[1], args[2], args[3]);
+  });
+
 /*! \brief Builder function for instantiating schedules. */
 using FTVMScheduleBuilder = std::function<
   tvm::te::Schedule(const tvm::Target& target, const tvm::Array<tvm::te::Tensor>& outs)>;