admin/milvus
1
0
Fork 0
mirror of https://gitee.com/milvus-io/milvus.git synced 2025-12-08 01:58:34 +08:00
Code Issues Packages Projects Releases Wiki Activity
2,550 Commits 133 Branches 183 Tags
Commit Graph

1849 Commits

Author SHA1 Message Date
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
650d43dd4e update changelog 
Former-commit-id: 9aefaa8682dbe383b7fdf75b4edeb6332bf36019
 2019-09-17 10:16:37 +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
56737a2f88 Update CHANGELOGS 
Former-commit-id: 7441da96c79fb2cf89ac9ad2839ea45d3a9a5bdb
 2019-09-12 18:57:06 +08:00
jinhai
06433d879e Merge branch 'branch-0.4.0' into 'branch-0.4.0' 
Update lockguard

See merge request megasearch/milvus!565

Former-commit-id: cbb039c1da725a1c8ce0c8d06150749a6157ded7
 2019-09-12 17:59:32 +08:00
jinhai
73ee2e0a7b Update lockguard 
Former-commit-id: 1bdcd84679433929e582689661730f1359077c98
 2019-09-12 17:58:18 +08:00
jinhai
66a3b8f420 Merge branch 'branch-0.4.0' into 'branch-0.4.0' 
Branch 0.4.0

See merge request megasearch/milvus!564

Former-commit-id: 2bcae89add594fb171fa9c5b4cce3366f4373237
 2019-09-12 17:29:56 +08:00
jinhai
8c9bbc4467 Fix compile error 
Former-commit-id: 2fb38500e2c534d1ddfeca123675c2f425efb2a4
 2019-09-12 09:29:09 +00:00
jinhai
f6065c997f Merge branch 'branch-1.4.0' of http://192.168.1.105:6060/jinhai/milvus into branch-0.4.0 
Former-commit-id: 3f0e61ba1722063655c8b35870ca5e0a12e5ce9e
 2019-09-12 09:24:16 +00:00
jinhai
bb0bee5368 Fix boost url 
Former-commit-id: 323f1456f38a0adb468a53b8df0599a016e19b93
 2019-09-12 17:23:30 +08: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
starlord
8003b709d2 fix scheduler unittest error 
Former-commit-id: 65a76790634a63b3777aa79f038ea61f6fdf546f
 2019-09-12 17:06:41 +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
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
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
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
Yu Kun
4223ad9dc2 fix searchinfiles return status bug 
Former-commit-id: f7d2490eb6eebf366d4130e5b48adcaab6e41020
 2019-09-12 11:56:37 +08:00
wxyu
0f6a6fe14d MS-546 Add simple mode resource_config 
Former-commit-id: 13c594c3db06dc998af041ccb85d78d92a5e8fbf
 2019-09-12 11:49:32 +08:00
wxyu
54ec2a126d MS-546 Add simple mode resource_config 
Former-commit-id: d1909071f0d5e630ae8919c473083cad04778d76
 2019-09-12 11:48:45 +08:00
starlord
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
Yu Kun
8c06e4e2e3 remove some nouse changes 
Former-commit-id: 9b09de4cdb409f5327db7ce8966b0974eed1d3fa
 2019-09-12 11:35:15 +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
Yu Kun
9f832656a0 fix conflicts 
Former-commit-id: 5bf67736ef9c4a6dc505899a2bf5cb289c3c5aa5
 2019-09-12 11:28:20 +08:00
starlord
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
starlord
a7ea9b2817 remove gpu_cache_capacity config 
Former-commit-id: 94abdd662201c9b19c79d7b7170f3e9af2c39e81
 2019-09-12 11:27:19 +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
6c90546ee5 fix search status return error 
Former-commit-id: f44e97911d38a7aec383ba15d649699ff3b8328f
 2019-09-11 20:41:36 +08:00