Commit Graph

1640 Commits (7d782dbb9f826492680ee917199f109b5d6bc84a)

Author SHA1 Message Date
xj.lin 7d782dbb9f remove personal project knowhere
Former-commit-id: 9d030089606c110f0a42159fb5200ae2fbbefcc5
2019-07-30 15:12:45 +08:00
Jeff d04440294c Merge branch 'branch-0.4.0' into 'branch-0.4.0'
MS-297: disable mysql unit test

See merge request megasearch/milvus!286

Former-commit-id: 74d0f3f6a2c661a5ace48e5507fb75df963a1a88
2019-07-30 13:57:01 +08:00
zhiru b06cc9fe02 disable mysql unit test
Former-commit-id: 4f07286e00ceabe8fb700206ff45bbdda6bfe8d9
2019-07-30 13:53:45 +08:00
zhiru c16eabb538 disable mysql unit test
Former-commit-id: da61f1ae35c9ed2d8a363ffd2e85dfb634ae4b32
2019-07-30 13:51:59 +08:00
zhiru 6dd6798433 disable mysql unit test
Former-commit-id: cc3158053f3735e701d6c3de940eebeb25abafdd
2019-07-30 13:50:21 +08:00
jinhai 71c177227a Merge branch 'update_jenkins_scripts' into 'branch-0.4.0'
MS-295 update jenkins-scripts

See merge request megasearch/milvus!285

Former-commit-id: c072b20d593a20f38166ee2489211a6297276cd5
2019-07-29 20:04:00 +08:00
xj.lin 17db7c8d7b MS-295 update jenkins-scripts
Former-commit-id: de8984c63956b40e39d8798c245ab0e6dea1c5e5
2019-07-29 19:55:48 +08:00
jinhai 256b3702dc Merge branch 'branch-0.3.1' into branch-0.4.0
Former-commit-id: 6445b9ad1ec8db0fa1399563f187d206df04c63d
2019-07-28 09:55:56 +08:00
jinhai 3715ccb6a6 Merge branch 'branch-0.3.1' into 'branch-0.3.1'
parallel reduce default false

See merge request megasearch/milvus!282

Former-commit-id: 0726e6bdbc3af658d4757aacb96fe2668f7c0bc0
2019-07-28 09:55:32 +08:00
jinhai 5740985e0e Merge branch 'branch-0.3.1-xiaojun' into branch-0.4.0
Former-commit-id: a4c620656251f284789bead020c70a8fd64b4143
2019-07-28 09:30:31 +08:00
peng.xu 028850d0ca Merge branch 'integrate_knowhere' into 'branch-0.3.1-xiaojun'
MS-288 update build stage

See merge request megasearch/milvus!283

Former-commit-id: 34dafeebfd64100ee77e62d4bd142ce3c8dd57c9
2019-07-27 14:34:17 +08:00
xj.lin 3314d47114 MS-288 update build stage
Former-commit-id: d9e0bfbbbb5060b65311b2f6eb8eadf531b918c2
2019-07-27 14:30:52 +08:00
starlord 4fc8921183 parallel reduce default false
Former-commit-id: 863941e425c4c2653367d2da6f13bebcb2b5eb96
2019-07-26 19:31:02 +08:00
jinhai 469b639469 Merge branch 'integrate_knowhere' into 'branch-0.3.1-xiaojun'
MS-286 fix..

See merge request megasearch/milvus!281

Former-commit-id: ab2892036ea2e84f8036bf0918a42c4917d77f64
2019-07-26 17:57:27 +08:00
xj.lin 66119dd20f MS-286 fix..
Former-commit-id: 056d394c7aff7f05ac5519a626e60e77e576fb63
2019-07-26 17:45:14 +08:00
jinhai cf2aed57f4 Merge branch 'branch-0.3.1' into 'branch-0.3.1'
MS-260 Refine log

See merge request megasearch/milvus!280

Former-commit-id: 342de0cd5859636f3ee26b4777c4a196f32acb16
2019-07-26 13:07:39 +08:00
jinhai fc0cf0a1f2 Merge branch 'fix-bug-without-grpc' into 'branch-0.3.1'
fix quries/minute bug

See merge request megasearch/milvus!279

Former-commit-id: 6285b0b1a0d381771d4b44187f82e3344581ea81
2019-07-26 13:07:27 +08:00
starlord b5816a386c MS-260 Refine log
Former-commit-id: 0fbaa027ff33645bae10ce31ecd9ffa3c17894df
2019-07-26 12:29:36 +08:00
starlord bf8f5cca34 MS-260 Refine log
Former-commit-id: a67b4e677a6ad1b46a793119d19a6da85f2441c4
2019-07-26 12:26:45 +08:00
kun yu 805aef38af fix quries/minute bug
Former-commit-id: 63f4de823b290d346f4133d70e9a834054e12688
2019-07-26 11:19:51 +08:00
jinhai d98f0549b2 Merge branch 'branch-0.3.1' into 'branch-0.3.1'
MS-275  Avoid sqlite logic error excetion

See merge request megasearch/milvus!278

Former-commit-id: 2bd20e7b00d755590f3ab3819067be88d687b7a9
2019-07-26 11:00:46 +08:00
starlord b0557af128 MS-275 Avoid sqlite logic error excetion
Former-commit-id: 88c2b25f471afd80338280d2a522de89b242051b
2019-07-26 10:59:16 +08:00
starlord 640e9141c6 MS-275 Avoid sqlite logic error excetion
Former-commit-id: d6ecaf2f32ed6c75370e6ed2bd24779cc18e76ff
2019-07-26 10:54:49 +08:00
jinhai 4d36b71c22 Merge branch 'integrate_knowhere' into 'branch-0.3.1-xiaojun'
MS-137 update knowhere version

See merge request megasearch/milvus!277

Former-commit-id: dac718d3fa12712f49ecc23b354fcb2c237002e6
2019-07-26 10:44:09 +08:00
xj.lin aa771e7c3d update knowhere version
Former-commit-id: 0457623ff251b8bb925e289df0b9bf0ee097973c
2019-07-26 10:42:28 +08:00
jinhai 29409108da Merge branch 'integrate_knowhere' into 'branch-0.3.1-xiaojun'
MS-137 integrate knowhere...

See merge request megasearch/milvus!276

Former-commit-id: 642b55b3e573dcee2e686e106e7abf97a3f445ee
2019-07-25 20:00:19 +08:00
xj.lin f37ae7765a MS-137 integrate knowhere...
Former-commit-id: 04bd70d29d1da919dbff9c39e0c60ccc6db57d23
2019-07-25 19:57:12 +08:00
jinhai 17fe748d30 MS-279 Merge from Branch-0.3.1
Former-commit-id: cd9e051d00423ae8a25f100366b1050f1604fca2
2019-07-24 21:28:24 +08:00
jinhai a7766318ba Merge branch 'branch-0.3.1' into 'branch-0.3.1'
MS-278: add IndexStatsHelpe

See merge request megasearch/milvus!275

Former-commit-id: 49eb9be9b34b2fa26d49af4cdb49c19b5979f226
2019-07-24 20:37:50 +08:00
zhiru 99f92d8758 add IndexStatsHelper
Former-commit-id: d47bb68ff89728b31d237a62caa4d4d7673ceb0f
2019-07-24 20:36:35 +08:00
zhiru cfffcf9e9a Merge remote-tracking branch 'upstream/branch-0.3.1' into branch-0.3.1
Former-commit-id: 4f3226d234fb9cbbab86cb7e85d65e97c5773e2c
2019-07-24 20:34:33 +08:00
zhiru 837da04dc9 add IndexStatsHelper
Former-commit-id: 6579465eb992d10a9a2f10b0f129341664f9b77d
2019-07-24 20:34:11 +08:00
jinhai dbff40af0d Merge branch 'branch-0.3.1' into 'branch-0.3.1'
MS-276 Fix compile with volta architecture

See merge request megasearch/milvus!273

Former-commit-id: ffc15e40c2c042ffefd73d3f4a583ead93883057
2019-07-24 20:29:39 +08:00
Jeff 4cd27169ac Merge branch 'branch-0.3.1' into 'branch-0.3.1'
MS-277 - Update CUDA Version to V10.1

See merge request megasearch/milvus!274

Former-commit-id: c311464d926ff8d18caae84098e08c489991ee46
2019-07-24 20:29:25 +08:00
quicksilver 6d27cc91bb MS-277 - Update CUDA Version to V10.1
Former-commit-id: ae02d3236cc34ce89f5e2a453e2c027c1562fc98
2019-07-24 20:14:05 +08:00
starlord d7cbf9404a fix unittest unstable case
Former-commit-id: 2cc58215ffb327741e90824fecedf8a3073eebcc
2019-07-24 20:00:14 +08:00
jinhai 27b87309e9 Merge remote-tracking branch 'upstream/branch-0.3.1' into branch-0.3.1
Former-commit-id: e28665f82b62580e41f371ccc4daa4cc6a474c55
2019-07-24 19:59:46 +08:00
jinhai 6acfd7f60d MS-276 Fix compile with volta architecture
Former-commit-id: 5d67c583a462764d368b3d83d337849d54c955f7
2019-07-24 19:59:19 +08:00
jinhai 4e8500b4dc Merge branch 'branch-0.3.1' into 'branch-0.3.1'
MS-266 Improve topk reduce time by using multi-threads

See merge request megasearch/milvus!272

Former-commit-id: 038e0ee10f398d2d9a73ec5b8cec480e5d585f23
2019-07-24 19:49:21 +08:00
starlord a68e501b4b MS-266 Improve topk reduce time by using multi-threads
Former-commit-id: f19c6d78f7f9ab619de792fbb43efd86da0b07a1
2019-07-24 19:48:01 +08:00
jinhai 4a6b1779f6 Merge branch 'branch-0.3.1' into 'branch-0.3.1'
MS-266 Improve topk reduce time by using multi-threads

See merge request megasearch/milvus!271

Former-commit-id: c5b0ce9ebbd2a60fe7797b38996a70293c577789
2019-07-24 17:52:29 +08:00
starlord 8b757539d2 MS-266 Improve topk reduce time by using multi-threads
Former-commit-id: fb7b6588c31ca34b48e349a5b928bca2d21fbc20
2019-07-24 16:28:47 +08:00
starlord f986af8671 MS-266 Improve topk reduce time by using multi-threads
Former-commit-id: ec370a34b214c9105f06a9bdea8f34728ed5026a
2019-07-24 14:09:06 +08:00
starlord e51b7f1619 Merge remote-tracking branch 'source/branch-0.3.1' into branch-0.3.1
Former-commit-id: 6093fec932087c5c92d82e454d76bd614090615e
2019-07-24 12:48:47 +08:00
starlord ed029178c4 MS-266 Improve topk reduce time by using multi-threads
Former-commit-id: 79e4cfe6ade7b0fc059cd246c4b670a4b5343ca3
2019-07-24 12:48:36 +08:00
jinhai afc40c454a Merge branch 'branch-0.3.1' into 'branch-0.3.1'
MS-273 Add some logs and reformat code

See merge request megasearch/milvus!270

Former-commit-id: fe9e27aefd9bd73e12dd7aeaf709884b68da9ae6
2019-07-24 11:25:35 +08:00
jinhai aee7809c61 MS-273 Add some logs and reformat code, fix compile error
Former-commit-id: 5bf635ab31d5dfd0cdb558b7f038670098d75ed0
2019-07-24 11:17:53 +08:00
jinhai 34ca37d9a0 MS-273 Add some logs and reformat code
Former-commit-id: 5dfd98a0b954d5cc44ae40f6b14ce65a15d76f80
2019-07-24 11:02:22 +08:00
jinhai b46168cfeb Merge branch 'dev-sq8' into 'branch-0.3.1-xiaojun'
Dev sq8

See merge request megasearch/milvus!269

Former-commit-id: 7f2c9ce4b52d0436e5cea77f57b379b5edb8ff4a
2019-07-24 10:36:06 +08:00
xj.lin 7b3886fd23 MS-267 default support IP
Former-commit-id: 64bfb03ea5291604f551530bc65896cc19841a5d
2019-07-24 10:33:41 +08:00