274 Commits

Author SHA1 Message Date
youny626
bd01ac91c0 clang format 2019-11-05 13:47:55 +08:00
youny626
05dda4ab73 clang format 2019-11-05 13:42:12 +08:00
youny626
bede77751e clang format 2019-11-05 13:35:24 +08:00
youny626
29e8ef110f change default cpu version option to off 2019-11-05 13:21:32 +08:00
youny626
4ca6b59b91 add CPU version 2019-11-05 10:23:59 +08:00
JinHai-CN
8a1b60ff31 Merge remote-tracking branch 'main/0.5.1' into 0.5.1
Former-commit-id: 3ec0e13f634cd53cae3da6ccb6b939b4d98923ce
2019-11-03 17:20:43 +08:00
JinHai-CN
bf2e3e790c Update milvus version
Former-commit-id: 3d345b0dc6eaaba41b78f87a46ef70e5d4ca6c19
2019-11-03 17:19:28 +08:00
yudong.cai
ad395a7f06 #175 update invalid config unittest
Former-commit-id: 06ef1ca314a4ad5d55a5a3352f75ec6e265cb4a0
2019-11-03 16:05:38 +08:00
JinHai-CN
46e2655033 update
Former-commit-id: 977f322ddccf4e1b1a6b87a1fc1710d47eb5d48d
2019-11-03 15:35:28 +08:00
JinHai-CN
47d52d250d Fix typo bug
Former-commit-id: 8b544b2158f89fea48a174e2f64128fa61706259
2019-11-03 15:14:42 +08:00
JinHai-CN
3b17eb7481 Merge remote-tracking branch 'main/0.5.1' into 0.5.1
Former-commit-id: 42a8368f0bedd23d2fedeb195ee8607f42bea555
2019-11-03 15:07:55 +08:00
yudong.cai
bfafb8cdef #175 fix clang-format
Former-commit-id: e7818d67ca090ced2a934e885074700b46619e15
2019-11-03 14:28:15 +08:00
JinHai-CN
54d5334ad7 Merge remote-tracking branch 'main/0.5.1' into 0.5.1
Former-commit-id: fd1ca7728f37610b8cdfaff52d8abaaa4c8cfa65
2019-11-03 14:06:06 +08:00
yudong.cai
9ff83e140e add invalid config unittest
Former-commit-id: b2201e3394a953e7e2055bdf351a094a6d6e5315
2019-11-03 12:51:47 +08:00
JinHai-CN
0ec462c603 Update faiss
Former-commit-id: ec0c88417aa5b3197b90feb53cad0b0ff791244a
2019-11-02 22:10:14 +08:00
yudong.cai
5150647eeb #168 fix reduce bug
Former-commit-id: 5c6f2e25cbf9efe4a58bf89757fc4983ebda4f35
2019-11-02 21:54:01 +08:00
yudong.cai
f49d23badd #168 improve result reduce
Former-commit-id: 21887800b9afe47b759a09c1f9fbed97b467cab1
2019-11-02 21:54:01 +08:00
JinHai-CN
cbdb9002fe Merge remote-tracking branch 'github/0.5.1' into 0.5.1
Former-commit-id: c4dfc96120e3fe49bc13fadeb04bd62da1e62406
2019-11-02 21:47:59 +08:00
JinHai-CN
6365640680 Merge remote-tracking branch 'main/0.5.1' into 0.5.1
Former-commit-id: b032e22a12f4b08b6944e8645e7ecd36da02dd4d
2019-11-02 21:35:48 +08:00
fishpenguin
bf35fe2df3 #169 - IVF_FLAT search out of memory
Former-commit-id: 0a231da138e4a3bbefb1ca0744bb121544834b65
2019-11-02 16:28:34 +08:00
fishpenguin
2f28f053d2 change gpu_index to device_id
Former-commit-id: 6993e98e19e31f942ffee5833b593a59cffa94a7
2019-11-02 11:26:08 +08:00
fishpenguin
63033ebc1f Code format
Former-commit-id: 8c9c010fd45c0a6737b8ad6c4493469440292707
2019-11-01 20:14:18 +08:00
fishpenguin
44d648c3af #164 - Add CPU version for building index
Former-commit-id: 02f9f2a04dc765f41c474af04659f70d121cdc18
2019-11-01 17:01:57 +08:00
peng.xu
b006c70e75 Merge branch 'add_debug_info' into '0.5.1'
info lint:

See merge request megasearch/milvus!810

Former-commit-id: 0fbba752a0afa734ced472a1c166327dd1c597b8
2019-11-01 16:06:05 +08:00
xiaojun.lin
70f6912533 info lint:
Former-commit-id: f3b68279e7473d817745941e2cb056489f3e8e76
2019-11-01 16:04:45 +08:00
peng.xu
e93e770f89 Merge branch 'add_debug_info' into '0.5.1'
add info

See merge request megasearch/milvus!809

Former-commit-id: 980c11a02bc2b6b5f5a655b06b0c44f4439322df
2019-11-01 15:58:58 +08:00
xiaojun.lin
102aa35350 add info
Former-commit-id: e2a9b4550ff966180f6fdf3d4046e2886849ab81
2019-11-01 15:54:58 +08:00
Jin Hai
888e188f71 Merge pull request #163 from cydrain/0.5.1
change configuration name from "use_gpu_threshold" to "gpu_search_threshold"

Former-commit-id: d339a53ab7e4414f3d9aa80dc6ba214ffa698856
2019-11-01 15:16:50 +08:00
JinHai-CN
be882b861c Merge remote-tracking branch 'main/0.5.1' into 0.5.1
Former-commit-id: ff4ef32c63b80aedd997085ff8c477d6f19ed3a0
2019-11-01 14:55:12 +08:00
yudong.cai
6ad1ed74e9 #159 Change the configuration name from 'use_gpu_threshold' to 'gpu_search_threshold'
Former-commit-id: b4e576b389a720d66ec5455ca05b20184c8c911d
2019-11-01 14:51:20 +08:00
xiaojun.lin
cb5eb3340a Merge branch '0.5.1' into fix_ivfsqh_crash
Former-commit-id: f78784bcbae30641ea0b40bcf9351a244b60b74c
2019-11-01 14:45:52 +08:00
xiaojun.lin
85b136b364 Fix bug #161
Former-commit-id: 5daf77b3344351a8030e53ff704b7e8bf1cce400
2019-11-01 14:40:52 +08:00
jinhai
d01c555604 Fix lint
Former-commit-id: 52ff843377f1463bb4cad7fcf67366b3facd8d10
2019-10-31 11:05:04 +00:00
jinhai
57e263bd55 Merge branch '0.5.1' of http://192.168.1.105:6060/jinhai/milvus into 0.5.1
Former-commit-id: 4fd76422da2c9b0bc9aa9e1522814c8016fa3193
2019-10-31 11:03:29 +00:00
jinhai
71fa8bdd05 Fix parallel merge issue
Former-commit-id: 7eae24c65e50c6c0abc423b841c14bf16a8c0a1d
2019-10-31 11:03:22 +00:00
Jin Hai
7b76696aed Merge pull request #151 from fishpenguin/branch-0.5.1-yk
Add only GPU and only CPU version for IVF_SQ8 and IVF_FLAT

Former-commit-id: bdca3006bc7b2c4456b1874d8c5eb23e67053b16
2019-10-31 17:19:04 +08:00
wxyu
335f35ed08 Merge remote-tracking branch 'main/0.5.1' into dev
Former-commit-id: a7bbf065776bbbc14c824880fdea706a66fdec93
2019-10-31 16:58:59 +08:00
wxyu
4df6f4b5a9 Not return error when search_resources and index_build_device set cpu
Former-commit-id: 0e0313e59cfbf8f8b17fc62db02f2e21a25d25a2
2019-10-31 16:58:47 +08:00
fishpenguin
32dac025af Merge remote-tracking branch 'upstream/0.5.1' into branch-0.5.1-yk
Former-commit-id: 7b3f48e3acfa6c35b62dc5de8731a6b85aaa5dce
2019-10-31 16:41:59 +08:00
fishpenguin
1dc7b321a4 Read config once in optimizer
Former-commit-id: 8fee2a3cfa20cdc8b51e86867b7b3eb71dd2e759
2019-10-31 16:41:48 +08:00
Jin Hai
a6f08ac963 Merge pull request #152 from Heisenberg-Y/0.5.1-yzb
[skip ci] complete baseline

Former-commit-id: 6e9a44c98bbf95ad36d5aa581aa1878fac59dc01
2019-10-31 15:32:13 +08:00
Jin Hai
a6f97a251d Merge pull request #150 from scsven/dev
Improve large query optimizer pass

Former-commit-id: 7abe61a7ca13461d3fe42acceec002acb11dac85
2019-10-31 15:30:25 +08:00
Zhiru Zhu
530b2a0f28 fix cmake error: STRING sub-command REGEX, mode REPLACE needs at least 6 arguments total to
command


Former-commit-id: 773f938125ed03582fc8242af0a23076677bf848
2019-10-31 14:57:09 +08:00
Heisenberg
c8da2c3d64 add mix mode for faiss baseline
make baseline compatible for different faiss version


Former-commit-id: 90f96b4d437136539e7aa805f58c49e2d8a23ed1
2019-10-31 14:46:25 +08:00
fishpenguin
a68255f9d0 clang format
Former-commit-id: 3f99d7df6b042683696dd70c9dc0f14fee57b388
2019-10-31 14:44:59 +08:00
Heisenberg
90e961649c Merge branch '0.5.1' into 0.5.1-yzb
Former-commit-id: 1e1a78a79db59c10c3ede8fd3187aea41c582c59
2019-10-31 14:43:11 +08:00
fishpenguin
68d5693a74 Merge remote-tracking branch 'upstream/0.5.1' into branch-0.5.1-yk
Former-commit-id: 2af5f3b5de04c3834c70ae1a5380b3bba40fe0bf
2019-10-31 14:39:13 +08:00
fishpenguin
49105e44f3 Add only GPU and only CPU version for IVF_SQ8 and IVF_FLAT
Former-commit-id: 14f5b095df2988d5f65ecd1cb2628fd3a3791a14
2019-10-31 14:39:02 +08:00
wxyu
1a12cd9bb5 Merge remote-tracking branch 'main/0.5.1' into dev
Former-commit-id: 110a811fa95f6d811f96f8f7bdf9b93ab0a17695
2019-10-31 14:30:31 +08:00
wxyu
892bd4daac Improve large query optimizer pass
Former-commit-id: 1f0c283ec4dc5560c14d4e17d76719d38dfc2280
2019-10-31 14:30:17 +08:00