Commit Graph

3263 Commits (13daf832a9666a53ce63ab9fcf028f54f5e9c3ee)

Author SHA1 Message Date
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
yudong.cai 274d96f99f MS-606 optimize reduce API, update unittest
Former-commit-id: 1e79b7dba4b7c90e5218fc75e5cc552152ec4bbe
2019-10-12 15:56:09 +08:00
jinhai d123bf2083 Merge branch 'branch-0.5.0' into 'branch-0.5.0'
MS-640 Cache object size calculate incorrect

See merge request megasearch/milvus!693

Former-commit-id: c90ec36775a1e5d9d4ed4d46c527bd4a093c1413
2019-10-12 14:35:37 +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
jinhai ee67cf1b83 Merge branch 'branch-0.5.0-yk' into 'branch-0.5.0'
MS-637 - out of memory when load too many tasks

See merge request megasearch/milvus!692

Former-commit-id: 2608e23172c1c75cc3a30a808536398870576c0e
2019-10-11 20:10:42 +08:00
Yu Kun 21db4cfb12 Merge branch 'branch-0.5.0-yk' of 192.168.1.105:kun.yu/milvus into branch-0.5.0-yk
Former-commit-id: 59b561d110cbdd305766a8e86c68b5a141dfb613
2019-10-11 20:09:52 +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 ceaab30835 Merge remote-tracking branch 'upstream/branch-0.5.0' into branch-0.5.0-yk
Former-commit-id: 56310dbb4c7324c018f38af215bc2f345bfd888a
2019-10-11 20:08:10 +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
jinhai c8feb980fe Merge branch 'branch-0.5.0-yk' into 'branch-0.5.0'
MS-636 Add optimizer in scheduler for FAISS_IVFSQ8H

See merge request megasearch/milvus!690

Former-commit-id: 5c239cfe28b286e8047a4386dc4a83825f3d5161
2019-10-11 19:51:15 +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
peng.xu 6dee58f9e7 Merge branch 'branch-0.5.0' into 'branch-0.5.0'
refine code

See merge request megasearch/milvus!689

Former-commit-id: 657055f806487253a110dffafbcc33b451e559b5
2019-10-11 16:19:00 +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
peng.xu 57daf170ee Merge branch 'branch-0.5.0' into 'branch-0.5.0'
format code

See merge request megasearch/milvus!686

Former-commit-id: b4e8582ed68587d5239ef49c1ce01e194500e92e
2019-10-10 16:04:12 +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
Yu Kun 33b398061d Merge remote-tracking branch 'upstream/branch-0.5.0' into branch-0.5.0-yk
Former-commit-id: 292543d7dad2d99b79d2a70170b8da3e295b64ef
2019-10-10 15:38:29 +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 725c3b5e1d Merge branch 'branch-0.5.1' of http://192.168.1.105:6060/jinhai/milvus into branch-0.5.1
Former-commit-id: 141aae3ed35f8d978b5d1ae29c9ee6fdb1a7ed8d
2019-10-10 15:35:30 +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 9e79bb9a7e Merge branch 'branch-0.5.1' of http://192.168.1.105:6060/jinhai/milvus into branch-0.5.1
Former-commit-id: 1b8c7bfed00a4d34aa1fa147fc32a6464fecf9a1
2019-10-10 15:20:44 +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
jinhai e8b09efaaf Merge branch 'branch-0.5.0' into 'branch-0.5.0'
MS-626 Refactor DataObj to support cache any type data

See merge request megasearch/milvus!682

Former-commit-id: 15f33afbfd88993a92baab53cd979e6b65e045e2
2019-10-10 15:13:15 +08:00
wxyu 92e39de8be MS-626 Refactor DataObj to support cache any type data
Former-commit-id: 4833ed21851689b234ab513de0929a25ae1ee941
2019-10-10 15:12:54 +08:00
jinhai 16cdd21795 Merge branch 'branch-0.5.0' into 'branch-0.5.0'
MS-626 Refactor DataObj to support cache any type data

See merge request megasearch/milvus!681

Former-commit-id: c61d2b112c65fe5a106f9621b86a616c00af8da2
2019-10-10 14:34:50 +08:00
wxyu 14685f77d2 solve conflicts
Former-commit-id: d6f938da342cc6c7643f3cc1fd41f5a6212a5ecd
2019-10-10 14:33:56 +08:00