Merge "Fix vlog initialization in sample drivers." into oc-mr1-dev

5 files changed, 5 insertions, 5 deletions

diff --git a/nn/driver/sample/SampleDriverAll.cpp b/nn/driver/sample/SampleDriverAll.cpp
index 3e29481f3..5ddaaec52 100644
--- a/nn/driver/sample/SampleDriverAll.cpp
+++ b/nn/driver/sample/SampleDriverAll.cpp
@@ -37,6 +37,7 @@ public:
 };
 
 Return<void> SampleDriverAll::getCapabilities(getCapabilities_cb cb) {
+    android::nn::initVLogMask();
     VLOG(DRIVER) << "getCapabilities()";
     Capabilities capabilities = {.float32Performance = {.execTime = 1.1f, .powerUsage = 1.1f},
                                  .quantized8Performance = {.execTime = 1.1f, .powerUsage = 1.1f}};
@@ -66,7 +67,6 @@ using android::nn::sample_driver::SampleDriverAll;
 using android::sp;
 
 int main() {
-    android::nn::initVLogMask();
     sp<SampleDriverAll> driver(new SampleDriverAll());
     return driver->run();
 }
diff --git a/nn/driver/sample/SampleDriverFloatFast.cpp b/nn/driver/sample/SampleDriverFloatFast.cpp
index 4a2b74963..cf416297d 100644
--- a/nn/driver/sample/SampleDriverFloatFast.cpp
+++ b/nn/driver/sample/SampleDriverFloatFast.cpp
@@ -37,6 +37,7 @@ public:
 };
 
 Return<void> SampleDriverFloatFast::getCapabilities(getCapabilities_cb cb) {
+    android::nn::initVLogMask();
     VLOG(DRIVER) << "getCapabilities()";
     Capabilities capabilities = {.float32Performance = {.execTime = 0.8f, .powerUsage = 1.2f},
                                  .quantized8Performance = {.execTime = 1.0f, .powerUsage = 1.0f}};
@@ -73,7 +74,6 @@ using android::nn::sample_driver::SampleDriverFloatFast;
 using android::sp;
 
 int main() {
-    android::nn::initVLogMask();
     sp<SampleDriverFloatFast> driver(new SampleDriverFloatFast());
     return driver->run();
 }
diff --git a/nn/driver/sample/SampleDriverFloatSlow.cpp b/nn/driver/sample/SampleDriverFloatSlow.cpp
index f472b9b11..87ed39944 100644
--- a/nn/driver/sample/SampleDriverFloatSlow.cpp
+++ b/nn/driver/sample/SampleDriverFloatSlow.cpp
@@ -37,6 +37,7 @@ public:
 };
 
 Return<void> SampleDriverFloatSlow::getCapabilities(getCapabilities_cb cb) {
+    android::nn::initVLogMask();
     VLOG(DRIVER) << "getCapabilities()";
     Capabilities capabilities = {.float32Performance = {.execTime = 1.3f, .powerUsage = 0.7f},
                                  .quantized8Performance = {.execTime = 1.0f, .powerUsage = 1.0f}};
@@ -73,7 +74,6 @@ using android::nn::sample_driver::SampleDriverFloatSlow;
 using android::sp;
 
 int main() {
-    android::nn::initVLogMask();
     sp<SampleDriverFloatSlow> driver(new SampleDriverFloatSlow());
     return driver->run();
 }
diff --git a/nn/driver/sample/SampleDriverMinimal.cpp b/nn/driver/sample/SampleDriverMinimal.cpp
index 919ac1cd4..0b6500078 100644
--- a/nn/driver/sample/SampleDriverMinimal.cpp
+++ b/nn/driver/sample/SampleDriverMinimal.cpp
@@ -38,6 +38,7 @@ public:
 };
 
 Return<void> SampleDriverMinimal::getCapabilities(getCapabilities_cb cb) {
+    android::nn::initVLogMask();
     VLOG(DRIVER) << "getCapabilities()";
     Capabilities capabilities = {.float32Performance = {.execTime = 0.4f, .powerUsage = 0.5f},
                                  .quantized8Performance = {.execTime = 1.0f, .powerUsage = 1.0f}};
@@ -85,7 +86,6 @@ using android::nn::sample_driver::SampleDriverMinimal;
 using android::sp;
 
 int main() {
-    android::nn::initVLogMask();
     sp<SampleDriverMinimal> driver(new SampleDriverMinimal());
     return driver->run();
 }
diff --git a/nn/driver/sample/SampleDriverQuant.cpp b/nn/driver/sample/SampleDriverQuant.cpp
index 269541691..25b07d2a5 100644
--- a/nn/driver/sample/SampleDriverQuant.cpp
+++ b/nn/driver/sample/SampleDriverQuant.cpp
@@ -37,6 +37,7 @@ public:
 };
 
 Return<void> SampleDriverQuant::getCapabilities(getCapabilities_cb cb) {
+    android::nn::initVLogMask();
     VLOG(DRIVER) << "getCapabilities()";
     Capabilities capabilities = {.float32Performance = {.execTime = 50.0f, .powerUsage = 1.0f},
                                  .quantized8Performance = {.execTime = 50.0f, .powerUsage = 1.0f}};
@@ -73,7 +74,6 @@ using android::nn::sample_driver::SampleDriverQuant;
 using android::sp;
 
 int main() {
-    android::nn::initVLogMask();
     sp<SampleDriverQuant> driver(new SampleDriverQuant());
     return driver->run();
 }