1518 Commits

Author SHA1 Message Date
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
923406da8b MS-639 SQ8H index created failed and server hang
Former-commit-id: f57b0eb2423ee7d99fb58f06a68e828b3273d0f9
2019-10-13 21:14:32 +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
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
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
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
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
wxyu
fcff83e083 MS-641 Segment fault(signal 11) in PickToLoad
Former-commit-id: 78149b38f89b1e0e6a9a35dac224c119f25467d2
2019-10-12 17:10:19 +08:00
wxyu
4778a904df cpplint
Former-commit-id: 772851521e1bd1d65a554a5ec19d5bacd67ef59d
2019-10-12 16:54:03 +08:00
wxyu
69d6f6c347 MS-641 Segment fault(signal 11) in PickToLoad
Former-commit-id: 9e97782faf0f24cfc89ca36e05e037f82489c8cd
2019-10-12 16:49:06 +08:00
yudong.cai
274d96f99f MS-606 optimize reduce API, update unittest
Former-commit-id: 1e79b7dba4b7c90e5218fc75e5cc552152ec4bbe
2019-10-12 15:56:09 +08:00
wxyu
5712b818f0 solve conflicts
Former-commit-id: 418beb7d855dc9264c0c061a740fa2a8e35b1eb4
2019-10-12 14:34:48 +08:00
wxyu
3393090dc1 MS-640 Cache object size calculate incorrect
Former-commit-id: 63dfa23d1aef9cec5597a2aeecb2a0c73800882d
2019-10-12 14:33:57 +08:00
yudong.cai
bf1f7ce66d MS-606 support result reduce parallel
Former-commit-id: 8b3b1fdae57214bcfb30bb8365aabd9eabc957cd
2019-10-12 09:35:20 +08:00
Yu Kun
f5eefaad26 Merge remote-tracking branch 'upstream/branch-0.5.0' into branch-0.5.0-yk
Former-commit-id: bebd077060b057a8fcf08ed0d575868b8d087907
2019-10-11 20:09:29 +08:00
Yu Kun
762140abc7 MS-637 - out of memory when load too many tasks
Former-commit-id: 9c40f373286086f57b02da119212b665d1cb8e8c
2019-10-11 20:08:05 +08:00
jinhai
30a52e3084 Merge branch 'new_compile_defination' into 'branch-0.5.0'
MS-635 New compile defination

See merge request megasearch/milvus!691

Former-commit-id: 3e4864385c93dbd3159d0213f9d9f4cdf546aa82
2019-10-11 19:51:34 +08:00
xiaojun.lin
7bc9039f2c MS-635 coding style check
Former-commit-id: 06afc01551073cd4ef3c2dc9dace407e441458a7
2019-10-11 19:49:48 +08:00
xiaojun.lin
5bcb660110 MS-635 add compile option
Former-commit-id: 773d61d34bdb131ae3219ddfbe9e4eb656292230
2019-10-11 19:41:43 +08:00
Yu Kun
8ab67f6965 Merge remote-tracking branch 'upstream/branch-0.5.0' into branch-0.5.0-yk
Former-commit-id: a29b4ca4764ad56d6da5d3d7c357a87e318e0704
2019-10-11 17:38:55 +08:00
Yu Kun
59f45763d3 MS-636 Add optimizer in scheduler for FAISS_IVFSQ8H
Former-commit-id: 4dff6236c98a86965e686b4a94e5492e0c1d5722
2019-10-11 17:38:48 +08:00
starlord
8a9e760639 refine code
Former-commit-id: 7935a4ed21d423e5fc72adc8ab68b7f69dae554e
2019-10-11 16:18:19 +08:00
jinhai
c884b9fde2 Merge branch 'branch-0.5.0' into 'branch-0.5.0'
solve cpplint

See merge request megasearch/milvus!688

Former-commit-id: ecd1da1744a2b0e7ccb0743aa195e7b23478064d
2019-10-10 21:14:34 +08:00
wxyu
75de7e191c solve cpplint
Former-commit-id: 1d500a125ac8a72a18e51e5a3ccdb0369ba0af4a
2019-10-10 21:14:07 +08:00
jinhai
93925b5be2 Merge branch 'branch-0.5.0' into 'branch-0.5.0'
MS-631 IVFSQ8H Index support

See merge request megasearch/milvus!687

Former-commit-id: b9cd733409cafec934ec2e6333fd283ba380895b
2019-10-10 21:04:19 +08:00
wxyu
0712798938 MS-631 IVFSQ8H Index support
Former-commit-id: 21e17a20794e4fde31e79c4bbd4e26d46c79d886
2019-10-10 20:57:14 +08:00
starlord
defd24b2c6 format code
Former-commit-id: 648cc3be7f2dc4cca5c1394ff83c2d383c7b70b7
2019-10-10 16:03:29 +08:00
jinhai
6769b6d960 Merge branch 'branch-0.5.1' into 'branch-0.5.0'
Format the code

See merge request megasearch/milvus!685

Former-commit-id: 853243085b31e4d1856e3a7c944f323a78a91263
2019-10-10 15:44:24 +08:00
jinhai
092ed2ecbc Merge branch 'branch-0.5.0-yk' into 'branch-0.5.0'
Add ToIndexData for CopyToIndexFileToGpu

See merge request megasearch/milvus!684

Former-commit-id: f7f497e86d3cce7604157d54f9ec09986429f3b8
2019-10-10 15:43:39 +08:00
JinHai-CN
cdf910b6e8 Format the code
Former-commit-id: 35eee89fce00364921cf35ad8539197edbdb8a01
2019-10-10 15:41:49 +08:00
jinhai
88906b1aec Merge branch 'branch-0.5.1' into 'branch-0.5.0'
MS-627 Integrate new index: IVFSQHybrid

See merge request megasearch/milvus!683

Former-commit-id: 7f176330c1b32e4fa161e5c11a747266017c89b2
2019-10-10 15:35:49 +08:00
xiaojun.lin
f4611e3840 Merge branch 'branch-0.5.1' of http://192.168.1.105:6060/jinhai/milvus into branch-0.5.1
Former-commit-id: 73cc669f16dae2613baf3336ef08180929044bbf
2019-10-10 15:35:22 +08:00
Yu Kun
762fc164cc clang tidy and clang format
Former-commit-id: 2bee4aa19cf50687308cf94dc4a7c9a735386789
2019-10-10 15:34:26 +08:00
Yu Kun
f9f336efc3 Add ToIndexData for CopyToIndexFileToGpu
Former-commit-id: 901d2113cb3530b7425f267b34f42e99439b6e0c
2019-10-10 15:31:39 +08:00
xiaojun.lin
7a4e30d716 Merge remote-tracking branch 'upstream/branch-0.5.0' into branch-0.5.1
Former-commit-id: 12ff8f9e496bd5f194d481b31a5479a80faae6e1
2019-10-10 15:20:35 +08:00
xiaojun.lin
71374bdd91 Merge remote-tracking branch 'upstream/branch-0.5.0' into branch-0.5.1
Former-commit-id: 583c0e2d0a8134882b92f6e6c415613739bc36dd
2019-10-10 15:16:21 +08:00