Commit Graph

2937 Commits

Author SHA1 Message Date
peng.xu
6b12678f06 Merge branch 'branch-0.5.0' into 'branch-0.5.0'
re-organize project directory

See merge request megasearch/milvus!706

Former-commit-id: 18490c4712a13e55cffd178d00821a70741fb9b7
2019-10-14 12:06:38 +08:00
peng.xu
a671171a8c Merge branch 'branch-0.5.0' into 'branch-0.5.0'
temporarily change sqlite-orm download url to gitlab

See merge request megasearch/milvus!707

Former-commit-id: 92cd2be8831bfceac26d89ca27d0455ca3bd7cd8
2019-10-14 11:56:28 +08:00
zhiru
52f82f976d temporarily change sqlite-orm download url to gitlab
Former-commit-id: 7d46aa017f2d68a9ec70deb743c72c30a8149713
2019-10-14 11:55:02 +08:00
starlord
2fc179104d Merge remote-tracking branch 'source/branch-0.5.0' into branch-0.5.0
Former-commit-id: 7e210e1c775b9acef194ac6f53cf0dc1a671b04d
2019-10-14 11:45:40 +08:00
starlord
994274a130 merge 0.5.0 branch
Former-commit-id: c687efe7864690004aecb296c1b75ce7084eb315
2019-10-14 11:44:56 +08:00
peng.xu
cbb2664807 Merge branch 'branch-0.5.0' into 'branch-0.5.0'
temporarily change sqlite-orm download url to gitlab

See merge request megasearch/milvus!705

Former-commit-id: e84d0cc506ef0cdc9202e5509866cb4b5c4b5988
2019-10-14 11:42:56 +08:00
zhiru
ed767a56be Merge remote-tracking branch 'upstream/branch-0.5.0' into branch-0.5.0
Former-commit-id: fcc4392560b95cb3c32d6488c456a51e7946c6df
2019-10-14 11:41:05 +08:00
zhiru
40186e2ec3 temporarily change sqlite-orm download url to gitlab
Former-commit-id: f5b8bc28955f091fa9003bf7e87e8c5c1167d56e
2019-10-14 11:41:01 +08:00
starlord
004bd81ac8 Merge remote-tracking branch 'source/branch-0.5.0' into branch-0.5.0
Former-commit-id: 4496b80869e6be02b8fbbe92a3ab08f8bf763acf
2019-10-14 09:51:56 +08:00
starlord
41d37f9648 re-organize project
Former-commit-id: 898c2c8b0b2cfdc1b8664062aa0ea910a93566dd
2019-10-14 09:51:48 +08:00
jinhai
711d8f015b Merge branch 'branch-0.5.0-yk' into 'branch-0.5.0'
MS-639 SQ8H index created failed and server hang

See merge request megasearch/milvus!704

Former-commit-id: 7ea975cd9cb71317c70b07471cc0c79bc9723c30
2019-10-13 21:40:09 +08:00
Yu Kun
d482246191 clang format
Former-commit-id: 24a39a20faa3bec8daf8c2ac5764f1856dceb2af
2019-10-13 21:21:29 +08:00
Yu Kun
b429953c0b fix conflicts
Former-commit-id: 421fa7db0f800aec6fef28d55a6dfb80e9308759
2019-10-13 21:18:02 +08:00
Yu Kun
56e6d17549 MS-639 SQ8H index created failed and server hang
Former-commit-id: bb2e5a11210eba6a5f4e3e4299e0e5bd4d8d86cc
2019-10-13 21:14:54 +08:00
Yu Kun
923406da8b MS-639 SQ8H index created failed and server hang
Former-commit-id: f57b0eb2423ee7d99fb58f06a68e828b3273d0f9
2019-10-13 21:14:32 +08:00
Jeff
8be739aeb1 Merge branch 'branch-0.5.0' into 'branch-0.5.0'
format

See merge request megasearch/milvus!703

Former-commit-id: c7486fb1d65dc26501cc65cdfa78d935aa469577
2019-10-13 18:13:09 +08:00
wxyu
07ef5a41bc format
Former-commit-id: 0fde786876ab02f2ed5c162dd5163892e5b796fb
2019-10-13 18:12:19 +08:00
jinhai
0d1d85f4bd Merge branch 'caiyd_reduce_parallel_0.5.0' into 'branch-0.5.0'
MS-606 optimize reduce, update unittest

See merge request megasearch/milvus!694

Former-commit-id: 3a99483a963ebda56d26c6137d70be3511122361
2019-10-13 17:59:25 +08:00
jinhai
0cd2e2a0c9 Merge branch 'branch-0.5.0' into 'branch-0.5.0'
SQ8H in GPU

See merge request megasearch/milvus!701

Former-commit-id: 8ee14aab943cbe9a979787a7169fe6c2f02f0382
2019-10-13 17:59:19 +08:00
jinhai
ca6a4b43aa Merge branch 'branch-0.5.0' into 'branch-0.5.0'
# Conflicts:
#   cpp/src/core/unittest/test_ivf.cpp
#   cpp/unittest/scheduler/test_resource.cpp

Former-commit-id: 92f072d94703b39712b5a61c03cbd144bfadfcd9
2019-10-13 17:59:12 +08:00
jinhai
fce032b31e Merge branch 'update_unittest' into 'branch-0.5.0'
MS-648 Update unittest

See merge request megasearch/milvus!702

Former-commit-id: 8778310c238e45ea61f0266d6e983430ce75b572
2019-10-13 17:57:58 +08:00
xiaojun.lin
657c0163f5 update v3
Former-commit-id: f0fc9af8a0207695522fbdedaf87ed7affb367c4
2019-10-13 17:57:04 +08:00
wxyu
3248d30139 format
Former-commit-id: cbc8d328bc00325658a17eb4c4198d71d185acd7
2019-10-13 17:54:48 +08:00
wxyu
f88b679877 fix unittest
Former-commit-id: 7088f23728bfbc2e946fbfef6aebaa33f8e8c999
2019-10-13 17:53:56 +08:00
xiaojun.lin
eea7f98200 update v3
Former-commit-id: af75de607e6f9db0276c8831868a6c0fa9b95a86
2019-10-13 17:50:43 +08:00
zhiru
c12e99c3fb update
Former-commit-id: 661cc9057b3c52fb09bef6adfec050e909ca4c3c
2019-10-13 17:30:05 +08:00
quicksilver
df456139e1 update JFROG_ARTFACTORY_URL
Former-commit-id: 027229595807a5cc2e960dbc34ca8b82a5253bdd
2019-10-13 17:23:50 +08:00
xiaojun.lin
1141bbbb06 update v2
Former-commit-id: 1240499e9e5f0042a2296300b00588ed11dc07c3
2019-10-13 16:57:34 +08:00
wxyu
640c4e3f7e format code
Former-commit-id: e6aad786d1c5ea845b62835df5c6c77db62d8e64
2019-10-13 16:51:26 +08:00
wxyu
7338a044f3 SQ8H in GPU part3
Former-commit-id: bd95d08bede45255fa10f4d8fdeb8674e435860b
2019-10-13 16:46:55 +08:00
jinhai
f5fbf67758 Merge branch 'branch-0.5.0' into 'branch-0.5.0'
Branch 0.5.0

See merge request megasearch/milvus!700

Former-commit-id: 84013aa1499d6b2ac1691c53897ed26996188df2
2019-10-13 15:27:45 +08:00
zhenwu
31e23fd2ea Using douban pypi
Former-commit-id: 4446056fb5e000fe597ade1eea11de3a544ea1bd
2019-10-13 15:18:50 +08:00
zhenwu
7a9c96b6a9 merge
Former-commit-id: 26e0e72b1da4f7b63d27f8ff7a96915a11fcbace
2019-10-13 15:17:15 +08:00
zhenwu
53e2d98df0 Using pypi.douban.com
Former-commit-id: 4ea40467d72db7a8ef5e636b187d3a5d48b07388
2019-10-13 15:05:38 +08:00
xiaojun.lin
bbdc611ca9 Merge branch 'branch-0.5.0' into update_unittest
Former-commit-id: 7fd8eefccbd8f7041ffa7af9ba0eb47f360b4006
2019-10-13 14:38:46 +08:00
xiaojun.lin
0c31540df4 update v1
Former-commit-id: 5b30f0f34233e831bee4572111c4bd9e67e9a33a
2019-10-13 14:35:51 +08:00
wxyu
e1e9ffeb46 Merge remote-tracking branch 'main/branch-0.5.0' into branch-0.5.0
Former-commit-id: 02962b0fed5f308589ebcb0521d002eb63312612
2019-10-13 14:31:24 +08:00
jinhai
af15c55aaf Merge branch 'branch-0.5.1' into 'branch-0.5.0'
MS-627 Fix new faiss issue

See merge request megasearch/milvus!698

Former-commit-id: dea76da171eeba8227ccdbe5732aef520e6b4aaa
2019-10-13 13:23:44 +08:00
wxyu
6b148639ef SQ8H in GPU part2
Former-commit-id: 2d8f5d2858f0ca3e4edf02ae53bc9c195a3c91a3
2019-10-13 13:20:11 +08:00
JinHai-CN
cf32049161 MS-627 Fix new faiss issue
Former-commit-id: 02626d0c95a3a1405a22bfeb9ea7fc21080a46a2
2019-10-13 09:52:34 +08:00
wxyu
bf24396571 SQ8H in GPU
Former-commit-id: 0075a759b0e2368f63c0ef9b75372f2afceafc34
2019-10-12 21:22:23 +08:00
Yu Kun
f30822e384 Merge remote-tracking branch 'upstream/branch-0.5.0' into branch-0.5.0-yk
Former-commit-id: e1c7a2e0cb6925a2a7004af1c5a45bbf7057879e
2019-10-12 17:57:14 +08:00
jinhai
54bc7b587f Merge branch 'branch-0.5.0' into 'branch-0.5.0'
MS-641 Segment fault(signal 11) in PickToLoad

See merge request megasearch/milvus!697

Former-commit-id: 34e1f77cd94cf66d03462c96f068caf7e629d409
2019-10-12 17:10:49 +08:00
wxyu
fcff83e083 MS-641 Segment fault(signal 11) in PickToLoad
Former-commit-id: 78149b38f89b1e0e6a9a35dac224c119f25467d2
2019-10-12 17:10:19 +08:00
jinhai
ec3b33e518 Merge branch 'branch-0.5.0' into 'branch-0.5.0'
cpplint

See merge request megasearch/milvus!696

Former-commit-id: 5a26906d3dd305e4ca606743e0c9e0325e9bdeb7
2019-10-12 16:54:17 +08:00
wxyu
4778a904df cpplint
Former-commit-id: 772851521e1bd1d65a554a5ec19d5bacd67ef59d
2019-10-12 16:54:03 +08:00
jinhai
5bda600072 Merge branch 'branch-0.5.0' into 'branch-0.5.0'
MS-641 Segment fault(signal 11) in PickToLoad

See merge request megasearch/milvus!695

Former-commit-id: 0f51ab8a9de66d5d22532e68888750749b487fe4
2019-10-12 16:49:24 +08:00
wxyu
69d6f6c347 MS-641 Segment fault(signal 11) in PickToLoad
Former-commit-id: 9e97782faf0f24cfc89ca36e05e037f82489c8cd
2019-10-12 16:49:06 +08:00
Yu Kun
6eb3cffc5c Merge remote-tracking branch 'upstream/branch-0.5.0' into branch-0.5.0-yk
Former-commit-id: 612ef3c80f2169bc52bef9324e5894d0bb92cc5f
2019-10-12 16:45:02 +08:00
Yu Kun
d776df7f63 fix test_resource
Former-commit-id: ef7b6c4987fd1a681c876870de2c1646673abbf4
2019-10-12 16:44:56 +08:00