Commit Graph

2287 Commits (7b2a668b3c1e079808edb71765ba2c78f3420305)

Author SHA1 Message Date
jinhai 7b2a668b3c Solve several issues
Former-commit-id: 5845ca6192a563f46d1d3183670b02e32961dcbe
2019-09-07 12:55:10 +00:00
jinhai a57e84e0a1 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
MS-518 Add schedinst_test in scheduler

See merge request megasearch/milvus!511

Former-commit-id: ac04ac08493c79ba8f0b9f1ac029e58a423c26be
2019-09-07 19:27:06 +08:00
wxyu 9a16867b8b Merge remote-tracking branch 'main/branch-0.4.0' into branch-0.4.0
Former-commit-id: d8df294b4af67d6f02ed308aff3fc3552ec13d41
2019-09-07 19:26:22 +08:00
wxyu 0061c5ed6c MS-518 Add schedinst_test in scheduler
Former-commit-id: cda00b76b0e2f43513844fb1a11413b135fa3be3
2019-09-07 19:26:03 +08:00
peng.xu ad9b0fe093 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
refine unittest code

See merge request megasearch/milvus!510

Former-commit-id: 7a78b4d0c3fc7c9032c26ec1375312c14f513179
2019-09-07 19:17:06 +08:00
starlord c1a91ac2d1 refine unittest code
Former-commit-id: 4d9a2330acc0cb7cb7fe663fcb4c2035203bc78b
2019-09-07 19:16:21 +08:00
peng.xu 762c13b1d8 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
MS-510 unittest out of memory and crashed

See merge request megasearch/milvus!509

Former-commit-id: 686a06955ab96505cc7e4a709f58cb0667ce2bda
2019-09-07 18:27:09 +08:00
starlord 3610c91130 MS-510 unittest out of memory and crashed
Former-commit-id: 17e5dd44414299840ccba10ae93ff67d10c80405
2019-09-07 18:26:13 +08:00
peng.xu e83c1b0f11 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
MS-517 Update resource_mgr_test in scheduler

See merge request megasearch/milvus!508

Former-commit-id: 73ea60f9a850d8d900f572cfa0c58e123ae3cf81
2019-09-07 18:15:45 +08:00
wxyu 40314d8fa7 Merge remote-tracking branch 'main/branch-0.4.0' into branch-0.4.0
Former-commit-id: af9a79ef1261687a79cadf42ef650edb2089cf74
2019-09-07 18:14:58 +08:00
wxyu 7ed52edd6e MS-517 Update resource_mgr_test in scheduler
Former-commit-id: 1ec8d4869bb1d863a2bd98d64180d19a77f3313b
2019-09-07 18:14:48 +08:00
wxyu 18dd06d07a MS-511 Update resource_test in scheduler
Former-commit-id: 99e298907ae56cfeb2475431080d06c4b34216f7
2019-09-07 16:45:17 +08:00
peng.xu 419bd23db4 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
update scheduler_test

See merge request megasearch/milvus!507

Former-commit-id: 646c2d4ba6bb8d245be08b3d4001db9d334a7984
2019-09-07 16:18:19 +08:00
wxyu 419097596e solve conflicts
Former-commit-id: c17de2992aa5837228c833e85b749cdc1f92edd9
2019-09-07 14:59:29 +08:00
jinhai 5e41d5c09a Merge branch 'change_top_k_limitation' into 'branch-0.4.0'
MS-496 Change the top_k limitation from 1024 to 2048

See merge request megasearch/milvus!501

Former-commit-id: b696a02067acc43971f319ae914dc1c0360af404
2019-09-07 14:58:31 +08:00
jinhai 521227bfdb Fix typo and time record
Former-commit-id: bd76bb403d0869125d48ecaf4a853c206e82106c
2019-09-07 06:56:47 +00:00
wxyu 4e0cd172ad solve conflicts
Former-commit-id: 79fbc25376811b5f3ddef4ba1aab786226d95727
2019-09-07 14:55:28 +08:00
wxyu e757727e48 MS-508 Update normal_test in scheduler
Former-commit-id: 343dae4a96cac46259094de9c1d025de3b3db53e
2019-09-07 14:54:32 +08:00
Heisenberg deed6aa231 fix the merge conflict again
Former-commit-id: ef05797165bc42d33e4e8b4709ee4bb988f3797e
2019-09-07 14:54:15 +08:00
Heisenberg b167b004c7 MS-496 Change the top_k limitation from 1024 to 2048
Former-commit-id: fc04ff846d7d4d8b1fb2b16e9dba4f5ddfbe9c9d
2019-09-07 14:48:15 +08:00
jinhai ae352dfa23 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
MS-505: Install core unit test and add to coverage

See merge request megasearch/milvus!506

Former-commit-id: 5dfd0b831050299e8a8e1c0fffae861da2fd1ee7
2019-09-07 14:46:07 +08:00
zhiru a4228e805b update
Former-commit-id: 0bd73290587cc8abb50ba038a72c3ba0f0097785
2019-09-07 14:45:28 +08:00
zhiru fb5ebac730 Install core unit test and add to coverage
Former-commit-id: cdd16a8ff94ab77538f17ffa322c19c5a13804ac
2019-09-07 14:43:46 +08:00
Heisenberg 380d7ef792 fix the merge conflict on change log
Former-commit-id: 70d61492e3538d60cf270b6f7a4422f524cb7946
2019-09-07 14:41:23 +08:00
peng.xu 768d5f76f0 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
MS-505: Install core unit test

See merge request megasearch/milvus!505

Former-commit-id: 1069db330f54e253986030d67438092da42578b4
2019-09-07 12:11:14 +08:00
zhiru 209127c185 Install core unit test
Former-commit-id: ca5af63829888fe86df6daf45ad3223f84da8e9f
2019-09-07 12:09:57 +08:00
wxyu 1efe696f57 MS-504 Update node_test in scheduler
Former-commit-id: 2477838780d6c2e6403bd1972faa24a0c850f40c
2019-09-07 12:01:36 +08:00
wxyu d3e91efce1 MS-502 Update tasktable_test in scheduler
Former-commit-id: 019eb3180cfdd09ba7bc016e9b7990c35da4028e
2019-09-07 11:00:33 +08:00
Heisenberg 3cb39ba157 Merge branch 'branch-0.4.0' into change_top_k_limitation
Former-commit-id: 3d27803138b5e5371de1e68e9ea2ba167acdaac5
2019-09-06 21:35:26 +08:00
Heisenberg 248bdbf08d MS-496 Change the top_k limitation from 1024 to 2048
Former-commit-id: d63d6d69432888324424ed1daf0b1236a5243f4e
2019-09-06 21:34:25 +08:00
jinhai 26b30c9a1d Merge branch 'branch-0.4.0' into 'branch-0.4.0'
refine error code

See merge request megasearch/milvus!500

Former-commit-id: ed97eb36c542abfacae7b724a894c39867201749
2019-09-06 20:47:08 +08:00
starlord ec2bf99699 Merge remote-tracking branch 'source/branch-0.4.0' into branch-0.4.0
Former-commit-id: 7186924615af54c6b5f478c32cb839ace35b607a
2019-09-06 20:14:28 +08:00
starlord 3d1c10d5ee refine error code
Former-commit-id: 616ad6b30b1292a910a93e5fddb9da5787b57ac1
2019-09-06 20:14:22 +08:00
jinhai eaff4e5f0b Merge branch 'cmake' into 'branch-0.4.0'
MS-495: cmake: integrated knowhere

See merge request megasearch/milvus!499

Former-commit-id: dc00213133c082dcc021575083255d3fdda21750
2019-09-06 18:16:31 +08:00
zhiru 89b220ad1f update
Former-commit-id: 6c5fee0f88254d7b4c4d5cd4c5c9d58267c8ba04
2019-09-06 17:37:26 +08:00
jinhai d6c7909b24 Merge branch 'cmake' into 'branch-0.4.0'
MS-495: cmake: integrated knowhere

See merge request megasearch/milvus!498

Former-commit-id: e1b45640f991398147279dbf408725d8bdbb89a7
2019-09-06 16:58:19 +08:00
zhiru 01c6293363 update
Former-commit-id: 9a00d0a0d8c93bbc8b2b8ae744fc5729b9d03865
2019-09-06 16:54:46 +08:00
zhiru 42a9edf3eb Merge remote-tracking branch 'upstream/branch-0.4.0' into cmake
Former-commit-id: 89e1b3ae3c22c02d40eed555c4d3dcd9d76faa7a
2019-09-06 16:53:59 +08:00
jinhai be75b7b81a Merge branch 'fix_MS_453' into 'branch-0.4.0'
MS-453 GPU search error when nprobe set more than 1024

See merge request megasearch/milvus!497

Former-commit-id: cd6d47dd9705a751dcf757de29f7c49664c3e65d
2019-09-06 16:43:31 +08:00
Heisenberg ae8c5f8b77 MS-453 GPU search error when nprobe set more than 1024
Former-commit-id: cd871f4c238febe90a02a81c0b0d311d88729839
2019-09-06 16:38:44 +08:00
zhiru ea830ebc67 cmake: integrated knowhere
Former-commit-id: 81afb501886848d478c7046f04b933e2a3f34ac0
2019-09-06 16:30:47 +08:00
starlord a7dd4f0117 Merge remote-tracking branch 'source/branch-0.4.0' into branch-0.4.0
Former-commit-id: ecb8f2ce0b259e1de011b1ee217ac9ff824af6ca
2019-09-06 16:16:49 +08:00
starlord 54b85185fe refine error code
Former-commit-id: 2919dc7e39aa970522bd99d553bd0f92fcee9345
2019-09-06 16:16:44 +08:00
Heisenberg dad07c70e0 MS-453 GPU search error when nprobe set more than 1024
Former-commit-id: a32159a5cca42d592efc24cac2f9acb9b35defb3
2019-09-06 16:15:15 +08:00
Heisenberg bb7a0511da MS-453 GPU search error when nprobe set more than 1024
Former-commit-id: 455e79a2aa392610634a402b7c55a077a7c5eaca
2019-09-06 16:13:44 +08:00
jinhai 646a4d3f86 Merge branch 'fix_MS493' into 'branch-0.4.0'
MS-493: 1. FIX return cuda error when system exit 2. enable knowhere unittest

See merge request megasearch/milvus!495

Former-commit-id: 5576b7e530bf023107137759b88faa647dd8e205
2019-09-06 16:09:17 +08:00
xj.lin dcae247b79 Merge branch 'branch-0.4.0' into fix_MS493
Former-commit-id: 59a9f1966eca287932406ece6e57c0485eed2d0c
2019-09-06 16:07:19 +08:00
xj.lin bb1f96bdf7 MS-493 1. update changelog
Former-commit-id: 70b89a957d0bdff9a047e42faeefa0c84d0e155a
2019-09-06 16:04:19 +08:00
xj.lin 6fba3cda43 MS-493: 1. FIX return cuda error when system exit 2. enable knowhere unittest
Former-commit-id: 6081d0da211e07fd74e5b1607518da879a09eb93
2019-09-06 15:55:23 +08:00
zhiru 8d2b16a6e9 Merge remote-tracking branch 'upstream/branch-0.4.0' into cmake
Former-commit-id: 4a6d01614e1ec35b25523be67a5d7f7676f75b17
2019-09-06 15:15:31 +08:00