Commit Graph

3520 Commits

Author SHA1 Message Date
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-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-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
Jin Hai
078fea9174 Merge pull request #157 from scsven/dev
Not return error when search_resources and index_build_device set cpu

Former-commit-id: ebba315bde66ecc0d360942cb56cb94b65ed5d4d
2019-10-31 17:15:24 +08:00
JinHai-CN
56b786dced Merge remote-tracking branch 'main/0.5.1' into 0.5.1
Former-commit-id: 998c6ea1ffee323e77137d0ec50cd2b37270ebe9
2019-10-31 17:11:21 +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
434548fad6 Merge pull request #144 from milvus-ci-robot/0.5.1
Delete GIT_CREDENTIALS_ID parameter

Former-commit-id: 2a3bd00494bbd19e1e01292d7f450b0ae437e02e
2019-10-31 16:34:38 +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
Jin Hai
ddea522bc9 Merge pull request #153 from youny626/0.5.1
fix cmake regex error

Former-commit-id: 0abc234db17fd0bcd469fc28f970197e2f8cb240
2019-10-31 15:29:50 +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
milvus-ci-robot
28ac93a226 make sure to put #!/usr/bin/env groovy at the top of the Jenkinsfile
Former-commit-id: 5af0774e12ea9d10f3fe10b77336df22d748c7de
2019-10-31 14:30:55 +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
Jin Hai
a048b6a5eb Merge pull request #145 from JinHai-CN/0.5.1
Update from internal milvus

Former-commit-id: 6d3877dc5ff22a7dc24fb0362eb7aba66651122a
2019-10-31 14:14:16 +08:00
jinhai
6a468d9e42 Merge branch '0.5.1' into '0.5.1'
0.5.1

See merge request megasearch/milvus!803

Former-commit-id: cb88d9205defa5efd7e2edef9bed5d71345b78f7
2019-10-31 14:09:11 +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
milvus-ci-robot
e3e22cedc5 delete GIT_CREDENTIALS_ID parameter
Former-commit-id: 8308271362483b047c3b406f6cbe0de32734e73d
2019-10-31 10:34:55 +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
Jin Hai
87b80491d9 Merge pull request #141 from scsven/dev
fix lint

Former-commit-id: 4a5fe797dbf23f6f5476eec728e2d7af61cfbf46
2019-10-30 20:26:40 +08: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
Jin Hai
7898b8e570 Merge pull request #140 from scsven/dev
New config opion use_gpu_threshold

Former-commit-id: 119adf89b7800ff660ed1589ab829b42c7c2515c
2019-10-30 20:07:57 +08:00
wxyu
7dc552fdea New config opion use_gpu_threshold
Former-commit-id: 3d33145d8fa473f2b81cc98022c1bb93853a2fbc
2019-10-30 19:57:55 +08:00
peng.xu
90c25d73a5 Merge branch '0.5.1' into '0.5.1'
get branch name

See merge request megasearch/milvus!800

Former-commit-id: 63ed8d0017f48bff8fd902fca7b5c036c8ff8337
2019-10-30 18:37:00 +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
Jin Hai
3d61bbf9cc Merge pull request #131 from scsven/dev
Set task state MOVED after resource copy it completed

Former-commit-id: 4dfb87b726c56b76c2e56c37ac14a14600a8da21
2019-10-30 14:18:06 +08:00
Jin Hai
98ea5f67eb Merge pull request #133 from milvus-io/master
Merge from master

Former-commit-id: f9817fb9bb7218adff78637b264d5e1e3fc8bece
2019-10-30 14:01:24 +08:00