131 Commits

Author SHA1 Message Date
starlord
dacd86f0af clean code
Former-commit-id: 81fdba0f5bc4e523f47b4f4f7fecac1fc5abdd62
2019-08-13 18:50:36 +08:00
Yu Kun
dcf8d3e838 Merge remote-tracking branch 'upstream/branch-0.4.0' into branch-0.4.0
Former-commit-id: 5bdebcd74b5a5d7665029f727ac452807d7f564f
2019-08-13 17:29:17 +08:00
Yu Kun
bb9b6d36fd rename milvus_grpc_server to milvus_server
Former-commit-id: 54f295751d413a3af3765ff6334d25392ed17ac8
2019-08-13 17:29:13 +08:00
starlord
039b38bc71 avoid jenkins break build
Former-commit-id: b326a6ae14befd2f5dad11076cc4299edc55d341
2019-08-13 16:37:22 +08:00
Yu Kun
1a06e7e944 Merge remote-tracking branch 'upstream/branch-0.4.0' into branch-0.4.0
Former-commit-id: 41b7d12779189baff1a90aaf749c4a8f138e1584
2019-08-13 15:37:27 +08:00
Yu Kun
4ba11c02d4 add new interface definition
Former-commit-id: 1f5919bfd2b3a08422c408922733e40edd9c5db2
2019-08-13 15:37:16 +08:00
starlord
549b18f871 MS-343 implement ResourceMgr
Former-commit-id: 4cafc2cadf229ab61952233f1abc04d4ffdf9129
2019-08-13 15:22:01 +08:00
Yu Kun
f8b7df5e0b modify build.sh to make thrift on
Former-commit-id: b38a915b34149df47de5be0611970490dd2751aa
2019-08-09 18:24:01 +08:00
Yu Kun
ebd8cd9aeb merge upstream and fix bug
Former-commit-id: 45fa6852c3ad2303263cc836d30f3d2f76dd964f
2019-08-09 17:00:32 +08:00
Yu Kun
a68fa43ddd grpc and thrift server run concurrently
Former-commit-id: 4abfccaf6ee598bbb7cc47d48f943b8ca9726f12
2019-08-09 15:46:32 +08:00
jinhai
6e04bf9ef2 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
MS-313: add GRPC

See merge request megasearch/milvus!311

Former-commit-id: d488459184731d5c12599d1ecd5f3774b747ae69
2019-08-08 15:56:51 +08:00
starlord
39499d2f77 MS-327 clean code
Former-commit-id: 46b960c0a67766c4d67b36826ec88b47ae470206
2019-08-08 15:36:00 +08:00
Yu Kun
179a0feabf modify format
Former-commit-id: 74f43325a1b8ae17b1b7a5aeb61f0c6d7fd42de4
2019-08-08 15:02:27 +08:00
starlord
4d5618f4c3 MS-327 clean code
Former-commit-id: 9ca0ea6cb89b3fb95e17b0c0d6f647fe0c3ff7c4
2019-08-08 14:20:00 +08:00
zhiru
81928c91e4 cmake: add grpc
Former-commit-id: 3a17c401ed59ff071040c6e67a6e7c76a315d958
2019-08-06 18:04:37 +08:00
kun yu
0c580bfa13 fix conflict
Former-commit-id: b1ebf9db86289bcb6afd9f30c3525b0df40433d6
2019-07-29 11:40:27 +08:00
xj.lin
3314d47114 MS-288 update build stage
Former-commit-id: d9e0bfbbbb5060b65311b2f6eb8eadf531b918c2
2019-07-27 14:30:52 +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
kun yu
db15ea57e9 fix structure
Former-commit-id: 6b4afd3c15236340eb666f22a0150ce090202b04
2019-07-24 19:29:18 +08:00
yudong.cai
29a177d129 MS-248 fix profiler build error
Former-commit-id: 817200ab3a01e34553090b8074726ea47f8fd7d8
2019-07-23 17:58:11 +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
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
starlord
fe63fb509a MS-249 Check machine hardware during initialize
Former-commit-id: 86a0b2945852a9be8fd84422871855702445b7bf
2019-07-22 10:45:13 +08:00
starlord
b285c64e96 Check machine hardware during initialize
Former-commit-id: fe3efe3b519235d9579e0c311a7da3f7a299154f
2019-07-22 10:44:24 +08:00
kun yu
4a967676fd Merge remote-tracking branch 'upstream/branch-0.3.1' into branch-0.3.1
Former-commit-id: 59c36121db32e51794f1798160d90287bfb823b7
2019-07-22 10:33:10 +08:00
kun yu
48064dfdee add grpc
Former-commit-id: aee405b98f44290051fe022387c42bcb6d68cc76
2019-07-22 10:14:23 +08:00
zhiru
e24ae02665 update faiss version to 1.5.3 and add BUILD_FAISS_WITH_MKL as an option
Former-commit-id: 0c26016af4203d4849b8b9b710d005e83e32daea
2019-07-21 20:46:24 +08:00
yudong.cai
4be35eecd6 MS-248 fix build issue
Former-commit-id: 5be81d324326f721d1c4651e064104123fd65026
2019-07-18 11:46:37 +08:00
yudong.cai
15d76b84d4 Merge remote-tracking branch 'main/branch-0.3.1' into branch-0.3.1
Former-commit-id: 5e4bbae09c91b6aebec06951921baa1ea4ac89b5
2019-07-18 11:10:14 +08:00
yudong.cai
f8875429b1 MS-248 support Milvus profiling
Former-commit-id: 1507ffd4cafbd0005a8edb161169f127f1532c04
2019-07-17 20:24:09 +08:00
zhiru
5acd9ac4eb MS-241 MS-242
Former-commit-id: 608b3d0b14834591a55fca324855b7cbbcf34ca5
2019-07-17 12:50:37 +08:00
starlord
de09ef53a9 MS-230 - Change parameter name: Maximum_memory to insert_buffer_size
Former-commit-id: 1263b0c2edceb235163c48b34af681c3edb48d16
2019-07-15 13:47:36 +08:00
zhiru
763194dc2b update
Former-commit-id: ac5140491b67a1fbbf87e61ef5194e39992796e4
2019-07-13 23:50:59 +08:00
starlord
121fba6e10 ignore c sdk
Former-commit-id: b6e3d44be7bf3db02d855ac75d100aff76e7d255
2019-07-13 23:50:59 +08:00
starlord
8fc4dce5c8 MS-206 support SQ8 index type
Former-commit-id: 9788ff43d950e60a29b944d732648f73313c72d3
2019-07-12 11:08:25 +08:00
zhiru
d13b244a46 use env variable to switch mem manager and fix cmake
Former-commit-id: 7928c6384045f002fd4bf4367bcf5ab9b5262ac0
2019-07-09 17:15:21 +08:00
xj.lin
4502c9e6f6 add tbb.so
Former-commit-id: 44a9d9485d3f6de2006979c81fe092fa179f5515
2019-07-09 15:50:54 +08:00
xj.lin
92ebfe95d0 update...
Former-commit-id: 6366c5292e1483be5009e46bd273fdb00433fea6
2019-07-08 19:09:18 +08:00
starlord
8edaff9517 new engine
Former-commit-id: 8f84ec8cbe26733b730528b49ae76c9ea158d359
2019-07-07 20:20:30 +08:00
xj.lin
f7287d74ea MS-154
1. Add Submodule knowhere and specify branch
2. Integrate Knowhere, update many cmakelist
3. dev knowhere-wrapper
4. dev knowhere-wrapper unittest


Former-commit-id: 783a85562b2b5db3b89920b0c68de133a577f245
2019-07-04 16:15:30 +08:00
peng.xu
697427e7ea Revert "Merge branch 'integrate_knowhere-0.3.1' into 'branch-0.3.1'"
This reverts merge request !152

Former-commit-id: 739bf84961e2d6daa2ebbe2f45882efd2acaa89f
2019-07-03 15:17:28 +08:00
xj.lin
88110a0d65 update ...
Former-commit-id: 6b721737d082237cd84128228d187f7b0a336d9b
2019-07-03 11:53:42 +08:00
xj.lin
00acbd9ff6 update R
Former-commit-id: 668ee056c2b0de6a56465be8fb78f910935c0e5c
2019-07-03 11:50:47 +08:00
xj.lin
619a800766 MS-143 merge
Former-commit-id: b8eeda3dcb955a065f4adc933d53c16a10b6f04a
2019-07-02 19:28:50 +08:00
groot
34eb182252 Merge remote-tracking branch 'source/branch-0.3.0' into branch-0.3.0
Former-commit-id: 2d381a99c00923ae2bfe4c798bc97192bd1037a2
2019-06-30 19:07:05 +08:00
groot
ea3fdf6603 ignore c sdk
Former-commit-id: 4bb374ff328198226ae3ab78e5901ed6264713e7
2019-06-30 19:07:00 +08:00
zhiru
c659f0fcfb update
Former-commit-id: 64ac42d61ae8aa38599324b5f72e93e66507aa01
2019-06-30 19:00:53 +08:00