Update paths to NNAPI VTS models am: cac83eefa5

am: 868ef4ac7a

Change-Id: Ie3448cbd73c464a40e5a6d3db27c8554c32ffebd
This commit is contained in:
Slava Shklyaev
2019-07-19 13:40:28 -07:00
committed by android-build-merger
7 changed files with 8 additions and 8 deletions

View File

@@ -42,7 +42,7 @@ using ::test_helper::MixedTypedExample;
std::vector<Request> createRequests(const std::vector<MixedTypedExample>& examples); std::vector<Request> createRequests(const std::vector<MixedTypedExample>& examples);
// in frameworks/ml/nn/runtime/tests/generated/ // 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 functional
} // namespace vts } // namespace vts

View File

@@ -43,7 +43,7 @@ using ::test_helper::MixedTypedExample;
std::vector<Request> createRequests(const std::vector<MixedTypedExample>& examples); std::vector<Request> createRequests(const std::vector<MixedTypedExample>& examples);
// in frameworks/ml/nn/runtime/tests/generated/ // 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 functional
} // namespace vts } // namespace vts

View File

@@ -43,7 +43,7 @@ using ::test_helper::MixedTypedExample;
std::vector<Request> createRequests(const std::vector<MixedTypedExample>& examples); std::vector<Request> createRequests(const std::vector<MixedTypedExample>& examples);
// in frameworks/ml/nn/runtime/tests/generated/ // 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 functional
} // namespace vts } // namespace vts

View File

@@ -50,7 +50,7 @@ namespace float32_model {
// In frameworks/ml/nn/runtime/test/generated/, creates a hidl model of float32 mobilenet. // In frameworks/ml/nn/runtime/test/generated/, creates a hidl model of float32 mobilenet.
#include "examples/mobilenet_224_gender_basic_fixed.example.cpp" #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. // Prevent the compiler from complaining about an otherwise unused function.
[[maybe_unused]] auto dummy_createTestModel = createTestModel_dynamic_output_shape; [[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. // In frameworks/ml/nn/runtime/test/generated/, creates a hidl model of quant8 mobilenet.
#include "examples/mobilenet_quantized.example.cpp" #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. // Prevent the compiler from complaining about an otherwise unused function.
[[maybe_unused]] auto dummy_createTestModel = createTestModel_dynamic_output_shape; [[maybe_unused]] auto dummy_createTestModel = createTestModel_dynamic_output_shape;

View File

@@ -42,7 +42,7 @@ using ::test_helper::MixedTypedExample;
std::vector<Request> createRequests(const std::vector<MixedTypedExample>& examples); std::vector<Request> createRequests(const std::vector<MixedTypedExample>& examples);
// in frameworks/ml/nn/runtime/tests/generated/ // 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 functional
} // namespace vts } // namespace vts

View File

@@ -42,7 +42,7 @@ using ::test_helper::MixedTypedExample;
std::vector<Request> createRequests(const std::vector<MixedTypedExample>& examples); std::vector<Request> createRequests(const std::vector<MixedTypedExample>& examples);
// in frameworks/ml/nn/runtime/tests/generated/ // in frameworks/ml/nn/runtime/tests/generated/
#include "all_generated_V1_1_vts_tests.cpp" #include "vts/V1_2/all_generated_V1_1_vts_tests.cpp"
} // namespace functional } // namespace functional
} // namespace vts } // namespace vts

View File

@@ -42,7 +42,7 @@ using ::test_helper::MixedTypedExample;
std::vector<Request> createRequests(const std::vector<MixedTypedExample>& examples); std::vector<Request> createRequests(const std::vector<MixedTypedExample>& examples);
// in frameworks/ml/nn/runtime/tests/generated/ // in frameworks/ml/nn/runtime/tests/generated/
#include "all_generated_V1_2_vts_tests.cpp" #include "vts/V1_2/all_generated_V1_2_vts_tests.cpp"
// Generated from spec/strided_slice_invalid_output_dims.mod.py. // Generated from spec/strided_slice_invalid_output_dims.mod.py.
// TODO(b/132155416): Make this part of all_generated_V1_2_vts_tests.cpp. // TODO(b/132155416): Make this part of all_generated_V1_2_vts_tests.cpp.