From a09de0c8b2ed0f1481502d3b023375609362d9e3 Mon Sep 17 00:00:00 2001 From: Moritz Pflanzer Date: Fri, 1 Sep 2017 20:41:12 +0100 Subject: COMPMID-415: Rename and move tests The boost validation is now "standalone" in validation_old and builds as arm_compute_validation_old. The new validation builds now as arm_compute_validation. Change-Id: Ib93ba848a25680ac60afb92b461d574a0757150d Reviewed-on: http://mpd-gerrit.cambridge.arm.com/86187 Tested-by: Kaizen Reviewed-by: Anthony Barbier --- .../vgg/vgg16/VGG16ActivationLayerDataset.h | 69 ---------------------- 1 file changed, 69 deletions(-) delete mode 100644 tests/datasets_new/system_tests/vgg/vgg16/VGG16ActivationLayerDataset.h (limited to 'tests/datasets_new/system_tests/vgg/vgg16/VGG16ActivationLayerDataset.h') diff --git a/tests/datasets_new/system_tests/vgg/vgg16/VGG16ActivationLayerDataset.h b/tests/datasets_new/system_tests/vgg/vgg16/VGG16ActivationLayerDataset.h deleted file mode 100644 index 757357f62e..0000000000 --- a/tests/datasets_new/system_tests/vgg/vgg16/VGG16ActivationLayerDataset.h +++ /dev/null @@ -1,69 +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. - */ -#ifndef ARM_COMPUTE_TEST_VGG16_ACTIVATION_LAYER_DATASET -#define ARM_COMPUTE_TEST_VGG16_ACTIVATION_LAYER_DATASET - -#include "framework/datasets/Datasets.h" - -#include "tests/TypePrinter.h" - -#include "arm_compute/core/TensorShape.h" -#include "arm_compute/core/Types.h" - -namespace arm_compute -{ -namespace test -{ -namespace datasets -{ -class VGG16ActivationLayerDataset final : public - framework::dataset::CartesianProductDataset, framework::dataset::SingletonDataset> -{ -public: - VGG16ActivationLayerDataset() - : CartesianProductDataset - { - framework::dataset::make("Shape", { // relu1_1, relu1_2 - TensorShape(224U, 224U, 64U), - // relu2_1, relu2_2 - TensorShape(112U, 112U, 128U), - // relu3_1, relu3_2, relu3_3 - TensorShape(56U, 56U, 256U), - // relu4_1, relu4_2, relu4_3 - TensorShape(28U, 28U, 512U), - // relu5_1, relu5_2, relu5_3 - TensorShape(14U, 14U, 512U), - // relu6, relu7 - TensorShape(4096U) }), - framework::dataset::make("Info", ActivationLayerInfo(ActivationLayerInfo::ActivationFunction::RELU)) - } - { - } - VGG16ActivationLayerDataset(VGG16ActivationLayerDataset &&) = default; - ~VGG16ActivationLayerDataset() = default; -}; -} // namespace datasets -} // namespace test -} // namespace arm_compute -#endif /* ARM_COMPUTE_TEST_VGG16_ACTIVATION_LAYER_DATASET */ -- cgit v1.2.1