Commit Graph

1119 Commits (87a1f4838dc79e9b72b99541b697bf145a4a70ac)

Author SHA1 Message Date
quicksilver 87a1f4838d setting script file permissions to 755
Former-commit-id: 421486f834d6c65215fca89572b3327f6dcbcac5
2019-07-03 16:35:19 +08:00
quicksilver 8b71d45ac7 setting script file permissions to 744
Former-commit-id: ba085a62f7a15665cdfa5a481c9470ecdda66d1e
2019-07-03 16:11:18 +08:00
quicksilver ad6e164e19 setting script file permissions to 700
Former-commit-id: c14d9e457795129f684cf9e25baa6e0a9f39ad8f
2019-07-03 15:54:15 +08:00
peng.xu ea9fdbd817 Merge branch 'revert-278f9085' into 'branch-0.3.1'
Revert "Merge branch 'integrate_knowhere-0.3.1' into 'branch-0.3.1'"

See merge request megasearch/milvus!154

Former-commit-id: 4143ee648f606b4a49ccecb25ab51cd2904918a6
2019-07-03 15:18:01 +08:00
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
jinhai f15f796319 Merge branch 'integrate_knowhere-0.3.1' into 'branch-0.3.1'
Integrate knowhere 0.3.1

See merge request megasearch/milvus!152

Former-commit-id: 325e321d4d937b6aa108317aee09aedea59207e4
2019-07-03 11:54:21 +08:00
xj.lin 88110a0d65 update ...
Former-commit-id: 6b721737d082237cd84128228d187f7b0a336d9b
2019-07-03 11:53:42 +08:00
xj.lin 00acbd9ff6 update R
Former-commit-id: 668ee056c2b0de6a56465be8fb78f910935c0e5c
2019-07-03 11:50:47 +08:00
xj.lin 1c3c8b1c1b Merge remote-tracking branch 'upstream/branch-0.3.1' into integrate_knowhere-0.3.1
Former-commit-id: 21f32dea9d0f0a703248422758494bb87f621124
2019-07-03 11:28:42 +08:00
jinhai 960d1c5a80 Merge branch 'branch-0.3.0' into 'branch-0.3.1'
MS - 147 Enable IVF

See merge request megasearch/milvus!151

Former-commit-id: c3c997bd086aaba798fb0ef77a4a46e7dc0c0017
2019-07-03 11:23:21 +08:00
yu yunfeng 81e13fd1cb change CHANGELOG
Former-commit-id: f1b0bebcca37b9fb33efc3faea4b9db66a9a4a7e
2019-07-03 11:18:34 +08:00
yu yunfeng 3083d4cd5e Merge remote-tracking branch 'main/branch-0.3.1' into branch-0.3.0
Former-commit-id: dd7b9d0fb8c176d194f213d2ae3e142b5de35f0f
2019-07-03 11:15:43 +08:00
yu yunfeng 4aabe33207 update IVF nprobe
Former-commit-id: 41aa77c14de1db37cfb1a177ba223de90829e003
2019-07-03 11:09:17 +08:00
jinhai feded929ce Merge branch 'branch-0.3.0' into 'branch-0.3.1'
MS - 144 Add engine conf

See merge request megasearch/milvus!150

Former-commit-id: a035448700a96fc317f4ba43df89a521bfdf23c9
2019-07-02 20:51:22 +08:00
yu yunfeng 380363f477 update
Former-commit-id: 99f1f53c6f2b1775f78acf0ba5560a112c68140b
2019-07-02 20:24:41 +08:00
yu yunfeng 87af3d632d add engine config
Former-commit-id: 326501e3adc70b88fe3b8304ba39920fb11cf2d0
2019-07-02 20:13:10 +08:00
yu yunfeng 9e56b536f7 Merge remote-tracking branch 'main/branch-0.3.1' into branch-0.3.0
Former-commit-id: 79032b111a24180ed2f3a3f7ca5b1ce04a1537bc
2019-07-02 20:11:00 +08:00
jinhai c480cb8b7f Fix typo
Former-commit-id: 1bccdd0999347c1fa76bdef446e9a7a2109ef66a
2019-07-02 20:06:00 +08:00
xj.lin 3d9a0df2bd update README.md
Former-commit-id: e28550bbbf254514b93e318a7aa8798274e5e55d
2019-07-02 19:58:15 +08:00
yu yunfeng 543f25b266 change changelog
Former-commit-id: 375be008b39b71b266febdcf5c3e389c270cb8a0
2019-07-02 19:41:02 +08:00
yu yunfeng 3fda33ac0b alter nprobe
Former-commit-id: 21cc3f6523580303bf702f7e616bcee7416a053f
2019-07-02 19:36:06 +08:00
xj.lin 619a800766 MS-143 merge
Former-commit-id: b8eeda3dcb955a065f4adc933d53c16a10b6f04a
2019-07-02 19:28:50 +08:00
xj.lin 640999c0a1 Merge branch 'add_submodule_knowhere' of 192.168.1.105:xiaojun.lin/vecwise_engine into add_submodule_knowhere
Former-commit-id: b591518581dafe050de9603b8c5089d5c649e5ed
2019-07-02 18:40:33 +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 82150885d0 update wrapper and wrapper test
Former-commit-id: a57d040aae7d8f5ba20c99ea6a0c6220efcaeacd
2019-07-02 18:37:33 +08:00
jinhai 5546de4586 Add Milvus EULA
Former-commit-id: 80422eb3dcd1b7eaa64b369a4e558aba968ee4da
2019-07-02 18:17:39 +08:00
jinhai 4672a9e045 Merge branch 'branch-0.3.0' into 'branch-0.3.1'
Update faiss parameter

See merge request megasearch/milvus!146

Former-commit-id: 5dca72d958dd89ace538540338dab91bf95eb2f3
2019-07-02 15:09:00 +08:00
yu yunfeng f30c327386 Update faiss parameter
Former-commit-id: a1ae1ac1bc963c18ac8a5281f8aa07ecba50eb94
2019-07-02 15:03:21 +08:00
jinhai 6c88dc1ed8 Merge branch 'mysql-0.3.0' into 'branch-0.3.1'
MS-105 - Add MySQL

See merge request megasearch/milvus!145

Former-commit-id: 07b1d5f82454a6b07e6951abccf3d74b3c75cff3
2019-07-01 20:10:45 +08:00
zhiru 9c374b09ef update
Former-commit-id: c97dbcbb86c85046a9bc89e69c43c27bcc4b2ded
2019-07-01 20:10:25 +08:00
zhiru 817e8f25ce update
Former-commit-id: 82c11af9305e823256197114c2ddd4c0a2f2e833
2019-07-01 19:59:26 +08:00
zhiru f6cccd3cbc update
Former-commit-id: da15a7f96a251941e8dc8302dc00fcfe05d88784
2019-07-01 19:49:42 +08:00
zhiru b2cdb9e96d update
Former-commit-id: 0b15e2302d0bec551b1215285ff86b5f6cdf71de
2019-07-01 19:40:28 +08:00
zhiru 542a521286 update
Former-commit-id: a86958591283465c24c8114044e646f2e7ebc8a9
2019-07-01 19:37:36 +08:00
jinhai ac03c4b2f0 Merge from branch-0.3.0
Former-commit-id: 07919b5140ff86401df087bc2539402d80897734
2019-07-01 17:47:33 +08:00
zhiru cdc47c3603 test
Former-commit-id: 338d1eb653c2b0726afe3ac19b2d62aefb5b0169
2019-07-01 17:11:33 +08:00
peng.xu 77120a62ab Merge branch 'revert-5f523800' into 'branch-0.3.0'
Revert "Merge branch 'mysql-0.3.0' into 'branch-0.3.0'"

See merge request megasearch/vecwise_engine!144

Former-commit-id: 2fec20a2409c67e50c9081d1e3626d273e20489e
2019-07-01 15:54:07 +08:00
zhiru fb7505cbce update
Former-commit-id: 9c61cc9301b9d92e5919c6ef4d6e0cf2bf0b441a
2019-07-01 15:51:47 +08:00
zhiru 0ac71cbfda update
Former-commit-id: e7df921b0817f1da8c88fd9f0ff143c0232d751f
2019-07-01 15:49:48 +08:00
zhiru.zhu bd96f26583 Revert "Merge branch 'mysql-0.3.0' into 'branch-0.3.0'"
This reverts merge request !143

Former-commit-id: 81a89490f668ae9342eaf1ecc48d1255879e44a6
2019-07-01 15:38:35 +08:00
peng.xu daf9eda97b Merge branch 'mysql-0.3.0' into 'branch-0.3.0'
MS-105 - Add MySQL

See merge request megasearch/vecwise_engine!143

Former-commit-id: c202a0a82d02bff1528db05e6c1b1f9a6788b9bb
2019-07-01 15:32:04 +08:00
zhiru 5c65f2a865 update
Former-commit-id: 2b2dae7736ed5a79b0bc610a1a51fd5361c8d5cb
2019-07-01 15:29:12 +08:00
jinhai ea7aa4f37a Merge branch 'branch-0.3.0' into 'branch-0.3.0'
ignore c sdk

See merge request megasearch/vecwise_engine!142

Former-commit-id: 809d43be5ae1fa827d47952e6b2ba22929001fed
2019-06-30 19:08:28 +08:00
groot 34eb182252 Merge remote-tracking branch 'source/branch-0.3.0' into branch-0.3.0
Former-commit-id: 2d381a99c00923ae2bfe4c798bc97192bd1037a2
2019-06-30 19:07:05 +08:00
groot ea3fdf6603 ignore c sdk
Former-commit-id: 4bb374ff328198226ae3ab78e5901ed6264713e7
2019-06-30 19:07:00 +08:00
peng.xu 68f6af02e3 Merge branch 'mysql-0.3.0' into 'branch-0.3.0'
MS-105 - Add MySQL

See merge request megasearch/vecwise_engine!141

Former-commit-id: cb83d329e08f38d1d53b123a4d38242a412366df
2019-06-30 19:02:01 +08:00
zhiru c659f0fcfb update
Former-commit-id: 64ac42d61ae8aa38599324b5f72e93e66507aa01
2019-06-30 19:00:53 +08:00
peng.xu 9163dd4cb9 Merge branch 'branch-0.3.0' into 'branch-0.3.0'
refine unitest code

See merge request megasearch/vecwise_engine!140

Former-commit-id: 1195a17800573a36e27b6ccf9ed89d1a52f86069
2019-06-30 18:54:54 +08:00
groot 26f182c7af refine unitest code
Former-commit-id: 7a78a5d5bd966d34d9ccd6f52e3b1c533da3a1a0
2019-06-30 18:53:43 +08:00
peng.xu ee3e384a03 Merge branch 'branch-0.3.0' into 'branch-0.3.0'
fix build error

See merge request megasearch/vecwise_engine!139

Former-commit-id: 526da01ddcf4a660f08c3b0a2d0cde22624b6b00
2019-06-30 17:20:02 +08:00