Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cac83eef authored by Slava Shklyaev's avatar Slava Shklyaev
Browse files

Update paths to NNAPI VTS models 

See change If3bfbdfa016cd32a39b8a63028481da7318d6e02

Bug: 124040454
Test: VtsHalNeuralnetworksV1_0TargetTest
Test: VtsHalNeuralnetworksV1_1TargetTest
Test: VtsHalNeuralnetworksV1_1CompatV1_0TargetTest
Test: VtsHalNeuralnetworksV1_2TargetTest
Test: VtsHalNeuralnetworksV1_2CompatV1_0TargetTest
Test: VtsHalNeuralnetworksV1_2CompatV1_1TargetTest
Change-Id: I17dd4377ee5110ac10ae8142fa7403329eda067c
Merged-In: I17dd4377ee5110ac10ae8142fa7403329eda067c
(cherry picked from commit 82268614)
parent 73ee79da

neuralnetworks/1.0/vts/functional/GeneratedTestsV1_0.cpp

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ using ::test_helper::MixedTypedExample; 
std::vector<Request> createRequests(const std::vector<MixedTypedExample>& examples);



// in frameworks/ml/nn/runtime/tests/generated/

#include "all_generated_V1_0_vts_tests.cpp"

#include "vts/V1_0/all_generated_V1_0_vts_tests.cpp"



}  // namespace functional

}  // namespace vts

neuralnetworks/1.1/vts/functional/GeneratedTestsV1_0.cpp

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ using ::test_helper::MixedTypedExample; 
std::vector<Request> createRequests(const std::vector<MixedTypedExample>& examples);



// in frameworks/ml/nn/runtime/tests/generated/

#include "all_generated_V1_0_vts_tests.cpp"

#include "vts/V1_1/all_generated_V1_0_vts_tests.cpp"



}  // namespace functional

}  // namespace vts

neuralnetworks/1.1/vts/functional/GeneratedTestsV1_1.cpp

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ using ::test_helper::MixedTypedExample; 
std::vector<Request> createRequests(const std::vector<MixedTypedExample>& examples);



// in frameworks/ml/nn/runtime/tests/generated/

#include "all_generated_V1_1_vts_tests.cpp"

#include "vts/V1_1/all_generated_V1_1_vts_tests.cpp"



}  // namespace functional

}  // namespace vts

neuralnetworks/1.2/vts/functional/CompilationCachingTests.cpp

+2 −2
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ 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_models/mobilenet_224_gender_basic_fixed.model.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;
@@ -73,7 +73,7 @@ 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_models/mobilenet_quantized.model.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;

neuralnetworks/1.2/vts/functional/GeneratedTestsV1_0.cpp

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ using ::test_helper::MixedTypedExample; 
std::vector<Request> createRequests(const std::vector<MixedTypedExample>& examples);



// in frameworks/ml/nn/runtime/tests/generated/

#include "all_generated_V1_0_vts_tests.cpp"

#include "vts/V1_2/all_generated_V1_0_vts_tests.cpp"



}  // namespace functional

}  // namespace vts