86 Commits

Author SHA1 Message Date
wxyu
e1e9ffeb46 Merge remote-tracking branch 'main/branch-0.5.0' into branch-0.5.0
Former-commit-id: 02962b0fed5f308589ebcb0521d002eb63312612
2019-10-13 14:31:24 +08:00
wxyu
6b148639ef SQ8H in GPU part2
Former-commit-id: 2d8f5d2858f0ca3e4edf02ae53bc9c195a3c91a3
2019-10-13 13:20:11 +08:00
JinHai-CN
cf32049161 MS-627 Fix new faiss issue
Former-commit-id: 02626d0c95a3a1405a22bfeb9ea7fc21080a46a2
2019-10-13 09:52:34 +08:00
wxyu
bf24396571 SQ8H in GPU
Former-commit-id: 0075a759b0e2368f63c0ef9b75372f2afceafc34
2019-10-12 21:22:23 +08:00
jinhai
30a52e3084 Merge branch 'new_compile_defination' into 'branch-0.5.0'
MS-635 New compile defination

See merge request megasearch/milvus!691

Former-commit-id: 3e4864385c93dbd3159d0213f9d9f4cdf546aa82
2019-10-11 19:51:34 +08:00
xiaojun.lin
7bc9039f2c MS-635 coding style check
Former-commit-id: 06afc01551073cd4ef3c2dc9dace407e441458a7
2019-10-11 19:49:48 +08:00
xiaojun.lin
5bcb660110 MS-635 add compile option
Former-commit-id: 773d61d34bdb131ae3219ddfbe9e4eb656292230
2019-10-11 19:41:43 +08:00
starlord
8a9e760639 refine code
Former-commit-id: 7935a4ed21d423e5fc72adc8ab68b7f69dae554e
2019-10-11 16:18:19 +08:00
jinhai
c884b9fde2 Merge branch 'branch-0.5.0' into 'branch-0.5.0'
solve cpplint

See merge request megasearch/milvus!688

Former-commit-id: ecd1da1744a2b0e7ccb0743aa195e7b23478064d
2019-10-10 21:14:34 +08:00
wxyu
75de7e191c solve cpplint
Former-commit-id: 1d500a125ac8a72a18e51e5a3ccdb0369ba0af4a
2019-10-10 21:14:07 +08:00
jinhai
93925b5be2 Merge branch 'branch-0.5.0' into 'branch-0.5.0'
MS-631 IVFSQ8H Index support

See merge request megasearch/milvus!687

Former-commit-id: b9cd733409cafec934ec2e6333fd283ba380895b
2019-10-10 21:04:19 +08:00
wxyu
0712798938 MS-631 IVFSQ8H Index support
Former-commit-id: 21e17a20794e4fde31e79c4bbd4e26d46c79d886
2019-10-10 20:57:14 +08:00
starlord
defd24b2c6 format code
Former-commit-id: 648cc3be7f2dc4cca5c1394ff83c2d383c7b70b7
2019-10-10 16:03:29 +08:00
JinHai-CN
cdf910b6e8 Format the code
Former-commit-id: 35eee89fce00364921cf35ad8539197edbdb8a01
2019-10-10 15:41:49 +08:00
xiaojun.lin
f4611e3840 Merge branch 'branch-0.5.1' of http://192.168.1.105:6060/jinhai/milvus into branch-0.5.1
Former-commit-id: 73cc669f16dae2613baf3336ef08180929044bbf
2019-10-10 15:35:22 +08:00
xiaojun.lin
7a4e30d716 Merge remote-tracking branch 'upstream/branch-0.5.0' into branch-0.5.1
Former-commit-id: 12ff8f9e496bd5f194d481b31a5479a80faae6e1
2019-10-10 15:20:35 +08:00
xiaojun.lin
71374bdd91 Merge remote-tracking branch 'upstream/branch-0.5.0' into branch-0.5.1
Former-commit-id: 583c0e2d0a8134882b92f6e6c415613739bc36dd
2019-10-10 15:16:21 +08:00
xiaojun.lin
77b28a3981 enable hybrid IVFSQ8
Former-commit-id: 9bbf835e63818ef6cc5f792d0ab11247794d0c3a
2019-10-10 14:28:00 +08:00
JinHai-CN
d4babbcae1 Use new faiss package
Former-commit-id: 520b90709373d8892a1f6f3f0fa353d9bf1f9555
2019-10-10 10:16:32 +08:00
JinHai-CN
8f052f509f Add one more interface: UnsetQuantizer
Former-commit-id: 4cac2a470925db8286e142e4332aae1564af4391
2019-10-09 19:42:30 +08:00
xiaojun.lin
04524d9c0e hybrid enable
Former-commit-id: 9c89d56f61445c1b1eda80b1403165aba2d3b986
2019-10-09 17:58:59 +08:00
xiaojun.lin
5807d62db0 add hybrid mode
Former-commit-id: feae4c8df728c1ae8f96e2d19c0b115a5a420575
2019-10-09 17:57:49 +08:00
starlord
98447500c7 fix break build
Former-commit-id: 588cb86bdc60cd3d155692be5a875ec2a7ea2233
2019-10-09 15:26:04 +08:00
peng.xu
87e46f025d Merge branch 'branch-0.5.0' into 'branch-0.5.0'
refine code

See merge request megasearch/milvus!671

Former-commit-id: b0f97045424eba4fde46db28aeb7af47a4c5dde2
2019-10-09 15:05:18 +08:00
starlord
5253ee01fd refine code
Former-commit-id: 92557f67f9034c38da747cb75ad4c1fb8278e645
2019-10-09 14:59:30 +08:00
jinhai
fba79974be Merge branch 'branch-0.5.0' into 'branch-0.5.0'
refine code

See merge request megasearch/milvus!670

Former-commit-id: 157b2bede3114799229d330109879924784a5a51
2019-10-09 14:33:17 +08:00
starlord
0dc4f2fcfd refine code
Former-commit-id: e9204354f990b2b4d1cc27f44efb2c35264af7f8
2019-10-09 14:32:52 +08:00
test
e4e2faf416 MS-575 Add Clang-format & Clang-tidy & Cpplint
Former-commit-id: 0a31f6c2b8b5c36a019c2d4f89cacac33006960c
2019-10-09 06:18:55 +00:00
test
406fc339cc MS-575 Add Clang-format & Clang-tidy & Cpplint
Former-commit-id: 1a941a50fcdeaa0193be5c6d0031781bc3775d1e
2019-10-09 06:00:30 +00:00
JinHai-CN
2eeee72f40 MS-613 Integrate new faiss
Former-commit-id: 40982d3b5f39debbd8964274481930b07ba55020
2019-10-08 17:40:54 +08:00
starlord
aa1be9cd16 Remove zilliz namespace
Former-commit-id: 18ae9b5711cabd59baf7e0784583f99a655bf9c2
2019-09-29 16:37:34 +08:00
xiaojun.lin
c2ab2bc092 MS-565 rename test->unittest and fix parameter autotune bug
Former-commit-id: 65392a505107e20491035d417940a66e67f82ef9
2019-09-29 10:13:57 +08:00
starlord
c54a787ae1 format knowhere code
Former-commit-id: eb06e117c192b568d9da3a33d94faa127e7cf0b7
2019-09-28 19:01:11 +08:00
starlord
d1251fb0c1 format code by clang-tidy
Former-commit-id: 437b1fff79da965b8aafce026c8be4f9d582c909
2019-09-28 15:00:26 +08:00
starlord
aabd91a156 format code by clang-tidy
Former-commit-id: f9e606566555ad381b8e95e1a4e2572fc61678f0
2019-09-28 12:36:14 +08:00
xiaojun.lin
c6501ec049 MS-596 enable knowhere and fix compile error
Former-commit-id: 75c435ef22ceec6f07e92e42f99b369657e3911a
2019-09-27 20:27:59 +08:00
xiaojun.lin
180600fb24 MS-565 remove jsoncons v2
Former-commit-id: a37cbd9b67c66fca6e4ef08519e5f48248985c98
2019-09-27 15:41:20 +08:00
xiaojun.lin
aff9491824 Merge branch 'branch-0.5.0' into refactor_knowhere
Former-commit-id: 005c77538d7c2d0b52015a748a04da6d171d0f3d
2019-09-26 17:05:07 +08:00
xiaojun.lin
d78d032b82 MS-565 remove jsoncons v1
Former-commit-id: cedf253075a00eb4a7d999ffcceb90f8fa795f2e
2019-09-26 17:03:46 +08:00
quicksilver
e7a6cff566 add JFROG_ARTFACTORY_URL parameter in CMakeLists.txt
Former-commit-id: 20150e9cabff924b2fc83757a0faee14e26998d4
2019-09-25 19:54:30 +08:00
quicksilver
0f287c3910 format CMakeLists.txt
Former-commit-id: b1980e2e8fda99a49d9bd005ce0caf0ef494ca02
2019-09-25 16:32:48 +08:00
xiaojun.lin
4b91faa50c MS-565 split class version 1
Former-commit-id: 1a60045de13e055d4b0a7e9da389b7e377c141af
2019-09-19 21:21:38 +08:00
xiaojun.lin
b282580bf9 MS-565 rename knowhere files
Former-commit-id: a7c2a8b1d99e6cf29bbcaf27b131e0ce5bd42f43
2019-09-19 19:01:26 +08:00
jinhai
4e8b762329 Merge branch 'Refactor_Knowhere' into 'branch-0.5.0'
MS-573 Enable log in knowhere

See merge request megasearch/milvus!589

Former-commit-id: 41baf80533e98d5f30898e3e2956351d764ff7a2
2019-09-19 15:20:00 +08:00
Heisenberg
e26948e858 MS-573 remove useless code
Former-commit-id: 4db9733a33dcbc26b5b11a66f54087d3af51ccc6
2019-09-19 15:18:37 +08:00
Heisenberg
029d4a97b3 MS-573 Enable log in knowhere
Former-commit-id: 7b60e5fc6edcaabea9e967ba4f3312a17533c986
2019-09-19 15:12:46 +08:00
xiaojun.lin
02270a6298 MS-568 Fix GpuResource free error
Former-commit-id: 52acd35e93a5293c70c45bb681fc54046b43a2cb
2019-09-19 14:52:14 +08:00
Heisenberg
3978c2a71f add Log.h in knowhere
Former-commit-id: e866a09e487f1ef60816bd0ee6c7308e4bf1ff7e
2019-09-19 11:04:56 +08:00
zhiru
666c6003f4 update
Former-commit-id: 1a3242b1ac87cad3274cc28d2e73697e55936e8b
2019-09-18 19:00:40 +08:00
xiaojun.lin
ed105628fc MS-565 1. refactor dir structure 2. add license 3. del swig
Former-commit-id: 580d35b9fe3ea71ebc7d6096fbf5d905351f34f5
2019-09-18 17:27:18 +08:00