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
Yu Kun
4223ad9dc2
fix searchinfiles return status bug
...
Former-commit-id: f7d2490eb6eebf366d4130e5b48adcaab6e41020
2019-09-12 11:56:37 +08:00
wxyu
54ec2a126d
MS-546 Add simple mode resource_config
...
Former-commit-id: d1909071f0d5e630ae8919c473083cad04778d76
2019-09-12 11:48:45 +08:00
Yu Kun
ddfc052223
Merge remote-tracking branch 'upstream/branch-0.4.0' into branch-0.4.0
...
Former-commit-id: 1086979d1883a172a96f99ad5d6d03aa6b61e3f1
2019-09-12 11:30:55 +08:00
peng.xu
9998adb305
Merge branch 'branch-0.4.0' into 'branch-0.4.0'
...
remove gpu_cache_capacity config
See merge request megasearch/milvus!555
Former-commit-id: 684259254218b9c02a3fdaa67ffadd3dca7efc0e
2019-09-12 11:30:25 +08:00
starlord
b92d489709
remove gpu_cache_capacity config
...
Former-commit-id: 34cd12b8f13d4d92517cd6c5aa94fa8aa0c1cd66
2019-09-12 11:25:21 +08:00
Yu Kun
d6c314b9e6
fix conflicts
...
Former-commit-id: aa97e1f8864d9cf3c48c41b3670a0f315019350c
2019-09-12 11:18:11 +08:00
Yu Kun
a2504c13e3
fix coverage bugs
...
Former-commit-id: 6fd2ca73cc082164c2e44301797cbade85fbe218
2019-09-12 11:15:02 +08:00
jinhai
26c8011294
Change type
...
Former-commit-id: da3ae3ff25ac26dd1c85a52bd8ddc5538dd42fbd
2019-09-12 10:51:56 +08:00
jinhai
457c43a9f4
Merge remote-tracking branch 'upstream/branch-0.4.0' into branch-0.4.0
...
Former-commit-id: 316fb37455523a04270b87ba49824a4ef3352abe
2019-09-12 10:31:31 +08:00
Yu Kun
4cd641058f
remove some nouse changes
...
Former-commit-id: c550390a97917b975fe456a733efda7d5b17c099
2019-09-11 21:26:35 +08:00
Yu Kun
6625cc1a81
Merge remote-tracking branch 'upstream/branch-0.4.0' into branch-0.4.0
...
Former-commit-id: e59c248d2b525fe480a3b5ba97c6acc6e63d0c45
2019-09-11 20:42:01 +08:00
Yu Kun
cc0ce2e49f
MS-532 Add grpc server unittest
...
Former-commit-id: 92368a067cc2a7295f3fd027b576f78789297b52
2019-09-11 20:17:43 +08:00
xj.lin
12dd738e46
MS-544 fix
...
Former-commit-id: 2d9d4afb74ce2522b8cf5bf29ade982d3d6722ad
2019-09-11 20:16:31 +08:00
Yu Kun
6afd997b7a
Merge remote-tracking branch 'upstream/branch-0.4.0' into branch-0.4.0
...
Former-commit-id: d918f411479abd408d66ae84741ffb5231ccce42
2019-09-11 19:08:35 +08:00
peng.xu
aee725a3f2
Merge branch 'branch-0.4.0' into 'branch-0.4.0'
...
update config validation
See merge request megasearch/milvus!551
Former-commit-id: 87c1e2b4f6c66b2fe9c89990bf2209bacd7b91ae
2019-09-11 18:52:10 +08:00
zhiru
127fb43bf7
update config validation
...
Former-commit-id: a0e644700e6c3ce9e443da782019dae276fd4b36
2019-09-11 18:49:55 +08:00
peng.xu
a8e971ce3a
Merge branch 'branch-0.4.0' into 'branch-0.4.0'
...
optimize debug log
See merge request megasearch/milvus!550
Former-commit-id: 242a51f50863d23ffdb0a53dd0ca8bbb99e8fb30
2019-09-11 18:31:36 +08:00
yudong.cai
47d98989d0
optimize debug log
...
Former-commit-id: cf7c5b41a51493072acf68f42649cca532a4d896
2019-09-11 18:28:22 +08:00