From 6e832767c7ddbb0abd2b19d955f5a68aaee2feab Mon Sep 17 00:00:00 2001 From: =?utf8?q?=EC=9D=B4=EC=83=81=EA=B7=9C/On-Device=20Lab=28SR=29/Princip?= =?utf8?q?al=20Engineer/=EC=82=BC=EC=84=B1=EC=A0=84=EC=9E=90?= Date: Mon, 18 Nov 2019 16:06:48 +0900 Subject: [PATCH] [nnpkg-run] templatize randomData and introduce unnamed namespace (#9000) It is a preparation step to support qint8 input/output. It templatize randomData and introduce unnamed namespace. Signed-off-by: Sanggyu Lee --- tests/tools/nnpackage_run/src/nnpackage_run.cc | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/tests/tools/nnpackage_run/src/nnpackage_run.cc b/tests/tools/nnpackage_run/src/nnpackage_run.cc index f2a5277..d6e71bc 100644 --- a/tests/tools/nnpackage_run/src/nnpackage_run.cc +++ b/tests/tools/nnpackage_run/src/nnpackage_run.cc @@ -37,6 +37,9 @@ } \ } while (0) +namespace +{ + uint64_t NowMicros() { auto time_point = std::chrono::high_resolution_clock::now(); @@ -56,14 +59,16 @@ uint64_t num_elems(const nnfw_tensorinfo *ti) return n; } -std::vector randomData(RandomGenerator &randgen, uint64_t size) +template std::vector randomData(RandomGenerator &randgen, uint64_t size) { - std::vector vec(size); + std::vector vec(size); for (uint64_t i = 0; i < size; i++) - vec[i] = randgen.generate(); + vec[i] = randgen.generate(); return vec; } +} // unnamed namespace + static const char *h5_value_grpname = "value"; NNFW_STATUS resolve_op_backend(nnfw_session *session) @@ -213,7 +218,7 @@ int main(const int argc, char **argv) nnfw_tensorinfo ti; NNPR_ENSURE_STATUS(nnfw_input_tensorinfo(session, i, &ti)); auto input_num_elements = num_elems(&ti); - inputs[i] = randomData(randgen, input_num_elements); + inputs[i] = randomData(randgen, input_num_elements); NNPR_ENSURE_STATUS(nnfw_set_input(session, i, NNFW_TYPE_TENSOR_FLOAT32, inputs[i].data(), sizeof(float) * input_num_elements)); NNPR_ENSURE_STATUS(nnfw_set_input_layout(session, i, NNFW_LAYOUT_CHANNELS_LAST)); -- 2.7.4