#9874: Remove clamp_min_bw

tenstorrent · Jul 18, 2024 · 031ac09 · 031ac09
1 parent b08fc09
commit 031ac09
Show file tree

Hide file tree

Showing 9 changed files with 4 additions and 65 deletions.
diff --git a/docs/source/ttnn/ttnn/api.rst b/docs/source/ttnn/ttnn/api.rst
@@ -168,7 +168,6 @@ Pointwise Unary
    ttnn/tanhshrink
    ttnn/threshold
    ttnn/mul_bw
-   ttnn/clamp_min_bw
    ttnn/clamp_bw
    ttnn/hardtanh_bw
    ttnn/threshold_bw

diff --git a/docs/source/ttnn/ttnn/ttnn/clamp_min_bw.rst b/docs/source/ttnn/ttnn/ttnn/clamp_min_bw.rst
diff --git a/tests/ttnn/unit_tests/operations/backward/test_backward_clamp_min.py b/tests/ttnn/unit_tests/operations/backward/test_backward_clamp_min.py
diff --git a/ttnn/cpp/ttnn/operations/eltwise/unary_backward/device/unary_backward_op.cpp b/ttnn/cpp/ttnn/operations/eltwise/unary_backward/device/unary_backward_op.cpp
@@ -29,24 +29,16 @@ std::vector<ttnn::Tensor> _mul_bw(
     return grad_tensor;
 }
 
-std::vector<Tensor> _clamp_min_bw(
-    const Tensor& grad, const Tensor& input, float min, const MemoryConfig& output_mem_config) {
-    std::vector<Tensor> grad_tensor;
-    Tensor minT = ttnn::ge(input, min, std::nullopt, output_mem_config);
-    Tensor result = ttnn::multiply(grad, minT, std::nullopt, output_mem_config);
-    grad_tensor.emplace_back(result);
-    return grad_tensor;
-}
-
-
-
 std::vector<Tensor> _clamp_bw(
     const Tensor& grad, const Tensor& input, std::optional<float> min, std::optional<float> max, const std::optional<MemoryConfig>& output_mem_config) {
     std::vector<Tensor> grad_tensor;
     auto output_memory_config = output_mem_config.value_or(input.memory_config()); //TODO: Remove after ternary forward ops migration is completed
     TT_FATAL((max.has_value() || min.has_value()) && "Only one of 'min' or 'max' can be None. Please provide atleast one value");
     if (!max.has_value()) {
-        return _clamp_min_bw( grad, input, min.value(), output_memory_config);
+        Tensor minT = ttnn::ge(input, min.value(), std::nullopt, output_mem_config);
+        Tensor result = ttnn::multiply(grad, minT, std::nullopt, output_mem_config);
+        grad_tensor.emplace_back(result);
+    return grad_tensor;
     }else if(!min.has_value()) {
         Tensor maxT = ttnn::le(input, max.value(), std::nullopt, output_mem_config);
         Tensor result = ttnn::multiply(grad, maxT, std::nullopt, output_mem_config);
@@ -1726,8 +1718,6 @@ std::function<std::vector<ttnn::Tensor>(const Tensor&, const Tensor&, float, con
     switch (OpType) {
         case UnaryBackwardOpType::MUL_BW:
             return _mul_bw;
-        case UnaryBackwardOpType::CLAMP_MIN_BW:
-            return _clamp_min_bw;
         case UnaryBackwardOpType::ADD_BW:
             return _add_bw;
         case UnaryBackwardOpType::EQ_BW:

diff --git a/ttnn/cpp/ttnn/operations/eltwise/unary_backward/device/unary_backward_op.hpp b/ttnn/cpp/ttnn/operations/eltwise/unary_backward/device/unary_backward_op.hpp
@@ -14,7 +14,6 @@ namespace ttnn::operations::unary_backward {
 constexpr uint8_t DefaultQueueId = 0;
 enum class UnaryBackwardOpType {
     MUL_BW,
-    CLAMP_MIN_BW,
     CLAMP_BW,
     HARDTANH_BW,
     THRESHOLD_BW,

diff --git a/ttnn/cpp/ttnn/operations/eltwise/unary_backward/unary_backward.hpp b/ttnn/cpp/ttnn/operations/eltwise/unary_backward/unary_backward.hpp
@@ -329,7 +329,6 @@ constexpr auto sqrt_bw = ttnn::register_operation<operations::unary_backward::Ex
 constexpr auto prod_bw = ttnn::register_operation<operations::unary_backward::ExecuteUnaryBackwardProdBW<operations::unary_backward::UnaryBackwardOpType::PROD_BW>>("ttnn::prod_bw");
 
 constexpr auto mul_bw = ttnn::register_operation<operations::unary_backward::ExecuteUnaryBackward<operations::unary_backward::UnaryBackwardOpType::MUL_BW>>("ttnn::mul_bw");
-constexpr auto clamp_min_bw = ttnn::register_operation<operations::unary_backward::ExecuteUnaryBackward<operations::unary_backward::UnaryBackwardOpType::CLAMP_MIN_BW>>("ttnn::clamp_min_bw");
 constexpr auto assign_bw = ttnn::register_operation<operations::unary_backward::ExecuteUnaryBackward<operations::unary_backward::UnaryBackwardOpType::ASSIGN_BW>>("ttnn::assign_bw");
 constexpr auto multigammaln_bw = ttnn::register_operation<operations::unary_backward::ExecuteUnaryBackward<operations::unary_backward::UnaryBackwardOpType::MULTIGAMMALN_BW>>("ttnn::multigammaln_bw");
 constexpr auto add_bw = ttnn::register_operation<operations::unary_backward::ExecuteUnaryBackward<operations::unary_backward::UnaryBackwardOpType::ADD_BW>>("ttnn::add_bw");

diff --git a/ttnn/cpp/ttnn/operations/eltwise/unary_backward/unary_backward_pybind.hpp b/ttnn/cpp/ttnn/operations/eltwise/unary_backward/unary_backward_pybind.hpp
@@ -729,11 +729,6 @@ void py_module(py::module& module) {
         ttnn::mul_bw,
         R"doc(Performs backward operations for multiply on :attr:`input_tensor`, :attr:`alpha` or attr:`input_tensor_a`, attr:`input_tensor_b`, with given :attr:`grad_tensor`.)doc");
 
-    detail::bind_unary_backward(
-        module,
-        ttnn::clamp_min_bw,
-        R"doc(Performs backward operations for clamp min value on :attr:`input_tensor`, :attr:`alpha` with given :attr:`grad_tensor`.)doc");
-
     detail::bind_unary_backward_optional_float_params_with_default(
         module,
         ttnn::clamp_bw,

diff --git a/ttnn/ttnn/.rpath_checked__ttnn b/ttnn/ttnn/.rpath_checked__ttnn
diff --git a/ttnn/ttnn/operations/unary_backward.py b/ttnn/ttnn/operations/unary_backward.py
@@ -48,7 +48,6 @@ def unary_bw_prod(torch_op, x, grad_data, *args, **kwargs):
 
     name_to_golden_function = {
         "mul_bw": lambda x, grad_data: unary_bw_with_float(torch.mul, x, grad_data),
-        "clamp_min_bw": lambda x, grad_data: unary_bw_with_float(torch.clamp_min, x, grad_data),
         "add_bw": lambda x, grad_data: unary_bw_with_float(torch.add, x, grad_data),
         "eq_bw": lambda x, grad_data: unary_bw_with_float(torch.eq, x, grad_data),
         "gt_bw": lambda x, grad_data: unary_bw_with_float(torch.gt, x, grad_data),
@@ -136,7 +135,6 @@ def _golden_function(input_tensor: ttnn.Tensor, **_):
 
 TTNN_ELTWISE_UNARY_BACKWARD_CPP_FUNCTIONS = [
     ttnn.mul_bw,
-    ttnn.clamp_min_bw,
     ttnn.add_bw,
     ttnn.eq_bw,
     ttnn.gt_bw,