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 --- tests/validation/system_tests/CL/AlexNet.cpp | 132 ------------------------ tests/validation/system_tests/CL/LeNet5.cpp | 115 --------------------- tests/validation/system_tests/NEON/AlexNet.cpp | 133 ------------------------- tests/validation/system_tests/NEON/LeNet5.cpp | 115 --------------------- 4 files changed, 495 deletions(-) delete mode 100644 tests/validation/system_tests/CL/AlexNet.cpp delete mode 100644 tests/validation/system_tests/CL/LeNet5.cpp delete mode 100644 tests/validation/system_tests/NEON/AlexNet.cpp delete mode 100644 tests/validation/system_tests/NEON/LeNet5.cpp (limited to 'tests/validation/system_tests') diff --git a/tests/validation/system_tests/CL/AlexNet.cpp b/tests/validation/system_tests/CL/AlexNet.cpp deleted file mode 100644 index 2b1d31f65f..0000000000 --- a/tests/validation/system_tests/CL/AlexNet.cpp +++ /dev/null @@ -1,132 +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. - */ -#ifdef INTERNAL_ONLY //FIXME Delete this file before the release -/* - * 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 "CL/CLAccessor.h" -#include "validation/Validation.h" - -#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/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 "model_objects/AlexNet.h" - -#include - -using namespace arm_compute; -using namespace arm_compute::test; -using namespace arm_compute::test::validation; - -namespace -{ -using CLAlexNetModel = model_objects::AlexNet; -std::vector compute_alexnet(unsigned int batches, std::string input_file) -{ - std::vector weight_files = { "cnn_data/alexnet_model/conv1_w.dat", - "cnn_data/alexnet_model/conv2_w.dat", - "cnn_data/alexnet_model/conv3_w.dat", - "cnn_data/alexnet_model/conv4_w.dat", - "cnn_data/alexnet_model/conv5_w.dat", - "cnn_data/alexnet_model/fc6_w.dat", - "cnn_data/alexnet_model/fc7_w.dat", - "cnn_data/alexnet_model/fc8_w.dat" - }; - - std::vector bias_files = { "cnn_data/alexnet_model/conv1_b.dat", - "cnn_data/alexnet_model/conv2_b.dat", - "cnn_data/alexnet_model/conv3_b.dat", - "cnn_data/alexnet_model/conv4_b.dat", - "cnn_data/alexnet_model/conv5_b.dat", - "cnn_data/alexnet_model/fc6_b.dat", - "cnn_data/alexnet_model/fc7_b.dat", - "cnn_data/alexnet_model/fc8_b.dat" - }; - CLAlexNetModel network{}; - network.init_weights(batches); - network.build(); - network.allocate(); - network.fill(weight_files, bias_files); - network.feed(std::move(input_file)); - network.run(); - - return network.get_classifications(); -} -} // namespace - -#ifndef DOXYGEN_SKIP_THIS -BOOST_AUTO_TEST_SUITE(SYSTEM_TESTS) -BOOST_AUTO_TEST_SUITE(CL) - -BOOST_TEST_DECORATOR(*boost::unit_test::label("precommit")) -BOOST_AUTO_TEST_CASE(AlexNet) -{ - // Compute alexnet - std::vector classified_labels = compute_alexnet(1, "cnn_data/imagenet_data/shark.dat"); - - // Expected labels - std::vector expected_labels = { 2 }; - - // Validate labels - validate(classified_labels, expected_labels); -} - -BOOST_AUTO_TEST_SUITE_END() -BOOST_AUTO_TEST_SUITE_END() -#endif /* DOXYGEN_SKIP_THIS */ -#endif /* INTERNAL_ONLY */ diff --git a/tests/validation/system_tests/CL/LeNet5.cpp b/tests/validation/system_tests/CL/LeNet5.cpp deleted file mode 100644 index 4b3d969a1d..0000000000 --- a/tests/validation/system_tests/CL/LeNet5.cpp +++ /dev/null @@ -1,115 +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. - */ -#ifdef INTERNAL_ONLY //FIXME Delete this file before the release -/* - * 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 "CL/CLAccessor.h" -#include "validation/Validation.h" - -#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 "model_objects/LeNet5.h" - -using namespace arm_compute; -using namespace arm_compute::test; -using namespace arm_compute::test::validation; - -namespace -{ -using CLLeNet5Model = model_objects::LeNet5; -std::vector compute_lenet5(unsigned int batches, std::string input_file) -{ - std::vector weight_files = { "cnn_data/lenet_model/conv1_w.dat", - "cnn_data/lenet_model/conv2_w.dat", - "cnn_data/lenet_model/ip1_w.dat", - "cnn_data/lenet_model/ip2_w.dat" - }; - - std::vector bias_files = { "cnn_data/lenet_model/conv1_b.dat", - "cnn_data/lenet_model/conv2_b.dat", - "cnn_data/lenet_model/ip1_b.dat", - "cnn_data/lenet_model/ip2_b.dat" - }; - CLLeNet5Model network{}; - network.build(batches); - network.fill(weight_files, bias_files); - network.feed(std::move(input_file)); - network.run(); - - return network.get_classifications(); -} -} // namespace - -#ifndef DOXYGEN_SKIP_THIS -BOOST_AUTO_TEST_SUITE(SYSTEM_TESTS) -BOOST_AUTO_TEST_SUITE(CL) - -BOOST_TEST_DECORATOR(*boost::unit_test::label("precommit")) -BOOST_AUTO_TEST_CASE(LeNet5) -{ - // Compute alexnet - std::vector classified_labels = compute_lenet5(10, "cnn_data/mnist_data/input100.dat"); - - // Expected labels - std::vector expected_labels = { 7, 2, 1, 0, 4, 1, 4, 9, 5, 9 }; - - // Validate labels - validate(classified_labels, expected_labels); -} - -BOOST_AUTO_TEST_SUITE_END() -BOOST_AUTO_TEST_SUITE_END() -#endif /* DOXYGEN_SKIP_THIS */ -#endif /* INTERNAL_ONLY */ diff --git a/tests/validation/system_tests/NEON/AlexNet.cpp b/tests/validation/system_tests/NEON/AlexNet.cpp deleted file mode 100644 index 20a612fd64..0000000000 --- a/tests/validation/system_tests/NEON/AlexNet.cpp +++ /dev/null @@ -1,133 +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. - */ -#ifdef INTERNAL_ONLY //FIXME Delete this file before the release -/* - * 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 "NEON/Accessor.h" -#include "validation/Validation.h" - -#include "arm_compute/runtime/NEON/functions/NEActivationLayer.h" -#include "arm_compute/runtime/NEON/functions/NEConvolutionLayer.h" -#include "arm_compute/runtime/NEON/functions/NEFullyConnectedLayer.h" -#include "arm_compute/runtime/NEON/functions/NENormalizationLayer.h" -#include "arm_compute/runtime/NEON/functions/NEPoolingLayer.h" -#include "arm_compute/runtime/NEON/functions/NESoftmaxLayer.h" -#include "arm_compute/runtime/SubTensor.h" - -#include "model_objects/AlexNet.h" - -#include - -using namespace arm_compute; -using namespace arm_compute::test; -using namespace arm_compute::test::validation; - -namespace -{ -using NEAlexNetModel = model_objects::AlexNet; -std::vector compute_alexnet(unsigned int batches, std::string input_file) -{ - std::vector weight_files = { "cnn_data/alexnet_model/conv1_w.dat", - "cnn_data/alexnet_model/conv2_w.dat", - "cnn_data/alexnet_model/conv3_w.dat", - "cnn_data/alexnet_model/conv4_w.dat", - "cnn_data/alexnet_model/conv5_w.dat", - "cnn_data/alexnet_model/fc6_w.dat", - "cnn_data/alexnet_model/fc7_w.dat", - "cnn_data/alexnet_model/fc8_w.dat" - }; - - std::vector bias_files = { "cnn_data/alexnet_model/conv1_b.dat", - "cnn_data/alexnet_model/conv2_b.dat", - "cnn_data/alexnet_model/conv3_b.dat", - "cnn_data/alexnet_model/conv4_b.dat", - "cnn_data/alexnet_model/conv5_b.dat", - "cnn_data/alexnet_model/fc6_b.dat", - "cnn_data/alexnet_model/fc7_b.dat", - "cnn_data/alexnet_model/fc8_b.dat" - }; - NEAlexNetModel network{}; - - network.init_weights(batches); - network.build(); - network.allocate(); - network.fill(weight_files, bias_files); - network.feed(std::move(input_file)); - network.run(); - - return network.get_classifications(); -} -} // namespace - -#ifndef DOXYGEN_SKIP_THIS -BOOST_AUTO_TEST_SUITE(SYSTEM_TESTS) -BOOST_AUTO_TEST_SUITE(NEON) - -BOOST_TEST_DECORATOR(*boost::unit_test::label("precommit")) -BOOST_AUTO_TEST_CASE(AlexNet) -{ - // Compute alexnet - std::vector classified_labels = compute_alexnet(1, "cnn_data/imagenet_data/shark.dat"); - - // Expected labels - std::vector expected_labels = { 2 }; - - // Validate labels - validate(classified_labels, expected_labels); -} - -BOOST_AUTO_TEST_SUITE_END() -BOOST_AUTO_TEST_SUITE_END() -#endif /* DOXYGEN_SKIP_THIS */ -#endif /* INTERNAL_ONLY */ diff --git a/tests/validation/system_tests/NEON/LeNet5.cpp b/tests/validation/system_tests/NEON/LeNet5.cpp deleted file mode 100644 index c745613959..0000000000 --- a/tests/validation/system_tests/NEON/LeNet5.cpp +++ /dev/null @@ -1,115 +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. - */ -#ifdef INTERNAL_ONLY //FIXME Delete this file before the release -/* - * 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 "NEON/Accessor.h" -#include "validation/Validation.h" - -#include "arm_compute/runtime/NEON/functions/NEActivationLayer.h" -#include "arm_compute/runtime/NEON/functions/NEConvolutionLayer.h" -#include "arm_compute/runtime/NEON/functions/NEFullyConnectedLayer.h" -#include "arm_compute/runtime/NEON/functions/NEPoolingLayer.h" -#include "arm_compute/runtime/NEON/functions/NESoftmaxLayer.h" - -#include "model_objects/LeNet5.h" - -using namespace arm_compute; -using namespace arm_compute::test; -using namespace arm_compute::test::validation; - -namespace -{ -using NELeNet5Model = model_objects::LeNet5; -std::vector compute_lenet5(unsigned int batches, std::string input_file) -{ - std::vector weight_files = { "cnn_data/lenet_model/conv1_w.dat", - "cnn_data/lenet_model/conv2_w.dat", - "cnn_data/lenet_model/ip1_w.dat", - "cnn_data/lenet_model/ip2_w.dat" - }; - - std::vector bias_files = { "cnn_data/lenet_model/conv1_b.dat", - "cnn_data/lenet_model/conv2_b.dat", - "cnn_data/lenet_model/ip1_b.dat", - "cnn_data/lenet_model/ip2_b.dat" - }; - NELeNet5Model network{}; - network.build(batches); - network.fill(weight_files, bias_files); - network.feed(std::move(input_file)); - network.run(); - - return network.get_classifications(); -} -} // namespace - -#ifndef DOXYGEN_SKIP_THIS -BOOST_AUTO_TEST_SUITE(SYSTEM_TESTS) -BOOST_AUTO_TEST_SUITE(NEON) - -BOOST_TEST_DECORATOR(*boost::unit_test::label("precommit")) -BOOST_AUTO_TEST_CASE(LeNet5) -{ - // Compute alexnet - std::vector classified_labels = compute_lenet5(10, "cnn_data/mnist_data/input100.dat"); - - // Expected labels - std::vector expected_labels = { 7, 2, 1, 0, 4, 1, 4, 9, 5, 9 }; - - // Validate labels - validate(classified_labels, expected_labels); -} - -BOOST_AUTO_TEST_SUITE_END() -BOOST_AUTO_TEST_SUITE_END() -#endif /* DOXYGEN_SKIP_THIS */ -#endif /* INTERNAL_ONLY */ -- cgit v1.2.1