1343 Commits

Author SHA1 Message Date
Yu Kun
23d253ea85 Merge remote-tracking branch 'upstream/branch-0.4.0' into branch-0.4.0
Former-commit-id: c8c9e0080c386a357afdacb77440b1c0e6ab1cc2
2019-09-06 11:20:14 +08:00
Yu Kun
ba0640dbf8 add profiling
Former-commit-id: df257a19fb3976072733b6933759358d7e5c6abb
2019-09-06 11:20:05 +08:00
starlord
fd84fdcf66 refine code
Former-commit-id: baaa681395909de65c1a2e588a621bc52d5ff416
2019-09-05 20:34:23 +08:00
starlord
471b8be8eb refine code
Former-commit-id: fba832c2d32bdbaf55cc94c67f7c0e6070b81abb
2019-09-05 20:33:38 +08:00
wxyu
67ed920307 solve conflicts
Former-commit-id: 49468077be74bf12b4407d9c91c3864d8229bcdc
2019-09-05 20:02:32 +08:00
wxyu
c26513a035 MS-488 Improve code format in scheduler
Former-commit-id: e6051b03b5fa09ff5e1e20af65724efb86520edf
2019-09-05 19:58:54 +08:00
starlord
57c33b58b1 Merge remote-tracking branch 'source/branch-0.4.0' into branch-0.4.0
Former-commit-id: cc4142c198d68d98c4a91a1bdf39f7f643700383
2019-09-05 19:51:30 +08:00
jinhai
af4090242f faiss updated to fix ip wrong and k limitation to 2048
Former-commit-id: 5e5094ed17c2aac5d726f6fbb1eae3965e9e8aef
2019-09-05 19:26:57 +08:00
starlord
a9ae881a7c MS-487 Define metric type in CreateTable
Former-commit-id: 28e85927c2d2eadca62749f61be3a08588e1a1be
2019-09-05 17:41:01 +08:00
starlord
6733f13007 change api
Former-commit-id: b414f29182779a48f992094c1ac8d3ca5e3b9f60
2019-09-05 17:32:03 +08:00
peng.xu
96d580ab41 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
MS-470 Drop index success, which table not created

See merge request megasearch/milvus!487

Former-commit-id: e74992b4089c1e93d05d4f5332e2d1b438640441
2019-09-05 17:30:59 +08:00
peng.xu
a2d5adfa72 Merge branch 'update_gpuresource' into 'branch-0.4.0'
MS484 remove idmap search config

See merge request megasearch/milvus!486

Former-commit-id: f2af09bc81dcd999fbbb25d183a127f3893fdd98
2019-09-05 17:30:35 +08:00
zirui.chen
5e037e420f MS-470 Drop index success, which table not created
Former-commit-id: 8ec6d5e60b2095d418446324530ca8e5a84ba8ba
2019-09-05 16:42:33 +08:00
Yu Kun
f90b57d195 revert in searchtask
Former-commit-id: 364a871624ad5a664f8aa9fad2c2006b0388f03d
2019-09-05 16:36:07 +08:00
Yu Kun
53aac70ad9 fix conflicts
Former-commit-id: d9f9e5bcccd2f7e8691471403051f245d8ea4f41
2019-09-05 16:31:48 +08:00
Yu Kun
92aedc55b9 fix conflicts
Former-commit-id: e91a1292e4b65a509f1f1a749d2aac66d8d0d748
2019-09-05 15:55:49 +08:00
xj.lin
d2af21f03f Merge branch 'branch-0.4.0' into update_gpuresource
Former-commit-id: bce35930a0548fc4df5e7d68f3947d868efe8d19
2019-09-05 15:35:44 +08:00
xj.lin
636b4d7914 MS-484 1. remove idmap add search config
Former-commit-id: f698807bbc0a3011f1c3327d596aed2bd0a627ea
2019-09-05 15:35:11 +08:00
Yu Kun
1139157e41 Merge remote-tracking branch 'upstream/branch-0.4.0' into branch-0.4.0
Former-commit-id: 301aebcf3f7733b74b0e18d42060ea1328e347b0
2019-09-05 14:09:29 +08:00
Yu Kun
dc9ca49874 fix conflicts
Former-commit-id: 117e31f7cfff33e1b5716e60e4521faa0ef4ecee
2019-09-05 14:09:19 +08:00
jinhai
2522b04294 Merge branch 'update_gpuresource' into 'branch-0.4.0'
MS-484 1. update faiss version 2. idmap add search config

See merge request megasearch/milvus!485

Former-commit-id: b821c0cc0075c3f0ff6a293b37488daf79c29258
2019-09-05 12:00:39 +08:00
xj.lin
6b422840b4 MS-484 1. update faiss version 2. idmap add search config
Former-commit-id: e9b2131870e0a011a94c6cd2fed8166d9ebd80a5
2019-09-05 11:59:24 +08:00
Yu Kun
c4536f0d74 fix conflicts
Former-commit-id: d23695bdff018e5c94e92286307c6dc52df8ee93
2019-09-05 11:31:00 +08:00
Yu Kun
3f6c9ce766 Merge remote-tracking branch 'upstream/branch-0.4.0' into branch-0.4.0
Former-commit-id: 38cbc16947b3d4d3fabf871a531209fcf8f4ceff
2019-09-05 11:21:34 +08:00
Yu Kun
2fbad4e43f fix conflicts
Former-commit-id: 1e15db53dc0af40678969cd1111458582c055223
2019-09-05 11:21:18 +08:00
Yu Kun
e8429a19ec fix conflicts
Former-commit-id: 91a7705ab4b0d359e3044e40ffb34f1ab650011d
2019-09-05 10:53:45 +08:00
Yu Kun
0fb029eec9 MS-482 Change search stream transport to unary in grpc
Former-commit-id: d2230e4dbe24d3e4176cf1d8b256e8b7b68f91b4
2019-09-05 10:51:46 +08:00
starlord
a30a638d13 Merge remote-tracking branch 'source/branch-0.4.0' into branch-0.4.0
Former-commit-id: d4c83bacbbdeee3c95ddfee4542e56cbc27aa248
2019-09-05 10:48:15 +08:00
xj.lin
ea0443c84e MS-476 1. default value
Former-commit-id: 57341d845d864f22604890004af28708f9fffea9
2019-09-05 10:37:12 +08:00
xj.lin
b24882563d MS-476 1. enable default value
Former-commit-id: 1692514a0749b7fdaaf66679c07903398efd3b7e
2019-09-05 10:32:17 +08:00
starlord
c118d15fa2 Merge remote-tracking branch 'source/branch-0.4.0' into branch-0.4.0
Former-commit-id: d1768235b11458b3199b5b7beaa0836d4d7f791b
2019-09-05 10:32:09 +08:00
starlord
e441dea5cb refine code
Former-commit-id: b873ea2628269323db8230c6c82081cfbefc79b2
2019-09-05 10:32:07 +08:00
xj.lin
ee303a525a MS-476 1. fix resource mgr config
Former-commit-id: 3914417a5fa92e5fe59868e3a0ccb0885fea7f9d
2019-09-04 20:43:26 +08:00
jinhai
1e3965a5aa Merge branch 'new_gpureource' into 'branch-0.4.0'
MS-476 improve gpu performance

See merge request megasearch/milvus!479

Former-commit-id: 5711daa911c2c6c090593b5eaf0ac0514b213d38
2019-09-04 19:24:09 +08:00
yudong.cai
ece4f16289 MS-458 fix bug for keep building index for one file when no gpu resource
Former-commit-id: 3fbf5481c3fa9660e6a1baf26958cb9e6a7cbba7
2019-09-04 17:19:19 +08:00
xj.lin
35492ec0f9 MS-476 1. add resource mgr config
Former-commit-id: 5cae0ea977e93184ad34de39983ef46cb1ab075b
2019-09-04 17:11:25 +08:00
xj.lin
d97f1bd723 Merge branch 'branch-0.4.0' into new_gpureource
Former-commit-id: 559676452dbcf72cb2a3f195c5233ee45bc97ef3
2019-09-04 16:51:03 +08:00
xj.lin
1b4a908510 MS-476 1. update gpuresource mgr 2. improve gpu index performance
Former-commit-id: 0659a3ded3c00befbddc991b3017e76cfca0070d
2019-09-04 16:49:41 +08:00
starlord
b136286c53 remove boring log
Former-commit-id: 2be0fd0de169ff85565e578833e00659ca3cd319
2019-09-04 16:32:22 +08:00
starlord
8d7480314e MS-471 code coverage run failed
Former-commit-id: 9aea558d811b52f9e8349567a3746c3b89b683db
2019-09-04 14:29:46 +08:00
starlord
0399c2b57e refine code
Former-commit-id: cc73d87afb3ce7671f4103c06553562d63eaaf17
2019-09-03 15:24:01 +08:00
zhiru
1e604eca31 Merge remote-tracking branch 'upstream/branch-0.4.0' into cmake
Former-commit-id: 1fbc82b1370cc90d03fac5bee1d1cbec006f7c6d
2019-09-03 14:40:26 +08:00
xj.lin
f307e8dd86 add knowhere error message
Former-commit-id: 2c20ca16ad79f359ecfcf858211f40a289f90376
2019-09-03 11:45:06 +08:00
jinhai
2e594177cc Merge branch 'branch-0.4.0' into 'branch-0.4.0'
MS-463 Search timeout

See merge request megasearch/milvus!471

Former-commit-id: 54cf3521d710116cc87525d434c0f7c6962abe41
2019-09-03 11:27:33 +08:00
Yu Kun
926d474887 MS-463 Search timeout
Former-commit-id: 35dad8989759e24fe749bb0429f72e911eb16aa0
2019-09-03 11:26:12 +08:00
zhiru
ff79e1796e cmake: integerated knowhere
Former-commit-id: bd87ac66e3bc90a85a4fb6517711c4a2c36caaef
2019-09-03 10:18:55 +08:00
xj.lin
0dc0df6bac Merge branch 'branch-0.4.0' into enable_knowhere_test
Former-commit-id: 2eece5caff6b83319bcab406ed91da85f21acb9f
2019-09-03 10:00:23 +08:00
xj.lin
36359554e4 MS-442 enable knowhere wrapper test
Former-commit-id: 6912138096ccc0966999edd6b9b199d7f2092202
2019-09-03 09:59:28 +08:00
Yu Kun
d67a6bce46 merge conflict
Former-commit-id: 19b757b6692fb5a397b85f6188e8772790e04f37
2019-09-02 20:29:57 +08:00
Yu Kun
5857d8163e MS-462 Run milvus server twices, should display error
Former-commit-id: 5d9e7b62470cf48ba84d7be358b0f277268fa831
2019-09-02 20:28:01 +08:00