Commit Graph

3570 Commits

Author SHA1 Message Date
Jin Hai
e7cc1a8f52 Merge pull request #178 from cydrain/0.5.1
[skip ci]#175 update invalid config unittest

Former-commit-id: a4b09cb938a9e9ddb16acf5fef1ec55d5c27a581
2019-11-03 17:20:33 +08:00
yudong.cai
ad395a7f06 #175 update invalid config unittest
Former-commit-id: 06ef1ca314a4ad5d55a5a3352f75ec6e265cb4a0
2019-11-03 16:05:38 +08:00
Jin Hai
81a3070aaa Merge pull request #177 from cydrain/0.5.1
#175 fix clang-format

Former-commit-id: f55477e645e936280242172d6cf1cda25df74ab9
2019-11-03 15:07:27 +08:00
yudong.cai
bfafb8cdef #175 fix clang-format
Former-commit-id: e7818d67ca090ced2a934e885074700b46619e15
2019-11-03 14:28:15 +08:00
yudong.cai
9d1277af9e Merge remote-tracking branch 'main/0.5.1' into 0.5.1
Former-commit-id: 204fecf73939c8f7c46e32f433a13019541e10d8
2019-11-03 14:23:26 +08:00
Jin Hai
2f324120d4 Merge pull request #176 from cydrain/caiyd_add_invalid_config_unittest
#175 add invalid config unittest

Former-commit-id: f2500d613cb94d7434eeb5ce80fea41533548c22
2019-11-03 14:22:33 +08:00
yudong.cai
35bad8b63f #175 add invalid config unittest
Former-commit-id: 86f629e902b707a5b0aaed17e4ecb9d1e46e5070
2019-11-03 13:06:29 +08:00
yudong.cai
9ff83e140e add invalid config unittest
Former-commit-id: b2201e3394a953e7e2055bdf351a094a6d6e5315
2019-11-03 12:51:47 +08:00
Jin Hai
b6a96b06f6 Merge pull request #172 from cydrain/caiyd_reduce_opt
#168 improve result reduce

Former-commit-id: bb427da1df99c649010eac878f96b19b12ba1af9
2019-11-03 11:21:30 +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
Jin Hai
bc6f233709 Merge pull request #173 from JinHai-CN/0.5.1
Merge from internal

Former-commit-id: bc6edee3260cb9f7dbb4fe2104c77e644cb25819
2019-11-02 21:49:32 +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
Jin Hai
8f5ee2eb10 Merge pull request #1 from milvus-io/0.5.1
0.5.1

Former-commit-id: c990c58dcf320383758a8dd94ca0bacc87edbabd
2019-11-02 21:47:32 +08:00
Jin Hai
a04adb3d7a Merge pull request #171 from fishpenguin/branch-0.5.1-yk
#169 - IVF_FLAT search out of memory

Former-commit-id: 62ad8c37c2211121837b0e99a4d5b6600fb41bc9
2019-11-02 21:38:34 +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
peng.xu
5324a7f99b Merge branch '0.5.1' into '0.5.1'
[ci] fix test groovy

See merge request megasearch/milvus!812

Former-commit-id: dea09982448103e03bbca5d545888aa0e3c15102
2019-11-02 13:19:41 +08:00
zhenwu
97a3d974d3 fix test groovy
Former-commit-id: cbc94db875e7078902a6238160ad581d7679150f
2019-11-02 13:19:00 +08:00
peng.xu
e05a21101e Merge branch '0.5.1' into '0.5.1'
[ci] add test params

See merge request megasearch/milvus!811

Former-commit-id: 47be2393dccb6c5642e44a8beeff443c004251d9
2019-11-02 11:52:44 +08:00
zhenwu
fed65830b1 add test params
Former-commit-id: c50a44661a54e0269a6dc2dbe368b9d5b7d5a712
2019-11-02 11:49:31 +08:00
Jin Hai
a81450175f Merge pull request #165 from fishpenguin/branch-0.5.1-yk
#164 - Add CPU version for building index 

Former-commit-id: 2ed2de91ff4992c2c43c6a3f9abd48e35b86cd3c
2019-11-02 11:33:20 +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
03b6598382 fix conflicts
Former-commit-id: dd30c8a826f78623c6984fc5c65ac801cf009478
2019-11-01 17:06:20 +08:00
fishpenguin
44d648c3af #164 - Add CPU version for building index
Former-commit-id: 02f9f2a04dc765f41c474af04659f70d121cdc18
2019-11-01 17:01:57 +08:00
fishpenguin
e1ad8d34fd #164 - Add CPU version for building index
Former-commit-id: d03346e95d746a4c95a0e42765df9c0dc1394e42
2019-11-01 16:54:59 +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
9d0d22b72e Merge pull request #129 from akihoni/master
[skip ci] Create README_CN.md

Former-commit-id: 4086dee27ca328ed98006782cd1e09bd7e6ca2bd
2019-11-01 15:17:04 +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
1fdd195123 Merge branch '0.5.1' into '0.5.1'
0.5.1

See merge request megasearch/milvus!808

Former-commit-id: df02e86f205d93f390b0de2db8210021a03d2e11
2019-11-01 14:55:45 +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
Jin Hai
3841ed1888 Merge pull request #155 from milvus-ci-robot/0.5.1
update milvus ubuntu18.04 build enviroment images version to 0.5.1

Former-commit-id: c1e88a115d667b4a699a90137d90c4527b605802
2019-11-01 14:54:41 +08:00
Jin Hai
3788407da9 Merge pull request #162 from tinkerlin/fix_ivfsqh_crash
Fix ivfsqh crash

Former-commit-id: 357b02fe1b410ba1f41fd3d22dc1dd58d8e7208d
2019-11-01 14:53:41 +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
yudong.cai
6e6c2153ea Merge remote-tracking branch 'main/0.5.1' into 0.5.1
Former-commit-id: 2ab08f424150d1855333e620bbfd57ea10497e01
2019-10-31 19:56:28 +08:00
jinhai
4d36e58309 Merge branch '0.5.1' into '0.5.1'
0.5.1

See merge request megasearch/milvus!806

Former-commit-id: 55d951e5963574c5e8b31641fe93168a66cd7ac0
2019-10-31 19:05:15 +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
jinhai
3ae1de39e0 Merge branch '0.5.1' into '0.5.1'
0.5.1

See merge request megasearch/milvus!805

Former-commit-id: 8681b6826c5943aa6168287d44b37c480ee64793
2019-10-31 17:19:29 +08:00
JinHai-CN
3a0e3e47a0 Merge remote-tracking branch 'main/0.5.1' into 0.5.1
Former-commit-id: 1fa35dac8d7f5720d026af92c4473919520e3bff
2019-10-31 17:19:15 +08: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
jinhai
df4021d4e8 Merge branch '0.5.1' into '0.5.1'
0.5.1

See merge request megasearch/milvus!804

Former-commit-id: e580322504443d618bf79166cae817c0debea8e7
2019-10-31 17:16:55 +08:00
JinHai-CN
795e69bbaf Merge remote-tracking branch 'main/0.5.1' into 0.5.1
Former-commit-id: 7c140fb85e3d8b9993772968a011be9ade0ebeea
2019-10-31 17:15:56 +08:00