f4ec5fd4ae
* import from branch commit c86bcf48fa6acd19647a7a096b9e1a5d4e56cc74 Merge: 0fa88051b da75b2a52 Author: Masahiro Masuda <masahi129@gmail.com> Date: Sun May 30 12:13:29 2021 +0900 Merge branch 'tmp' into all_class_nms_tf commit 0fa88051b3d30337674a07e579b78e8cb254cd66 Author: Masahiro Masuda <masahi129@gmail.com> Date: Sun May 30 06:24:57 2021 +0900 Revert "handling case when num detections is smaller than max_total_size" This reverts commit 61e70b82f338300224b22f4d6bdda349e7aa5aca. commit 67251504c652e36106718617c5ae8b42c61deffc Author: Masahiro Masuda <masahi129@gmail.com> Date: Sun May 30 05:43:06 2021 +0900 handling case when num detections is smaller than max_total_size commit 39549aa25267617671ca2a82ca517442065afe97 Author: Masahiro Masuda <masahi129@gmail.com> Date: Sun May 30 05:32:37 2021 +0900 simplify frontend commit ca9470ba68e68c81902b0a3bad4bf5b5f0aa311e Author: Masahiro Masuda <masahi129@gmail.com> Date: Sun May 30 05:25:13 2021 +0900 update op definition commit 47bdef9e0fcdbab4671dd46044be5acac24b2f2b Author: Masahiro Masuda <masahi129@gmail.com> Date: Sat May 29 19:47:04 2021 +0900 remove unnecessary mask commit 445a7daf1afb794be5f03473c70b172f06556d05 Author: Masahiro Masuda <masahi129@gmail.com> Date: Sat May 29 16:54:19 2021 +0900 remove in_buffer commit 71879b115b3bfe8087b73618bdab16fd61fbed86 Author: Masahiro Masuda <masahi129@gmail.com> Date: Sat May 29 16:48:22 2021 +0900 minor fix commit 72e055a721ee7d698e7b3a3f58ab074ab78b57b2 Author: Masahiro Masuda <masahi129@gmail.com> Date: Sat May 29 16:45:37 2021 +0900 make it more readable commit a1fe7c46d6bb77da51de24b46bec881ed19d4cb3 Author: Masahiro Masuda <masahi129@gmail.com> Date: Sat May 29 16:44:14 2021 +0900 clean up commit 0c659bf27f9b90dd53455abd0d24b42f86e802bb Author: Masahiro Masuda <masahi129@gmail.com> Date: Sat May 29 16:33:54 2021 +0900 improve sort on cpu commit 480f6b782427dd46514efbf7028de4fb9f5ff9aa Author: Masahiro Masuda <masahi129@gmail.com> Date: Sat May 29 16:29:53 2021 +0900 collect indices and scores in one kernel commit 2b441c391a25930092b55f12dadc31832400277b Author: Masahiro Masuda <masahi129@gmail.com> Date: Sat May 29 15:47:31 2021 +0900 initialization bug fixed in cuda commit d43e801289621e71a79c71308dedeef0969264be Author: Masahiro Masuda <masahi129@gmail.com> Date: Sat May 29 15:23:09 2021 +0900 cpu nms bug fixed commit 025010e42110388d0de2bc2ffcd76fbe14a188fb Author: Masahiro Masuda <masahi129@gmail.com> Date: Sat May 29 11:09:47 2021 +0900 add cpu impl commit 787d8399ff160694ecd2c4a9721a5825ca945d81 Author: Masahiro Masuda <masahi129@gmail.com> Date: Sat May 29 10:38:20 2021 +0900 refactoring commit 05404305d1323b475829de10aa68f1f8791686cc Author: Masahiro Masuda <masahi129@gmail.com> Date: Sat May 29 10:03:51 2021 +0900 initial import commit 5ff0985625ec75f117af37017ebf4089dafb8a46 Author: Masahiro Masuda <masahi129@gmail.com> Date: Sat May 29 10:02:45 2021 +0900 cleanup commit 199f9b67c2d471a761f743e6ea5fa414c899bd3f Author: Masahiro Masuda <masahi129@gmail.com> Date: Sat May 29 10:00:15 2021 +0900 Revert "add gather_nd shape func" This reverts commit 1ff4d53f057e7bfd1c6dff31a81f866727bef855. commit 47a05c4c8f5a56a1685848210229aaa083b92880 Author: Masahiro Masuda <masahi129@gmail.com> Date: Sat May 29 09:53:00 2021 +0900 format commit 9dcd0f02b25d658c94fa23e2cc65a9424ed8a1a5 Author: Masahiro Masuda <masahi129@gmail.com> Date: Sat May 29 09:48:43 2021 +0900 make it static commit eb06393939f1b8d8130f3815dc0f66223c9aa4f3 Author: Masahiro Masuda <masahi129@gmail.com> Date: Sat May 29 09:14:31 2021 +0900 restore old impl and use it for q != 1 case commit 115a5dfcf9b552fb2682534d82bbf638e661c0aa Author: Masahiro Masuda <masahi129@gmail.com> Date: Sat May 29 09:00:40 2021 +0900 fixed score gathering commit d2035626a72f8df71c514e3293337f6fda723353 Author: Masahiro Masuda <masahi129@gmail.com> Date: Sat May 29 08:53:14 2021 +0900 minimum fixed commit 3fe91e8846b6d2075ae1d9a162c4b70b08cc8024 Author: Masahiro Masuda <masahi129@gmail.com> Date: Sat May 29 06:59:39 2021 +0900 batch issue fixed commit 19e3e84690c0289c85001597046969d0c8dc92c2 Author: Masahiro Masuda <masahi129@gmail.com> Date: Sat May 29 04:29:15 2021 +0900 zero padding working This reverts commit58c3413a30. commit ce7848ba7def5a22659b09de039b2df12c0114f9 Author: Masahiro Masuda <masahi129@gmail.com> Date: Fri May 28 13:12:47 2021 +0900 pylint, do not use -1 for default value commit 968f3bd230ed4855b45fd739dfc86edc2335ec80 Author: Masahiro Masuda <masahi129@gmail.com> Date: Fri May 28 13:07:31 2021 +0900 rename to index_rank and make it Optional commit 9e06b8491e0ce1c981a5059f28135319f96978d0 Author: Masahiro Masuda <masahi129@gmail.com> Date: Fri May 21 18:01:59 2021 +0900 fix pylint commit 81dc6050dcbe59915a8f9b4f78b4aaf9fdba89a6 Author: Masahiro Masuda <masahi129@gmail.com> Date: Fri May 21 17:57:03 2021 +0900 minor fix commit 54297b6128863d07e7dded71cc40077726faf2db Author: Masahiro Masuda <masahi129@gmail.com> Date: Fri May 21 17:54:16 2021 +0900 support dynamic scatter nd commit e25c225ce747c4e84452e6e7b32eeb0d71b2995d Author: Masahiro Masuda <masahi129@gmail.com> Date: Fri May 21 17:33:19 2021 +0900 gather_dim -> num_indices_per_tuple commit aaa6211e7ef3ce520b8711a78cf7eb2af52e7acc Author: Masahiro Masuda <masahi129@gmail.com> Date: Fri May 21 17:23:46 2021 +0900 add dynamic gather_nd test commit 3a9fe5dfa5faeadbcdb882ff70039ea7bccb61a3 Author: Masahiro Masuda <masahi129@gmail.com> Date: Fri May 21 17:18:26 2021 +0900 refactor gather_nd ref funcs commit 1ff4d53f057e7bfd1c6dff31a81f866727bef855 Author: Masahiro Masuda <masahi129@gmail.com> Date: Fri May 21 14:36:34 2021 +0900 add gather_nd shape func commit b0200643a184294a2f2b3cce7208c4d257987424 Author: Masahiro Masuda <masahi129@gmail.com> Date: Sat May 29 04:01:11 2021 +0900 working on zero padding commit 456741790dd5e73f3f76ef7a5ede6e1014de8b2d Author: Masahiro Masuda <masahi129@gmail.com> Date: Sat May 29 03:21:52 2021 +0900 working commit 7f5c76d0090950985888781f071ca341e2fa5695 Author: Masahiro Masuda <masahi129@gmail.com> Date: Sat May 29 02:37:50 2021 +0900 relay type inference works, debugging topi commit 4a4b8dfbfdc65d7a6e77ed0a6e8b09af162b77ad Author: Masahiro Masuda <masahi129@gmail.com> Date: Fri May 28 15:08:16 2021 +0900 add max_total_size to attributes commit 7218b2f7b4de0c796d69f23084cd688e28f7b461 Author: Masahiro Masuda <masahi129@gmail.com> Date: Fri May 28 14:50:58 2021 +0900 tf frontend update commit cde4a1fdd15ed898b1f7299e99377cceaaee2732 Author: Masahiro Masuda <masahi129@gmail.com> Date: Fri May 28 14:17:14 2021 +0900 all class nms tf mode first cut commit 5f349f77c9c230ee636aceb52547502319c8ad77 Author: Masahiro Masuda <masahi129@gmail.com> Date: Fri May 28 06:54:34 2021 +0900 begin supporting per batch output commit 0044365affac6667a02d15791a59040702f8990b Author: Trevor Morris <trevmorr@amazon.com> Date: Mon May 3 19:46:28 2021 +0000 initial commit 168a617e48b062417b766d6400b0c6b856084cfa Author: Trevor Morris <trevmorr@amazon.com> Date: Fri Apr 16 20:31:32 2021 +0000 initia; l commit da75b2a52e9a8daa322168d1b6026e144d42d5bb Author: Masahiro Masuda <masahi129@gmail.com> Date: Sun May 30 07:58:19 2021 +0900 do minimum in topi commit 52c5e8a5bca56f93778990d4faa87c7e7b342ba7 Author: Masahiro Masuda <masahi129@gmail.com> Date: Sun May 30 07:54:49 2021 +0900 more simplify commit 44d88cdecd87468b630fd16a7d1e1214e86eabfa Author: Masahiro Masuda <masahi129@gmail.com> Date: Sun May 30 07:51:39 2021 +0900 simplify commit 74e19174f1b2d40ee8f4d08c7a61667bc3dd69b5 Author: Masahiro Masuda <masahi129@gmail.com> Date: Sun May 30 07:39:37 2021 +0900 black commit fc3a38e1cb699b66340c7742cb74188fdbe92bf5 Author: Masahiro Masuda <masahi129@gmail.com> Date: Sun May 30 07:37:30 2021 +0900 minor change commit f88e2a3a98a7ee283622e57712e28634374e5e2c Author: Masahiro Masuda <masahi129@gmail.com> Date: Sun May 30 07:14:54 2021 +0900 minor refactor commit f2d7ed410a0b835586929706873ee1f448d1f955 Author: Masahiro Masuda <masahi129@gmail.com> Date: Sun May 30 07:08:47 2021 +0900 support the case when there is not enough box commit 0f184a6bf6e533c91d26c98a7a17f8d7970364cc Author: Masahiro Masuda <masahi129@gmail.com> Date: Sun May 30 06:24:16 2021 +0900 Revert "handling case when num detections is smaller than max_total_size" This reverts commit 61e70b82f338300224b22f4d6bdda349e7aa5aca. commit d7180f27cfaffbbd1ab1ce970ca605133bc812ee Merge: 61e70b82f 06ac2052a Author: Masahiro Masuda <masahi129@gmail.com> Date: Sun May 30 05:43:37 2021 +0900 Merge branch 'gather_nd_shape_func' into tmp commit 61e70b82f338300224b22f4d6bdda349e7aa5aca Author: Masahiro Masuda <masahi129@gmail.com> Date: Sun May 30 05:43:06 2021 +0900 handling case when num detections is smaller than max_total_size commit 453a79bd05f67653be8b90db80ecde12d343aea6 Author: Masahiro Masuda <masahi129@gmail.com> Date: Sun May 30 05:32:37 2021 +0900 simplify frontend commit 2fc5f1ed3de49266f1eb72aed25d26457da78491 Author: Masahiro Masuda <masahi129@gmail.com> Date: Sun May 30 05:25:13 2021 +0900 update op definition commit 8afbd30c0fbbd40902acc4196a18b448f2a93266 Author: Masahiro Masuda <masahi129@gmail.com> Date: Sat May 29 19:47:04 2021 +0900 remove unnecessary mask commit ff870f7e972e289953ca0e5daa444c09e5095efa Author: Masahiro Masuda <masahi129@gmail.com> Date: Sat May 29 16:54:19 2021 +0900 remove in_buffer commit e71b922b6cdf129ef51e91928635374a1f02a6fc Author: Masahiro Masuda <masahi129@gmail.com> Date: Sat May 29 16:48:22 2021 +0900 minor fix commit b02faaead24d2d14d3b67bf04ee23f9df9bfecbe Author: Masahiro Masuda <masahi129@gmail.com> Date: Sat May 29 16:45:37 2021 +0900 make it more readable commit 6baee99ed1b57be8da06c00e17d6b92083668ac0 Author: Masahiro Masuda <masahi129@gmail.com> Date: Sat May 29 16:44:14 2021 +0900 clean up commit 7a2a2df8b696faf7c4280fd9a3f9fbdf8f5c3e03 Author: Masahiro Masuda <masahi129@gmail.com> Date: Sat May 29 16:33:54 2021 +0900 improve sort on cpu commit afad2a2e920c98d269c6000035f31392cff7b6a3 Author: Masahiro Masuda <masahi129@gmail.com> Date: Sat May 29 16:29:53 2021 +0900 collect indices and scores in one kernel commit c5718e299a82ffe5e60bc1fee679b2b0405346e5 Author: Masahiro Masuda <masahi129@gmail.com> Date: Sat May 29 15:47:31 2021 +0900 initialization bug fixed in cuda commit 5623e3f8f71de1dbec55c83a300fa4131cd82aad Author: Masahiro Masuda <masahi129@gmail.com> Date: Sat May 29 15:23:09 2021 +0900 cpu nms bug fixed commit c40eaecd87513a6869098ed95c03b8553c350414 Author: Masahiro Masuda <masahi129@gmail.com> Date: Sat May 29 11:09:47 2021 +0900 add cpu impl commit 6c7aaeb44f5586b57e7b1bfd7772d1b78a9eae1f Author: Masahiro Masuda <masahi129@gmail.com> Date: Sat May 29 10:38:20 2021 +0900 refactoring commit 7b87922279121f06cdcc77a41ac6c8f59b6d5549 Author: Masahiro Masuda <masahi129@gmail.com> Date: Sat May 29 10:03:51 2021 +0900 initial import commit 5ff0985625ec75f117af37017ebf4089dafb8a46 Author: Masahiro Masuda <masahi129@gmail.com> Date: Sat May 29 10:02:45 2021 +0900 cleanup commit 199f9b67c2d471a761f743e6ea5fa414c899bd3f Author: Masahiro Masuda <masahi129@gmail.com> Date: Sat May 29 10:00:15 2021 +0900 Revert "add gather_nd shape func" This reverts commit 1ff4d53f057e7bfd1c6dff31a81f866727bef855. commit 47a05c4c8f5a56a1685848210229aaa083b92880 Author: Masahiro Masuda <masahi129@gmail.com> Date: Sat May 29 09:53:00 2021 +0900 format commit 9dcd0f02b25d658c94fa23e2cc65a9424ed8a1a5 Author: Masahiro Masuda <masahi129@gmail.com> Date: Sat May 29 09:48:43 2021 +0900 make it static commit eb06393939f1b8d8130f3815dc0f66223c9aa4f3 Author: Masahiro Masuda <masahi129@gmail.com> Date: Sat May 29 09:14:31 2021 +0900 restore old impl and use it for q != 1 case commit 115a5dfcf9b552fb2682534d82bbf638e661c0aa Author: Masahiro Masuda <masahi129@gmail.com> Date: Sat May 29 09:00:40 2021 +0900 fixed score gathering commit d2035626a72f8df71c514e3293337f6fda723353 Author: Masahiro Masuda <masahi129@gmail.com> Date: Sat May 29 08:53:14 2021 +0900 minimum fixed commit 3fe91e8846b6d2075ae1d9a162c4b70b08cc8024 Author: Masahiro Masuda <masahi129@gmail.com> Date: Sat May 29 06:59:39 2021 +0900 batch issue fixed commit 19e3e84690c0289c85001597046969d0c8dc92c2 Author: Masahiro Masuda <masahi129@gmail.com> Date: Sat May 29 04:29:15 2021 +0900 zero padding working This reverts commit58c3413a30. commit ce7848ba7def5a22659b09de039b2df12c0114f9 Author: Masahiro Masuda <masahi129@gmail.com> Date: Fri May 28 13:12:47 2021 +0900 pylint, do not use -1 for default value commit 968f3bd230ed4855b45fd739dfc86edc2335ec80 Author: Masahiro Masuda <masahi129@gmail.com> Date: Fri May 28 13:07:31 2021 +0900 rename to index_rank and make it Optional commit 9e06b8491e0ce1c981a5059f28135319f96978d0 Author: Masahiro Masuda <masahi129@gmail.com> Date: Fri May 21 18:01:59 2021 +0900 fix pylint commit 81dc6050dcbe59915a8f9b4f78b4aaf9fdba89a6 Author: Masahiro Masuda <masahi129@gmail.com> Date: Fri May 21 17:57:03 2021 +0900 minor fix commit 54297b6128863d07e7dded71cc40077726faf2db Author: Masahiro Masuda <masahi129@gmail.com> Date: Fri May 21 17:54:16 2021 +0900 support dynamic scatter nd commit e25c225ce747c4e84452e6e7b32eeb0d71b2995d Author: Masahiro Masuda <masahi129@gmail.com> Date: Fri May 21 17:33:19 2021 +0900 gather_dim -> num_indices_per_tuple commit aaa6211e7ef3ce520b8711a78cf7eb2af52e7acc Author: Masahiro Masuda <masahi129@gmail.com> Date: Fri May 21 17:23:46 2021 +0900 add dynamic gather_nd test commit 3a9fe5dfa5faeadbcdb882ff70039ea7bccb61a3 Author: Masahiro Masuda <masahi129@gmail.com> Date: Fri May 21 17:18:26 2021 +0900 refactor gather_nd ref funcs commit 1ff4d53f057e7bfd1c6dff31a81f866727bef855 Author: Masahiro Masuda <masahi129@gmail.com> Date: Fri May 21 14:36:34 2021 +0900 add gather_nd shape func commit b0200643a184294a2f2b3cce7208c4d257987424 Author: Masahiro Masuda <masahi129@gmail.com> Date: Sat May 29 04:01:11 2021 +0900 working on zero padding commit 456741790dd5e73f3f76ef7a5ede6e1014de8b2d Author: Masahiro Masuda <masahi129@gmail.com> Date: Sat May 29 03:21:52 2021 +0900 working commit 7f5c76d0090950985888781f071ca341e2fa5695 Author: Masahiro Masuda <masahi129@gmail.com> Date: Sat May 29 02:37:50 2021 +0900 relay type inference works, debugging topi commit 4a4b8dfbfdc65d7a6e77ed0a6e8b09af162b77ad Author: Masahiro Masuda <masahi129@gmail.com> Date: Fri May 28 15:08:16 2021 +0900 add max_total_size to attributes commit 7218b2f7b4de0c796d69f23084cd688e28f7b461 Author: Masahiro Masuda <masahi129@gmail.com> Date: Fri May 28 14:50:58 2021 +0900 tf frontend update commit cde4a1fdd15ed898b1f7299e99377cceaaee2732 Author: Masahiro Masuda <masahi129@gmail.com> Date: Fri May 28 14:17:14 2021 +0900 all class nms tf mode first cut commit 5f349f77c9c230ee636aceb52547502319c8ad77 Author: Masahiro Masuda <masahi129@gmail.com> Date: Fri May 28 06:54:34 2021 +0900 begin supporting per batch output commit 0044365affac6667a02d15791a59040702f8990b Author: Trevor Morris <trevmorr@amazon.com> Date: Mon May 3 19:46:28 2021 +0000 initial commit 168a617e48b062417b766d6400b0c6b856084cfa Author: Trevor Morris <trevmorr@amazon.com> Date: Fri Apr 16 20:31:32 2021 +0000 initia; l commit 06ac2052ab843be950ff3abf6ce8d52803adc5e5 Author: Masahiro Masuda <masahi129@gmail.com> Date: Fri May 28 13:12:47 2021 +0900 pylint, do not use -1 for default value commit 2adc42618580c967bd49d53c0724382f9cf87772 Author: Masahiro Masuda <masahi129@gmail.com> Date: Fri May 28 13:07:31 2021 +0900 rename to index_rank and make it Optional commit c458da6e80b0ff7b6e2ca729a49755f42dfe3702 Author: Masahiro Masuda <masahi129@gmail.com> Date: Fri May 21 18:01:59 2021 +0900 fix pylint commit b7faf0f93bd3ba4fc0eb88f1fac31c8d9525c883 Author: Masahiro Masuda <masahi129@gmail.com> Date: Fri May 21 17:57:03 2021 +0900 minor fix commit c03164116046670963f1d04529bfe94c5030ad17 Author: Masahiro Masuda <masahi129@gmail.com> Date: Fri May 21 17:54:16 2021 +0900 support dynamic scatter nd commit 56f3f0ea3fae4ba049101fcb4571b8999a3bda1c Author: Masahiro Masuda <masahi129@gmail.com> Date: Fri May 21 17:33:19 2021 +0900 gather_dim -> num_indices_per_tuple commit 081823b0129093602bb7f512f326eeb10bfb1906 Author: Masahiro Masuda <masahi129@gmail.com> Date: Fri May 21 17:23:46 2021 +0900 add dynamic gather_nd test commit 6b2655baf867b4d08e7d21ffe5f854228ced57e9 Author: Masahiro Masuda <masahi129@gmail.com> Date: Fri May 21 17:18:26 2021 +0900 refactor gather_nd ref funcs commit f9f5dfbe2a65eff8aa6718bf05fd8a843c5df08f Author: Masahiro Masuda <masahi129@gmail.com> Date: Fri May 21 14:36:34 2021 +0900 add gather_nd shape func * make combined nms converter public * do topk on smaller score tensor * update tests * remove max_total_size attribute, do minimum in relay side * fix topk * update relay doc * update doc * fix pylint * update shape func for tf mode and add test * name change * reject dynamic inputs * revert gather_nd change * do not try to support dynamic batch size in tile rep * check batch_size is int * fix dtype issue in scan * fix slicing before topk