jinhai
3b9255ab42
Merge branch 'branch-0.2.0' into branch-0.3.0
...
Former-commit-id: 9bd79b393566305b6ee9d10961bd316e39204bf1
2019-06-04 14:10:02 +08:00
jinhai
d40f75e6df
Update CMakeLists.txt: add libgpufaiss.a
...
Former-commit-id: 75eab2b1a069b6e42d3410543d95b38776a62a43
2019-06-04 11:58:05 +08:00
jinhai
5554cd0e07
Update CMake files
...
Former-commit-id: a67bcb2311cba6bff73597e1e45944992916ce4f
2019-06-04 11:35:53 +08:00
jinhai
89d22d5927
Still use faiss-1.5.0 and change the URL to customized REPO
...
Former-commit-id: e6e1588032030474e755360d806501e6960e9022
2019-06-04 10:12:10 +08:00
jinhai
3edb147b43
Use master branch of faiss
...
Former-commit-id: 65339e9f2ea8e8cb98fe2679498b5e8b33d1f875
2019-06-03 21:12:41 +08:00
yu yunfeng
e9dac7521f
fix CHANGELOG CONFLICTcqqq
...
Former-commit-id: da059eb1ab2c0d4dac31e698e47a345b9baf916c
2019-06-03 15:50:04 +08:00
Yang Xuan
8453172590
feat(python): module rearrange and impl
...
Former-commit-id: 0c38f4a34bddb3660fc9af04bb8b63c1aef8aa90
2019-06-03 11:56:52 +08:00
jinhai
8348415d41
Changelogs updated
...
Former-commit-id: 220c49126526199c7f171a3435632b793fdf66d9
2019-06-03 11:52:53 +08:00
jinhai
f0de76cc7e
Merge branch 'branch-0.3.0' into 'branch-0.3.0'
...
MS-54 - cmake: Change Thirft third party URL to github.com
See merge request megasearch/vecwise_engine!55
Former-commit-id: 56ee19080ac317353da5b7d5bb6dff50ea638cc4
2019-06-02 19:15:20 +08:00
zhiru
f9e58a1247
fix merge conflict
...
Former-commit-id: 77581f78fd10b95d15f01a6551e58f547eee0a77
2019-06-02 14:13:03 +08:00
jinhai
a85966aa98
Update CHANGELOG for 0.2.0 release
...
Former-commit-id: db4bf76619bdef8928fe2d7705aecf695d979d3c
2019-06-02 13:50:09 +08:00
zhiru
4c3a00bf46
Merge remote-tracking branch 'upstream/branch-0.3.0' into branch-1.2
...
Former-commit-id: 6d718ac8612928c4554c701305fe53d00640510e
2019-06-02 12:13:45 +08:00
jinhai
cf5636e4ab
Merge branch 'branch-0.2.0' into 'develop'
...
Merge from Branch 0.2.0 to develop branch
See merge request megasearch/vecwise_engine!54
Former-commit-id: b4e9b6239bbf77215f32d40328b3b523bea2e1e9
2019-06-02 12:10:09 +08:00
zhiru
9255010439
update
...
Former-commit-id: 92abb14e85df1ac55f51082da7bbdf575cb34529
2019-06-02 12:00:09 +08:00
zhiru
1bc7db125e
fix merge conflict
...
Former-commit-id: 693ae97543b8240f3bbcdbb54699fbf01fc1161c
2019-06-02 11:48:06 +08:00
zhiru
8f7e8c5570
MS-54 - cmake: Change Thirft thrid party URL to github.com
...
Former-commit-id: 7ce6dad58035d01db9f7060be2b1142014434383
2019-06-02 11:46:31 +08:00
jinhai
47107b66dc
Merge branch 'branch-1.2' into 'branch-1.2'
...
MS-47 Add vps and query metrics
See merge request megasearch/vecwise_engine!52
Former-commit-id: d3c26123790f1eb56f4a16c791a6723c71ee0e6f
2019-05-31 18:39:03 +08:00
yu yunfeng
05ab76473d
fix CHANGELOG conflict
...
Former-commit-id: df8811e4af39e2fead9b0923928d10703fbd25cb
2019-05-31 18:38:00 +08:00
jinhai
346e229544
Merge branch 'support_gpu_config' into 'branch-1.2'
...
MS-27 support gpu config
See merge request megasearch/vecwise_engine!51
Former-commit-id: ce8e8856b8b5783529c1a56f4da4cff59ad94ecb
2019-05-31 18:35:07 +08:00
yu yunfeng
7f5c72b3c3
alter CHANGELOG
...
Former-commit-id: a9d68649ef5102665e31686620796a556adc0710
2019-05-31 18:29:36 +08:00
yu yunfeng
8367c9aaa7
add vps qeury_summary metircs
...
Former-commit-id: ec3f9e3dd9338332d2e40dbae8b5d4b672b1cef1
2019-05-31 18:26:44 +08:00
xj.lin
502f1a956c
MS-27 support gpu config
...
Former-commit-id: 08749b66413000571d733a28303eed3944220a9b
2019-05-31 18:25:06 +08:00
jinhai
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
yu yunfeng
2ab5e246ac
add metrics
...
Former-commit-id: d7acd398be8aeee11de3f972d9bcf6e84df39358
2019-05-31 14:36:36 +08:00
jinhai
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
yu yunfeng
67a5acf669
fix unitest
...
Former-commit-id: 1da98cfbf78110fa3732899e45ff3722eaf921ed
2019-05-30 15:54:22 +08:00
yu yunfeng
2b472a3340
fix CHANGELOG CONFLICT
...
Former-commit-id: 22222b13fe56975a13b45066b1b7b721d124729c
2019-05-30 15:13:29 +08:00
jinhai
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
yu yunfeng
dcc6752495
add task in changelog
...
Former-commit-id: a88c6ecd7b97dccadb492c5df94729da2e52f136
2019-05-30 15:01:07 +08:00
yu yunfeng
f8c46af560
fix metrics test and add prometheus conf
...
Former-commit-id: 0c7ff6f49880db0ce4dd22ea1375886fb0e9b03d
2019-05-30 14:50:16 +08:00
Yang Xuan
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
jinhai
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
Yang Xuan
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
jinhai
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
Yang Xuan
49fab66b70
feat(python): Add Python SDK APIs
...
Former-commit-id: 61ddcafcc5b02b0f193ada1fcefdac79d137f1d1
2019-05-30 11:11:41 +08:00
zhiru
18bd963462
update changelog
...
Former-commit-id: d751122297499c3ce581cb757285b2a3896046ca
2019-05-30 10:18:34 +08:00
zhiru
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
zhiru
a096e52826
cmake: add -j4 to make third party packages build faster
...
Former-commit-id: c8ce2a8cbcf0d610304131e244d5d5000b4c8645
2019-05-30 10:12:52 +08:00
groot
f1bb41d34c
restruct thrift package
...
Former-commit-id: 57d8eba6ad2df54f7b2d4e0544157788fe1eb127
2019-05-30 10:06:22 +08:00
groot
f681c3ae86
restruct thrift package
...
Former-commit-id: d02f846e4ffa3c61d860b081054d4526e03eb930
2019-05-30 10:02:17 +08:00
groot
168ac46cdb
fix thrift generate error
...
Former-commit-id: 444233484091fe329e190a5fd62bf93c5e26e3f4
2019-05-30 09:24:14 +08:00
jinhai
fc21578f24
Build: make -j 4
...
Former-commit-id: 2726bed199c8921f1ba6850777125d609790841e
2019-05-30 09:20:47 +08:00
yu yunfeng
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
jinhai
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
zhiru
0b0bcb0a2c
add changelog
...
Former-commit-id: 96dc9ec82689e827996cf05e3c78f37fa24e75d8
2019-05-29 19:20:58 +08:00
zhiru
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
jinhai
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
zhiru
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
zhiru
bc14a2e2f5
MS-31 cmake: add prometheus
...
Former-commit-id: b26ad79afe4745afea0c802f23f1d9725c8d4747
2019-05-29 19:17:39 +08:00
yu yunfeng
439a5d10e9
add IO gauge
...
Former-commit-id: f23a858abade383d61780caf146f5dbbf578a113
2019-05-29 19:15:32 +08:00
