Commit Graph

745 Commits (f08fb195c7ace3ca623f222b59b87a32b8c5cd46)

Author SHA1 Message Date
groot 4f32022df3 MS-92 - Unify behavior of debug and release build
Former-commit-id: 873447e6e43b94657cb86a27e01cdedc9652aa7b
2019-06-17 19:29:51 +08:00
groot 374b30794c MS-92 - Unify behavior of debug and release build
Former-commit-id: cf2ab198bf28c9bf26cd0acb239c203626f7592f
2019-06-17 19:25:48 +08:00
groot 1336716d39 Merge remote-tracking branch 'source/branch-0.3.0' into branch-0.3.0
Former-commit-id: d8e6a436cd456050a2ed576129e5727fb71a495b
2019-06-17 18:49:35 +08:00
Xiangyu Wang d35b51f564 solve conflict
Former-commit-id: 62294779efb44ed0dc4e248493482d4c7cc3e016
2019-06-17 17:56:49 +08:00
Xiangyu Wang 88c7e749b6 MS-90 Fix arch match incorrect on ARM
Former-commit-id: b92c6b3ba3109490fa358a9bb123fc7dedea4854
2019-06-17 17:52:46 +08:00
wxyu 80e45d14b2 MS-89 Fix compile failed
Former-commit-id: 922f2d5105e1ca8c99560b27e51c34d79f5836f2
2019-06-17 17:38:33 +08:00
wxyu 4b1ef8e92e update thrift cmake arguments
Former-commit-id: eea86175005e6a0e67c6c7e2f2d404d568671095
2019-06-17 15:42:18 +08:00
wxyu d65da423b8 update .gitignore
Former-commit-id: e155a9e7911403958bf9c0246d3e9da529451266
2019-06-17 15:39:11 +08:00
wxyu f48ffc58a1 MS-88 add support for arm arch
Former-commit-id: db52dc345c907874d4fde1c0f048bab3cdc207f5
2019-06-17 15:32:25 +08:00
Xiangyu Wang 2aa3975371 solve conflicts
Former-commit-id: a3a201d31004f08432c1af0cd15e7db4c3a51119
2019-06-17 14:26:46 +08:00
Xiangyu Wang cc14e2ed59 add support arm
Former-commit-id: ecb01d5728e276f2aae6162cf280d1cf959a1235
2019-06-17 14:15:07 +08:00
groot 054a7b0d20 achangelog
Former-commit-id: 0266c20614775fd7dfd3b91fa2cbc50807765afc
2019-06-17 10:28:26 +08:00
groot 8d99ba172d refine
Former-commit-id: e0bb1ee1ff6c7bdac13ebe2d06ec45acb9db3d20
2019-06-17 10:08:22 +08:00
groot 5d862e1cab typo
Former-commit-id: 5fa60becb4318178f9236ce3a6e08c0c4b9b5a55
2019-06-17 10:01:20 +08:00
groot 14e690718d rename config item
Former-commit-id: 3f03b9e94e27f4ad6d3c0e6aebbd7c86be1b456a
2019-06-17 10:00:05 +08:00
groot ba67c75933 Enhancement for MemVector size control
Former-commit-id: b6648148d8d9ba3f894c6c8aace5c1351f4f5126
2019-06-16 18:34:51 +08:00
jinhai 7c7adc1452 Merge remote-tracking branch 'upstream/branch-0.3.0' into branch-0.3.0
Former-commit-id: e5210820cf606e11fd3cb8fff0b48284b4a690ce
2019-06-16 14:12:01 +08:00
jinhai 6164e68123 Merge branch 'arrow-0.3.0' into 'branch-0.3.0'
MS-84: cmake: add arrow, jemalloc and jsoncons third party; default build option OFF

See merge request megasearch/vecwise_engine!94

Former-commit-id: cc77c3183a286e1edf8de08f9be33d956928f7b9
2019-06-16 14:01:54 +08:00
zhiru 47537d0783 update
Former-commit-id: d6d4456d9b9638a7ac149155e1cd851b3105dc0e
2019-06-16 10:24:23 +08:00
zhiru 81b2d9f01e cmake: add arrow, jemalloc and jsoncons third party; default build option OFF
Former-commit-id: 55cfc9b7ac2aa94fab0b6978bfd2d65afaf7de3f
2019-06-14 19:10:15 +08:00
zhiru d9076789d0 update
Former-commit-id: c72896aebcabce77cb12c4912b75aa109468a225
2019-06-14 19:02:06 +08:00
zhiru f6564f6c3c Merge remote-tracking branch 'upstream/branch-0.3.0' into mysql-0.3.0
Former-commit-id: e5468a09dbd74cea3e7486223b2c3b0a50862dd1
2019-06-14 19:00:45 +08:00
groot c2c2509573 dont delete table in sdk sample
Former-commit-id: 3732321a43fa1c62c130a459ec6ce6bcf90490e2
2019-06-14 19:00:28 +08:00
groot d8f4dfcf9d fix a bug
Former-commit-id: cbf14a38d42b41c58f687078e8310a4a968af8cf
2019-06-14 18:08:25 +08:00
groot d031bb9e26 remove old names from source code
Former-commit-id: 3fcd7e5e6d2a8d147f09aa455c4a3f3eab20a24a
2019-06-14 17:29:29 +08:00
zhiru 48fa9efd44 temp update
Former-commit-id: 42adb2a912930d35c53d7fefca1f35d556b45c05
2019-06-14 15:32:28 +08:00
jinhai d5b56f278c Merge branch 'branch-0.3.0' into 'branch-0.3.0'
MS-77 Performance issue of post-search action

See merge request megasearch/vecwise_engine!92

Former-commit-id: 94a039963017cf0820a101d8f458091731e79c60
2019-06-14 14:56:38 +08:00
groot 0cd0349c46 Performance issue of post-search action
Former-commit-id: 91087e268e3a32f93f4691a8d3d7ba31ef6e7053
2019-06-14 14:35:22 +08:00
yu yunfeng a4f59b0067 CHANGELOG
Former-commit-id: 88be048a7d13e8c0042390c9dd95fdb8814e5977
2019-06-14 10:58:13 +08:00
yu yunfeng 3c2fb4e1eb changelog
Former-commit-id: 095fbda50ed831729237fbc0c0b3c238c55da109
2019-06-14 10:34:01 +08:00
yu yunfeng 3aebfec225 add netio
Former-commit-id: 68d34cf2f54e893cbd0bb2c04b89994ec3b1b752
2019-06-14 10:29:25 +08:00
zhiru 6a0a1607bd add changelog
Former-commit-id: a6bdcf1ea83451136f9ab1cb8535b358a27ddc0e
2019-06-14 10:21:10 +08:00
zhiru 79f6a88e37 cmake: set build arrow and jsoncons option to dafault OFF
Former-commit-id: 922efcdc21c6d2361633a370247368cd8b368408
2019-06-14 10:18:24 +08:00
zhiru 0f8ac6dc65 temp update
Former-commit-id: 6dc00e1940e209fb5e65fb6cf31d8f6f0e0a4c1e
2019-06-14 10:15:44 +08:00
yu yunfeng 52e23c4760 merge 0.3.0
Former-commit-id: 9e30f64b77a970d48e627bd5c518a7c17f498fd5
2019-06-14 09:59:28 +08:00
yu yunfeng f30bb1d35d add netio
Former-commit-id: 778661eb22ca5e6e697afe00df3dac4aca416125
2019-06-14 09:23:39 +08:00
zhiru 3f43dc04c2 Merge remote-tracking branch 'upstream/branch-0.3.0' into mysql-0.3.0
Former-commit-id: e06fd9ec61d7525480fbaa064fd4e82c40cac253
2019-06-13 18:14:10 +08:00
zhiru 60fc9d24e6 cmake: add Arrow, jemalloc and jsoncons
Former-commit-id: 7f4feb5ad2801ba1f4c99967491f1a3f07e1415f
2019-06-13 18:12:57 +08:00
jinhai b749e7ec50 MS-82 Update
Former-commit-id: c8dd35401e0fd15df7f140978e37c7a0e6a363f7
2019-06-13 16:54:49 +08:00
jinhai b6e51b26be Merge remote-tracking branch 'upstream/branch-0.3.0' into branch-0.3.0
Former-commit-id: f431335445d2c54f939dfd84a8dfdf0e4d2df4a2
2019-06-13 16:04:04 +08:00
jinhai 49c528301c Merge branch 'branch-0.3.0' into 'branch-0.3.0'
MS-80 fix hang issue

See merge request megasearch/vecwise_engine!85

Former-commit-id: 583d6c0a0915be203fa26b235958f6c161075fd4
2019-06-13 16:03:13 +08:00
jinhai 94612238e5 MS-82 & MS-83 Update vecwise to Milvus
Former-commit-id: 69d1f1b661e6fc7779b4ae3abae60eeb28fa2b04
2019-06-13 16:02:25 +08:00
groot ebfa05d435 fix hang issue
Former-commit-id: 8e31caee7dc66dfca929f78a55786b5d0e86837d
2019-06-13 15:32:02 +08:00
jinhai 9c34c92e16 Merge branch 'branch-0.3.0' into 'branch-0.3.0'
MS-81: fix faiss ptx issue; change cuda gencode

See merge request megasearch/vecwise_engine!84

Former-commit-id: 14033f044523fe36dfff5c4c5841b794ed2ffb75
2019-06-13 14:34:04 +08:00
zhiru 1c31909a68 temp update
Former-commit-id: 7512647247fffebde1b599b4b90caff8a7787bb7
2019-06-13 14:27:13 +08:00
zhiru 83bce35e8c fix faiss ptx issue; change cuda gencode
Former-commit-id: e45b7ae6b90cc3cdbf56dd30a8e9a674a03d0028
2019-06-13 13:20:06 +08:00
zhiru 48f0a43f22 add mysqlNotes
Former-commit-id: 8b4e613a1aff02ec2c0b99f7f80abc40fe0fbd6c
2019-06-13 11:47:06 +08:00
groot ff00692666 chnagelog
Former-commit-id: 976eb7fe04f1e66e2501451491cc7dff052fbda7
2019-06-13 10:08:45 +08:00
groot c604eb59a2 fix pipeline crash bug
Former-commit-id: 55fbac7f92ba19ccb23425f8720b29efd65c5728
2019-06-13 10:05:08 +08:00
jinhai be843f84c4 Merge branch 'branch-0.3.0' into 'branch-0.3.0'
MS-75: cmake: change faiss version to 1.5.2; add CUDA gencode

See merge request megasearch/vecwise_engine!80

Former-commit-id: a7ea464c9b193f96a326588cf9a2ce89ecef605f
2019-06-12 19:38:06 +08:00
jinhai 1c4e97e4c1 Merge branch 'branch-0.3.0' into 'branch-0.3.0'
MS-56 Add version information when server is started

See merge request megasearch/vecwise_engine!79

Former-commit-id: 5d3818724e48d1ec742477e7fc300a96ab3f8db6
2019-06-12 11:55:54 +08:00
zhiru 1577ed3502 cmake: change faiss version to 1.5.2; add CUDA gencode
Former-commit-id: 63fea8b09720ced30413b08faea8237939ed41a3
2019-06-12 11:27:50 +08:00
groot 11b32c9d1d version bug
Former-commit-id: aeded6d017202aff19cccd44bb4f7299cbad4d31
2019-06-12 11:11:00 +08:00
zhiru a7b27d3c46 Change README.md in cpp
Former-commit-id: c6ad84a6488350bce6f007df8a9e81ad3817fc88
2019-06-12 11:05:33 +08:00
groot 235b85f63b changelog
Former-commit-id: 6b2099e086696dfbf956e0778d0941ec89bb4812
2019-06-11 16:43:05 +08:00
groot 8b3982916f changelog
Former-commit-id: 307d64c2635cc7cc5efbc973d573ef9d030eec27
2019-06-11 16:41:41 +08:00
groot 3ee722ae85 merge remote branch 0.3.0
Former-commit-id: e7cc89f6bd93693ca0b6501293b91646ef47130d
2019-06-11 16:38:36 +08:00
zhiru 8328391443 cmake: delete civetweb
Former-commit-id: 9433a000ba9da1916ef85288316477069d2019c7
2019-06-11 16:23:55 +08:00
zhiru 2d7b67a06f fix merge conflicts
Former-commit-id: a716e47d046e3cc738f7f4b6a7b7201f57fa0d3a
2019-06-11 15:47:50 +08:00
zhiru 420fe72133 fix merge conflicts
Former-commit-id: 3b113299611aac6bf6094315be161f27760d56a6
2019-06-11 15:43:05 +08:00
groot db3f0e9ba7 support delete table
Former-commit-id: 3b728c4dfc0b9a6c8803538c89961e4b43c6ca67
2019-06-11 14:54:09 +08:00
zhiru 4e1d514c73 fix merge conflicts
Former-commit-id: c6d304468fb8e4ac35a8b16b5090ac0c78d38af7
2019-06-11 14:35:44 +08:00
jinhai ea01661889 Merge branch 'turnOffRocksDB-0.3.0' into 'branch-0.3.0'
MS-68: Remove rocksdb from third-party

See merge request megasearch/vecwise_engine!73

Former-commit-id: 6c870e6cb1f5434b619485bf4306e3a02fc7bfd4
2019-06-11 14:22:12 +08:00
jinhai fd407c9e62 Merge branch 'branch-0.3.0' into 'branch-0.3.0'
MS - 69 add all metrics

See merge request megasearch/vecwise_engine!69

Former-commit-id: 45cf1dc65c7a750ba7001888ac36da6e13b85d94
2019-06-11 14:12:32 +08:00
yu yunfeng 25398285e3 Merge remote-tracking branch 'main/branch-0.3.0' into branch-0.3.0
Former-commit-id: 6fec52f1aed006946b3360647d2f3fc727632fb3
2019-06-11 14:10:50 +08:00
yu yunfeng 9cb66ac8d9 fix
Former-commit-id: 00af0b4a367be2dfb26fff09105482364fd56a8e
2019-06-11 14:10:22 +08:00
zhiru 4875bdc4b6 Remove rocksdb from third-party
Former-commit-id: 5f7439e7a2152d5b6b9a8dd82ff54a091ea729ec
2019-06-11 11:47:17 +08:00
zhiru ec9afe5c46 cmake: change prometheus source to git
Former-commit-id: ee0b45452cd7a5d695cabc31ab833b86a05c87ce
2019-06-11 11:41:11 +08:00
zhiru 6c59f66b0d cmake: fix faiss dependency
Former-commit-id: 4f93415c61d67a902972cfde865f2672366282b1
2019-06-11 11:00:41 +08:00
zhiru 3969cbaf0b cmake: remove redundant libs in src
Former-commit-id: 9d73816a0d20620d54d813d08739855dd4cc9909
2019-06-11 10:39:03 +08:00
groot 24498cd466 fix license check bug
Former-commit-id: 7b0fb269f41dd6c1b3bf415a51e9f97260b8ab80
2019-06-10 19:25:51 +08:00
groot 51c9ffbaaf fix license check bug
Former-commit-id: 69114c03a3482ab0835e209b7c680d9b2a0f684c
2019-06-10 19:16:44 +08:00
yu yunfeng c74d368640 CHANGELOG
Former-commit-id: 22edc2371e9fc3ca684b271f5d3766cd91c8196b
2019-06-10 19:16:06 +08:00
yu yunfeng d279b37e53 conflict
Former-commit-id: b94b2d6f0ab402138d3567e395eb7aa9bd68c325
2019-06-10 19:11:07 +08:00
groot a2d7a4072c fix license check bug
Former-commit-id: c1ad0e1db515ecc079ecad2bae31209ff70d95fa
2019-06-10 18:38:34 +08:00
yu yunfeng 73a1d26e40 fix conflict
Former-commit-id: fc062bd7f5818169bd1e3fac750ecf4b016d5d80
2019-06-10 15:56:20 +08:00
groot 3ce05749b2 addd change loig
Former-commit-id: 29f6d2097590a28a0a9adf44b44ad941fa24697f
2019-06-10 15:25:56 +08:00
groot 7da06a7e6f support date range search
Former-commit-id: ec9841b7c586f27afadf90e7c49914850ad4d299
2019-06-10 15:13:26 +08:00
yu yunfeng dfda1e2f56 fetch from main/branch0.3.0
Former-commit-id: 9058453cf58e85bc177e385c6d465a1d21d80282
2019-06-10 14:19:28 +08:00
yu yunfeng c55a70dc94 fix codestyle
Former-commit-id: 10caa1a57e07115fd3eab3f3a23eaebda6b8ecf2
2019-06-10 10:33:24 +08:00
groot 8ef34c91f4 return search score
Former-commit-id: 683f5873992e47f5220dbcb3cf7fa0f6dc66e48b
2019-06-09 17:57:11 +08:00
groot cf94a753d7 return search score
Former-commit-id: e141cb974769ee0e7ee06eb7635eb458622af60c
2019-06-09 17:35:52 +08:00
groot cb48a11a90 changelog
Former-commit-id: 30c4ceae2819665e83624722abaa56a891deedca
2019-06-09 15:47:07 +08:00
groot ff7cab7006 refacture db code
Former-commit-id: d232155b1de07bd7b66a64f39417f25118b59891
2019-06-09 15:45:43 +08:00
groot a1e652088d refacture db code
Former-commit-id: 4aa8a2bb10b44d9315431a79ec6c140e4735aff5
2019-06-09 09:43:05 +08:00
jinhai e95f511025 Merge branch '0.3.0-local' into 'branch-0.3.0'
MS-62 Search range to all if no date specified

See merge request megasearch/vecwise_engine!58

Former-commit-id: 32d83f5316df5807efd6129fe3babfd5d2327c0b
2019-06-06 12:15:44 +08:00
groot 0c8eb1a8e6 automaticlly generate build version infor
Former-commit-id: 2998203da61d287b167e5170dbc4f8ec1f315b9a
2019-06-06 10:45:07 +08:00
groot 741c5e90eb automaticlly generate build version infor
Former-commit-id: 7ed02faa146b614ee06327b95a8dba4154a904f9
2019-06-06 10:34:10 +08:00
groot d019ccc338 automaticlly generate build version infor
Former-commit-id: 4c8fccc57722bd527e1947590014e07ca110a108
2019-06-06 10:24:40 +08:00
Xu Peng baf70e6156 chore(all): update change log
Former-commit-id: ccd39605c25d169f2bc7eb80e57cf20447b41715
2019-06-05 21:17:54 +08:00
Xu Peng 956f774c62 fix(db): temp fix for files to search
Former-commit-id: f45a0e22708c9e9fc388f3fbe6a40c3e0094dd77
2019-06-05 21:10:53 +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
groot c9f9991ef3 modify changelog
Former-commit-id: c7448a91938c65c997df94c0929e4dfb53bb19a6
2019-05-29 16:29:08 +08:00
zhiru 9b2d62631d resolve merge conflicts
Former-commit-id: 31d8d0d07a1fb4d8299f694db44787ceacf8c2d3
2019-05-29 16:23:24 +08:00
groot 397457112b refine sdk code
Former-commit-id: 30ab87ccf76dadf9c65489d5a19c1134124faec5
2019-05-29 16:21:22 +08:00
zhiru 31a00449a4 MS-26 cmake. Add thirdparty packages
Former-commit-id: a68611c035820a429ae5ef1ae104a9826838dcca
2019-05-29 16:14:15 +08:00
groot 5386d5e70e refine sample code
Former-commit-id: 18bda8e3585dfd0bcfc699c6788a9af0eb53fc5f
2019-05-29 14:55:22 +08:00
zhiru f119cc39db cmake: add thirparty packages
Former-commit-id: f7efb9acd4c01567f8ed6f26a7aa220aa174bb53
2019-05-29 12:06:37 +08:00
groot 369ce2d76d fix typo
Former-commit-id: b83788e0c11efa77b74a953cfd3b85432c85d5c3
2019-05-29 11:24:30 +08:00
groot de1d9fb655 fix some bugs
Former-commit-id: 297b63106e0ed450d92017ca0b079798a43909c5
2019-05-29 11:22:12 +08:00
groot 61fb59d23b merge from remote source
Former-commit-id: fc7be69bc0d039576469f0adb81e027a8f00272c
2019-05-29 09:15:12 +08:00
groot ab90dff7b4 implement sdk interface part2 change log
Former-commit-id: 41f1487f14d2c5e93700b0e521dfcf3410f3802d
2019-05-28 18:46:30 +08:00