Tests cleaning.
Removed old-style non unit tests.
PiperOrigin-RevId: 354117758
Change-Id: I8cfc3b8bb3eaa604e9e2a8f7e13a59128394702f
diff --git a/tensorflow/lite/delegates/gpu/metal/kernels/add_test.mm b/tensorflow/lite/delegates/gpu/metal/kernels/add_test.mm
index 1e32c43..ee135e8 100644
--- a/tensorflow/lite/delegates/gpu/metal/kernels/add_test.mm
+++ b/tensorflow/lite/delegates/gpu/metal/kernels/add_test.mm
@@ -34,10 +34,6 @@
tflite::gpu::metal::MetalExecutionEnvironment exec_env_;
}
-- (void)setUp {
- [super setUp];
-}
-
- (void)testAddTwoEqualTensors {
auto status = AddTwoEqualTensorsTest(&exec_env_);
XCTAssertTrue(status.ok(), @"%s", std::string(status.message()).c_str());
diff --git a/tensorflow/lite/delegates/gpu/metal/kernels/concat_test.mm b/tensorflow/lite/delegates/gpu/metal/kernels/concat_test.mm
index 6ba5c92..8924bcd 100644
--- a/tensorflow/lite/delegates/gpu/metal/kernels/concat_test.mm
+++ b/tensorflow/lite/delegates/gpu/metal/kernels/concat_test.mm
@@ -29,10 +29,6 @@
tflite::gpu::metal::MetalExecutionEnvironment exec_env_;
}
-- (void)setUp {
- [super setUp];
-}
-
- (void)testConcatWidth {
auto status = ConcatWidthTest(&exec_env_);
XCTAssertTrue(status.ok(), @"%s", std::string(status.message()).c_str());
diff --git a/tensorflow/lite/delegates/gpu/metal/kernels/elementwise_test.mm b/tensorflow/lite/delegates/gpu/metal/kernels/elementwise_test.mm
index 158ebf4..6e3fb78 100644
--- a/tensorflow/lite/delegates/gpu/metal/kernels/elementwise_test.mm
+++ b/tensorflow/lite/delegates/gpu/metal/kernels/elementwise_test.mm
@@ -34,10 +34,6 @@
tflite::gpu::metal::MetalExecutionEnvironment exec_env_;
}
-- (void)setUp {
- [super setUp];
-}
-
- (void)testAbsUnit {
auto status = AbsTest(&exec_env_);
XCTAssertTrue(status.ok(), @"%s", std::string(status.message()).c_str());
diff --git a/tensorflow/lite/delegates/gpu/metal/kernels/padding_test.mm b/tensorflow/lite/delegates/gpu/metal/kernels/padding_test.mm
index d7bcf1b..2862849 100644
--- a/tensorflow/lite/delegates/gpu/metal/kernels/padding_test.mm
+++ b/tensorflow/lite/delegates/gpu/metal/kernels/padding_test.mm
@@ -27,170 +27,13 @@
#include "tensorflow/lite/delegates/gpu/metal/compute_task_descriptor.h"
#include "tensorflow/lite/delegates/gpu/metal/kernels/test_util.h"
-using ::tflite::gpu::BHWC;
-using ::tflite::gpu::DataType;
-using ::tflite::gpu::HWC;
-using ::tflite::gpu::OperationType;
-using ::tflite::gpu::PadAttributes;
-using ::tflite::gpu::PaddingContentType;
-using ::tflite::gpu::TensorRef;
-using ::tflite::gpu::metal::CompareVectors;
-using ::tflite::gpu::metal::SingleOpModel;
-
@interface PaddingTest : XCTestCase
-- (void)runPadOperation:(const HWC&)prepend
- append:(const HWC&)append
- output_shape:(const BHWC&)output_shape
- expected:(std::vector<float>&&)expected;
-- (void)runPrepending:(const HWC&)prepend
- output_shape:(const BHWC&)output_shape
- expected:(std::vector<float>&&)expected;
-- (void)runAppending:(const HWC&)append
- output_shape:(const BHWC&)output_shape
- expected:(std::vector<float>&&)expected;
@end
@implementation PaddingTest {
tflite::gpu::metal::MetalExecutionEnvironment exec_env_;
}
-- (void)runPadOperation:(const HWC&)prepend
- append:(const HWC&)append
- output_shape:(const BHWC&)output_shape
- expected:(std::vector<float>&&)expected {
- TensorRef<BHWC> input;
- input.type = DataType::FLOAT32;
- input.ref = 0;
- input.shape = BHWC(1, 1, 1, 1);
-
- TensorRef<BHWC> output;
- output.type = DataType::FLOAT32;
- output.ref = 1;
- output.shape = output_shape;
-
- PadAttributes attr;
- attr.prepended = BHWC(0, prepend.h, prepend.w, prepend.c);
- attr.appended = BHWC(0, append.h, append.w, append.c);
- attr.type = PaddingContentType::ZEROS;
-
- SingleOpModel model({ToString(OperationType::PAD), attr}, {input}, {output});
- XCTAssertTrue(model.PopulateTensor(0, {1.0}));
- auto status = model.Invoke();
- XCTAssertTrue(status.ok(), @"%s", std::string(status.message()).c_str());
- status = CompareVectors(expected, model.GetOutput(0), 1e-6f);
- XCTAssertTrue(status.ok(), @"%s", std::string(status.message()).c_str());
-}
-
-- (void)runPrepending:(const HWC&)prepend
- output_shape:(const BHWC&)output_shape
- expected:(std::vector<float>&&)expected {
- [self runPadOperation:prepend
- append:HWC(0, 0, 0)
- output_shape:output_shape
- expected:std::move(expected)];
-}
-
-- (void)runAppending:(const HWC&)append
- output_shape:(const BHWC&)output_shape
- expected:(std::vector<float>&&)expected {
- [self runPadOperation:HWC(0, 0, 0)
- append:append
- output_shape:output_shape
- expected:std::move(expected)];
-}
-
-- (void)testPadPrependH {
- [self runPrepending:HWC(1, 0, 0) output_shape:BHWC(1, 2, 1, 1) expected:{0, 1}];
-}
-
-- (void)testPadPrependW {
- [self runPrepending:HWC(0, 1, 0) output_shape:BHWC(1, 1, 2, 1) expected:{0, 1}];
-}
-
-- (void)testPadPrependC {
- [self runPrepending:HWC(0, 0, 1) output_shape:BHWC(1, 1, 1, 2) expected:{0, 1}];
-}
-
-- (void)testPadPrependCx4 {
- [self runPrepending:HWC(0, 0, 4) output_shape:BHWC(1, 1, 1, 5) expected:{0, 0, 0, 0, 1}];
-}
-
-- (void)testPadPrependHWC {
- [self runPrepending:HWC(1, 1, 1) output_shape:BHWC(1, 2, 2, 2) expected:{0, 0, 0, 0, 0, 0, 0, 1}];
-}
-
-- (void)testPadAppendH {
- [self runAppending:HWC(1, 0, 0) output_shape:BHWC(1, 2, 1, 1) expected:{1, 0}];
-}
-
-- (void)testPadAppendW {
- [self runAppending:HWC(0, 1, 0) output_shape:BHWC(1, 1, 2, 1) expected:{1, 0}];
-}
-
-- (void)testPadAppendC {
- [self runAppending:HWC(0, 0, 1) output_shape:BHWC(1, 1, 1, 2) expected:{1, 0}];
-}
-
-- (void)testPadAppendHWC {
- [self runAppending:HWC(1, 1, 1) output_shape:BHWC(1, 2, 2, 2) expected:{1, 0, 0, 0, 0, 0, 0, 0}];
-}
-
-- (void)testPadPrependHWCAppendHWC {
- [self runPadOperation:HWC(1, 1, 1)
- append:HWC(1, 1, 1)
- output_shape:BHWC(1, 3, 3, 3)
- expected:{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}];
-}
-
-- (void)testMirrorPadWidthOperation {
- TensorRef<BHWC> input;
- input.type = DataType::FLOAT32;
- input.ref = 0;
- input.shape = BHWC(1, 1, 3, 1);
-
- TensorRef<BHWC> output;
- output.type = DataType::FLOAT32;
- output.ref = 2;
- output.shape = BHWC(1, 1, 7, 1);
-
- PadAttributes attr;
- attr.prepended = BHWC(0, 0, 2, 0);
- attr.appended = BHWC(0, 0, 2, 0);
- attr.type = PaddingContentType::REFLECT;
-
- SingleOpModel model({ToString(OperationType::PAD), attr}, {input}, {output});
- XCTAssertTrue(model.PopulateTensor(0, {1.0, 2.0, 3.0}));
- auto status = model.Invoke();
- XCTAssertTrue(status.ok(), @"%s", std::string(status.message()).c_str());
- status = CompareVectors({3.0, 2.0, 1.0, 2.0, 3.0, 2.0, 1.0}, model.GetOutput(0), 1e-6f);
- XCTAssertTrue(status.ok(), @"%s", std::string(status.message()).c_str());
-}
-
-- (void)testMirrorPadChannelsOperation {
- TensorRef<BHWC> input;
- input.type = DataType::FLOAT32;
- input.ref = 0;
- input.shape = BHWC(1, 1, 1, 3);
-
- TensorRef<BHWC> output;
- output.type = DataType::FLOAT32;
- output.ref = 2;
- output.shape = BHWC(1, 1, 1, 7);
-
- PadAttributes attr;
- attr.prepended = BHWC(0, 0, 0, 2);
- attr.appended = BHWC(0, 0, 0, 2);
- attr.type = PaddingContentType::REFLECT;
-
- SingleOpModel model({ToString(OperationType::PAD), attr}, {input}, {output});
- XCTAssertTrue(model.PopulateTensor(0, {1.0, 2.0, 3.0}));
- auto status = model.Invoke();
- XCTAssertTrue(status.ok(), @"%s", std::string(status.message()).c_str());
- status = CompareVectors({3.0, 2.0, 1.0, 2.0, 3.0, 2.0, 1.0}, model.GetOutput(0), 1e-6f);
- XCTAssertTrue(status.ok(), @"%s", std::string(status.message()).c_str());
-}
-
- (void)testPaddingAppendWidth {
auto status = PaddingAppendWidthTest(&exec_env_);
XCTAssertTrue(status.ok(), @"%s", std::string(status.message()).c_str());
diff --git a/tensorflow/lite/delegates/gpu/metal/kernels/relu_test.mm b/tensorflow/lite/delegates/gpu/metal/kernels/relu_test.mm
index 1bcbd1c..56f6ce5 100644
--- a/tensorflow/lite/delegates/gpu/metal/kernels/relu_test.mm
+++ b/tensorflow/lite/delegates/gpu/metal/kernels/relu_test.mm
@@ -34,10 +34,6 @@
tflite::gpu::metal::MetalExecutionEnvironment exec_env_;
}
-- (void)setUp {
- [super setUp];
-}
-
- (void)testReLUNoClipNoAlpha {
auto status = ReLUNoClipNoAlphaTest(&exec_env_);
XCTAssertTrue(status.ok(), @"%s", std::string(status.message()).c_str());
diff --git a/tensorflow/lite/delegates/gpu/metal/kernels/slice_test.mm b/tensorflow/lite/delegates/gpu/metal/kernels/slice_test.mm
index 8e44a66..981da7c 100644
--- a/tensorflow/lite/delegates/gpu/metal/kernels/slice_test.mm
+++ b/tensorflow/lite/delegates/gpu/metal/kernels/slice_test.mm
@@ -27,15 +27,6 @@
#include "tensorflow/lite/delegates/gpu/metal/kernels/test_util.h"
#include "tensorflow/lite/delegates/gpu/common/tasks/strided_slice_test_util.h"
-using ::tflite::gpu::BHWC;
-using ::tflite::gpu::DataType;
-using ::tflite::gpu::HWC;
-using ::tflite::gpu::OperationType;
-using ::tflite::gpu::SliceAttributes;
-using ::tflite::gpu::TensorRef;
-using ::tflite::gpu::metal::CompareVectors;
-using ::tflite::gpu::metal::SingleOpModel;
-
@interface SliceTest : XCTestCase
@end
@@ -43,154 +34,6 @@
tflite::gpu::metal::MetalExecutionEnvironment exec_env_;
}
-- (void)setUp {
- [super setUp];
-}
-
-- (void)testSliceIdentity {
- TensorRef<BHWC> input;
- input.type = DataType::FLOAT32;
- input.ref = 0;
- input.shape = BHWC(1, 1, 2, 2);
-
- TensorRef<BHWC> output;
- output.type = DataType::FLOAT32;
- output.ref = 1;
- output.shape = BHWC(1, 1, 2, 2);
-
- SliceAttributes attr;
- attr.starts = BHWC(0, 0, 0, 0);
- attr.ends = BHWC(input.shape.b, 1, 2, 2);
- attr.strides = BHWC(1, 1, 1, 1);
-
- SingleOpModel model({ToString(OperationType::SLICE), attr}, {input}, {output});
- XCTAssertTrue(model.PopulateTensor(0, {1, 2, 3, 4}));
- auto status = model.Invoke();
- XCTAssertTrue(status.ok(), @"%s", std::string(status.message()).c_str());
- status = CompareVectors({1, 2, 3, 4}, model.GetOutput(0), 1e-6f);
- XCTAssertTrue(status.ok(), @"%s", std::string(status.message()).c_str());
-}
-
-- (void)testSliceNoStrides {
- TensorRef<BHWC> input;
- input.type = DataType::FLOAT32;
- input.ref = 0;
- input.shape = BHWC(1, 1, 2, 2);
-
- TensorRef<BHWC> output;
- output.type = DataType::FLOAT32;
- output.ref = 1;
- output.shape = BHWC(1, 1, 2, 1);
-
- SliceAttributes attr;
- attr.starts = BHWC(0, 0, 0, 0);
- attr.ends = BHWC(input.shape.b, 1, 2, 1);
- attr.strides = BHWC(1, 1, 1, 1);
-
- SingleOpModel model({ToString(OperationType::SLICE), attr}, {input}, {output});
- XCTAssertTrue(model.PopulateTensor(0, {1, 2, 3, 4}));
- auto status = model.Invoke();
- XCTAssertTrue(status.ok(), @"%s", std::string(status.message()).c_str());
- status = CompareVectors({1, 3}, model.GetOutput(0), 1e-6f);
- XCTAssertTrue(status.ok(), @"%s", std::string(status.message()).c_str());
-}
-
-- (void)testSliceNoStridesStartOffset {
- TensorRef<BHWC> input;
- input.type = DataType::FLOAT32;
- input.ref = 0;
- input.shape = BHWC(1, 1, 2, 2);
-
- TensorRef<BHWC> output;
- output.type = DataType::FLOAT32;
- output.ref = 1;
- output.shape = BHWC(1, 1, 1, 2);
-
- SliceAttributes attr;
- attr.starts = BHWC(0, 0, 1, 0);
- attr.ends = BHWC(input.shape.b, 1, 2, 2);
- attr.strides = BHWC(1, 1, 1, 1);
-
- SingleOpModel model({ToString(OperationType::SLICE), attr}, {input}, {output});
- XCTAssertTrue(model.PopulateTensor(0, {1, 2, 3, 4}));
- auto status = model.Invoke();
- XCTAssertTrue(status.ok(), @"%s", std::string(status.message()).c_str());
- status = CompareVectors({3, 4}, model.GetOutput(0), 1e-6f);
- XCTAssertTrue(status.ok(), @"%s", std::string(status.message()).c_str());
-}
-
-- (void)testSliceStridesByHeight {
- TensorRef<BHWC> input;
- input.type = DataType::FLOAT32;
- input.ref = 0;
- input.shape = BHWC(1, 4, 1, 1);
-
- TensorRef<BHWC> output;
- output.type = DataType::FLOAT32;
- output.ref = 1;
- output.shape = BHWC(1, 2, 1, 1);
-
- SliceAttributes attr;
- attr.starts = BHWC(0, 0, 0, 0);
- attr.ends = BHWC(input.shape.b, 4, 1, 1);
- attr.strides = BHWC(1, 2, 1, 1);
-
- SingleOpModel model({ToString(OperationType::SLICE), attr}, {input}, {output});
- XCTAssertTrue(model.PopulateTensor(0, {1, 2, 3, 4}));
- auto status = model.Invoke();
- XCTAssertTrue(status.ok(), @"%s", std::string(status.message()).c_str());
- status = CompareVectors({1, 3}, model.GetOutput(0), 1e-6f);
- XCTAssertTrue(status.ok(), @"%s", std::string(status.message()).c_str());
-}
-
-- (void)testSliceStridesByWidth {
- TensorRef<BHWC> input;
- input.type = DataType::FLOAT32;
- input.ref = 0;
- input.shape = BHWC(1, 1, 4, 1);
-
- TensorRef<BHWC> output;
- output.type = DataType::FLOAT32;
- output.ref = 1;
- output.shape = BHWC(1, 1, 2, 1);
-
- SliceAttributes attr;
- attr.starts = BHWC(0, 0, 1, 0);
- attr.ends = BHWC(input.shape.b, 1, 4, 1);
- attr.strides = BHWC(1, 1, 2, 1);
-
- SingleOpModel model({ToString(OperationType::SLICE), attr}, {input}, {output});
- XCTAssertTrue(model.PopulateTensor(0, {1, 2, 3, 4}));
- auto status = model.Invoke();
- XCTAssertTrue(status.ok(), @"%s", std::string(status.message()).c_str());
- status = CompareVectors({2, 4}, model.GetOutput(0), 1e-6f);
- XCTAssertTrue(status.ok(), @"%s", std::string(status.message()).c_str());
-}
-
-- (void)testSliceStridesByChannels {
- TensorRef<BHWC> input;
- input.type = DataType::FLOAT32;
- input.ref = 0;
- input.shape = BHWC(1, 1, 1, 4);
-
- TensorRef<BHWC> output;
- output.type = DataType::FLOAT32;
- output.ref = 1;
- output.shape = BHWC(1, 1, 1, 2);
-
- SliceAttributes attr;
- attr.starts = BHWC(0, 0, 0, 1);
- attr.ends = BHWC(input.shape.b, 1, 1, 4);
- attr.strides = BHWC(1, 1, 1, 2);
-
- SingleOpModel model({ToString(OperationType::SLICE), attr}, {input}, {output});
- XCTAssertTrue(model.PopulateTensor(0, {1, 2, 3, 4}));
- auto status = model.Invoke();
- XCTAssertTrue(status.ok(), @"%s", std::string(status.message()).c_str());
- status = CompareVectors({2, 4}, model.GetOutput(0), 1e-6f);
- XCTAssertTrue(status.ok(), @"%s", std::string(status.message()).c_str());
-}
-
- (void)testStridedSlice {
auto status = StridedSliceTest(&exec_env_);
XCTAssertTrue(status.ok(), @"%s", std::string(status.message()).c_str());
