Commit Graph

2934 Commits (2fc179104d16a6287f94757dc20b783d902d6094)

Author SHA1 Message Date
JinHai-CN 2eeee72f40 MS-613 Integrate new faiss
Former-commit-id: 40982d3b5f39debbd8964274481930b07ba55020
2019-10-08 17:40:54 +08:00
Yu Kun f048ecf060 Merge remote-tracking branch 'upstream/branch-0.5.0' into branch-0.5.0-yk
Former-commit-id: cda7fa0f39647f247cb18cd225c0f52b8cf171eb
2019-10-08 17:26:30 +08:00
Yu Kun 0af6d85ea9 fix conflict
Former-commit-id: afdfa1f34302637762b06fa6ccb4058dbb391922
2019-10-08 17:26:25 +08:00
jinhai 5e64d845e9 Merge branch 'branch-0.5.0' into 'branch-0.5.0'
refine code

See merge request megasearch/milvus!664

Former-commit-id: ab4a168e0464af06b0dd9f989bc4ee207f237e38
2019-10-08 16:28:07 +08:00
jinhai bfb09cb4fa Merge branch 'branch-0.5.0' into 'branch-0.5.0'
MS-611 Add resources validity check in ResourceMgr

See merge request megasearch/milvus!663

Former-commit-id: 23765cd27ce07bd0f74373800ffb9e91c9293a67
2019-10-08 16:27:46 +08:00
Yu Kun 0a77b4547f fix conflict
Former-commit-id: b51828bbff45e2c3eeb2eaeb72b1e4adebda0550
2019-10-08 16:07:46 +08:00
Yu Kun bdbc1375d7 MS-603 Add BuildIndex to scheduler
Former-commit-id: f962874aac6dd92b4cdf121ca8a645185bc5882f
2019-10-08 16:05:57 +08:00
starlord 1040298ec0 refine code
Former-commit-id: 5303054b0769e7f03a16ede2ff42f7068663b889
2019-10-08 15:44:03 +08:00
wxyu d0e7744abc MS-611 Add resources validity check in ResourceMgr
Former-commit-id: cc00283529c2e56ee9829c2f42d7c217d1ba3f42
2019-10-08 15:24:50 +08:00
wxyu 0d3da0b841 MS-611 Add resources validity check in ResourceMgr
Former-commit-id: 0957d8980a07a07434bc2bea3ecff686a56cb127
2019-10-08 15:03:16 +08:00
jinhai e62a7b3626 Merge branch 'branch-0.5.0' into 'branch-0.5.0'
MS-611 Add resources validity check in ResourceMgr

See merge request megasearch/milvus!662

Former-commit-id: bd4b9327b9fbd101e6811f6002f4dae4ff105f05
2019-10-08 14:49:04 +08:00
wxyu 6d0a2489c0 MS-611 Add resources validity check in ResourceMgr
Former-commit-id: 8732bacae82613066c415d4e22db256f9b8056d2
2019-10-08 14:48:11 +08:00
jinhai 3948c84c02 Merge branch 'branch-0.5.0' into 'branch-0.5.0'
MS-606 speed up result reduce

See merge request megasearch/milvus!661

Former-commit-id: 8dcea1323c9ef97803bb2e94fcfc56431b37f3bf
2019-10-08 14:35:52 +08:00
yudong.cai e9e263fdb7 MS-606 speed up result reduce
Former-commit-id: 775557c15789b01d63d149ae495653af3cdaca38
2019-10-08 14:34:17 +08:00
jinhai dc72f1dd59 Merge branch 'branch-0.5.0' into 'branch-0.5.0'
MS-610 Change error code base value from hex to decimal

See merge request megasearch/milvus!660

Former-commit-id: de9a27e7644bbb8416bad57ad87a86e41f98c36c
2019-10-08 11:53:29 +08:00
jinhai 5f18abe80a Merge branch 'branch-0.5.0' into 'branch-0.5.0'
MS-611 Add resources validity check in ResourceMgr

See merge request megasearch/milvus!659

Former-commit-id: 8360abe8b2cce5953c3147a30d255cb4d99741c1
2019-10-08 11:53:09 +08:00
wxyu e27e6741d3 MS-611 Add resources validity check in ResourceMgr
Former-commit-id: 55900459b4b25b27328b1ef85540f423742e70a3
2019-10-08 11:52:30 +08:00
starlord 0b2bd8d5ab MS-610 Change error code base value from hex to decimal
Former-commit-id: 4b12f9998a2490a2b059514301f67883d5e730f4
2019-10-08 11:52:05 +08:00
jinhai 37b519ff1e Merge branch 'branch-0.5.0' into 'branch-0.5.0'
MS-609 Update task construct function

See merge request megasearch/milvus!658

Former-commit-id: efa7467a04e40727dd47ce8db8a85a6169c774ea
2019-10-07 19:03:06 +08:00
wxyu 14d9af54a3 MS-609 Update task construct function
Former-commit-id: f187500ad365a90ae751b6fd4efa7f8b10e2f6c4
2019-10-07 19:01:56 +08:00
wxyu 3ad2b8d74c MS-608 Update TODO names
Former-commit-id: 6a3cabeef62feb3c3125bc5e9a9b2c4f6eb20d7c
2019-10-07 15:29:56 +08:00
JinHai-CN 0c05edfddb MS-595 Fix compiling error on gcc 7.4
Former-commit-id: 4f602467afe2e6e859c3d7772a6136a6ee5d0fcf
2019-10-06 14:46:03 +08:00
Yu Kun bc10937bcf buildindex to scheduler run ok
Former-commit-id: 5d596c2cdc543d1093992d8a09594a1ca7d5d17a
2019-09-30 19:16:56 +08:00
Yu Kun a211263a2b fix conflicts
Former-commit-id: 83735ff50291d142aa5e7b94149e20c55b963020
2019-09-29 16:45:20 +08:00
Yu Kun b815cc36fe complete BuildIndexJob and BuildIndexTask
Former-commit-id: 3b5d96f4800860b7b3fb09fa3d64b9b3f41441b8
2019-09-29 16:43:03 +08:00
jinhai 6fe1fb9a11 Merge branch 'branch-0.5.0' into 'branch-0.5.0'
MS-602 Remove zilliz namespace

See merge request megasearch/milvus!651

Former-commit-id: a24e2508be51603e17447cbd7d91689fdba64299
2019-09-29 16:39:49 +08:00
jinhai 0a684872ff Merge branch 'branch-0.5.0' into 'branch-0.5.0'
MS-599 search wrong result when table created with metric_type: IP

See merge request megasearch/milvus!648

Former-commit-id: f104254ac9efde0aa9f1e45df23f2faa0554ffc9
2019-09-29 16:39:34 +08:00
starlord aa1be9cd16 Remove zilliz namespace
Former-commit-id: 18ae9b5711cabd59baf7e0784583f99a655bf9c2
2019-09-29 16:37:34 +08:00
wxyu 26a6bb6b87 MS-599 search wrong result when table created with metric_type: IP
Former-commit-id: 7dd107fa0126919ba7948cc0bacb6b1426f2d7c8
2019-09-29 15:05:00 +08:00
quicksilver fd25f05979 add resources limits
Former-commit-id: 5f249b0c9ce1a2c5667512e2420941f115a797aa
2019-09-29 15:04:27 +08:00
Jeff 0b8229b033 Merge branch 'branch-0.5.0' into 'branch-0.5.0'
fix code coverage error

See merge request megasearch/milvus!647

Former-commit-id: 19fd1fa7b162c329ee80f69ebdf949900cc37ad3
2019-09-29 14:37:47 +08:00
starlord eb23e112c1 fix code coverage error
Former-commit-id: 9242dca4a2cd1eef432b4d4d5eb6da10efff9935
2019-09-29 14:33:01 +08:00
quicksilver c59b0a65ff Merge branch 'branch-0.5.0' of http://192.168.1.105:6060/megasearch/milvus into branch-0.5.0
Former-commit-id: 0032fed31caf96d6abceb0cbbf4735075d23a94c
2019-09-29 14:27:38 +08:00
quicksilver 7633425ff5 add resources limits
Former-commit-id: 625e61cec4d2a64e52faa5b64f355e3671e7ec27
2019-09-29 14:27:32 +08:00
peng.xu b0b1dec346 Merge branch 'branch-0.5.0' into 'branch-0.5.0'
MS-600 Reconstruct unittest code

See merge request megasearch/milvus!645

Former-commit-id: 8e1e3134e0f86ee8ff6072505fe825a6d9a29d10
2019-09-29 12:06:21 +08:00
starlord 715d823d0b MS-600 Reconstruct unittest code
Former-commit-id: e48bed725840b4044dc4cb647905972c193ebacd
2019-09-29 11:52:55 +08:00
jinhai 56cc4ea530 Merge branch 'rename_test' into 'branch-0.5.0'
MS-565 rename test->unittest and fix parameter autotune bug

See merge request megasearch/milvus!643

Former-commit-id: 36d9ea3c25f1cf080cd63f70eccb352ec0f6bc3f
2019-09-29 10:15:26 +08:00
xiaojun.lin c2ab2bc092 MS-565 rename test->unittest and fix parameter autotune bug
Former-commit-id: 65392a505107e20491035d417940a66e67f82ef9
2019-09-29 10:13:57 +08:00
jinhai dd048c2593 Merge branch 'branch-0.5.0' into 'branch-0.5.0'
format knowhere code

See merge request megasearch/milvus!641

Former-commit-id: dce348b81de9047f3f452e01a74825ae7f6e57f5
2019-09-28 19:02:47 +08:00
starlord c54a787ae1 format knowhere code
Former-commit-id: eb06e117c192b568d9da3a33d94faa127e7cf0b7
2019-09-28 19:01:11 +08:00
peng.xu 5fb4c8b8df Merge branch 'branch-0.5.0' into 'branch-0.5.0'
format wrapper code

See merge request megasearch/milvus!640

Former-commit-id: 651418d209cc39a69a7d771d02172d8933a3678a
2019-09-28 15:58:46 +08:00
starlord 7633437e5d format wrapper code
Former-commit-id: 75fc82a41b150fbd3f1ddcc9d09c7c4b4e43c93b
2019-09-28 15:56:40 +08:00
peng.xu e9d3f80cbc Merge branch 'branch-0.5.0' into 'branch-0.5.0'
format code by clang-tidy

See merge request megasearch/milvus!639

Former-commit-id: 58af38916431ecf50eaa0ba1665efc2c0d84cc87
2019-09-28 15:01:44 +08:00
starlord d1251fb0c1 format code by clang-tidy
Former-commit-id: 437b1fff79da965b8aafce026c8be4f9d582c909
2019-09-28 15:00:26 +08:00
peng.xu e8ae612782 Merge branch 'branch-0.5.0' into 'branch-0.5.0'
format code by clang-tidy

See merge request megasearch/milvus!638

Former-commit-id: a4584c5b060fcce62e5bac4485f6bc4173add312
2019-09-28 14:00:00 +08:00
starlord aabd91a156 format code by clang-tidy
Former-commit-id: f9e606566555ad381b8e95e1a4e2572fc61678f0
2019-09-28 12:36:14 +08:00
Yu Kun 35cfea9210 Merge remote-tracking branch 'upstream/branch-0.5.0' into branch-0.5.0-yk
Former-commit-id: dd49cc79b5e934e8b2daee1e926df2731655fd4a
2019-09-28 10:32:56 +08:00
peng.xu 464a341523 Merge branch 'branch-0.5.0' into 'branch-0.5.0'
format code by clang-format

See merge request megasearch/milvus!637

Former-commit-id: 5ef398b80b258437c7edd3543bb1c0721e8a4078
2019-09-28 10:30:37 +08:00
starlord 58b82398cc format code by clang-format
Former-commit-id: c817c67a409054a49da2be878872e885a0b3e041
2019-09-28 10:28:51 +08:00
jinhai c181e405e4 Merge branch 'enable_nsg' into 'branch-0.5.0'
MS-596 enable knowhere and fix compile error

See merge request megasearch/milvus!636

Former-commit-id: 39892263eaf578f745a608a4a03305c27f9fa0f3
2019-09-27 20:32:31 +08:00