From e8b2446b35b3c0c4bd66da7059aa04134d3de358 Mon Sep 17 00:00:00 2001 From: Slava Shklyaev Date: Wed, 17 Jul 2019 15:50:57 +0100 Subject: [PATCH] Refactor generated NNAPI tests See change I2c0366fb87c96851fa6e0f8fe9ceac012d8e3513 Bug: 136097638 Test: m VtsHalNeuralnetworksV1_0TargetTest Test: m VtsHalNeuralnetworksV1_1TargetTest Test: m VtsHalNeuralnetworksV1_2TargetTest Test: m VtsHalNeuralnetworksV1_2CompatV1_0TargetTest Change-Id: I6fdede028422145d313d46532b5d2154ef0d40bc Merged-In: I6fdede028422145d313d46532b5d2154ef0d40bc (cherry picked from commit 2bcfdc82a0172d42202d3b3bc4dab98d8cc0ff58) --- neuralnetworks/1.0/vts/functional/Android.bp | 4 +- .../vts/functional/GeneratedTestHarness.cpp | 2 + .../1.0/vts/functional/GeneratedTestHarness.h | 5 +- .../1.0/vts/functional/GeneratedTests.h | 38 +++++++++++++ .../1.0/vts/functional/GeneratedTestsV1_0.cpp | 52 ------------------ neuralnetworks/1.1/vts/functional/Android.bp | 6 +-- .../vts/functional/GeneratedTestHarness.cpp | 2 + .../1.1/vts/functional/GeneratedTestHarness.h | 2 + .../1.1/vts/functional/GeneratedTests.h | 39 ++++++++++++++ .../1.1/vts/functional/GeneratedTestsV1_0.cpp | 53 ------------------ .../1.1/vts/functional/GeneratedTestsV1_1.cpp | 53 ------------------ neuralnetworks/1.2/vts/functional/Android.bp | 9 ++-- .../functional/CompilationCachingTests.cpp | 37 ++++++++----- .../vts/functional/GeneratedTestHarness.cpp | 2 + .../1.2/vts/functional/GeneratedTestHarness.h | 2 + .../1.2/vts/functional/GeneratedTests.h | 40 ++++++++++++++ .../1.2/vts/functional/GeneratedTestsV1_0.cpp | 54 ------------------- .../1.2/vts/functional/GeneratedTestsV1_1.cpp | 54 ------------------- .../1.2/vts/functional/GeneratedTestsV1_2.cpp | 54 ------------------- 19 files changed, 163 insertions(+), 345 deletions(-) create mode 100644 neuralnetworks/1.0/vts/functional/GeneratedTests.h delete mode 100644 neuralnetworks/1.0/vts/functional/GeneratedTestsV1_0.cpp create mode 100644 neuralnetworks/1.1/vts/functional/GeneratedTests.h delete mode 100644 neuralnetworks/1.1/vts/functional/GeneratedTestsV1_0.cpp delete mode 100644 neuralnetworks/1.1/vts/functional/GeneratedTestsV1_1.cpp create mode 100644 neuralnetworks/1.2/vts/functional/GeneratedTests.h delete mode 100644 neuralnetworks/1.2/vts/functional/GeneratedTestsV1_0.cpp delete mode 100644 neuralnetworks/1.2/vts/functional/GeneratedTestsV1_1.cpp delete mode 100644 neuralnetworks/1.2/vts/functional/GeneratedTestsV1_2.cpp diff --git a/neuralnetworks/1.0/vts/functional/Android.bp b/neuralnetworks/1.0/vts/functional/Android.bp index 0d70816f31..a8406de235 100644 --- a/neuralnetworks/1.0/vts/functional/Android.bp +++ b/neuralnetworks/1.0/vts/functional/Android.bp @@ -76,7 +76,7 @@ cc_test { defaults: ["VtsHalNeuralNetworksV1_0TargetTestDefaults"], srcs: [ "BasicTests.cpp", - "GeneratedTestsV1_0.cpp", + ":VtsHalNeuralNetworksV1_0_all_generated_V1_0_tests", ], } @@ -85,7 +85,7 @@ cc_test { defaults: ["VtsHalNeuralNetworksV1_0TargetTestDefaults"], srcs: [ "BasicTests.cpp", - "GeneratedTestsV1_0.cpp", + ":VtsHalNeuralNetworksV1_0_all_generated_V1_0_tests", ], cflags: [ "-DPRESUBMIT_NOT_VTS", diff --git a/neuralnetworks/1.0/vts/functional/GeneratedTestHarness.cpp b/neuralnetworks/1.0/vts/functional/GeneratedTestHarness.cpp index 603054dddf..40d2f4ceb7 100644 --- a/neuralnetworks/1.0/vts/functional/GeneratedTestHarness.cpp +++ b/neuralnetworks/1.0/vts/functional/GeneratedTestHarness.cpp @@ -33,6 +33,7 @@ namespace android { namespace hardware { namespace neuralnetworks { +namespace V1_0 { namespace generated_tests { using ::android::hardware::neuralnetworks::V1_0::ErrorStatus; @@ -217,6 +218,7 @@ void Execute(const sp& device, std::function create_model, } } // namespace generated_tests +} // namespace V1_0 } // namespace neuralnetworks } // namespace hardware } // namespace android diff --git a/neuralnetworks/1.0/vts/functional/GeneratedTestHarness.h b/neuralnetworks/1.0/vts/functional/GeneratedTestHarness.h index 11950d91f0..337eb0f924 100644 --- a/neuralnetworks/1.0/vts/functional/GeneratedTestHarness.h +++ b/neuralnetworks/1.0/vts/functional/GeneratedTestHarness.h @@ -23,15 +23,16 @@ namespace android { namespace hardware { namespace neuralnetworks { - +namespace V1_0 { namespace generated_tests { + using ::test_helper::MixedTypedExample; void Execute(const sp& device, std::function create_model, std::function is_ignored, const std::vector& examples); } // namespace generated_tests - +} // namespace V1_0 } // namespace neuralnetworks } // namespace hardware } // namespace android diff --git a/neuralnetworks/1.0/vts/functional/GeneratedTests.h b/neuralnetworks/1.0/vts/functional/GeneratedTests.h new file mode 100644 index 0000000000..11ee5e882a --- /dev/null +++ b/neuralnetworks/1.0/vts/functional/GeneratedTests.h @@ -0,0 +1,38 @@ +/* + * Copyright (C) 2019 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include +#include + +#include "GeneratedTestHarness.h" +#include "MemoryUtils.h" +#include "TestHarness.h" +#include "VtsHalNeuralnetworks.h" + +namespace android::hardware::neuralnetworks::V1_0::vts::functional { + +std::vector createRequests(const std::vector<::test_helper::MixedTypedExample>& examples); + +} // namespace android::hardware::neuralnetworks::V1_0::vts::functional + +namespace android::hardware::neuralnetworks::V1_0::generated_tests { + +using namespace android::hardware::neuralnetworks::V1_0::vts::functional; + +using ::android::hardware::neuralnetworks::V1_0::Model; +using ::android::hardware::neuralnetworks::V1_0::Request; + +} // namespace android::hardware::neuralnetworks::V1_0::generated_tests diff --git a/neuralnetworks/1.0/vts/functional/GeneratedTestsV1_0.cpp b/neuralnetworks/1.0/vts/functional/GeneratedTestsV1_0.cpp deleted file mode 100644 index 32e9a7f4ce..0000000000 --- a/neuralnetworks/1.0/vts/functional/GeneratedTestsV1_0.cpp +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright (C) 2018 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#define LOG_TAG "neuralnetworks_hidl_hal_test" - -#include -#include -#include - -#include "1.0/Callbacks.h" -#include "GeneratedTestHarness.h" -#include "MemoryUtils.h" -#include "TestHarness.h" -#include "VtsHalNeuralnetworks.h" - -namespace android { -namespace hardware { -namespace neuralnetworks { -namespace V1_0 { -namespace vts { -namespace functional { - -using ::android::hardware::neuralnetworks::V1_0::implementation::ExecutionCallback; -using ::android::hardware::neuralnetworks::V1_0::implementation::PreparedModelCallback; -using ::android::hidl::memory::V1_0::IMemory; -using ::android::nn::allocateSharedMemory; -using ::test_helper::MixedTypedExample; - -std::vector createRequests(const std::vector& examples); - -// in frameworks/ml/nn/runtime/tests/generated/ -#include "vts/V1_0/all_generated_V1_0_vts_tests.cpp" - -} // namespace functional -} // namespace vts -} // namespace V1_0 -} // namespace neuralnetworks -} // namespace hardware -} // namespace android diff --git a/neuralnetworks/1.1/vts/functional/Android.bp b/neuralnetworks/1.1/vts/functional/Android.bp index ee90ec6fe2..1b31008cbb 100644 --- a/neuralnetworks/1.1/vts/functional/Android.bp +++ b/neuralnetworks/1.1/vts/functional/Android.bp @@ -50,7 +50,7 @@ cc_test { name: "VtsHalNeuralnetworksV1_1CompatV1_0TargetTest", defaults: ["VtsHalNeuralNetworksV1_1TargetTestDefaults"], srcs: [ - "GeneratedTestsV1_0.cpp", + ":VtsHalNeuralNetworksV1_1_all_generated_V1_0_tests", ], } @@ -60,7 +60,7 @@ cc_test { defaults: ["VtsHalNeuralNetworksV1_1TargetTestDefaults"], srcs: [ "BasicTests.cpp", - "GeneratedTestsV1_1.cpp", + ":VtsHalNeuralNetworksV1_1_all_generated_V1_1_tests", ], } @@ -69,7 +69,7 @@ cc_test { defaults: ["VtsHalNeuralNetworksV1_1TargetTestDefaults"], srcs: [ "BasicTests.cpp", - "GeneratedTestsV1_1.cpp", + ":VtsHalNeuralNetworksV1_1_all_generated_V1_1_tests", ], cflags: [ "-DPRESUBMIT_NOT_VTS", diff --git a/neuralnetworks/1.1/vts/functional/GeneratedTestHarness.cpp b/neuralnetworks/1.1/vts/functional/GeneratedTestHarness.cpp index d9f64fdb5b..e7d59eca91 100644 --- a/neuralnetworks/1.1/vts/functional/GeneratedTestHarness.cpp +++ b/neuralnetworks/1.1/vts/functional/GeneratedTestHarness.cpp @@ -34,6 +34,7 @@ namespace android { namespace hardware { namespace neuralnetworks { +namespace V1_1 { namespace generated_tests { using ::android::hardware::neuralnetworks::V1_0::ErrorStatus; @@ -227,6 +228,7 @@ void Execute(const sp& device, std::function create_model, } } // namespace generated_tests +} // namespace V1_1 } // namespace neuralnetworks } // namespace hardware } // namespace android diff --git a/neuralnetworks/1.1/vts/functional/GeneratedTestHarness.h b/neuralnetworks/1.1/vts/functional/GeneratedTestHarness.h index ab71b2b87a..64b88dd689 100644 --- a/neuralnetworks/1.1/vts/functional/GeneratedTestHarness.h +++ b/neuralnetworks/1.1/vts/functional/GeneratedTestHarness.h @@ -26,6 +26,7 @@ namespace android { namespace hardware { namespace neuralnetworks { +namespace V1_1 { namespace generated_tests { void Execute(const sp& device, std::function create_model, @@ -33,6 +34,7 @@ void Execute(const sp& device, std::function c const std::vector<::test_helper::MixedTypedExample>& examples); } // namespace generated_tests +} // namespace V1_1 } // namespace neuralnetworks } // namespace hardware } // namespace android diff --git a/neuralnetworks/1.1/vts/functional/GeneratedTests.h b/neuralnetworks/1.1/vts/functional/GeneratedTests.h new file mode 100644 index 0000000000..2343a4f955 --- /dev/null +++ b/neuralnetworks/1.1/vts/functional/GeneratedTests.h @@ -0,0 +1,39 @@ +/* + * Copyright (C) 2019 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include +#include + +#include "GeneratedTestHarness.h" +#include "MemoryUtils.h" +#include "TestHarness.h" +#include "VtsHalNeuralnetworks.h" + +namespace android::hardware::neuralnetworks::V1_1::vts::functional { + +std::vector createRequests(const std::vector<::test_helper::MixedTypedExample>& examples); + +} // namespace android::hardware::neuralnetworks::V1_1::vts::functional + +namespace android::hardware::neuralnetworks::V1_1::generated_tests { + +using namespace android::hardware::neuralnetworks::V1_1::vts::functional; + +using ::android::hardware::neuralnetworks::V1_0::OperandLifeTime; +using ::android::hardware::neuralnetworks::V1_0::Request; +using ::android::hardware::neuralnetworks::V1_1::Model; + +} // namespace android::hardware::neuralnetworks::V1_1::generated_tests diff --git a/neuralnetworks/1.1/vts/functional/GeneratedTestsV1_0.cpp b/neuralnetworks/1.1/vts/functional/GeneratedTestsV1_0.cpp deleted file mode 100644 index 23e6534231..0000000000 --- a/neuralnetworks/1.1/vts/functional/GeneratedTestsV1_0.cpp +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright (C) 2018 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#define LOG_TAG "neuralnetworks_hidl_hal_test" - -#include -#include -#include - -#include "1.0/Callbacks.h" -#include "GeneratedTestHarness.h" -#include "MemoryUtils.h" -#include "TestHarness.h" -#include "VtsHalNeuralnetworks.h" - -namespace android { -namespace hardware { -namespace neuralnetworks { -namespace V1_1 { -namespace vts { -namespace functional { - -using ::android::hardware::neuralnetworks::V1_0::OperandLifeTime; -using ::android::hardware::neuralnetworks::V1_0::implementation::ExecutionCallback; -using ::android::hardware::neuralnetworks::V1_0::implementation::PreparedModelCallback; -using ::android::hidl::memory::V1_0::IMemory; -using ::android::nn::allocateSharedMemory; -using ::test_helper::MixedTypedExample; - -std::vector createRequests(const std::vector& examples); - -// in frameworks/ml/nn/runtime/tests/generated/ -#include "vts/V1_1/all_generated_V1_0_vts_tests.cpp" - -} // namespace functional -} // namespace vts -} // namespace V1_1 -} // namespace neuralnetworks -} // namespace hardware -} // namespace android diff --git a/neuralnetworks/1.1/vts/functional/GeneratedTestsV1_1.cpp b/neuralnetworks/1.1/vts/functional/GeneratedTestsV1_1.cpp deleted file mode 100644 index 680b93aaee..0000000000 --- a/neuralnetworks/1.1/vts/functional/GeneratedTestsV1_1.cpp +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright (C) 2018 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#define LOG_TAG "neuralnetworks_hidl_hal_test" - -#include -#include -#include - -#include "1.0/Callbacks.h" -#include "GeneratedTestHarness.h" -#include "MemoryUtils.h" -#include "TestHarness.h" -#include "VtsHalNeuralnetworks.h" - -namespace android { -namespace hardware { -namespace neuralnetworks { -namespace V1_1 { -namespace vts { -namespace functional { - -using ::android::hardware::neuralnetworks::V1_0::OperandLifeTime; -using ::android::hardware::neuralnetworks::V1_0::implementation::ExecutionCallback; -using ::android::hardware::neuralnetworks::V1_0::implementation::PreparedModelCallback; -using ::android::hidl::memory::V1_0::IMemory; -using ::android::nn::allocateSharedMemory; -using ::test_helper::MixedTypedExample; - -std::vector createRequests(const std::vector& examples); - -// in frameworks/ml/nn/runtime/tests/generated/ -#include "vts/V1_1/all_generated_V1_1_vts_tests.cpp" - -} // namespace functional -} // namespace vts -} // namespace V1_1 -} // namespace neuralnetworks -} // namespace hardware -} // namespace android diff --git a/neuralnetworks/1.2/vts/functional/Android.bp b/neuralnetworks/1.2/vts/functional/Android.bp index 31b853242c..301ca5d065 100644 --- a/neuralnetworks/1.2/vts/functional/Android.bp +++ b/neuralnetworks/1.2/vts/functional/Android.bp @@ -53,7 +53,7 @@ cc_test { name: "VtsHalNeuralnetworksV1_2CompatV1_0TargetTest", defaults: ["VtsHalNeuralNetworksV1_2TargetTestDefaults"], srcs: [ - "GeneratedTestsV1_0.cpp", + ":VtsHalNeuralNetworksV1_2_all_generated_V1_0_tests", "ValidateBurst.cpp", ], } @@ -63,7 +63,7 @@ cc_test { name: "VtsHalNeuralnetworksV1_2CompatV1_1TargetTest", defaults: ["VtsHalNeuralNetworksV1_2TargetTestDefaults"], srcs: [ - "GeneratedTestsV1_1.cpp", + ":VtsHalNeuralNetworksV1_2_all_generated_V1_1_tests", "ValidateBurst.cpp", ], } @@ -74,8 +74,9 @@ cc_test { defaults: ["VtsHalNeuralNetworksV1_2TargetTestDefaults"], srcs: [ "BasicTests.cpp", + ":VtsHalNeuralNetworksV1_2_all_generated_V1_2_tests", "CompilationCachingTests.cpp", - "GeneratedTestsV1_2.cpp", + ":VtsHalNeuralNetworksV1_2_mobilenets", // CompilationCachingTests depend on MobileNets. "ValidateBurst.cpp", ], } @@ -85,7 +86,7 @@ cc_test { defaults: ["VtsHalNeuralNetworksV1_2TargetTestDefaults"], srcs: [ "BasicTests.cpp", - "GeneratedTestsV1_2.cpp", + ":VtsHalNeuralNetworksV1_2_all_generated_V1_2_tests", "ValidateBurst.cpp", ], cflags: [ diff --git a/neuralnetworks/1.2/vts/functional/CompilationCachingTests.cpp b/neuralnetworks/1.2/vts/functional/CompilationCachingTests.cpp index 8711f479fe..082d7583a3 100644 --- a/neuralnetworks/1.2/vts/functional/CompilationCachingTests.cpp +++ b/neuralnetworks/1.2/vts/functional/CompilationCachingTests.cpp @@ -35,6 +35,23 @@ #include "Utils.h" #include "VtsHalNeuralnetworks.h" +namespace android::hardware::neuralnetworks::V1_2::generated_tests:: + mobilenet_224_gender_basic_fixed { +Model createTestModel(); +} // namespace android::hardware::neuralnetworks::V1_2::generated_tests::mobilenet_224_gender_basic_fixed + +namespace generated_tests::mobilenet_224_gender_basic_fixed { +std::vector& get_examples(); +} // namespace generated_tests::mobilenet_224_gender_basic_fixed + +namespace android::hardware::neuralnetworks::V1_2::generated_tests::mobilenet_quantized { +Model createTestModel(); +} // namespace android::hardware::neuralnetworks::V1_2::generated_tests::mobilenet_quantized + +namespace generated_tests::mobilenet_quantized { +std::vector& get_examples(); +} // namespace generated_tests::mobilenet_quantized + namespace android { namespace hardware { namespace neuralnetworks { @@ -52,13 +69,9 @@ using ::test_helper::MixedTypedExample; namespace float32_model { -// In frameworks/ml/nn/runtime/test/generated/, creates a hidl model of float32 mobilenet. -#include "examples/mobilenet_224_gender_basic_fixed.example.cpp" -#include "vts/V1_2/models/mobilenet_224_gender_basic_fixed.model.cpp" - -// Prevent the compiler from complaining about an otherwise unused function. -[[maybe_unused]] auto dummy_createTestModel = createTestModel_dynamic_output_shape; -[[maybe_unused]] auto dummy_get_examples = get_examples_dynamic_output_shape; +constexpr auto createTestModel = ::android::hardware::neuralnetworks::V1_2::generated_tests:: + mobilenet_224_gender_basic_fixed::createTestModel; +constexpr auto get_examples = ::generated_tests::mobilenet_224_gender_basic_fixed::get_examples; // MixedTypedExample is defined in frameworks/ml/nn/tools/test_generator/include/TestHarness.h. // This function assumes the operation is always ADD. @@ -75,13 +88,9 @@ std::vector getLargeModelExamples(uint32_t len) { namespace quant8_model { -// In frameworks/ml/nn/runtime/test/generated/, creates a hidl model of quant8 mobilenet. -#include "examples/mobilenet_quantized.example.cpp" -#include "vts/V1_2/models/mobilenet_quantized.model.cpp" - -// Prevent the compiler from complaining about an otherwise unused function. -[[maybe_unused]] auto dummy_createTestModel = createTestModel_dynamic_output_shape; -[[maybe_unused]] auto dummy_get_examples = get_examples_dynamic_output_shape; +constexpr auto createTestModel = ::android::hardware::neuralnetworks::V1_2::generated_tests:: + mobilenet_quantized::createTestModel; +constexpr auto get_examples = ::generated_tests::mobilenet_quantized::get_examples; // MixedTypedExample is defined in frameworks/ml/nn/tools/test_generator/include/TestHarness.h. // This function assumes the operation is always ADD. diff --git a/neuralnetworks/1.2/vts/functional/GeneratedTestHarness.cpp b/neuralnetworks/1.2/vts/functional/GeneratedTestHarness.cpp index 495f3ecdb6..82cc73db95 100644 --- a/neuralnetworks/1.2/vts/functional/GeneratedTestHarness.cpp +++ b/neuralnetworks/1.2/vts/functional/GeneratedTestHarness.cpp @@ -43,6 +43,7 @@ namespace android { namespace hardware { namespace neuralnetworks { +namespace V1_2 { namespace generated_tests { using ::android::hardware::neuralnetworks::V1_0::ErrorStatus; @@ -451,6 +452,7 @@ void Execute(const sp& device, std::function create_model, } } // namespace generated_tests +} // namespace V1_2 } // namespace neuralnetworks } // namespace hardware } // namespace android diff --git a/neuralnetworks/1.2/vts/functional/GeneratedTestHarness.h b/neuralnetworks/1.2/vts/functional/GeneratedTestHarness.h index 30e5578b66..0ecbe7e76a 100644 --- a/neuralnetworks/1.2/vts/functional/GeneratedTestHarness.h +++ b/neuralnetworks/1.2/vts/functional/GeneratedTestHarness.h @@ -27,6 +27,7 @@ namespace android { namespace hardware { namespace neuralnetworks { +namespace V1_2 { namespace generated_tests { using ::test_helper::MixedTypedExample; @@ -44,6 +45,7 @@ void Execute(const sp& device, std::function c bool testDynamicOutputShape = false); } // namespace generated_tests +} // namespace V1_2 } // namespace neuralnetworks } // namespace hardware } // namespace android diff --git a/neuralnetworks/1.2/vts/functional/GeneratedTests.h b/neuralnetworks/1.2/vts/functional/GeneratedTests.h new file mode 100644 index 0000000000..f393eb2499 --- /dev/null +++ b/neuralnetworks/1.2/vts/functional/GeneratedTests.h @@ -0,0 +1,40 @@ +/* + * Copyright (C) 2019 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include +#include + +#include "GeneratedTestHarness.h" +#include "MemoryUtils.h" +#include "TestHarness.h" +#include "Utils.h" +#include "VtsHalNeuralnetworks.h" + +namespace android::hardware::neuralnetworks::V1_2::vts::functional { + +std::vector createRequests(const std::vector<::test_helper::MixedTypedExample>& examples); + +} // namespace android::hardware::neuralnetworks::V1_2::vts::functional + +namespace android::hardware::neuralnetworks::V1_2::generated_tests { + +using namespace ::android::hardware::neuralnetworks::V1_2::vts::functional; + +using ::android::hardware::neuralnetworks::V1_0::OperandLifeTime; +using ::android::hardware::neuralnetworks::V1_0::Request; +using ::android::hardware::neuralnetworks::V1_2::Model; + +} // namespace android::hardware::neuralnetworks::V1_2::generated_tests diff --git a/neuralnetworks/1.2/vts/functional/GeneratedTestsV1_0.cpp b/neuralnetworks/1.2/vts/functional/GeneratedTestsV1_0.cpp deleted file mode 100644 index 6fbd1dc6a2..0000000000 --- a/neuralnetworks/1.2/vts/functional/GeneratedTestsV1_0.cpp +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (C) 2018 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#define LOG_TAG "neuralnetworks_hidl_hal_test" - -#include -#include -#include - -#include "1.2/Callbacks.h" -#include "GeneratedTestHarness.h" -#include "MemoryUtils.h" -#include "TestHarness.h" -#include "Utils.h" -#include "VtsHalNeuralnetworks.h" - -namespace android { -namespace hardware { -namespace neuralnetworks { -namespace V1_2 { -namespace vts { -namespace functional { - -using ::android::hardware::neuralnetworks::V1_0::OperandLifeTime; -using ::android::hardware::neuralnetworks::V1_2::implementation::ExecutionCallback; -using ::android::hardware::neuralnetworks::V1_2::implementation::PreparedModelCallback; -using ::android::hidl::memory::V1_0::IMemory; -using ::android::nn::allocateSharedMemory; -using ::test_helper::MixedTypedExample; - -std::vector createRequests(const std::vector& examples); - -// in frameworks/ml/nn/runtime/tests/generated/ -#include "vts/V1_2/all_generated_V1_0_vts_tests.cpp" - -} // namespace functional -} // namespace vts -} // namespace V1_2 -} // namespace neuralnetworks -} // namespace hardware -} // namespace android diff --git a/neuralnetworks/1.2/vts/functional/GeneratedTestsV1_1.cpp b/neuralnetworks/1.2/vts/functional/GeneratedTestsV1_1.cpp deleted file mode 100644 index d824e4348c..0000000000 --- a/neuralnetworks/1.2/vts/functional/GeneratedTestsV1_1.cpp +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (C) 2018 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#define LOG_TAG "neuralnetworks_hidl_hal_test" - -#include -#include -#include - -#include "1.2/Callbacks.h" -#include "GeneratedTestHarness.h" -#include "MemoryUtils.h" -#include "TestHarness.h" -#include "Utils.h" -#include "VtsHalNeuralnetworks.h" - -namespace android { -namespace hardware { -namespace neuralnetworks { -namespace V1_2 { -namespace vts { -namespace functional { - -using ::android::hardware::neuralnetworks::V1_0::OperandLifeTime; -using ::android::hardware::neuralnetworks::V1_2::implementation::ExecutionCallback; -using ::android::hardware::neuralnetworks::V1_2::implementation::PreparedModelCallback; -using ::android::hidl::memory::V1_0::IMemory; -using ::android::nn::allocateSharedMemory; -using ::test_helper::MixedTypedExample; - -std::vector createRequests(const std::vector& examples); - -// in frameworks/ml/nn/runtime/tests/generated/ -#include "vts/V1_2/all_generated_V1_1_vts_tests.cpp" - -} // namespace functional -} // namespace vts -} // namespace V1_2 -} // namespace neuralnetworks -} // namespace hardware -} // namespace android diff --git a/neuralnetworks/1.2/vts/functional/GeneratedTestsV1_2.cpp b/neuralnetworks/1.2/vts/functional/GeneratedTestsV1_2.cpp deleted file mode 100644 index 6e03534394..0000000000 --- a/neuralnetworks/1.2/vts/functional/GeneratedTestsV1_2.cpp +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (C) 2018 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#define LOG_TAG "neuralnetworks_hidl_hal_test" - -#include -#include -#include - -#include "1.2/Callbacks.h" -#include "GeneratedTestHarness.h" -#include "MemoryUtils.h" -#include "TestHarness.h" -#include "Utils.h" -#include "VtsHalNeuralnetworks.h" - -namespace android { -namespace hardware { -namespace neuralnetworks { -namespace V1_2 { -namespace vts { -namespace functional { - -using ::android::hardware::neuralnetworks::V1_0::OperandLifeTime; -using ::android::hardware::neuralnetworks::V1_2::implementation::ExecutionCallback; -using ::android::hardware::neuralnetworks::V1_2::implementation::PreparedModelCallback; -using ::android::hidl::memory::V1_0::IMemory; -using ::android::nn::allocateSharedMemory; -using ::test_helper::MixedTypedExample; - -std::vector createRequests(const std::vector& examples); - -// in frameworks/ml/nn/runtime/tests/generated/ -#include "vts/V1_2/all_generated_V1_2_vts_tests.cpp" - -} // namespace functional -} // namespace vts -} // namespace V1_2 -} // namespace neuralnetworks -} // namespace hardware -} // namespace android