admin/milvus
1
0
Fork 0
mirror of https://gitee.com/milvus-io/milvus.git synced 2025-12-30 23:45:28 +08:00
Code Issues Packages Projects Releases Wiki Activity
2,556 Commits 136 Branches 186 Tags
Commit Graph

1323 Commits

Author SHA1 Message Date
yudong.cai
b6c0c04463 Merge remote-tracking branch 'main/branch-0.5.0' into branch-0.5.0 
Former-commit-id: 05c0b1d4edfd0f2f87a4c24efad984c7a1c5c38f
 2019-09-19 15:01:09 +08:00
jinhai
878ad7be50 Merge branch 'ms-568' into 'branch-0.5.0' 
MS-568 Fix GpuResource free error

See merge request megasearch/milvus!587

Former-commit-id: b8d4623c617016c6569e90a6f5cb1fd2510ab371
 2019-09-19 14:57:24 +08:00
yudong.cai
dc71feabab use better name 
Former-commit-id: ccf466b6906067d03cb62f0a813a3d7b4c346e2c
 2019-09-19 14:52:25 +08:00
xiaojun.lin
02270a6298 MS-568 Fix GpuResource free error 
Former-commit-id: 52acd35e93a5293c70c45bb681fc54046b43a2cb
 2019-09-19 14:52:14 +08:00
yudong.cai
19d7c065ac MS-572 correct format 
Former-commit-id: 0bdbc27634eed7ba241b40d5957f5689d50d6a6a
 2019-09-19 14:46:09 +08:00
yudong.cai
4d23ecf082 MS-572 re-org signal handle 
Former-commit-id: a357dd78d214c3f2c39538ea32f7fc492d72b6f2
 2019-09-19 14:16:43 +08:00
yudong.cai
c89a99b800 MS-572 fix Milvus crash when get SIGINT 
Former-commit-id: 32b92068024731fcc3451271c7f66f8a37b68cbd
 2019-09-19 14:16:43 +08:00
zhiru
5c16730469 fix cmake 
Former-commit-id: dd8288d065c48eccc6dff699d153e48fbe5205f4
 2019-09-19 12:52:46 +08:00
Yu Kun
00b815332e Merge remote-tracking branch 'upstream/branch-0.5.0' into branch-0.5.0 
Former-commit-id: 672874bd9e304dc7a82ae652c6b68bd861e2a781
 2019-09-18 20:04:07 +08:00
wxyu
3c6f49f9cc MS-555 Remove old scheduler 
Former-commit-id: e07f211e59232b04cfa3f37240e896461ad9b616
 2019-09-18 19:52:23 +08:00
wxyu
e72b0348f7 MS-555 Remove old scheduler 
Former-commit-id: 8eb7f773a15df78f46bf61a59ec0ea9d8923cc28
 2019-09-18 19:44:38 +08:00
zhiru
666c6003f4 update 
Former-commit-id: 1a3242b1ac87cad3274cc28d2e73697e55936e8b
 2019-09-18 19:00:40 +08:00
jinhai
b32666a407 Merge branch 'refactor_knowhere' into 'branch-0.5.0' 
MS-565 Refactor knowhere

See merge request megasearch/milvus!581

Former-commit-id: 61180414e4319c25e0dcc4af5442233765c6c3ae
 2019-09-18 17:40:39 +08:00
xiaojun.lin
59ea536db6 MS-565 1. del wrapper/knowhere 
Former-commit-id: 3905da5c0716c6fe8317588c27a61b4a5c36316e
 2019-09-18 17:36:47 +08:00
zhiru
a5b3dea158 update 
Former-commit-id: 3d3617149b664de4d6af554af6e984163b963fe6
 2019-09-18 17:30:05 +08:00
xiaojun.lin
ed105628fc MS-565 1. refactor dir structure 2. add license 3. del swig 
Former-commit-id: 580d35b9fe3ea71ebc7d6096fbf5d905351f34f5
 2019-09-18 17:27:18 +08:00
starlord
8e5197a53b add log for table file miss issue 
Former-commit-id: 641bc002a5f760e9bd804c99897d0c6c84f07919
 2019-09-18 16:41:42 +08:00
zhiru
8464b8a206 refactor cmake 
Former-commit-id: 587cc22f501fd12cbdaf2d9950fce3f2483c7020
 2019-09-18 15:49:47 +08:00
Yu Kun
795ed3cf8e Merge remote-tracking branch 'upstream/branch-0.5.0' into branch-0.5.0 
Former-commit-id: 39277e83cae742e3b2b7dc288f516a833e89a38b
 2019-09-18 15:34:55 +08:00
Yu Kun
e852816176 fix memory leak 
Former-commit-id: 397a13f633b1b120c516db97ed46e5c8836db1ce
 2019-09-18 15:34:47 +08:00
starlord
8eaf03a279 refine code 
Former-commit-id: 710c122428d52f56a7bf41903afa4a7f8c6db01e
 2019-09-18 15:05:51 +08:00
starlord
cc02093029 Merge remote-tracking branch 'source/branch-0.5.0' into branch-0.5.0 
Former-commit-id: 2a518240fd2f4e4fbdcb8a653f98d6520fa79315
 2019-09-18 12:49:38 +08:00
starlord
69ce92dcc5 MS-558 refine status code 
Former-commit-id: ebb5ec55a58cfce4385f39d186e86d858eab1bf0
 2019-09-18 12:49:29 +08:00
wxyu
5a2743946b MS-562 Add JobMgr and TaskCreator in Scheduler 
Former-commit-id: bbaf2b649843e86fc7bbd28ec61e5a990fc5951f
 2019-09-18 10:42:01 +08:00
starlord
e16ac72a25 MS-558 refine status code 
Former-commit-id: cb176cf273ec66e1f7f5e89e9ba4c39cabc511ea
 2019-09-17 17:37:31 +08:00
starlord
5f07962cd4 MS-557 merge Log.h 
Former-commit-id: 37a1aece83b0885aef1ad60fbd3b26805df57a54
 2019-09-17 11:07:39 +08:00
starlord
b77155f3ec merge Log.h 
Former-commit-id: 3de21b82b857b7601075b977792ffdd36638e800
 2019-09-17 11:05:09 +08:00
wxyu
909e2a0934 add Apache License 
Former-commit-id: 8afccd9400189249b2f0c797e6e0f53f74547246
 2019-09-17 10:59:51 +08:00
wxyu
6cbf62c35f Merge remote-tracking branch 'main/branch-0.5.0' into branch-0.5.0 
Former-commit-id: 3b0b477ac496700e63f0ecf51fed63d100f2bd24
 2019-09-17 10:58:01 +08:00
starlord
63bd4cca5c merge Log.h 
Former-commit-id: 1204cfbfddee0b863abf10874ef97f0581c36a9a
 2019-09-17 10:57:41 +08:00
wxyu
dc559ef2ca solve conflicts 
Former-commit-id: 42e851d305e116053bc8cbf57dffc4161e66bc48
 2019-09-17 10:55:46 +08:00
wxyu
af9c167ed0 MS-556 Add Job Definition in Scheduler 
Former-commit-id: 87787757226f3b397d65125a687442222a5d3532
 2019-09-17 10:54:51 +08:00
jinhai
9433bf81cc MS-554 Change license to apache 2.0 
Former-commit-id: e09b7dd7872372fa0ece9f5d18ec4c316b89cbe8
 2019-09-17 10:51:48 +08:00
starlord
ef37fc9702 Merge branch 'branch-0.4.0' into 'branch-0.5.0' 
refine cache code

See merge request groot/vecwise_engine!4

Former-commit-id: 1baa0f3ce6bb90667f090e2ee76f5c168a4ca76d
 2019-09-17 10:01:27 +08:00
starlord
49c3b8e9f6 refine cache code 
Former-commit-id: 9d74c7f97e3bca9bb43963ed6f05491e258b712c
 2019-09-17 09:55:25 +08:00
Heisenberg
8fdef361b1 change cmakelist 
Former-commit-id: 9a60b9fb71226b5b15e7bb2b755ff2ad53e6d922
 2019-09-16 20:18:18 +08:00
Heisenberg
785a75a121 MS-552 Add and change the easylogging library 
Former-commit-id: cc29d15a956a343622f1f17c63b1ada51bb172a5
 2019-09-16 20:08:46 +08:00
starlord
5c36b1a052 refine cache code 
Former-commit-id: 2a982ed5663a5e34c46d8a3be2bb5c875ee6b63a
 2019-09-16 15:46:58 +08:00
jinhai
73ee2e0a7b Update lockguard 
Former-commit-id: 1bdcd84679433929e582689661730f1359077c98
 2019-09-12 17:58:18 +08:00
jinhai
8c9bbc4467 Fix compile error 
Former-commit-id: 2fb38500e2c534d1ddfeca123675c2f425efb2a4
 2019-09-12 09:29:09 +00:00
jinhai
bf9e1d7073 Merge branch 'branch-1.4.0' of http://192.168.1.105:6060/jinhai/milvus into branch-0.4.0 
Former-commit-id: aa587bd63672ba5bec583eba3f4737142af02f0d
 2019-09-12 09:13:18 +00:00
jinhai
ca53a98c55 Add merge mutex 
Former-commit-id: 3e65e9a3195ec1eff635b17997b599dbca1a0457
 2019-09-12 17:11:02 +08:00
peng.xu
da99a9e1f0 Merge branch 'branch-0.4.0' into 'branch-0.4.0' 
fix build index error

See merge request megasearch/milvus!562

Former-commit-id: 3f42a54ffa04c2f8c53ff6228e982fac8281b4fd
 2019-09-12 16:23:44 +08:00
starlord
193d0eeb6d fix build index error 
Former-commit-id: 593aeb2482792bfef55fbec8e6480df498cf9708
 2019-09-12 16:22:21 +08:00
jinhai
221a3134a1 Merge branch 'ms549' into 'branch-0.4.0' 
MS-549 server crash when search and train on same gpu

See merge request megasearch/milvus!561

Former-commit-id: 949cd52836c801888f352fef96d7cff2022a9ca1
 2019-09-12 15:48:26 +08:00
yudong.cai
25a78bb9b1 MS-543 send error status to sdk when load index fail 
Former-commit-id: eee5d755dc706d176a0d0a29db17ba29ebb6aa37
 2019-09-12 15:42:46 +08:00
xj.lin
c9aff1ebab MS-549 server crash when search and train on same gpu 
Former-commit-id: b285b816dac478e3940a5dac38bd45c7b13da578
 2019-09-12 15:33:46 +08:00
yudong.cai
f136df4aaa MS-543 send error status to sdk when load index fail 
Former-commit-id: a62922b904c7f7d478f5211b4d215d387ea23ae2
 2019-09-12 14:10:56 +08:00
peng.xu
cb332598d9 Merge branch 'branch-0.4.0' into 'branch-0.4.0' 
MS-546 Add simple mode resource_config

See merge request megasearch/milvus!558

Former-commit-id: 79f3420f07aedde4897c718498cc3ec7d1be463b
 2019-09-12 12:05:27 +08:00
wxyu
c569f8acf5 solve conflicts 
Former-commit-id: 9d12c13ad3b65384e6f566f83655b0d85028312f
 2019-09-12 12:04:47 +08:00