starlord
b0557af128
MS-275 Avoid sqlite logic error excetion
...
Former-commit-id: 88c2b25f471afd80338280d2a522de89b242051b
2019-07-26 10:59:16 +08:00
starlord
640e9141c6
MS-275 Avoid sqlite logic error excetion
...
Former-commit-id: d6ecaf2f32ed6c75370e6ed2bd24779cc18e76ff
2019-07-26 10:54:49 +08:00
jinhai
4d36b71c22
Merge branch 'integrate_knowhere' into 'branch-0.3.1-xiaojun'
...
MS-137 update knowhere version
See merge request megasearch/milvus!277
Former-commit-id: dac718d3fa12712f49ecc23b354fcb2c237002e6
2019-07-26 10:44:09 +08:00
xj.lin
aa771e7c3d
update knowhere version
...
Former-commit-id: 0457623ff251b8bb925e289df0b9bf0ee097973c
2019-07-26 10:42:28 +08:00
jinhai
29409108da
Merge branch 'integrate_knowhere' into 'branch-0.3.1-xiaojun'
...
MS-137 integrate knowhere...
See merge request megasearch/milvus!276
Former-commit-id: 642b55b3e573dcee2e686e106e7abf97a3f445ee
2019-07-25 20:00:19 +08:00
xj.lin
f37ae7765a
MS-137 integrate knowhere...
...
Former-commit-id: 04bd70d29d1da919dbff9c39e0c60ccc6db57d23
2019-07-25 19:57:12 +08:00
jinhai
2ac2dfca01
Fix build error and refactor code
...
Former-commit-id: da6bf57fdebc0fc9b03251d7d9eb6c398dd35770
2019-07-25 19:57:10 +08:00
kun yu
6aba1d011b
pull upstream
...
Former-commit-id: 82dafb79113706d919562c5aeefbf32ae010f9c3
2019-07-25 17:26:30 +08:00
kun yu
af074d0eb5
Merge remote-tracking branch 'upstream/branch-0.3.1' into branch-0.3.1
...
Former-commit-id: f3aad0f877176111021d537aa7ffcfb217041f45
2019-07-25 15:58:16 +08:00
jinhai
17fe748d30
MS-279 Merge from Branch-0.3.1
...
Former-commit-id: cd9e051d00423ae8a25f100366b1050f1604fca2
2019-07-24 21:28:24 +08:00
jinhai
a7766318ba
Merge branch 'branch-0.3.1' into 'branch-0.3.1'
...
MS-278: add IndexStatsHelpe
See merge request megasearch/milvus!275
Former-commit-id: 49eb9be9b34b2fa26d49af4cdb49c19b5979f226
2019-07-24 20:37:50 +08:00
zhiru
99f92d8758
add IndexStatsHelper
...
Former-commit-id: d47bb68ff89728b31d237a62caa4d4d7673ceb0f
2019-07-24 20:36:35 +08:00
zhiru
cfffcf9e9a
Merge remote-tracking branch 'upstream/branch-0.3.1' into branch-0.3.1
...
Former-commit-id: 4f3226d234fb9cbbab86cb7e85d65e97c5773e2c
2019-07-24 20:34:33 +08:00
zhiru
837da04dc9
add IndexStatsHelper
...
Former-commit-id: 6579465eb992d10a9a2f10b0f129341664f9b77d
2019-07-24 20:34:11 +08:00
jinhai
dbff40af0d
Merge branch 'branch-0.3.1' into 'branch-0.3.1'
...
MS-276 Fix compile with volta architecture
See merge request megasearch/milvus!273
Former-commit-id: ffc15e40c2c042ffefd73d3f4a583ead93883057
2019-07-24 20:29:39 +08:00
Jeff
4cd27169ac
Merge branch 'branch-0.3.1' into 'branch-0.3.1'
...
MS-277 - Update CUDA Version to V10.1
See merge request megasearch/milvus!274
Former-commit-id: c311464d926ff8d18caae84098e08c489991ee46
2019-07-24 20:29:25 +08:00
quicksilver
6d27cc91bb
MS-277 - Update CUDA Version to V10.1
...
Former-commit-id: ae02d3236cc34ce89f5e2a453e2c027c1562fc98
2019-07-24 20:14:05 +08:00
starlord
d7cbf9404a
fix unittest unstable case
...
Former-commit-id: 2cc58215ffb327741e90824fecedf8a3073eebcc
2019-07-24 20:00:14 +08:00
jinhai
27b87309e9
Merge remote-tracking branch 'upstream/branch-0.3.1' into branch-0.3.1
...
Former-commit-id: e28665f82b62580e41f371ccc4daa4cc6a474c55
2019-07-24 19:59:46 +08:00
jinhai
6acfd7f60d
MS-276 Fix compile with volta architecture
...
Former-commit-id: 5d67c583a462764d368b3d83d337849d54c955f7
2019-07-24 19:59:19 +08:00
jinhai
4e8500b4dc
Merge branch 'branch-0.3.1' into 'branch-0.3.1'
...
MS-266 Improve topk reduce time by using multi-threads
See merge request megasearch/milvus!272
Former-commit-id: 038e0ee10f398d2d9a73ec5b8cec480e5d585f23
2019-07-24 19:49:21 +08:00
starlord
a68e501b4b
MS-266 Improve topk reduce time by using multi-threads
...
Former-commit-id: f19c6d78f7f9ab619de792fbb43efd86da0b07a1
2019-07-24 19:48:01 +08:00
kun yu
db15ea57e9
fix structure
...
Former-commit-id: 6b4afd3c15236340eb666f22a0150ce090202b04
2019-07-24 19:29:18 +08:00
jinhai
4a6b1779f6
Merge branch 'branch-0.3.1' into 'branch-0.3.1'
...
MS-266 Improve topk reduce time by using multi-threads
See merge request megasearch/milvus!271
Former-commit-id: c5b0ce9ebbd2a60fe7797b38996a70293c577789
2019-07-24 17:52:29 +08:00
starlord
8b757539d2
MS-266 Improve topk reduce time by using multi-threads
...
Former-commit-id: fb7b6588c31ca34b48e349a5b928bca2d21fbc20
2019-07-24 16:28:47 +08:00
starlord
f986af8671
MS-266 Improve topk reduce time by using multi-threads
...
Former-commit-id: ec370a34b214c9105f06a9bdea8f34728ed5026a
2019-07-24 14:09:06 +08:00
starlord
e51b7f1619
Merge remote-tracking branch 'source/branch-0.3.1' into branch-0.3.1
...
Former-commit-id: 6093fec932087c5c92d82e454d76bd614090615e
2019-07-24 12:48:47 +08:00
starlord
ed029178c4
MS-266 Improve topk reduce time by using multi-threads
...
Former-commit-id: 79e4cfe6ade7b0fc059cd246c4b670a4b5343ca3
2019-07-24 12:48:36 +08:00
jinhai
afc40c454a
Merge branch 'branch-0.3.1' into 'branch-0.3.1'
...
MS-273 Add some logs and reformat code
See merge request megasearch/milvus!270
Former-commit-id: fe9e27aefd9bd73e12dd7aeaf709884b68da9ae6
2019-07-24 11:25:35 +08:00
jinhai
aee7809c61
MS-273 Add some logs and reformat code, fix compile error
...
Former-commit-id: 5bf635ab31d5dfd0cdb558b7f038670098d75ed0
2019-07-24 11:17:53 +08:00
jinhai
34ca37d9a0
MS-273 Add some logs and reformat code
...
Former-commit-id: 5dfd98a0b954d5cc44ae40f6b14ce65a15d76f80
2019-07-24 11:02:22 +08:00
jinhai
b46168cfeb
Merge branch 'dev-sq8' into 'branch-0.3.1-xiaojun'
...
Dev sq8
See merge request megasearch/milvus!269
Former-commit-id: 7f2c9ce4b52d0436e5cea77f57b379b5edb8ff4a
2019-07-24 10:36:06 +08:00
xj.lin
7b3886fd23
MS-267 default support IP
...
Former-commit-id: 64bfb03ea5291604f551530bc65896cc19841a5d
2019-07-24 10:33:41 +08:00
peng.xu
3fdebc9152
Merge branch 'branch-0.3.1' into 'branch-0.3.1'
...
MS-248 fix profiler build error
See merge request megasearch/milvus!268
Former-commit-id: 4b98d4ebfa60ff28528e13777844e398bfa47d46
2019-07-23 19:01:18 +08:00
yudong.cai
29a177d129
MS-248 fix profiler build error
...
Former-commit-id: 817200ab3a01e34553090b8074726ea47f8fd7d8
2019-07-23 17:58:11 +08:00
jinhai
33d6250e31
Merge branch 'branch-0.3.1' into 'branch-0.3.1'
...
MS-246 refine log
See merge request megasearch/milvus!267
Former-commit-id: 085c102f99cdbaecbb10101402964285e8e038ec
2019-07-23 16:58:23 +08:00
starlord
07a9fdb8ca
MS-246 refine log
...
Former-commit-id: 87ef7f959b43e92c3e7687f9f8e1d059cc353f79
2019-07-23 15:42:17 +08:00
peng.xu
1364deb6ac
Merge branch 'branch-0.3.1' into 'branch-0.3.1'
...
MS-261: change BUILD_FAISS_WITH_MKL to default off and fix metrics
See merge request megasearch/milvus!266
Former-commit-id: 5052b90739bb3215f2f8deae1a3f905d49565d8d
2019-07-23 10:43:50 +08:00
zhiru
57fd142712
change BUILD_FAISS_WITH_MKL to default off
...
Former-commit-id: 8cf737578611bf2f05cc4da3a775328e6463d341
2019-07-23 10:42:47 +08:00
zhiru
5d1e887622
Merge remote-tracking branch 'upstream/branch-0.3.1' into branch-0.3.1
...
Former-commit-id: 643c3e4dbad9a1be34bdf491b93d2a52e463a02e
2019-07-23 10:41:35 +08:00
zhiru
28e84f384d
fix metrics
...
Former-commit-id: 2a7f67913dfdb615e09d7316053c59944132a8fe
2019-07-23 10:41:28 +08:00
peng.xu
05119d42a7
Merge branch 'revert-2debf343' into 'branch-0.3.1'
...
Revert "Merge branch 'branch-0.3.1' into 'branch-0.3.1'"
See merge request megasearch/milvus!265
Former-commit-id: a5e1a4968b9384566e9810a60fca39190424e6eb
2019-07-22 20:23:11 +08:00
xj.lin
813f5151e8
MS-267 Support Inner Product
...
update..
Former-commit-id: 8fdbb39fbdd05853f25c374f437f3ed78a46345d
2019-07-22 20:12:33 +08:00
peng.xu
cdb031e62b
Revert "Merge branch 'branch-0.3.1' into 'branch-0.3.1'"
...
This reverts merge request !264
Former-commit-id: 501e92946ab87fb9a21c55545f84ab8da499e1aa
2019-07-22 20:03:59 +08:00
peng.xu
531978a4b0
Merge branch 'branch-0.3.1' into 'branch-0.3.1'
...
MS-261: change BUILD_FAISS_WITH_MKL to default off
See merge request megasearch/milvus!264
Former-commit-id: 90a409dec7a99d93f95017e935971558923a997a
2019-07-22 19:44:33 +08:00
zhiru
397d9516f3
change BUILD_FAISS_WITH_MKL to default off
...
Former-commit-id: 2d61d5e7e25732ed8632d295992ac16378181c37
2019-07-22 18:24:26 +08:00
jinhai
9dc28812b4
Merge branch 'branch-0.3.1' into 'branch-0.3.1'
...
MS-246 refine log
See merge request megasearch/milvus!263
Former-commit-id: aa0a50e4e47241f55ba430cc6f024e6c473cd923
2019-07-22 17:50:56 +08:00
starlord
5f86066e8d
MS-246 refine log
...
Former-commit-id: d8c30756db5666f964fd4fcf63fdc4a7ab08a4ea
2019-07-22 17:49:11 +08:00
jinhai
7c8b105d0b
Merge branch 'branch-0.3.1' into 'branch-0.3.1'
...
MS-261: change BUILD_FAISS_WITH_MKL to default on
See merge request megasearch/milvus!262
Former-commit-id: ea2f2de479e95449daaa8e928d5594d7bfba5eaf
2019-07-22 17:03:41 +08:00
zhiru
f10d8e1b66
change BUILD_FAISS_WITH_MKL to default on
...
Former-commit-id: 2efee7ecceb466100ea0d875aeb1aeb3dbc02737
2019-07-22 17:02:03 +08:00