From: Jihoon Lee Date: Mon, 22 Mar 2021 01:33:23 +0000 (+0900) Subject: [UTC][nntrainer][NON-ACR] Support tv tct X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fd88eae1166f8c8962c6914eb21826d7a21e5f8f;p=test%2Ftct%2Fnative%2Fapi.git [UTC][nntrainer][NON-ACR] Support tv tct This patch enables tv tct for the 6.5 tct as 6.5 tct started to support nntrainer Change-Id: I5447158c47091c25c045027cf52c4ffd2f435a27 Signed-off-by: Jihoon Lee --- diff --git a/src/utc/nntrainer/tct-nntrainer-core_tv.h b/src/utc/nntrainer/tct-nntrainer-core_tv.h index fdadae4eb..2b18cdc44 100644 --- a/src/utc/nntrainer/tct-nntrainer-core_tv.h +++ b/src/utc/nntrainer/tct-nntrainer-core_tv.h @@ -77,6 +77,23 @@ extern int utc_nntrainer_model_run_p1(void); extern int utc_nntrainer_model_run_p2(void); extern int utc_nntrainer_model_run_n(void); +/// since tizen 6.5 +extern int utc_nntrainer_layer_create_p2(void); +extern int utc_nntrainer_layer_set_property_bn_p(void); +extern int utc_nntrainer_layer_set_property_bn_n(void); +extern int utc_nntrainer_layer_set_property_conv_p(void); +extern int utc_nntrainer_layer_set_property_conv_n(void); +extern int utc_nntrainer_layer_set_property_pooling_p(void); +extern int utc_nntrainer_layer_set_property_pooling_n(void); +extern int utc_nntrainer_layer_set_property_activation_p(void); +extern int utc_nntrainer_layer_set_property_activation_n(void); +extern int utc_nntrainer_layer_set_property_addition_p(void); +extern int utc_nntrainer_layer_set_property_addition_n(void); +extern int utc_nntrainer_layer_set_property_concat_p(void); +extern int utc_nntrainer_layer_set_property_concat_n(void); +extern int utc_nntrainer_layer_set_property_multiout_p(void); +extern int utc_nntrainer_layer_set_property_multiout_n(void); + testcase tc_array[] = { // layer tcs {"utc_nntrainer_layer_create_p", utc_nntrainer_layer_create_p, utc_nntrainer_layer_startup, utc_nntrainer_layer_cleanup}, @@ -125,6 +142,23 @@ testcase tc_array[] = { {"utc_nntrainer_model_run_p2", utc_nntrainer_model_run_p2, utc_nntrainer_model_startup, utc_nntrainer_model_cleanup}, {"utc_nntrainer_model_run_n", utc_nntrainer_model_run_n, utc_nntrainer_model_startup, utc_nntrainer_model_cleanup}, + /// since tizen 6.5 + {"utc_nntrainer_layer_create_p2", utc_nntrainer_layer_create_p2, utc_nntrainer_layer_startup, utc_nntrainer_layer_cleanup}, + {"utc_nntrainer_layer_set_property_bn_p", utc_nntrainer_layer_set_property_bn_p, utc_nntrainer_layer_startup, utc_nntrainer_layer_cleanup}, + {"utc_nntrainer_layer_set_property_bn_n", utc_nntrainer_layer_set_property_bn_n, utc_nntrainer_layer_startup, utc_nntrainer_layer_cleanup}, + {"utc_nntrainer_layer_set_property_conv_p", utc_nntrainer_layer_set_property_conv_p, utc_nntrainer_layer_startup, utc_nntrainer_layer_cleanup}, + {"utc_nntrainer_layer_set_property_conv_n", utc_nntrainer_layer_set_property_conv_n, utc_nntrainer_layer_startup, utc_nntrainer_layer_cleanup}, + {"utc_nntrainer_layer_set_property_pooling_p", utc_nntrainer_layer_set_property_pooling_p, utc_nntrainer_layer_startup, utc_nntrainer_layer_cleanup}, + {"utc_nntrainer_layer_set_property_pooling_n", utc_nntrainer_layer_set_property_pooling_n, utc_nntrainer_layer_startup, utc_nntrainer_layer_cleanup}, + {"utc_nntrainer_layer_set_property_activation_p", utc_nntrainer_layer_set_property_activation_p, utc_nntrainer_layer_startup, utc_nntrainer_layer_cleanup}, + {"utc_nntrainer_layer_set_property_activation_n", utc_nntrainer_layer_set_property_activation_n, utc_nntrainer_layer_startup, utc_nntrainer_layer_cleanup}, + {"utc_nntrainer_layer_set_property_addition_p", utc_nntrainer_layer_set_property_addition_p, utc_nntrainer_layer_startup, utc_nntrainer_layer_cleanup}, + {"utc_nntrainer_layer_set_property_addition_n", utc_nntrainer_layer_set_property_addition_n, utc_nntrainer_layer_startup, utc_nntrainer_layer_cleanup}, + {"utc_nntrainer_layer_set_property_concat_p", utc_nntrainer_layer_set_property_concat_p, utc_nntrainer_layer_startup, utc_nntrainer_layer_cleanup}, + {"utc_nntrainer_layer_set_property_concat_n", utc_nntrainer_layer_set_property_concat_n, utc_nntrainer_layer_startup, utc_nntrainer_layer_cleanup}, + {"utc_nntrainer_layer_set_property_multiout_p", utc_nntrainer_layer_set_property_multiout_p, utc_nntrainer_layer_startup, utc_nntrainer_layer_cleanup}, + {"utc_nntrainer_layer_set_property_multiout_n", utc_nntrainer_layer_set_property_multiout_n, utc_nntrainer_layer_startup, utc_nntrainer_layer_cleanup}, + {NULL, NULL}, }; diff --git a/src/utc/nntrainer/utc-nntrainer-layer.c b/src/utc/nntrainer/utc-nntrainer-layer.c index d02d7e4ec..0f9d3353e 100644 --- a/src/utc/nntrainer/utc-nntrainer-layer.c +++ b/src/utc/nntrainer/utc-nntrainer-layer.c @@ -73,8 +73,6 @@ int utc_nntrainer_layer_create_p(void) return 0; } -#ifndef TV - /** * @brief function utc_nntrainer_layer_create_p2 * @since_tizen 6.5 @@ -121,8 +119,6 @@ int utc_nntrainer_layer_create_p2(void) return 0; } -#endif - /** * @function utc_nntrainer_layer_create_n * @since_tizen 6.0 @@ -244,8 +240,6 @@ int utc_nntrainer_layer_set_property_n(void) return 0; } -#ifndef TV - /** * @brief function utc_nntrainer_layer_set_property_bn_p * @since_tizen 6.5 @@ -612,4 +606,3 @@ int utc_nntrainer_layer_set_property_multiout_n(void) return 0; } -#endif