84396d0521
Merge branch 'branch-1.2' into 'branch-1.2'
...
MS-37 Add metrics
See merge request megasearch/vecwise_engine!49
Former-commit-id: a24b1914ac475406f85ba83ff2c5ead2796122d8
2019-05-31 18:23:14 +08:00
2ab5e246ac
add metrics
...
Former-commit-id: d7acd398be8aeee11de3f972d9bcf6e84df39358
2019-05-31 14:36:36 +08:00
d5712b799b
Merge branch 'branch-1.2' into 'branch-1.2'
...
MS-34 Fix Prometheus Thirdparty
See merge request megasearch/vecwise_engine!48
Former-commit-id: a7d8f85b03ee41ef72eb94aeb31cf8081abb8bc6
2019-05-30 16:10:44 +08:00
67a5acf669
fix unitest
...
Former-commit-id: 1da98cfbf78110fa3732899e45ff3722eaf921ed
2019-05-30 15:54:22 +08:00
2b472a3340
fix CHANGELOG CONFLICT
...
Former-commit-id: 22222b13fe56975a13b45066b1b7b721d124729c
2019-05-30 15:13:29 +08:00
786c216e5c
Merge branch 'branch-1.2' into 'branch-1.2'
...
MS-10 feat(python): Add Python SDK APIs
See merge request megasearch/vecwise_engine!47
Former-commit-id: b20b52060f74c9631932c7aebdf76f449551e848
2019-05-30 15:08:16 +08:00
dcc6752495
add task in changelog
...
Former-commit-id: a88c6ecd7b97dccadb492c5df94729da2e52f136
2019-05-30 15:01:07 +08:00
f8c46af560
fix metrics test and add prometheus conf
...
Former-commit-id: 0c7ff6f49880db0ce4dd22ea1375886fb0e9b03d
2019-05-30 14:50:16 +08:00
430d09a36f
Merge remote-tracking branch 'mega/branch-1.2' into branch-1.2
...
Former-commit-id: 8af3d1b93944bba3c4015d278ac14756c43f804e
2019-05-30 11:32:20 +08:00
3896fca2c7
Merge branch 'branch-1.2' into 'branch-1.2'
...
MS-33 - cmake: add -j4 to make third party packages build faster
See merge request megasearch/vecwise_engine!46
Former-commit-id: 37ce72de7e03ed04b9b2b9b1b12d8fcb495d5e6f
2019-05-30 11:19:14 +08:00
321dda5315
Merge remote-tracking branch 'mega/branch-1.2' into branch-1.2
...
Former-commit-id: 5f0a9c8603f16bbadf9fecd6c87c5bd82956da7a
2019-05-30 11:18:33 +08:00
f038c5d289
Merge branch 'branch-1.2' into 'branch-1.2'
...
MS-32 fix thrift generate error
See merge request megasearch/vecwise_engine!45
Former-commit-id: c38029f2e4bac15245ea06900b680cf7d86fc70c
2019-05-30 11:16:25 +08:00
49fab66b70
feat(python): Add Python SDK APIs
...
Former-commit-id: 61ddcafcc5b02b0f193ada1fcefdac79d137f1d1
2019-05-30 11:11:41 +08:00
18bd963462
update changelog
...
Former-commit-id: d751122297499c3ce581cb757285b2a3896046ca
2019-05-30 10:18:34 +08:00
342e969be2
Merge remote-tracking branch 'upstream/branch-1.2' into branch-1.2
...
Former-commit-id: e93143498c1d4374d5a0879613788b77b40a96af
2019-05-30 10:14:09 +08:00
a096e52826
cmake: add -j4 to make third party packages build faster
...
Former-commit-id: c8ce2a8cbcf0d610304131e244d5d5000b4c8645
2019-05-30 10:12:52 +08:00
f1bb41d34c
restruct thrift package
...
Former-commit-id: 57d8eba6ad2df54f7b2d4e0544157788fe1eb127
2019-05-30 10:06:22 +08:00
f681c3ae86
restruct thrift package
...
Former-commit-id: d02f846e4ffa3c61d860b081054d4526e03eb930
2019-05-30 10:02:17 +08:00
168ac46cdb
fix thrift generate error
...
Former-commit-id: 444233484091fe329e190a5fd62bf93c5e26e3f4
2019-05-30 09:24:14 +08:00
fc21578f24
Build: make -j 4
...
Former-commit-id: 2726bed199c8921f1ba6850777125d609790841e
2019-05-30 09:20:47 +08:00
4193b2e305
Merge remote-tracking branch 'main/branch-1.2' into branch-1.2
...
Former-commit-id: 3ec3ca22cca08e517779bc268c535d5edd8768fe
2019-05-29 19:23:32 +08:00
ee8d81003c
Merge branch 'branch-1.2' into 'branch-1.2'
...
MS-31 cmake: add prometheus
See merge request megasearch/vecwise_engine!44
Former-commit-id: eb497b9737c8b4165aca3490db2315d1791f11a1
2019-05-29 19:22:27 +08:00
0b0bcb0a2c
add changelog
...
Former-commit-id: 96dc9ec82689e827996cf05e3c78f37fa24e75d8
2019-05-29 19:20:58 +08:00
9d79dd851f
Merge remote-tracking branch 'upstream/branch-1.2' into branch-1.2
...
Former-commit-id: f89f423b90a8c26732b8e7728fa5ae5688d968a3
2019-05-29 19:19:19 +08:00
8927a616d5
Merge branch 'branch-1.2' into 'branch-1.2'
...
MS-30 use faiss 1.5.2
See merge request megasearch/vecwise_engine!43
Former-commit-id: fb338b1145cbb745f17ade9ed1a54397cfc90aac
2019-05-29 19:18:44 +08:00
12aa730645
Merge remote-tracking branch 'upstream/branch-1.2' into branch-1.2
...
Former-commit-id: 45a2bc5528231149db971aabd82d054a71f40df5
2019-05-29 19:18:10 +08:00
bc14a2e2f5
MS-31 cmake: add prometheus
...
Former-commit-id: b26ad79afe4745afea0c802f23f1d9725c8d4747
2019-05-29 19:17:39 +08:00
439a5d10e9
add IO gauge
...
Former-commit-id: f23a858abade383d61780caf146f5dbbf578a113
2019-05-29 19:15:32 +08:00
e509d29df3
use faiss 1.5.2
...
Former-commit-id: cae61443fe5fb47752e94b19f03a32f3b80ad2f1
2019-05-29 18:52:55 +08:00
9f75c8d2aa
use faiss 1.5.2
...
Former-commit-id: 3005f905b39d72ef0018151d7e704023657083c6
2019-05-29 18:51:21 +08:00
24b3da9fdb
Merge branch 'branch-1.2' into 'branch-1.2'
...
MS-29 fix third-party link error
See merge request megasearch/vecwise_engine!42
Former-commit-id: 37027de76b885d75195431545a7eea6424b0b2ec
2019-05-29 17:35:56 +08:00
39df2d4d1e
fix third-party link error
...
Former-commit-id: 54782a2d0812e836544ca8667c1ee42a4e934830
2019-05-29 17:30:27 +08:00
442c66fd0f
Merge branch 'branch-1.2' of http://192.168.1.105:6060/megasearch/vecwise_engine into branch-1.2
...
Former-commit-id: 316de4cdf7f7daa5e4a01881e7ea5461e10d45aa
2019-05-29 17:16:21 +08:00
08da9771da
Fix Compile error
...
Former-commit-id: c8568b9dde298251cbff5fc1e58d61c022e13efc
2019-05-29 17:16:14 +08:00
7bf3895cd8
Merge branch 'branch-1.2' into 'branch-1.2'
...
MS-21 implement sdk interface part2
See merge request megasearch/vecwise_engine!40
Former-commit-id: 797fb1f6ebbe939ff8c5aa5a132e3f6c96c7bdc2
2019-05-29 17:04:17 +08:00
a7fed267ee
remove thrid-party
...
Former-commit-id: c44038e6c6c4f593529956d62afead726abe3334
2019-05-29 17:02:19 +08:00
845b927783
modify changelog
...
Former-commit-id: 5988d25b5854c502f2496d0244be5313e5a2969e
2019-05-29 16:59:51 +08:00
c9f9991ef3
modify changelog
...
Former-commit-id: c7448a91938c65c997df94c0929e4dfb53bb19a6
2019-05-29 16:29:08 +08:00
46eb246e20
Merge branch 'branch-1.2' into 'branch-1.2'
...
MS-26 cmake: add thirparty packages
See merge request megasearch/vecwise_engine!38
Former-commit-id: 74b99445d3e68c24f298a91934c4319af7901b01
2019-05-29 16:25:42 +08:00
d601408b08
resolve merge conflicts
...
Former-commit-id: 47eee4d08cde0e6628cddff77de7809ebb486eaf
2019-05-29 16:24:46 +08:00
9b2d62631d
resolve merge conflicts
...
Former-commit-id: 31d8d0d07a1fb4d8299f694db44787ceacf8c2d3
2019-05-29 16:23:24 +08:00
397457112b
refine sdk code
...
Former-commit-id: 30ab87ccf76dadf9c65489d5a19c1134124faec5
2019-05-29 16:21:22 +08:00
31a00449a4
MS-26 cmake. Add thirdparty packages
...
Former-commit-id: a68611c035820a429ae5ef1ae104a9826838dcca
2019-05-29 16:14:15 +08:00
9f33297b6e
delete irrelavent files
...
Former-commit-id: 52ab1e2826f26b1be92742124d1ac01a771b7114
2019-05-29 16:09:05 +08:00
99625929fa
Merge branch 'disable-Prometheus' into 'branch-1.2'
...
MS-25 diable Prometheus
See merge request megasearch/vecwise_engine!41
Former-commit-id: 0ae8e03a63c005e82a601e8164102ac58da31ad1
2019-05-29 16:08:58 +08:00
40ec2d90b1
MS-25 diable Prometheus
...
Former-commit-id: 88974da9099e9f3f5d73c923abd29622acd0bd1c
2019-05-29 16:05:02 +08:00
5386d5e70e
refine sample code
...
Former-commit-id: 18bda8e3585dfd0bcfc699c6788a9af0eb53fc5f
2019-05-29 14:55:22 +08:00
f119cc39db
cmake: add thirparty packages
...
Former-commit-id: f7efb9acd4c01567f8ed6f26a7aa220aa174bb53
2019-05-29 12:06:37 +08:00
360d56fd48
Merge branch 'branch-1.2' into 'branch-1.2'
...
MS-21 implement sdk interface part2
See merge request megasearch/vecwise_engine!37
Former-commit-id: c4d647fa9fb4714b889fc05a82348c7984a39e8f
2019-05-29 11:39:00 +08:00
369ce2d76d
fix typo
...
Former-commit-id: b83788e0c11efa77b74a953cfd3b85432c85d5c3
2019-05-29 11:24:30 +08:00
jinhai
yu yunfeng
Yang Xuan
zhiru
groot
xj.lin