Commit Graph

315 Commits

Author SHA1 Message Date
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
Jin Hai
b60677b474 Merge pull request #137 from youny626/0.5.1
Add Ubuntu version specific cache

Former-commit-id: c5d1150ac392f7d344f1520b2a01a01cbd0e0335
2019-10-31 14:16:04 +08:00
JinHai-CN
628876806b Merge branch '0.5.1' of http://192.168.1.105:6060/jinhai/milvus into 0.5.1
Former-commit-id: 13037d6d389716a970cbfdc55edbb01fbaf0a4c0
2019-10-31 14:07:35 +08:00
JinHai-CN
eeb503f7c5 Update faiss link
Former-commit-id: 22febba9b19f8de8422eae922ec75d7106e37e7a
2019-10-31 14:07:23 +08:00
jinhai
4e33f223b7 Merge branch '0.5.1' into '0.5.1'
0.5.1

See merge request megasearch/milvus!802

Former-commit-id: 42769887dabff1e661b671b256b09ef931987fbd
2019-10-30 20:27:37 +08:00
jinhai
e316271a0d Merge remote-tracking branch 'main/0.5.1' into 0.5.1
Former-commit-id: 10559bda3c1089dcac77d33b420566ad1fa7b57e
2019-10-30 12:26:57 +00:00
wxyu
87963408bf fix lint
Former-commit-id: 2f5166b4c2a461c379c55eb5a49d431e878aa19a
2019-10-30 20:24:10 +08:00
jinhai
f9e74971a5 Merge branch '0.5.1' into '0.5.1'
0.5.1

See merge request megasearch/milvus!801

Former-commit-id: 26d6c4b4741295f1bfaac3ad17a54a79e49d0995
2019-10-30 20:14:50 +08:00
jinhai
233f3a9c9d Merge remote-tracking branch 'main/0.5.1' into 0.5.1
Former-commit-id: 710f0212ec7264f07a3a2373383cd49fd9e21b48
2019-10-30 12:10:40 +00:00
wxyu
7dc552fdea New config opion use_gpu_threshold
Former-commit-id: 3d33145d8fa473f2b81cc98022c1bb93853a2fbc
2019-10-30 19:57:55 +08:00
yudong.cai
74f7b359ae #89 update
Former-commit-id: 924960514c582b1c53f2115861c88e90252b63ac
2019-10-30 17:41:59 +08:00
starlord
a4f0f4bd13 get branch name
Former-commit-id: eb75eb1a41845c294479a8e15176feac629be9a8
2019-10-30 17:37:44 +08:00
yudong.cai
12b8d14a10 #89 clang-format
Former-commit-id: ddfd7fe63f48b0822d536b1079a129b84ea537cc
2019-10-30 17:22:30 +08:00
yudong.cai
881e962361 Merge remote-tracking branch 'main/0.5.1' into 0.5.1
Former-commit-id: 6f882df8f6a9571e9c5bf6aab55a813dcfe9cbad
2019-10-30 17:18:07 +08:00
yudong.cai
3dd61fee06 #89 re-org faiss_benchmark_test
Former-commit-id: 0fb0c3f91e9c864b301f5a9b8d29049e456d99e4
2019-10-30 17:17:38 +08:00
Zhiru Zhu
c99f407099 delete message
Former-commit-id: 577b8693eca42bf3537c8691f754dd1876d579a3
2019-10-30 15:30:28 +08:00
Zhiru Zhu
c41ebb7e7d fix JFrog cache error
Former-commit-id: 8b75351080e9201d6f9f47c643dfb7eec32d5a86
2019-10-30 15:27:05 +08:00
JinHai-CN
a6fd546196 Merge remote-tracking branch 'main/0.5.1' into 0.5.1
Former-commit-id: 7bf691eb73bc86b6de4030226226ea57106c6bc3
2019-10-30 14:20:24 +08:00
wxyu
3f8a3ca9fe Merge remote-tracking branch 'main/0.5.1' into dev
Former-commit-id: 1301dfebe6a4adffd65bf50a4a52f6b33765de7f
2019-10-30 12:34:21 +08:00
wxyu
3fa2c1e69a Set task state MOVED after resource copy it completed
Former-commit-id: a97e306b62f6a0a7a06c881e93a973ad75b8ac9d
2019-10-30 12:34:09 +08:00
starlord
2aa7176d46 show branch name
Former-commit-id: 8c5eca7a3372f553b13a349ad0e5407ec3683bf2
2019-10-30 11:21:28 +08:00
Jin Hai
8970efae49 Merge pull request #128 from tinkerlin/upgrade_faiss
Upgrade faiss

Former-commit-id: 0ed5ef40de13008935dbdbe3852e1af47c4d2283
2019-10-29 20:16:03 +08:00
xiaojun.lin
39e127d707 Upgrade Faiss to v1.6
Former-commit-id: 637f6933c77c2644d4d90120d9d2aed77e4e70ff
2019-10-29 20:05:01 +08:00
yudong.cai
b6484475d8 #89 fix clang-format
Former-commit-id: 0c7feb7370d58e7511a1089d181d256e9c9e6905
2019-10-29 19:22:21 +08:00
yudong.cai
95b231a5cb Merge remote-tracking branch 'main/0.5.1' into 0.5.1
Former-commit-id: aecebe10c5104ebc1d77d7e21c0d79844309f371
2019-10-29 19:16:33 +08:00
yudong.cai
b43b9bac27 #89 do normalize() for IP test
Former-commit-id: 11be41ee43e3dd0e2ecbcd50ba70bab2df58688d
2019-10-29 19:15:54 +08:00
starlord
bb43a77130 update message
Former-commit-id: 0a5ad5dfd42d76032c5008d9d9e4e2213b161232
2019-10-29 17:19:02 +08:00
starlord
dcc7fbd439 update message
Former-commit-id: 84f9b8ce2ac8050128f678754123ae2716e3b342
2019-10-29 16:50:55 +08:00
starlord
bfdc80401d fix typo
Former-commit-id: bc177ec75ef30265a1358961f89966c8d6ea535c
2019-10-29 16:15:14 +08:00
starlord
c63c622cf5 update message
Former-commit-id: 568dbdc5d6dc233716682ebec33e6bd3dfe45500
2019-10-29 16:06:27 +08:00
starlord
96dffcf8ab format code
Former-commit-id: f809ffd4505ada713620e4996d6fe1004bcc69dc
2019-10-29 15:37:08 +08:00
starlord
a05cebf513 fix job.h header cpplint error
Former-commit-id: c5bfb2f7acdfad00adf818b9cc4b20ce42b7c9e1
2019-10-29 15:18:54 +08:00
starlord
a78e928dfa #90 The server start error messages could be improved to enhance user experience
Former-commit-id: e3ad89ab67f2c46bc4cb4e6d094a7763fb098664
2019-10-29 15:16:04 +08:00
starlord
e743adb373 Merge remote-tracking branch 'source/0.5.1' into 0.5.1
Former-commit-id: 4ee722e2074ee58dce001b46ff05fd4c8152beb6
2019-10-29 15:14:18 +08:00
xiaojun.lin
789403b0c1 Merge remote-tracking branch 'gitlab/0.5.1' into upgrade_faiss
Former-commit-id: 826c673ce80978ab416b0e6568328e4028cad607
2019-10-29 11:18:56 +08:00
Jin Hai
2f762900e0 Merge pull request #119 from scsven/dev
Using shared_ptr instead of weak_ptr to avoid performance loss

Former-commit-id: 1e0c9f5a1ce757f3768c5efe44b383e93f677bbe
2019-10-28 20:48:01 +08:00
Heisenberg
d95b3906c8 [skip ci] refine the copy time test
Former-commit-id: d370cec5e350d3f3740d9b56182ad0a990ed2ec8
2019-10-28 20:41:08 +08:00
wxyu
de2bb68daa Add unique id for Job
Former-commit-id: 1865dbd859f345a3febc3ad76682f928678e59f5
2019-10-28 20:34:26 +08:00
wxyu
7510f1f7a2 remove unused code
Former-commit-id: 630cb776ec1a736f78241835fbbc8cc95b68deaa
2019-10-28 20:28:36 +08:00
starlord
52b6307027 Merge remote-tracking branch 'source/0.5.1' into 0.5.1
Former-commit-id: f29536b8ff8ac23aa9f629da28825c1efcedcf0b
2019-10-28 20:24:42 +08:00
starlord
12b7d6f5d8 #90 The server start error messages could be improved to enhance user experience
Former-commit-id: 746b126621cd845c2848bb850b5c2eb6d3b65a6d
2019-10-28 20:24:13 +08:00
Jin Hai
b1d7b02b1e Merge pull request #120 from cydrain/0.5.1
[skip ci] add faiss benchmark

Former-commit-id: 75c483a740e5c317d66ad05f48734baac6226862
2019-10-28 20:18:29 +08:00
yudong.cai
b439da8a36 #89 update README.md
Former-commit-id: 0b85b430c0d4a69e0470e916a76adda16f96c12b
2019-10-28 20:17:25 +08:00
yudong.cai
97ae8a780c #89 add README.txt
Former-commit-id: a84501ce6c2c94275819ace9e7d7a4afc14fbeca
2019-10-28 19:55:43 +08:00
yudong.cai
7f6092b6ba #89 add SQ8Hybrid MIX test and pure-GPU test
Former-commit-id: 25b5f419d3deedd4ec39c014ea47822a83a0af38
2019-10-28 19:34:38 +08:00
wxyu
2b1de98912 fix cpplint
Former-commit-id: df5bb8526ac0fe0662b10fbfb7daa706900e6758
2019-10-28 19:29:44 +08:00
wxyu
a3c369c076 solve conflicts
Former-commit-id: c92330680d95525afd2b11f3dbeb9db051dfc751
2019-10-28 19:20:55 +08:00
wxyu
53b3b60db2 Using shared_ptr instead of weak_ptr to avoid performance loss
Former-commit-id: 250cb7200b6eefdd9cbb9fd631379d59aca2f368
2019-10-28 19:19:42 +08:00
wxyu
5e504b3435 rename functions tasktable, make it accessing likes standard structure
Former-commit-id: c0ba41635e710e0807af0fe07d0b6a266f60d044
2019-10-28 17:27:49 +08:00
Jin Hai
8fda112ae1 Merge pull request #116 from scsven/dev
Using new structure for tasktable

Former-commit-id: 184c3c75587577c236933eabdd010df040e525df
2019-10-28 16:49:04 +08:00
wxyu
37e4b0a934 Using new structure for tasktable
Former-commit-id: 80376dce0fd24c8c541c05363d702941f69dca0e
2019-10-28 16:35:53 +08:00
wxyu
80b9c79c5d Using new structure for tasktable
Former-commit-id: 6742f21a429da87456ded0a910d248948dc948b4
2019-10-28 12:23:25 +08:00
Jin Hai
6d2dad0b53 Merge pull request #103 from youny626/0.5.1
Remove .a file in milvus/lib for docker-version

Former-commit-id: 462024cc5f1e678444b41fcad76ec3d97c2bcc73
2019-10-28 11:02:38 +08:00
yudong.cai
ca0f5e465e Merge remote-tracking branch 'main/0.5.1' into 0.5.1
Former-commit-id: d98c3a065f0a643ff3c9c3b34cdc9361b34bd1a1
2019-10-28 10:24:50 +08:00
fishpenguin
f32921f0fb test_scheduler core dump
Former-commit-id: 79208b55f7b016bde5100cc7474850160dc72503
2019-10-25 19:43:07 +08:00
Zhiru Zhu
d65160e4a1 Remove .a file in milvus/lib for docker-version
Former-commit-id: b27fd9ddcf9d0dcbcceca2422b8bf6230bf4e21a
2019-10-25 18:01:35 +08:00
Jin Hai
8b64aa7cda Merge pull request #91 from scsven/dev
Improvement dump function in scheduler

Former-commit-id: 2b7853f866db6aa3c7000c3629dfc28327a94762
2019-10-25 10:19:12 +08:00
Jin Hai
42e1ec8bd3 Merge pull request #93 from youny626/0.5.1
Speed up CMake build process

Former-commit-id: d113c6903c01f10958d85f70152640b82838b3cd
2019-10-24 18:48:18 +08:00
Jin Hai
abb6ab8de5 Merge pull request #81 from yhmo/0.5.1
#80 Print version information into log during server start

Former-commit-id: 44ccc3b0d8b23e72d2c05a2cc49ef5abd694606f
2019-10-24 14:06:28 +08:00
yudong.cai
65b46de1ac #89 code format
Former-commit-id: ced158f26d9c18e38c7afb84ad17fdb6f9057259
2019-10-24 10:56:12 +08:00