Commit Graph

2259 Commits (3cb39ba1577b1f72744b58a2bab144f4d81aeeac)

Author SHA1 Message Date
jinhai 44846cc1d9 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
MS-359 Add cost test in new scheduler

See merge request megasearch/milvus!370

Former-commit-id: 68f9f10ea3f70d068d01437ba267cd89c7db7f54
2019-08-15 19:56:07 +08:00
wxyu c3469fa561 MS-359 Add cost test in new scheduler
Former-commit-id: 5ec53217a216927e3b0ddf211f1a56bb1a44f2b4
2019-08-15 19:09:59 +08:00
peng.xu 145ee0f514 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
add nprobe in search and preloadtable unittest

See merge request megasearch/milvus!369

Former-commit-id: 4c32c4bc443b2ee61df2708bc47994ad39be1284
2019-08-15 18:31:03 +08:00
Yu Kun fabcbe9172 fix preloadtable unittest bug
Former-commit-id: 8d19429bb3d4d58a1fcc31700dcc74685188280e
2019-08-15 18:08:46 +08:00
jinhai 8cc143239f Merge branch 'branch-0.4.0' into 'branch-0.4.0'
MS-357 Add minimum schedule function

See merge request megasearch/milvus!367

Former-commit-id: 981542c442629b4428e31ade75b4bb6a1a9e5de1
2019-08-15 16:02:06 +08:00
xj.lin cbc734d83b MS-337 dev basic Resource
Former-commit-id: 7486415fa96cd3db77320aeb4b01dd78a2b4c878
2019-08-15 15:58:08 +08:00
wxyu 9400101582 MS-357 Add minimum schedule function
Former-commit-id: da78df540b934e3f1d881b16f023d749e4b37101
2019-08-15 15:57:12 +08:00
Yu Kun 536daeea16 Merge remote-tracking branch 'upstream/branch-0.4.0' into branch-0.4.0
Former-commit-id: 88fb929978ce4a016f8402c444668363aba35065
2019-08-15 15:14:59 +08:00
peng.xu 3537a35ff0 Merge branch 'dev_resource' into 'branch-0.4.0'
MS-337 dev basic Resource

See merge request megasearch/milvus!365

Former-commit-id: adbf8a4fef8994475a0f8153fa05d30df802fc94
2019-08-15 15:04:53 +08:00
xj.lin c6f7423c79 MS-337 dev basic Resource
Former-commit-id: b2a6cc6eb4c8fb7509280bff4b3fccd77e73870f
2019-08-15 15:01:37 +08:00
Yu Kun 03b28a9bcd Merge remote-tracking branch 'upstream/branch-0.4.0' into branch-0.4.0
Former-commit-id: 2afda3c33fc5c4970005991d77937600904c312b
2019-08-15 10:32:43 +08:00
Yu Kun 608aa1b784 add nprobe and preloadtable unittest
Former-commit-id: dfaa1c4b36068c9de7499b48094ce39021d1213b
2019-08-15 10:32:36 +08:00
jinhai d5b6eceb66 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
MS-355 Add copy interface in ExcutionEngine

See merge request megasearch/milvus!363

Former-commit-id: 4f19f0cdd109e74fdec0d9d5b992a6b7c384b8d7
2019-08-14 21:26:57 +08:00
wxyu c11c58a555 MS-355 Add copy interface in ExcutionEngine
Former-commit-id: 9320dde8c2452982c552f604289d2661e5c1907e
2019-08-14 21:24:20 +08:00
Jeff dc1f80d2d0 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
add gperftools dependencies

See merge request megasearch/milvus!361

Former-commit-id: 1ce0bb9c3dc1ee3f4ad61258e1db3376c48f0323
2019-08-14 20:36:04 +08:00
quicksilver 7cc6e173b1 add gperftools dependencies
Former-commit-id: cc8e3f68f5fbe3393ac966083b607b54ccb50fe8
2019-08-14 20:35:21 +08:00
jinhai 0cd9a97487 Merge branch 'MS-351' into 'branch-0.4.0'
fix bug unittest

Closes MS-351

See merge request megasearch/milvus!360

Former-commit-id: f1fe91d674b212bc4297bcdba846a693de4606d0
2019-08-14 20:19:11 +08:00
xj.lin 4e20eb16a4 fix bug unittest
Former-commit-id: bb332dbf8545bc4e3528bdf699e38cf396be902f
2019-08-14 20:18:13 +08:00
jinhai f3c77cb37a Merge branch 'branch-0.4.0' into 'branch-0.4.0'
MS-354 Add task class and interface in scheduler

See merge request megasearch/milvus!359

Former-commit-id: 9e607732eaff16acf2db319efabb3ed5d884cb35
2019-08-14 20:14:41 +08:00
wxyu 7cb9401716 MS-354 Add task class and interface in scheduler
Former-commit-id: b76186ae5ae4057a704279a6ed24bfd17878c445
2019-08-14 20:12:14 +08:00
wxyu 9d7302cd7c MS-354 Add task class and interface in scheduler
Former-commit-id: a8697bf20ed0db126cc6857c6d7719a4731bd87d
2019-08-14 20:10:31 +08:00
wxyu 4de6f675ec MS-354 Add task class and interface in scheduler
Former-commit-id: 0a61d095db7144006b80bc0824886e62be71a5d5
2019-08-14 20:09:00 +08:00
jinhai af987b61e2 Merge branch 'MS-351' into 'branch-0.4.0'
Support MS-351

Closes MS-351

See merge request megasearch/milvus!357

Former-commit-id: 131e7aa9c100edb6254c3d97cabec8a9a513412d
2019-08-14 19:53:43 +08:00
xj.lin 59b63524da Merge branch 'branch-0.4.0' into MS-351
Former-commit-id: 2c8203f1e953247ad3bab65052d2b44811cc94e3
2019-08-14 19:50:21 +08:00
xj.lin 387e15455f MS-351 enable index move between cpu<=>gpu
Former-commit-id: 40841d540f1ded276f8455ffd863789edc2a1796
2019-08-14 19:48:48 +08:00
peng.xu 4b887cf094 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
add PreloadTable and some parameters

See merge request megasearch/milvus!355

Former-commit-id: b9e0a21d137dfb22983d1ed4e71e1f91354bd49c
2019-08-14 19:45:10 +08:00
Yu Kun b230f19ce5 fix bugs with discessions
Former-commit-id: 54cd32977b70608898c6c4c61e5971d4716a8e08
2019-08-14 19:23:56 +08:00
Jeff 5a659fc5ec Merge branch 'branch-0.4.0' into 'branch-0.4.0'
MS-350 remove submodule

See merge request megasearch/milvus!356

Former-commit-id: e0298261a2db6840f3c0395d2623e8d093b552ef
2019-08-14 19:18:08 +08:00
quicksilver 027ee6920c update build.sh
Former-commit-id: 800a68080248c20b0c83b86360205bd395ee0371
2019-08-14 19:17:03 +08:00
Yu Kun d7936a6c60 add some parameters and merge upstream
Former-commit-id: 680349208d62108ceda4ad822c466107a840327c
2019-08-14 19:06:38 +08:00
Yu Kun 83ab3a640c Merge remote-tracking branch 'upstream/branch-0.4.0' into branch-0.4.0
Former-commit-id: 7cf01fff2fd7f33db79845d5fe6ca1972262975e
2019-08-14 19:04:47 +08:00
Jeff 298d57a9dd Merge branch 'branch-0.4.0' into 'branch-0.4.0'
MS-350 remove submodule

See merge request megasearch/milvus!354

Former-commit-id: 61243f792215f73532206dfe3acee5057c525e2d
2019-08-14 17:45:50 +08:00
quicksilver feda3ef849 update build.sh
Former-commit-id: f09fd1b0e764b54e1a5e8d028a12e8661b7a3151
2019-08-14 17:45:10 +08:00
Jeff 0e4a66a5af Merge branch 'branch-0.4.0' into 'branch-0.4.0'
MS-350 remove submodule

See merge request megasearch/milvus!353

Former-commit-id: 6bec6693b47efea598961b65dfcf7e085e055ca8
2019-08-14 17:33:54 +08:00
quicksilver 8b7581cad8 update build.sh
Former-commit-id: 1bf5c621573c58f865e996cad2ad61b488155722
2019-08-14 17:32:52 +08:00
Jeff 9fcfe4fe58 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
for jenkins build

See merge request megasearch/milvus!352

Former-commit-id: ca0991de9f8f827d771d97cb7a815d0c6d2da59d
2019-08-14 17:14:24 +08:00
starlord 7047472cf7 for jenkins build
Former-commit-id: e69f393d71c54489917100acc18d125ded248471
2019-08-14 17:13:02 +08:00
starlord 75e1fa90e1 for jenkins build
Former-commit-id: fa78b4d2201879fd6fe2619d2b0e498c5f9bf433
2019-08-14 17:09:33 +08:00
Jeff 0aa01f7b45 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
MS-350 remove submodule

See merge request megasearch/milvus!351

Former-commit-id: 2d49acf25c89336e35a6844c99ed0464cdeda007
2019-08-14 16:04:36 +08:00
quicksilver ee6ac7b791 fix knowhere download directory error
Former-commit-id: 80e2e9470b01adbdaabb2f0660323aafd57c065a
2019-08-14 16:03:47 +08:00
Jeff 5771039fa0 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
MS-350 remove submodule

See merge request megasearch/milvus!350

Former-commit-id: f3f0f9d0dbdee514a43d10c749bba0847c15005e
2019-08-14 15:59:12 +08:00
quicksilver 1246bfd89e build knowhere
Former-commit-id: e743650d98d8131ae50952f65500728c379c76bc
2019-08-14 15:58:30 +08:00
Yu Kun 5ef5c11140 Merge remote-tracking branch 'upstream/branch-0.4.0' into branch-0.4.0
Former-commit-id: 259fd94df3c95b445ccd8ff34be60f7343b873ee
2019-08-14 15:53:46 +08:00
Yu Kun ccec483e1e add preloadtable
Former-commit-id: f052a555777fce2a1d27478f7b2bb51d1e536c7c
2019-08-14 15:50:23 +08:00
peng.xu 107fe12113 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
milvus default version 0.4.0

See merge request megasearch/milvus!349

Former-commit-id: 7d970111cd247bbb2d3fc75fc16fcd32fbe3f73f
2019-08-14 15:26:29 +08:00
starlord a7488c2478 milvus default version 0.4.0
Former-commit-id: a62048f862cb3c36187f59c19f14b31251291156
2019-08-14 15:25:50 +08:00
Jeff 4c5c672bfc Merge branch 'branch-0.4.0' into 'branch-0.4.0'
MS-350 - Remove knowhere submodule

See merge request megasearch/milvus!348

Former-commit-id: 864ec745cdd1fc2738bbddcc012e67ccef925741
2019-08-14 15:18:12 +08:00
quicksilver c85f44e1c3 remove knowhere submodule
Former-commit-id: 694000ecfac03a507613bc1e4eb58c147a6b7413
2019-08-14 15:17:31 +08:00
Jeff 653fba6603 Merge branch 'branch-0.4.0' into 'branch-0.4.0'
MS-350 - Remove knowhere submodule

See merge request megasearch/milvus!347

Former-commit-id: 2cc0eaa36523d2e9b47a25c97106f8f9b4176b58
2019-08-14 15:14:11 +08:00
quicksilver 99fecf1829 update milvus_build.groovy
Former-commit-id: 396cb7ad3c48e170aaadab2bcc8813976c88bdc8
2019-08-14 15:13:21 +08:00