Commit Graph

216 Commits

Author SHA1 Message Date
zhiru
83bce35e8c fix faiss ptx issue; change cuda gencode
Former-commit-id: e45b7ae6b90cc3cdbf56dd30a8e9a674a03d0028
2019-06-13 13:20:06 +08:00
groot
ff00692666 chnagelog
Former-commit-id: 976eb7fe04f1e66e2501451491cc7dff052fbda7
2019-06-13 10:08:45 +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
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
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
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
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
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
groot
3ce05749b2 addd change loig
Former-commit-id: 29f6d2097590a28a0a9adf44b44ad941fa24697f
2019-06-10 15:25:56 +08:00
yu yunfeng
dfda1e2f56 fetch from main/branch0.3.0
Former-commit-id: 9058453cf58e85bc177e385c6d465a1d21d80282
2019-06-10 14:19:28 +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
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
Xu Peng
baf70e6156 chore(all): update change log
Former-commit-id: ccd39605c25d169f2bc7eb80e57cf20447b41715
2019-06-05 21:17:54 +08:00
yu yunfeng
07b85d3b38 add ms-59 in changelog
Former-commit-id: 86e7f0cbbae12051c4c68b2f4ff7741007aed765
2019-06-05 15:50:39 +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
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
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
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
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
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
groot
f1bb41d34c restruct thrift package
Former-commit-id: 57d8eba6ad2df54f7b2d4e0544157788fe1eb127
2019-05-30 10:06:22 +08:00
zhiru
0b0bcb0a2c add changelog
Former-commit-id: 96dc9ec82689e827996cf05e3c78f37fa24e75d8
2019-05-29 19:20:58 +08:00
groot
e509d29df3 use faiss 1.5.2
Former-commit-id: cae61443fe5fb47752e94b19f03a32f3b80ad2f1
2019-05-29 18:52:55 +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
zhiru
31a00449a4 MS-26 cmake. Add thirdparty packages
Former-commit-id: a68611c035820a429ae5ef1ae104a9826838dcca
2019-05-29 16:14:15 +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
yu yunfeng
4116f710f5 merge branch from Xu and add metrics
Former-commit-id: a5d3e97dbd87c6478ece637046a2d9545fbc973f
2019-05-28 18:46:07 +08:00
yu yunfeng
4d8385790a add feature
Former-commit-id: 3534c79716d1dbf9ba12d47c4de75fe19667aae4
2019-05-28 15:39:26 +08:00
Xu Peng
13ef8219aa refactor(db): update change log
Former-commit-id: 95c0f52c4f6b1b6723e72e71baed6bc640b7935f
2019-05-28 14:03:09 +08:00
yu yunfeng
7839bada77 fix conflict
Former-commit-id: 6d3d137cac5d1b8f826cecaeddbd77ad8a635ce2
2019-05-28 13:48:37 +08:00
Xu Peng
130b710169 refactor(db): MS-20
Former-commit-id: f34dd2746073c837fa877697e32f1ce3607e35c2
2019-05-28 11:04:37 +08:00
yu yunfeng
8510104066 fix conflict
Former-commit-id: cffe275e0430a89b99c17574766dff7c972d810d
2019-05-28 10:02:20 +08:00
groot
22e2a2bc3f throw exception for invalid index type
Former-commit-id: b028167c2460be4738af5f092a443749dba89bc0
2019-05-28 09:59:06 +08:00
yu yunfeng
1392e0d5c7 c
Former-commit-id: 420c70f051d7cbd2f9a0a5c4d8181ba11bb93f27
2019-05-27 16:31:20 +08:00
Xu Peng
37fc30e439 env(all): update change log
Former-commit-id: e9124716de75572eab1e027809b2b90a25ae127f
2019-05-26 19:35:30 +08:00
jinhai
ad8ef08bf9 MS-4 Refactor the vecwise_engine code structure
Former-commit-id: acade700d7956ad8c4c5ecaaecf23997b0ca5161
2019-05-26 14:48:13 +08:00
jinhai
bef742c0a9 Merge branch 'jinhai' of http://192.168.1.105:6060/jinhai/vecwise_engine into jinhai
Former-commit-id: 662de1631e4fe01c940b471f98fce654c52c0495
2019-05-17 20:18:24 +08:00
jinhai
2c42210e8c MS-1 Add Change log
Former-commit-id: 681054dc191d1f4cbdebf215c3fd0905aeb53e94
2019-05-17 20:17:51 +08:00
jinhai
af77eb7f89 MS-1 Add Change log
Former-commit-id: 5ab75cc621527fd2e095748728dcfe9731673fd4
2019-05-17 20:16:18 +08:00