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

Commit 01ba094e authored by Michael Butler's avatar Michael Butler
Browse files

Change NNAPI VTS to use static library 

This CL also adds Compilation Caching tests to the Presubmit tests,
which were missing configuration files before.

Bug: 139889855
Test: mma
Test: VtsHalNeuralnetworksV1_*TargetTest (with sample-all)
Test: VtsHalNeuralnetworksV1_*CompatV1_*TargetTest (with sample-all)
Change-Id: I65274b5f72def815ff238a8d8df10c9d014afc44
Merged-In: I65274b5f72def815ff238a8d8df10c9d014afc44
(cherry picked from commit f7a8f03e)
parent 65686222

neuralnetworks/1.0/vts/functional/Android.bp

+6 −2
Original line number Diff line number Diff line
@@ -75,7 +75,9 @@ cc_test { 
    defaults: ["VtsHalNeuralNetworksV1_0TargetTestDefaults"],

    srcs: [

        "BasicTests.cpp",

        ":VtsHalNeuralNetworksV1_0_all_generated_tests",

    ],

    whole_static_libs: [

        "neuralnetworks_generated_V1_0_example",

    ],

}
@@ -84,7 +86,9 @@ cc_test { 
    defaults: ["VtsHalNeuralNetworksV1_0TargetTestDefaults"],

    srcs: [

        "BasicTests.cpp",

        ":VtsHalNeuralNetworksV1_0_all_generated_tests",

    ],

    whole_static_libs: [

        "neuralnetworks_generated_V1_0_example",

    ],

    cflags: [

        "-DPRESUBMIT_NOT_VTS",

neuralnetworks/1.1/vts/functional/Android.bp

+8 −4
Original line number Diff line number Diff line
@@ -49,8 +49,8 @@ cc_defaults { 
cc_test {

    name: "VtsHalNeuralnetworksV1_1CompatV1_0TargetTest",

    defaults: ["VtsHalNeuralNetworksV1_1TargetTestDefaults"],

    srcs: [

        ":VtsHalNeuralNetworksV1_0_all_generated_tests",

    whole_static_libs: [

        "neuralnetworks_generated_V1_0_example",

    ],

}
@@ -60,7 +60,9 @@ cc_test { 
    defaults: ["VtsHalNeuralNetworksV1_1TargetTestDefaults"],

    srcs: [

        "BasicTests.cpp",

        ":VtsHalNeuralNetworksV1_1_all_generated_tests",

    ],

    whole_static_libs: [

        "neuralnetworks_generated_V1_1_example",

    ],

}
@@ -69,7 +71,9 @@ cc_test { 
    defaults: ["VtsHalNeuralNetworksV1_1TargetTestDefaults"],

    srcs: [

        "BasicTests.cpp",

        ":VtsHalNeuralNetworksV1_1_all_generated_tests",

    ],

    whole_static_libs: [

        "neuralnetworks_generated_V1_1_example",

    ],

    cflags: [

        "-DPRESUBMIT_NOT_VTS",

neuralnetworks/1.2/vts/functional/Android.bp

+14 −4
Original line number Diff line number Diff line
@@ -53,9 +53,11 @@ cc_test { 
    name: "VtsHalNeuralnetworksV1_2CompatV1_0TargetTest",

    defaults: ["VtsHalNeuralNetworksV1_2TargetTestDefaults"],

    srcs: [

        ":VtsHalNeuralNetworksV1_0_all_generated_tests",

        "ValidateBurst.cpp",

    ],

    whole_static_libs: [

        "neuralnetworks_generated_V1_0_example",

    ],

}



// Tests for V1_1 models using the V1_2 HAL.
@@ -63,9 +65,11 @@ cc_test { 
    name: "VtsHalNeuralnetworksV1_2CompatV1_1TargetTest",

    defaults: ["VtsHalNeuralNetworksV1_2TargetTestDefaults"],

    srcs: [

        ":VtsHalNeuralNetworksV1_1_all_generated_tests",

        "ValidateBurst.cpp",

    ],

    whole_static_libs: [

        "neuralnetworks_generated_V1_1_example",

    ],

}



// Tests for V1_2 models.
@@ -74,11 +78,13 @@ cc_test { 
    defaults: ["VtsHalNeuralNetworksV1_2TargetTestDefaults"],

    srcs: [

        "BasicTests.cpp",

        ":VtsHalNeuralNetworksV1_2_all_generated_tests",

        ":VtsHalNeuralNetworksV1_2_mobilenets",

        "CompilationCachingTests.cpp",

        "ValidateBurst.cpp",

    ],

    whole_static_libs: [

        "neuralnetworks_generated_V1_2_example",

    ],

}



cc_test {
@@ -86,9 +92,13 @@ cc_test { 
    defaults: ["VtsHalNeuralNetworksV1_2TargetTestDefaults"],

    srcs: [

        "BasicTests.cpp",

        ":VtsHalNeuralNetworksV1_2_all_generated_tests",

        ":VtsHalNeuralNetworksV1_2_mobilenets",

        "CompilationCachingTests.cpp",

        "ValidateBurst.cpp",

    ],

    whole_static_libs: [

        "neuralnetworks_generated_V1_2_example",

    ],

    cflags: [

        "-DPRESUBMIT_NOT_VTS",

    ],