Commit Graph

555 Commits (c55a70dc9423fa1a32deec51def6ad020d468741)

Author SHA1 Message Date
yu yunfeng c55a70dc94 fix codestyle
Former-commit-id: 10caa1a57e07115fd3eab3f3a23eaebda6b8ecf2
2019-06-10 10:33:24 +08:00
yu yunfeng 07b85d3b38 add ms-59 in changelog
Former-commit-id: 86e7f0cbbae12051c4c68b2f4ff7741007aed765
2019-06-05 15:50:39 +08:00
yu yunfeng 6ab97a7314 Merge remote-tracking branch 'main/branch-0.3.0' into branch-1.2
Former-commit-id: fb9ce866c473954800fe47b104eafeae4eab70ce
2019-06-05 15:46:16 +08:00
yu yunfeng 24863f63e5 all metrics are done
Former-commit-id: 68275f6545ac62a28899f4b6bbb687365c52d52e
2019-06-05 15:45:48 +08:00
groot dfef871f97 rename
Former-commit-id: 0db9006f7f17adcc933984f9b471a9173cd5b97e
2019-06-05 15:41:35 +08:00
groot 326945efa7 use switch case
Former-commit-id: 39b674d81433171cc62f30b75064c1f4daa844f9
2019-06-05 12:33:22 +08:00
groot ab3c9649c6 search context id
Former-commit-id: 7e8bafac6b78d879edb8a09cd2ffb83c46d44401
2019-06-05 12:29:31 +08:00
groot db1b37d45c fix problems
Former-commit-id: c90a6834c4848fbaed1a1b0c753979f307db4d27
2019-06-05 12:14:53 +08:00
groot 1f90641697 changelog
Former-commit-id: 9dc092a8836e7da04966acecece0270467f48959
2019-06-04 19:36:48 +08:00
groot 9a29861e08 Merge remote-tracking branch 'source/branch-0.3.0' into branch-0.3.0
Former-commit-id: 4e94a620e63c51693b555337e990530b9caecf25
2019-06-04 19:33:50 +08:00
groot 22b5b6cbf1 pipeline for loading/searching
Former-commit-id: 93cd16549fcd392de487237df21e2df14ef8321a
2019-06-04 19:32:43 +08:00
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
jinhai 8348415d41 Changelogs updated
Former-commit-id: 220c49126526199c7f171a3435632b793fdf66d9
2019-06-03 11:52:53 +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 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
yu yunfeng 05ab76473d fix CHANGELOG conflict
Former-commit-id: df8811e4af39e2fead9b0923928d10703fbd25cb
2019-05-31 18:38:00 +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
yu yunfeng 2ab5e246ac add metrics
Former-commit-id: d7acd398be8aeee11de3f972d9bcf6e84df39358
2019-05-31 14:36:36 +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
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
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
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
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
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
groot e509d29df3 use faiss 1.5.2
Former-commit-id: cae61443fe5fb47752e94b19f03a32f3b80ad2f1
2019-05-29 18:52:55 +08:00
groot 9f75c8d2aa use faiss 1.5.2
Former-commit-id: 3005f905b39d72ef0018151d7e704023657083c6
2019-05-29 18:51:21 +08:00
groot 39df2d4d1e fix third-party link error
Former-commit-id: 54782a2d0812e836544ca8667c1ee42a4e934830
2019-05-29 17:30:27 +08:00
groot 845b927783 modify changelog
Former-commit-id: 5988d25b5854c502f2496d0244be5313e5a2969e
2019-05-29 16:59:51 +08:00