diff options
author | Zingo Andersen <zingo.andersen@arm.com> | 2022-01-25 11:09:41 +0100 |
---|---|---|
committer | Zingo Andersen <zingo.andersen@arm.com> | 2022-01-25 13:38:05 +0100 |
commit | 7c56149ce8682fbb0e9d3c5a818921ff32b0af54 (patch) | |
tree | 2f09748db15fcff9108deefe62e426160228b277 | |
parent | 0fa5e6dda7e9e76d7ca5f77777c35374c768f28c (diff) | |
download | android-nn-driver-7c56149ce8682fbb0e9d3c5a818921ff32b0af54.tar.gz |
Cast Device and Driver in log message to unsigned long
When building Android S this is during the build ending up as
both unsigned long long and unsigned long, this makes the
build break when building the tests.
As both seem to be used during a normal build it will not help
to just change the %ul to %ull as you get an error on that instead.
This fixes so it's always printing with unsigned long.
Signed-off-by: Zingo Andersen <zingo.andersen@arm.com>
Change-Id: I1d1e4b8ab72c563a3b570f30112a7ce076f0a54e
-rw-r--r-- | ArmnnPreparedModel_1_2.cpp | 8 | ||||
-rw-r--r-- | ArmnnPreparedModel_1_3.cpp | 11 |
2 files changed, 10 insertions, 9 deletions
diff --git a/ArmnnPreparedModel_1_2.cpp b/ArmnnPreparedModel_1_2.cpp index f3d05ef5..29055a70 100644 --- a/ArmnnPreparedModel_1_2.cpp +++ b/ArmnnPreparedModel_1_2.cpp @@ -566,8 +566,8 @@ bool ArmnnPreparedModel_1_2<HalVersion>::ExecuteGraph( V1_2::Timing timing; timing.timeOnDevice = MicrosecondsDuration(deviceEnd, deviceStart); timing.timeInDriver = MicrosecondsDuration(driverEnd, cb.ctx.driverStart); - ALOGV("ArmnnPreparedModel_1_2::execute timing - Device = %lu Driver = %lu", timing.timeOnDevice, - timing.timeInDriver); + ALOGV("ArmnnPreparedModel_1_2::execute timing - Device = %lu Driver = %lu", + static_cast<unsigned long>(timing.timeOnDevice), static_cast<unsigned long>(timing.timeInDriver)); cb.callback(V1_0::ErrorStatus::NONE, outputShapes, timing, "ArmnnPreparedModel_1_2::ExecuteGraph"); } else { cb.callback(V1_0::ErrorStatus::NONE, outputShapes, g_NoTiming, "ArmnnPreparedModel_1_2::ExecuteGraph"); @@ -774,8 +774,8 @@ void ArmnnPreparedModel_1_2<HalVersion>::ArmnnThreadPoolCallback_1_2<CallbackCon V1_2::Timing timing; timing.timeOnDevice = MicrosecondsDuration(timeTaken.second, timeTaken.first); timing.timeInDriver = MicrosecondsDuration(driverEnd, m_CallbackContext.ctx.driverStart); - ALOGV("ArmnnPreparedModel_1_2::execute timing - Device = %lu Driver = %lu", timing.timeOnDevice, - timing.timeInDriver); + ALOGV("ArmnnPreparedModel_1_2::execute timing - Device = %lu Driver = %lu", + static_cast<unsigned long>(timing.timeOnDevice), static_cast<unsigned long>(timing.timeInDriver)); m_CallbackContext.callback( V1_0::ErrorStatus::NONE, m_OutputShapes, timing, "ArmnnPreparedModel_1_2::ExecuteGraph"); } else { diff --git a/ArmnnPreparedModel_1_3.cpp b/ArmnnPreparedModel_1_3.cpp index bde646de..abd135e8 100644 --- a/ArmnnPreparedModel_1_3.cpp +++ b/ArmnnPreparedModel_1_3.cpp @@ -476,7 +476,8 @@ Return<void> ArmnnPreparedModel_1_3<HalVersion>::executeFenced(const V1_3::Reque fenceTiming.timeOnDevice = MicrosecondsDuration(ctx.deviceEnd, ctx.deviceStart); fenceTiming.timeInDriver = MicrosecondsDuration(ctx.driverEnd, fenceExecutionStart); ALOGV("ArmnnPreparedModel_1_3::fenceFinishExecutionTiming - Device = %lu Driver = %lu", - fenceTiming.timeOnDevice, fenceTiming.timeInDriver); + static_cast<unsigned long>(fenceTiming.timeOnDevice), + static_cast<unsigned long>(fenceTiming.timeInDriver)); } sp<ArmnnFencedExecutionCallback> armnnFencedExecutionCallback = @@ -857,8 +858,8 @@ Return <V1_3::ErrorStatus> ArmnnPreparedModel_1_3<HalVersion>::ExecuteGraph( V1_2::Timing timing; timing.timeOnDevice = MicrosecondsDuration(cb.ctx.deviceEnd, cb.ctx.deviceStart); timing.timeInDriver = MicrosecondsDuration(cb.ctx.driverEnd, cb.ctx.driverStart); - ALOGV("ArmnnPreparedModel_1_3::execute timing - Device = %lu Driver = %lu", timing.timeOnDevice, - timing.timeInDriver); + ALOGV("ArmnnPreparedModel_1_3::execute timing - Device = %lu Driver = %lu", + static_cast<unsigned long>(timing.timeOnDevice), static_cast<unsigned long>(timing.timeInDriver)); cb.callback(V1_3::ErrorStatus::NONE, outputShapes, timing, "ArmnnPreparedModel_1_3::ExecuteGraph"); } else { @@ -1083,8 +1084,8 @@ void ArmnnPreparedModel_1_3<HalVersion>::ArmnnThreadPoolCallback_1_3<CallbackCon V1_2::Timing timing; timing.timeOnDevice = MicrosecondsDuration(m_CallbackContext.ctx.deviceEnd, m_CallbackContext.ctx.deviceStart); timing.timeInDriver = MicrosecondsDuration(m_CallbackContext.ctx.driverEnd, m_CallbackContext.ctx.driverStart); - ALOGV("ArmnnPreparedModel_1_3::execute timing - Device = %lu Driver = %lu", timing.timeOnDevice, - timing.timeInDriver); + ALOGV("ArmnnPreparedModel_1_3::execute timing - Device = %lu Driver = %lu", + static_cast<unsigned long>(timing.timeOnDevice), static_cast<unsigned long>(timing.timeInDriver)); m_CallbackContext.callback( V1_3::ErrorStatus::NONE, m_OutputShapes, timing, "ArmnnPreparedModel_1_3::ExecuteGraph"); } else |