Commit Graph

21 Commits

Author SHA1 Message Date
peng.xu
697427e7ea Revert "Merge branch 'integrate_knowhere-0.3.1' into 'branch-0.3.1'"
This reverts merge request !152

Former-commit-id: 739bf84961e2d6daa2ebbe2f45882efd2acaa89f
2019-07-03 15:17:28 +08:00
xj.lin
619a800766 MS-143 merge
Former-commit-id: b8eeda3dcb955a065f4adc933d53c16a10b6f04a
2019-07-02 19:28:50 +08:00
xj.lin
0224845fb3 1. update wrapper and wrapper-test
Former-commit-id: 73af1a5b254676e9d4c6360b4f4cb8f79cc47514
2019-07-02 18:40:01 +08:00
xj.lin
a8b068db57 1. git add submodule knowhere and set default branch
2. Update README.md about how to use git submodule


Former-commit-id: fd996485d8ef0b09055c4f3e8c20838ce9fd95ad
2019-06-27 11:08:24 +08:00
zhiru
7f24723ec7 fix mysql scoped connection concurrency issue
Former-commit-id: ecb3cf07b5f49f2f87e3972a126452ec2950caf8
2019-06-26 13:51:56 +08:00
zhiru
05774bd3f0 temp
Former-commit-id: 313132012046c604a27a03fe4856b5c6d5fde42c
2019-06-25 18:41:54 +08:00
zhiru
e5892dbefc Add MySQL
Former-commit-id: b79fe37030a73eb22300c33ff5122a98945daf22
2019-06-24 16:44:05 +08:00
jinhai
d65a7a156b MS-97 Integrate S3 storage sdk and provide storage api
Former-commit-id: 1fa5865169a2673806dad78916b87e3f30de188e
2019-06-19 12:04:02 +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
zhiru
60fc9d24e6 cmake: add Arrow, jemalloc and jsoncons
Former-commit-id: 7f4feb5ad2801ba1f4c99967491f1a3f07e1415f
2019-06-13 18:12:57 +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
ec9afe5c46 cmake: change prometheus source to git
Former-commit-id: ee0b45452cd7a5d695cabc31ab833b86a05c87ce
2019-06-11 11:41:11 +08:00
jinhai
5554cd0e07 Update CMake files
Former-commit-id: a67bcb2311cba6bff73597e1e45944992916ce4f
2019-06-04 11:35:53 +08:00
jinhai
3edb147b43 Use master branch of faiss
Former-commit-id: 65339e9f2ea8e8cb98fe2679498b5e8b33d1f875
2019-06-03 21:12:41 +08:00
jinhai
8348415d41 Changelogs updated
Former-commit-id: 220c49126526199c7f171a3435632b793fdf66d9
2019-06-03 11:52:53 +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
bc14a2e2f5 MS-31 cmake: add prometheus
Former-commit-id: b26ad79afe4745afea0c802f23f1d9725c8d4747
2019-05-29 19:17:39 +08:00
groot
9f75c8d2aa use faiss 1.5.2
Former-commit-id: 3005f905b39d72ef0018151d7e704023657083c6
2019-05-29 18:51:21 +08:00
zhiru
31a00449a4 MS-26 cmake. Add thirdparty packages
Former-commit-id: a68611c035820a429ae5ef1ae104a9826838dcca
2019-05-29 16:14:15 +08:00
zhiru
f119cc39db cmake: add thirparty packages
Former-commit-id: f7efb9acd4c01567f8ed6f26a7aa220aa174bb53
2019-05-29 12:06:37 +08:00