From ead90b579a6d93af53e4e6e104c873b9dcc7ee25 Mon Sep 17 00:00:00 2001 From: Georgios Pinitas Date: Fri, 27 Jul 2018 12:42:10 +0100 Subject: COMPMID-1188: Remove graph system tests Change-Id: I429087f8aa436cf0877c3abec8fd7201bec1b81c Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/141661 Reviewed-by: Anthony Barbier Tested-by: Jenkins --- tests/validation/CL/SYSTEM/AlexNet.cpp | 112 --------------------------------- tests/validation/CL/SYSTEM/LeNet5.cpp | 97 ---------------------------- 2 files changed, 209 deletions(-) delete mode 100644 tests/validation/CL/SYSTEM/AlexNet.cpp delete mode 100644 tests/validation/CL/SYSTEM/LeNet5.cpp (limited to 'tests/validation/CL') diff --git a/tests/validation/CL/SYSTEM/AlexNet.cpp b/tests/validation/CL/SYSTEM/AlexNet.cpp deleted file mode 100644 index 9be6f2cf53..0000000000 --- a/tests/validation/CL/SYSTEM/AlexNet.cpp +++ /dev/null @@ -1,112 +0,0 @@ -/* - * Copyright (c) 2017-2018 ARM Limited. - * - * SPDX-License-Identifier: MIT - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to - * deal in the Software without restriction, including without limitation the - * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or - * sell copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -#include "arm_compute/runtime/CL/CLSubTensor.h" -#include "arm_compute/runtime/CL/functions/CLActivationLayer.h" -#include "arm_compute/runtime/CL/functions/CLConvolutionLayer.h" -#include "arm_compute/runtime/CL/functions/CLDirectConvolutionLayer.h" -#include "arm_compute/runtime/CL/functions/CLFullyConnectedLayer.h" -#include "arm_compute/runtime/CL/functions/CLNormalizationLayer.h" -#include "arm_compute/runtime/CL/functions/CLPoolingLayer.h" -#include "arm_compute/runtime/CL/functions/CLSoftmaxLayer.h" -#include "tests/CL/CLAccessor.h" -#include "tests/framework/Asserts.h" -#include "tests/framework/Macros.h" -#include "tests/networks/AlexNetNetwork.h" -#include "tests/validation/Validation.h" - -#include -#include - -namespace arm_compute -{ -namespace test -{ -namespace validation -{ -namespace -{ -using CLAlexNetModel = networks::AlexNetNetwork; -std::vector compute_alexnet(DataType dt, unsigned int batches, std::string input_file) -{ - std::vector weight_files = { "cnn_data/alexnet_model/conv1_w.npy", - "cnn_data/alexnet_model/conv2_w.npy", - "cnn_data/alexnet_model/conv3_w.npy", - "cnn_data/alexnet_model/conv4_w.npy", - "cnn_data/alexnet_model/conv5_w.npy", - "cnn_data/alexnet_model/fc6_w.npy", - "cnn_data/alexnet_model/fc7_w.npy", - "cnn_data/alexnet_model/fc8_w.npy" - }; - - std::vector bias_files = { "cnn_data/alexnet_model/conv1_b.npy", - "cnn_data/alexnet_model/conv2_b.npy", - "cnn_data/alexnet_model/conv3_b.npy", - "cnn_data/alexnet_model/conv4_b.npy", - "cnn_data/alexnet_model/conv5_b.npy", - "cnn_data/alexnet_model/fc6_b.npy", - "cnn_data/alexnet_model/fc7_b.npy", - "cnn_data/alexnet_model/fc8_b.npy" - }; - CLAlexNetModel network{}; - network.init(dt, batches); - network.build(); - network.allocate(); - network.fill(weight_files, bias_files); - network.feed(std::move(input_file)); - network.run(); - - return network.get_classifications(); -} -} // namespace - -TEST_SUITE(CL) -TEST_SUITE(SYSTEM_TESTS) - -TEST_CASE(AlexNet, framework::DatasetMode::PRECOMMIT) -{ - // Compute alexnet - std::vector classified_labels = compute_alexnet(DataType::F32, 1, "cnn_data/imagenet_data/cat.npy"); - - // Expected labels - std::vector expected_labels = { 281 }; - - // Validate labels - validate(classified_labels, expected_labels); -} - -TEST_SUITE_END() -TEST_SUITE_END() -} // namespace validation -} // namespace test -} // namespace arm_compute diff --git a/tests/validation/CL/SYSTEM/LeNet5.cpp b/tests/validation/CL/SYSTEM/LeNet5.cpp deleted file mode 100644 index 92dcdea500..0000000000 --- a/tests/validation/CL/SYSTEM/LeNet5.cpp +++ /dev/null @@ -1,97 +0,0 @@ -/* - * Copyright (c) 2017 ARM Limited. - * - * SPDX-License-Identifier: MIT - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to - * deal in the Software without restriction, including without limitation the - * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or - * sell copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -#include "arm_compute/runtime/CL/functions/CLActivationLayer.h" -#include "arm_compute/runtime/CL/functions/CLConvolutionLayer.h" -#include "arm_compute/runtime/CL/functions/CLFullyConnectedLayer.h" -#include "arm_compute/runtime/CL/functions/CLPoolingLayer.h" -#include "arm_compute/runtime/CL/functions/CLSoftmaxLayer.h" -#include "tests/CL/CLAccessor.h" -#include "tests/framework/Asserts.h" -#include "tests/framework/Macros.h" -#include "tests/networks/LeNet5Network.h" -#include "tests/validation/Validation.h" - -#include -#include - -namespace arm_compute -{ -namespace test -{ -namespace validation -{ -namespace -{ -using CLLeNet5Model = networks::LeNet5Network; -std::vector compute_lenet5(unsigned int batches, std::string input_file) -{ - std::vector weight_files = { "cnn_data/lenet_model/conv1_w.npy", - "cnn_data/lenet_model/conv2_w.npy", - "cnn_data/lenet_model/ip1_w.npy", - "cnn_data/lenet_model/ip2_w.npy" - }; - - std::vector bias_files = { "cnn_data/lenet_model/conv1_b.npy", - "cnn_data/lenet_model/conv2_b.npy", - "cnn_data/lenet_model/ip1_b.npy", - "cnn_data/lenet_model/ip2_b.npy" - }; - CLLeNet5Model network{}; - network.init(batches); - network.build(); - network.allocate(); - network.fill(weight_files, bias_files); - network.feed(std::move(input_file)); - network.run(); - - return network.get_classifications(); -} -} // namespace - -TEST_SUITE(CL) -TEST_SUITE(SYSTEM_TESTS) - -TEST_CASE(LeNet5, framework::DatasetMode::PRECOMMIT) -{ - // Compute alexnet - std::vector classified_labels = compute_lenet5(10, "cnn_data/mnist_data/input10.npy"); - - // Expected labels - std::vector expected_labels = { 7, 2, 1, 0, 4, 1, 4, 9, 5, 9 }; - - // Validate labels - validate(classified_labels, expected_labels); -} - -TEST_SUITE_END() -TEST_SUITE_END() -} // namespace validation -} // namespace test -} // namespace arm_compute -- cgit v1.2.1