From: 이상규/On-Device Lab(SR)/Principal Engineer/삼성전자 Date: Mon, 12 Aug 2019 10:13:45 +0000 (+0900) Subject: [neurun] change int to uint32_t for size of input/output (#6502) X-Git-Tag: accepted/tizen/unified/20190903.052428~465 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c2ab29fdc9896fae6a65b14b7063d6aa0ab5e075;p=platform%2Fcore%2Fml%2Fnnfw.git [neurun] change int to uint32_t for size of input/output (#6502) neurun uses uint32_t internally. Runtime API uses int. This patch will change Runtime API to use uint32_t. (same type to `neurun` internal). Signed-off-by: Sanggyu Lee --- diff --git a/runtimes/include/nnfw.h b/runtimes/include/nnfw.h index 93371ee..6f259d0 100644 --- a/runtimes/include/nnfw.h +++ b/runtimes/include/nnfw.h @@ -111,8 +111,8 @@ NNFW_STATUS nnfw_run(nnfw_session *session); * @return NNFW_STATUS_NO_ERROR if successful */ -NNFW_STATUS nnfw_set_input(nnfw_session *session, int index, NNFW_TYPE type, const void *buffer, - size_t length); +NNFW_STATUS nnfw_set_input(nnfw_session *session, uint32_t index, NNFW_TYPE type, + const void *buffer, size_t length); /* * Set output @@ -126,7 +126,7 @@ NNFW_STATUS nnfw_set_input(nnfw_session *session, int index, NNFW_TYPE type, con * @return NNFW_STATUS_NO_ERROR if successful */ -NNFW_STATUS nnfw_set_output(nnfw_session *session, int index, NNFW_TYPE type, void *buffer, +NNFW_STATUS nnfw_set_output(nnfw_session *session, uint32_t index, NNFW_TYPE type, void *buffer, size_t length); /* @@ -137,7 +137,7 @@ NNFW_STATUS nnfw_set_output(nnfw_session *session, int index, NNFW_TYPE type, vo * * @return NNFW_STATUS_NO_ERROR if successful */ -NNFW_STATUS nnfw_input_size(nnfw_session *session, int *number); +NNFW_STATUS nnfw_input_size(nnfw_session *session, uint32_t *number); /* * Get the number of outputs @@ -147,7 +147,7 @@ NNFW_STATUS nnfw_input_size(nnfw_session *session, int *number); * * @return NNFW_STATUS_NO_ERROR if successful */ -NNFW_STATUS nnfw_output_size(nnfw_session *session, int *number); +NNFW_STATUS nnfw_output_size(nnfw_session *session, uint32_t *number); /* * Get i-th input tensor info @@ -158,7 +158,8 @@ NNFW_STATUS nnfw_output_size(nnfw_session *session, int *number); * * @return NNFW_STATUS_NO_ERROR if successful */ -NNFW_STATUS nnfw_input_tensorinfo(nnfw_session *session, int index, nnfw_tensorinfo *tensor_info); +NNFW_STATUS nnfw_input_tensorinfo(nnfw_session *session, uint32_t index, + nnfw_tensorinfo *tensor_info); /* * Get i-th output tensor info @@ -169,7 +170,8 @@ NNFW_STATUS nnfw_input_tensorinfo(nnfw_session *session, int index, nnfw_tensori * * @return NNFW_STATUS_NO_ERROR if successful */ -NNFW_STATUS nnfw_output_tensorinfo(nnfw_session *session, int index, nnfw_tensorinfo *tensor_info); +NNFW_STATUS nnfw_output_tensorinfo(nnfw_session *session, uint32_t index, + nnfw_tensorinfo *tensor_info); #ifdef __cplusplus } diff --git a/runtimes/neurun/frontend/api/nnfw_dev.cc b/runtimes/neurun/frontend/api/nnfw_dev.cc index 16f9667..88d5aaa 100644 --- a/runtimes/neurun/frontend/api/nnfw_dev.cc +++ b/runtimes/neurun/frontend/api/nnfw_dev.cc @@ -83,8 +83,8 @@ NNFW_STATUS nnfw_run(nnfw_session *session) { return session->run(); } * @return NNFW_STATUS_NO_ERROR if successful */ -NNFW_STATUS nnfw_set_input(nnfw_session *session, int index, NNFW_TYPE type, const void *buffer, - size_t length) +NNFW_STATUS nnfw_set_input(nnfw_session *session, uint32_t index, NNFW_TYPE type, + const void *buffer, size_t length) { return session->set_input(index, type, buffer, length); } @@ -101,7 +101,7 @@ NNFW_STATUS nnfw_set_input(nnfw_session *session, int index, NNFW_TYPE type, con * @return NNFW_STATUS_NO_ERROR if successful */ -NNFW_STATUS nnfw_set_output(nnfw_session *session, int index, NNFW_TYPE type, void *buffer, +NNFW_STATUS nnfw_set_output(nnfw_session *session, uint32_t index, NNFW_TYPE type, void *buffer, size_t length) { return session->set_output(index, type, buffer, length); diff --git a/runtimes/neurun/frontend/api/wrapper/nnfw_api.cc b/runtimes/neurun/frontend/api/wrapper/nnfw_api.cc index 02fc028..4fcdf55 100644 --- a/runtimes/neurun/frontend/api/wrapper/nnfw_api.cc +++ b/runtimes/neurun/frontend/api/wrapper/nnfw_api.cc @@ -100,7 +100,7 @@ NNFW_STATUS nnfw_session::run() return NNFW_STATUS_NO_ERROR; } -NNFW_STATUS nnfw_session::set_input(int index, NNFW_TYPE /*type*/, const void *buffer, +NNFW_STATUS nnfw_session::set_input(uint32_t index, NNFW_TYPE /*type*/, const void *buffer, size_t length) { try @@ -115,7 +115,8 @@ NNFW_STATUS nnfw_session::set_input(int index, NNFW_TYPE /*type*/, const void *b return NNFW_STATUS_NO_ERROR; } -NNFW_STATUS nnfw_session::set_output(int index, NNFW_TYPE /*type*/, void *buffer, size_t length) +NNFW_STATUS nnfw_session::set_output(uint32_t index, NNFW_TYPE /*type*/, void *buffer, + size_t length) { try { diff --git a/runtimes/neurun/frontend/api/wrapper/nnfw_api.hpp b/runtimes/neurun/frontend/api/wrapper/nnfw_api.hpp index 8d31ad2..75db5e8 100644 --- a/runtimes/neurun/frontend/api/wrapper/nnfw_api.hpp +++ b/runtimes/neurun/frontend/api/wrapper/nnfw_api.hpp @@ -31,8 +31,8 @@ public: NNFW_STATUS prepare(); NNFW_STATUS run(); - NNFW_STATUS set_input(int index, NNFW_TYPE type, const void *buffer, size_t length); - NNFW_STATUS set_output(int index, NNFW_TYPE type, void *buffer, size_t length); + NNFW_STATUS set_input(uint32_t index, NNFW_TYPE type, const void *buffer, size_t length); + NNFW_STATUS set_output(uint32_t index, NNFW_TYPE type, void *buffer, size_t length); private: std::shared_ptr _graph;