Remove usage of valid window region in NHWC CPU kernels - Part2
Remove set_valid_region methods from all NHWC CPU ML functions /
operators / kernels
Resolves COMPMID-4152 (2/2)
Change-Id: If9725e9c5b0213b87db96675e81b7fb724970b98
Signed-off-by: SiCongLi <sicong.li@arm.com>
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/5203
Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>
diff --git a/src/core/cpu/kernels/CpuActivationKernel.cpp b/src/core/cpu/kernels/CpuActivationKernel.cpp
index efdb42b..7612589 100644
--- a/src/core/cpu/kernels/CpuActivationKernel.cpp
+++ b/src/core/cpu/kernels/CpuActivationKernel.cpp
@@ -197,10 +197,6 @@
{
// dst auto inizialitation if not yet initialized
auto_init_if_empty(*dst, *src->clone());
-
- Coordinates coord;
- coord.set_num_dimensions(dst->num_dimensions());
- dst->set_valid_region(ValidRegion(coord, dst->tensor_shape()));
}
return std::make_pair(Status{}, win);
diff --git a/src/core/cpu/kernels/CpuConcatenateBatchKernel.cpp b/src/core/cpu/kernels/CpuConcatenateBatchKernel.cpp
index 48eac13..bd6d777 100644
--- a/src/core/cpu/kernels/CpuConcatenateBatchKernel.cpp
+++ b/src/core/cpu/kernels/CpuConcatenateBatchKernel.cpp
@@ -183,10 +183,7 @@
}
// Configure kernel window
- Window win = calculate_max_window(*dst, Steps());
- Coordinates coord;
- coord.set_num_dimensions(dst->num_dimensions());
- dst->set_valid_region(ValidRegion(coord, dst->tensor_shape()));
+ Window win = calculate_max_window(*dst, Steps());
ICpuKernel::configure(win);
}
diff --git a/src/core/cpu/kernels/CpuConcatenateDepthKernel.cpp b/src/core/cpu/kernels/CpuConcatenateDepthKernel.cpp
index f64c282..d8eed44 100644
--- a/src/core/cpu/kernels/CpuConcatenateDepthKernel.cpp
+++ b/src/core/cpu/kernels/CpuConcatenateDepthKernel.cpp
@@ -179,11 +179,7 @@
}
// Configure kernel window
- Window win = calculate_max_window(*dst, Steps());
- Coordinates coord;
- coord.set_num_dimensions(dst->num_dimensions());
-
- dst->set_valid_region(ValidRegion(coord, dst->tensor_shape()));
+ Window win = calculate_max_window(*dst, Steps());
ICpuKernel::configure(win);
}
diff --git a/src/core/cpu/kernels/CpuConcatenateHeightKernel.cpp b/src/core/cpu/kernels/CpuConcatenateHeightKernel.cpp
index c6e2249..4dc458a 100644
--- a/src/core/cpu/kernels/CpuConcatenateHeightKernel.cpp
+++ b/src/core/cpu/kernels/CpuConcatenateHeightKernel.cpp
@@ -77,10 +77,7 @@
_height_offset = height_offset;
// Configure kernel window
- Window win = calculate_max_window(*dst, Steps());
- Coordinates coord;
- coord.set_num_dimensions(dst->num_dimensions());
- dst->set_valid_region(ValidRegion(coord, dst->tensor_shape()));
+ Window win = calculate_max_window(*dst, Steps());
ICpuKernel::configure(win);
}
diff --git a/src/core/cpu/kernels/CpuConcatenateWidthKernel.cpp b/src/core/cpu/kernels/CpuConcatenateWidthKernel.cpp
index e707e8d..efefd5d 100644
--- a/src/core/cpu/kernels/CpuConcatenateWidthKernel.cpp
+++ b/src/core/cpu/kernels/CpuConcatenateWidthKernel.cpp
@@ -72,14 +72,12 @@
{
ARM_COMPUTE_ERROR_ON_NULLPTR(src, dst);
ARM_COMPUTE_ERROR_THROW_ON(validate_arguments(src, width_offset, dst));
+ ARM_COMPUTE_UNUSED(dst);
_width_offset = width_offset;
// Configure kernel window
- Window win = calculate_max_window(*src, Steps());
- Coordinates coord;
- coord.set_num_dimensions(dst->num_dimensions());
- dst->set_valid_region(ValidRegion(coord, dst->tensor_shape()));
+ Window win = calculate_max_window(*src, Steps());
ICpuKernel::configure(win);
}
diff --git a/src/core/cpu/kernels/CpuFloorKernel.cpp b/src/core/cpu/kernels/CpuFloorKernel.cpp
index 6115b69..c2e9d48 100644
--- a/src/core/cpu/kernels/CpuFloorKernel.cpp
+++ b/src/core/cpu/kernels/CpuFloorKernel.cpp
@@ -120,10 +120,6 @@
// Configure kernel window
const Window win = calculate_max_window(*src, Steps());
- Coordinates coord;
- coord.set_num_dimensions(dst->num_dimensions());
- dst->set_valid_region(ValidRegion(coord, dst->tensor_shape()));
-
ICPPKernel::configure(win);
}
diff --git a/src/core/cpu/kernels/CpuPermuteKernel.cpp b/src/core/cpu/kernels/CpuPermuteKernel.cpp
index e3055f5..7fd38a3 100644
--- a/src/core/cpu/kernels/CpuPermuteKernel.cpp
+++ b/src/core/cpu/kernels/CpuPermuteKernel.cpp
@@ -256,9 +256,6 @@
Window win = calculate_max_window(*src, Steps());
// The NEPermute doesn't need padding so update_window_and_padding() can be skipped
- Coordinates coord;
- coord.set_num_dimensions(dst->num_dimensions());
- dst->set_valid_region(ValidRegion(coord, dst->tensor_shape()));
ICpuKernel::configure(win);
}
diff --git a/src/core/cpu/kernels/CpuPoolingKernel.cpp b/src/core/cpu/kernels/CpuPoolingKernel.cpp
index e159bb4..115a3a4 100644
--- a/src/core/cpu/kernels/CpuPoolingKernel.cpp
+++ b/src/core/cpu/kernels/CpuPoolingKernel.cpp
@@ -422,10 +422,7 @@
if(_data_layout == DataLayout::NHWC)
{
// Configure kernel window
- Window win = calculate_max_window(*dst, Steps());
- Coordinates coord;
- coord.set_num_dimensions(dst->num_dimensions());
- dst->set_valid_region(ValidRegion(coord, dst->tensor_shape()));
+ Window win = calculate_max_window(*dst, Steps());
ICpuKernel::configure(win);
}
else
diff --git a/src/core/cpu/kernels/CpuReshapeKernel.cpp b/src/core/cpu/kernels/CpuReshapeKernel.cpp
index 41ff8bd..4ab1612 100644
--- a/src/core/cpu/kernels/CpuReshapeKernel.cpp
+++ b/src/core/cpu/kernels/CpuReshapeKernel.cpp
@@ -82,13 +82,11 @@
{
ARM_COMPUTE_ERROR_ON_NULLPTR(src, dst);
ARM_COMPUTE_ERROR_THROW_ON(validate_arguments(src, dst));
+ ARM_COMPUTE_UNUSED(dst);
// Configure kernel window
Window win = calculate_max_window(*src);
- // Set the destination valid region
- dst->set_valid_region(ValidRegion(Coordinates(), dst->tensor_shape()));
-
ICpuKernel::configure(win);
}
diff --git a/src/core/cpu/kernels/CpuSoftmaxKernel.cpp b/src/core/cpu/kernels/CpuSoftmaxKernel.cpp
index a8542b6..d2453ed 100644
--- a/src/core/cpu/kernels/CpuSoftmaxKernel.cpp
+++ b/src/core/cpu/kernels/CpuSoftmaxKernel.cpp
@@ -228,10 +228,7 @@
// Output auto initialization if not yet initialized
auto_init_if_empty(*dst, output_shape, 1, src->data_type(), src->quantization_info());
- Window win = calculate_max_window(*src, Steps());
- Coordinates coord;
- coord.set_num_dimensions(dst->num_dimensions());
- dst->set_valid_region(ValidRegion(coord, dst->tensor_shape()));
+ Window win = calculate_max_window(*src, Steps());
ICpuKernel::configure(win);
}
@@ -330,10 +327,7 @@
auto_init_if_empty(*tmp, TensorInfo(*src).set_data_type(tmp_data_type).reset_padding());
// Configure kernel window
- Window win = calculate_max_window(*max, Steps());
- Coordinates coord;
- coord.set_num_dimensions(dst->num_dimensions());
- dst->set_valid_region(ValidRegion(coord, dst->tensor_shape()));
+ Window win = calculate_max_window(*max, Steps());
ICpuKernel::configure(win);
}