2175893f54
Merge remote-tracking branch 'source/branch-0.4.0' into branch-0.4.0
...
Former-commit-id: d93a861e1171c298fe2d7d4cb8dd8e499b1ac3a8
2019-09-12 16:23:02 +08:00
193d0eeb6d
fix build index error
...
Former-commit-id: 593aeb2482792bfef55fbec8e6480df498cf9708
2019-09-12 16:22:21 +08:00
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
ee7fffef0c
Merge branch 'branch-0.4.0' into 'branch-0.4.0'
...
MS-543 send error status to sdk when load index fail
See merge request megasearch/milvus!560
Former-commit-id: 556b4747a0a90dea0384852fa83c770b3d47563b
2019-09-12 15:44:01 +08:00
25a78bb9b1
MS-543 send error status to sdk when load index fail
...
Former-commit-id: eee5d755dc706d176a0d0a29db17ba29ebb6aa37
2019-09-12 15:42:46 +08:00
c9aff1ebab
MS-549 server crash when search and train on same gpu
...
Former-commit-id: b285b816dac478e3940a5dac38bd45c7b13da578
2019-09-12 15:33:46 +08:00
f136df4aaa
MS-543 send error status to sdk when load index fail
...
Former-commit-id: a62922b904c7f7d478f5211b4d215d387ea23ae2
2019-09-12 14:10:56 +08:00
90cd973587
Merge remote-tracking branch 'main/branch-0.4.0' into branch-0.4.0
...
Former-commit-id: 824e89aeca41aebd20ad63bbe3d136126e0ba336
2019-09-12 12:50:35 +08:00
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
c569f8acf5
solve conflicts
...
Former-commit-id: 9d12c13ad3b65384e6f566f83655b0d85028312f
2019-09-12 12:04:47 +08:00
5ae1a6e7f0
Merge branch 'branch-0.4.0' into 'branch-0.4.0'
...
fix searchinfiles return status bug
See merge request megasearch/milvus!559
Former-commit-id: 8ed2f5d9eefdd0982de2d2aa5e10880552b25269
2019-09-12 12:03:25 +08:00
9583b9da64
Merge remote-tracking branch 'upstream/branch-0.4.0' into branch-0.4.0
...
Former-commit-id: 3a06caa572c2732c4e9da3e5b10cd18900225fc1
2019-09-12 11:57:22 +08:00
4223ad9dc2
fix searchinfiles return status bug
...
Former-commit-id: f7d2490eb6eebf366d4130e5b48adcaab6e41020
2019-09-12 11:56:37 +08:00
0f6a6fe14d
MS-546 Add simple mode resource_config
...
Former-commit-id: 13c594c3db06dc998af041ccb85d78d92a5e8fbf
2019-09-12 11:49:32 +08:00
54ec2a126d
MS-546 Add simple mode resource_config
...
Former-commit-id: d1909071f0d5e630ae8919c473083cad04778d76
2019-09-12 11:48:45 +08:00
e54b07cf9d
Merge branch 'branch-0.4.0' into 'branch-0.4.0'
...
remove knowhere path from jenkins build script
See merge request megasearch/milvus!557
Former-commit-id: e0899c91d089951d74d51056527e52fa617ea4fd
2019-09-12 11:41:19 +08:00
012d1df09f
Merge remote-tracking branch 'source/branch-0.4.0' into branch-0.4.0
...
Former-commit-id: 50170cbe70ef0111ab5c81a8472e5fee5a1ec708
2019-09-12 11:39:55 +08:00
b2a20f68c0
remove knowhere path from jenkins build script
...
Former-commit-id: ce5cb318fc129a0dea7596dc2133fdc740700167
2019-09-12 11:39:16 +08:00
f08e7d612c
Merge branch 'branch-0.4.0' into 'branch-0.4.0'
...
MS-532 Add grpc server unittest
See merge request megasearch/milvus!556
Former-commit-id: 15ea56174581d9a3f62edab8e9d6670e5e53180e
2019-09-12 11:37:42 +08:00
8c06e4e2e3
remove some nouse changes
...
Former-commit-id: 9b09de4cdb409f5327db7ce8966b0974eed1d3fa
2019-09-12 11:35:15 +08:00
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
6f21f6c1b2
Merge remote-tracking branch 'source/branch-0.4.0' into branch-0.4.0
...
Former-commit-id: 862958802a6ea2fc33ea64cde5dbba5a7a4554bb
2019-09-12 11:30:36 +08:00
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
6101b08dc8
force delete lcov files
...
Former-commit-id: e7312bc87d127b0e14af239a70ef88da4a7bd9fc
2019-09-12 11:29:00 +08:00
9f832656a0
fix conflicts
...
Former-commit-id: 5bf67736ef9c4a6dc505899a2bf5cb289c3c5aa5
2019-09-12 11:28:20 +08:00
d95417f793
Merge remote-tracking branch 'source/branch-0.4.0' into branch-0.4.0
...
Former-commit-id: 82145d3269bdda9f17993aa75c2308faf949c74c
2019-09-12 11:27:32 +08:00
a7ea9b2817
remove gpu_cache_capacity config
...
Former-commit-id: 94abdd662201c9b19c79d7b7170f3e9af2c39e81
2019-09-12 11:27:19 +08:00
b92d489709
remove gpu_cache_capacity config
...
Former-commit-id: 34cd12b8f13d4d92517cd6c5aa94fa8aa0c1cd66
2019-09-12 11:25:21 +08:00
d6c314b9e6
fix conflicts
...
Former-commit-id: aa97e1f8864d9cf3c48c41b3670a0f315019350c
2019-09-12 11:18:11 +08:00
a2504c13e3
fix coverage bugs
...
Former-commit-id: 6fd2ca73cc082164c2e44301797cbade85fbe218
2019-09-12 11:15:02 +08:00
0e757625d2
Merge branch 'branch-0.4.0' into 'branch-0.4.0'
...
Change type
See merge request megasearch/milvus!554
Former-commit-id: 6ab97078f942f1eaa02d7f7946ffdfa0267fba8f
2019-09-12 10:52:13 +08:00
26c8011294
Change type
...
Former-commit-id: da3ae3ff25ac26dd1c85a52bd8ddc5538dd42fbd
2019-09-12 10:51:56 +08:00
d5fa2d010c
Merge branch 'branch-0.4.0' into 'branch-0.4.0'
...
Branch 0.4.0
See merge request megasearch/milvus!553
Former-commit-id: 6e296f3d7d10786dc22d3f5a8139d94235b72c34
2019-09-12 10:51:36 +08:00
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
4cd641058f
remove some nouse changes
...
Former-commit-id: c550390a97917b975fe456a733efda7d5b17c099
2019-09-11 21:26:35 +08:00
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
6c90546ee5
fix search status return error
...
Former-commit-id: f44e97911d38a7aec383ba15d649699ff3b8328f
2019-09-11 20:41:36 +08:00
3b5cf191cf
Merge remote-tracking branch 'main/branch-0.4.0' into branch-0.4.0
...
Former-commit-id: d19c62083b5a4853d84380bdc7e47908b54aaba8
2019-09-11 20:21:42 +08:00
d4ea0151eb
Merge branch 'ms544' into 'branch-0.4.0'
...
MS-544 fix
See merge request megasearch/milvus!552
Former-commit-id: 2c99ce1fce5f15e36cfa854d9d688bc52fc68a02
2019-09-11 20:18:02 +08:00
cc0ce2e49f
MS-532 Add grpc server unittest
...
Former-commit-id: 92368a067cc2a7295f3fd027b576f78789297b52
2019-09-11 20:17:43 +08:00
12dd738e46
MS-544 fix
...
Former-commit-id: 2d9d4afb74ce2522b8cf5bf29ade982d3d6722ad
2019-09-11 20:16:31 +08:00
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
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
127fb43bf7
update config validation
...
Former-commit-id: a0e644700e6c3ce9e443da782019dae276fd4b36
2019-09-11 18:49:55 +08:00
595f3614ca
Merge remote-tracking branch 'main/branch-0.4.0' into branch-0.4.0
...
Former-commit-id: 137d054f3b006ad711c19f973d50e77bfe4e203b
2019-09-11 18:42:51 +08:00
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
8625f1ce3a
optimize debug log
...
Former-commit-id: 7f8acfdc6a0c74f61d8e8ff7fbd2f23089b16373
2019-09-11 18:30:16 +08:00
47d98989d0
optimize debug log
...
Former-commit-id: cf7c5b41a51493072acf68f42649cca532a4d896
2019-09-11 18:28:22 +08:00
a16b6a4f11
Merge branch 'branch-0.4.0' into 'branch-0.4.0'
...
refine code
See merge request megasearch/milvus!549
Former-commit-id: be438d921cb0fecebbc19745fa8e153f1f2ed224
2019-09-11 18:04:12 +08:00
28cc9e459e
refine code
...
Former-commit-id: 1d9e51080453544da5a6032a87618ef944bf3594
2019-09-11 18:01:44 +08:00
starlord
jinhai
peng.xu
yudong.cai
xj.lin
wxyu
Yu Kun
zhiru