Commit Graph

576 Commits (e705fa3007505252bfef6934cccc3866c5587e53)

Author SHA1 Message Date
Zhiru Zhu d4e2be1cd8 update 2019-11-14 20:11:03 +08:00
Zhiru Zhu 3bcd01fe55 format 2019-11-14 20:07:19 +08:00
Zhiru Zhu e7e416775b update build.sh 2019-11-14 20:00:32 +08:00
Zhiru Zhu f96bd076ec format 2019-11-14 19:57:12 +08:00
groot 94c2427f55 code lint 2019-11-14 19:39:35 +08:00
groot bb5f38b0dd #316 Some files not merged after vectors added 2019-11-14 19:25:53 +08:00
zirui.chen 9b1c57e07b Merge remote-tracking branch 'upstream/0.6.0' into 0.6.0 2019-11-14 18:57:03 +08:00
Zhiru Zhu 34c579cc1d fix merge conflicts 2019-11-14 18:18:40 +08:00
zirui.chen f4536ac888 #127 Support new Index type IVFPQ 2019-11-14 16:40:36 +08:00
groot a57bfae626 merge 0.5.3 to 0.6.0 2019-11-14 16:16:11 +08:00
Zhiru Zhu 981d5393ff update build.sh 2019-11-14 14:08:19 +08:00
Zhiru Zhu bf0e5cbc9d Add option to disable/enble prometheus when compiling 2019-11-14 11:22:07 +08:00
zirui.chen 8c412093ca Support new Index type IVFPQ #127 2019-11-14 11:13:35 +08:00
Jin Hai bbb1ed42a4
Merge pull request #321 from scsven/dev
reside src/external in thirdparty
2019-11-13 19:39:59 +08:00
Jin Hai e250b38464
Merge pull request #320 from ZhifengZhang-CN/0.6.0
Fix determine Milvus version from git branch name bug
2019-11-13 18:24:08 +08:00
Zhiru Zhu ff7452a21f fix faiss source url 2019-11-13 16:53:23 +08:00
wxyu 78d59bfb85 Merge remote-tracking branch 'main/0.6.0' into dev 2019-11-13 16:37:11 +08:00
wxyu f251d26bbb Reside src/external in thirdparty 2019-11-13 16:35:37 +08:00
quicksilver 7aef840e48 Fix determine Milvus version from git branch name bug 2019-11-13 16:14:59 +08:00
Zhiru Zhu de1aa04bd0 update build.sh 2019-11-13 16:11:31 +08:00
Zhiru Zhu 1fa4c2531a remove FAISS_URL 2019-11-13 16:01:03 +08:00
Zhiru Zhu 9bb2f83c37 Merge remote-tracking branch 'upstream/0.6.0' into 0.6.0 2019-11-13 15:16:20 +08:00
Jin Hai 224ad14085
Merge pull request #312 from cydrain/caiyd_rename_indextype
#275 rename c++ sdk IndexType
2019-11-13 15:13:03 +08:00
Jin Hai 8e381181de
Merge pull request #311 from ZhifengZhang-CN/gpu_config
Add server_gpu_config.templete for generate server_config.yaml
2019-11-13 15:12:40 +08:00
Zhiru Zhu fba291c596 Merge remote-tracking branch 'upstream/0.6.0' into 0.6.0
Merge remote-tracking branch 'upstream/0.6.0' into 0.6.0
2019-11-13 14:53:51 +08:00
Zhiru Zhu bf69d10f86 add find faiss 2019-11-13 14:53:37 +08:00
yudong.cai afbe9152e9 #275 rename c++ sdk IndexType 2019-11-13 14:34:07 +08:00
ZhifengZhang-CN 37487a8fee fix make error 2019-11-13 13:55:46 +08:00
ZhifengZhang-CN 03f297fff4 format server_cpu_config.template and server_gpu_config.template 2019-11-13 13:52:16 +08:00
ZhifengZhang-CN 613c74afcf rename server_config.template to server_cpu_config.template 2019-11-13 13:43:44 +08:00
Jin Hai 7edf3e8ad1
Merge pull request #299 from yhmo/0.6.0
#260 C++ SDK README
2019-11-13 11:49:52 +08:00
groot be733f1e5d #260 C++ SDK README 2019-11-13 11:43:23 +08:00
groot 1d36ab8905 Merge remote-tracking branch 'source/0.5.3' into 0.5.3 2019-11-13 11:42:58 +08:00
groot 5772c3b400 #260 C++ SDK README 2019-11-13 11:42:20 +08:00
Jin Hai dd7ee51222
Merge pull request #304 from ZhifengZhang-CN/0.6.0
Add Travis CI for Milvus
2019-11-13 11:25:21 +08:00
ZhifengZhang-CN c467ed9d07 add server_gpu_config.template 2019-11-13 11:15:03 +08:00
yudong.cai 48650e04e2 #89 fix clang-format 2019-11-13 09:24:27 +08:00
groot 919846ea6d #260 C++ SDK README 2019-11-12 19:47:37 +08:00
groot 5a74558f0d #260 C++ SDK README 2019-11-12 19:45:21 +08:00
groot 0442ec7900 #260 C++ SDK README 2019-11-12 19:22:27 +08:00
groot 06ae349fe2 #260 C++ SDK README 2019-11-12 19:14:20 +08:00
groot dfcce896e2 #260 C++ SDK README 2019-11-12 19:11:07 +08:00
yudong.cai 0d254639b0 #89 update faiss benchmark to support IDMap 2019-11-12 18:16:58 +08:00
ZhifengZhang-CN 9c954b562a delete FindGTest.cmake 2019-11-12 17:30:19 +08:00
ZhifengZhang-CN d04f7b56a2 update FindGTest.cmake 2019-11-12 17:11:32 +08:00
groot c9bb9d7e58 fix typo 2019-11-12 15:30:19 +08:00
quicksilver 1a02484b21 update arrow version to 0.15.1 2019-11-12 14:45:29 +08:00
quicksilver d6fe3c468f fix bug 2019-11-12 11:56:42 +08:00
quicksilver 583ec7a2b2 format ARROW_LIB_DIR 2019-11-12 11:34:21 +08:00
quicksilver f8e66f12a9 add FindGTest.cmake 2019-11-12 11:12:03 +08:00
groot a1ae44e602 #284 Change C++ SDK to shread library 2019-11-12 10:48:44 +08:00
groot 2aa6af2fd8 #284 Change C++ SDK to shread library 2019-11-12 10:45:49 +08:00
groot c0a728d244 #284 Change C++ SDK to shread library 2019-11-12 10:29:37 +08:00
ZhifengZhang-CN ce0d32fb53 fix mkl library path error 2019-11-11 22:38:41 +08:00
ZhifengZhang-CN af68a2f4d3 fix mkl library path error 2019-11-11 21:58:22 +08:00
ZhifengZhang-CN 89f094f7cb fix mkl library path error 2019-11-11 21:35:45 +08:00
quicksilver c7dcd558f3 fix link arrow library path 2019-11-11 17:26:05 +08:00
quicksilver 8ba423db03 update Index ThirdPartyPackagesCore.cmake 2019-11-11 16:55:02 +08:00
quicksilver ba2548a936 add FindArrow.cmake 2019-11-11 16:44:31 +08:00
quicksilver d4372d28b7 use ccache when compiling (if available) 2019-11-11 11:12:59 +08:00
quicksilver 8e78c8dfda Merge remote-tracking branch 'upstream/0.6.0' into 0.6.0 2019-11-11 10:52:39 +08:00
Jin Hai b43c8f592b
Merge pull request #259 from fishpenguin/0.5.3-yk
Bytes type in proto cause big-endian/little-endian problem
2019-11-08 19:12:08 +08:00
fishpenguin 105b98499b #258 - Bytes type in proto cause big-endian/little-endian problem 2019-11-08 18:52:56 +08:00
Jin Hai 6c8c4d180d
Merge pull request #239 from fishpenguin/0.5.3-yk
improve grpc performance in search
2019-11-08 16:43:24 +08:00
fishpenguin 87ef2f535a change server version to 0.5.3 in CMakeList.txt 2019-11-08 15:55:31 +08:00
fishpenguin fdb8167566 add README.md for grpc 2019-11-08 13:12:14 +08:00
groot a76d223a25 #246 Exclude src/external folder from code coverage for jenkin ci 2019-11-08 12:11:11 +08:00
fishpenguin fceb3ba714 Decrease test_rpc run time 2019-11-08 11:03:27 +08:00
JinHai-CN 32b609aaf3 Update to new local faiss 2019-11-08 00:48:05 +08:00
groot 57e3c14825 fix unittest failure 2019-11-07 18:46:27 +08:00
fishpenguin 174e16ad26 fix add_vector_data bug in clientproxy 2019-11-07 17:51:01 +08:00
groot f3c7fcf80e merge 0.6.0 2019-11-07 16:47:38 +08:00
groot dbe90c7abc support table partition 2019-11-07 16:46:31 +08:00
Zhiru Zhu 7fa712e45c
Update DefineOptions.cmake 2019-11-07 16:11:55 +08:00
Zhiru Zhu 3c0c4646b0 issue 229, 230 and 237 2019-11-07 15:35:53 +08:00
fishpenguin 07dfe09aed #204 - improve grpc performance in search 2019-11-07 15:23:28 +08:00
quicksilver 77a0ce8b75 Merge remote-tracking branch 'upstream/0.6.0' into 0.6.0 2019-11-07 14:07:00 +08:00
quicksilver 32b29fe7b8 update cmake version 2019-11-07 10:29:00 +08:00
Jin Hai 28810ad06e
Merge pull request #219 from cydrain/caiyd_opt_unittest
#208 optimize unittest to support run single test more easily
2019-11-06 17:06:04 +08:00
yudong.cai 2deba2dcb9 #208 optimize unittest to support run single test more easily 2019-11-06 16:22:38 +08:00
JinHai-CN c462c7e65b Merge remote-tracking branch 'main/0.5.2' into 0.5.3 2019-11-06 14:55:03 +08:00
Jin Hai b418937125
Merge pull request #214 from yhmo/0.6.0
git ignore config.h
2019-11-06 14:54:39 +08:00
JinHai-CN 11bfdc928b Merge branch '0.5.2' into 0.6.0 2019-11-06 14:48:09 +08:00
groot 89572b7362 git ignore config.h 2019-11-06 14:39:13 +08:00
Jin Hai f43feba95b
Merge pull request #212 from JinHai-CN/0.5.2
Fix faiss url
2019-11-06 14:36:45 +08:00
JinHai-CN af7120c4ee Fix faiss url 2019-11-06 14:33:30 +08:00
yudong.cai 5a9f7997ab #207 fix unittest build error 2019-11-06 13:12:04 +08:00
yudong.cai 1b0d453379 #207 add more unittest for config set/get 2019-11-06 11:56:06 +08:00
groot 55bfdd3fb6 merge 0.5.2 into 0.6.0 2019-11-06 11:39:30 +08:00
youny626 ece0b61ac8 small fix 2019-11-05 21:52:35 +08:00
youny626 2a1f2ab09d change default config to gpu 2019-11-05 21:48:23 +08:00
yudong.cai d6bf525309 #200 fix clang-format 2019-11-05 17:45:02 +08:00
yudong.cai c1f8dd2a23 #200 disable search resource has only CPU 2019-11-05 17:39:33 +08:00
Jin Hai 7a759709ee
Merge pull request #196 from yhmo/0.5.2
#194 Search faild: Table file doesnt exist
2019-11-05 15:06:28 +08:00
youny626 bd01ac91c0 clang format 2019-11-05 13:47:55 +08:00
youny626 05dda4ab73 clang format 2019-11-05 13:42:12 +08:00
youny626 bede77751e clang format 2019-11-05 13:35:24 +08:00
youny626 29e8ef110f change default cpu version option to off 2019-11-05 13:21:32 +08:00
groot 4e22ae189a set default version 2019-11-05 12:35:34 +08:00
groot bc802b04a0 fix build error 2019-11-05 12:02:58 +08:00
groot 7ccd442116 format code 2019-11-05 11:33:14 +08:00
groot 534e6e504a #194 Search faild: Table file doesnt exist 2019-11-05 11:29:19 +08:00
youny626 4ca6b59b91 add CPU version 2019-11-05 10:23:59 +08:00
JinHai-CN f2a64a1272 Update CHANGELOG and fix cpp lint error 2019-11-05 09:36:13 +08:00
jinhai 745ce13f46 Update Cache code format 2019-11-05 02:28:53 +08:00
jinhai bd4f033770 Update server_config.template 2019-11-05 02:18:13 +08:00
jinhai 4b7f86b0da Update CMakeLists.txt 2019-11-05 02:09:18 +08:00
JinHai-CN 8a1b60ff31 Merge remote-tracking branch 'main/0.5.1' into 0.5.1
Former-commit-id: 3ec0e13f634cd53cae3da6ccb6b939b4d98923ce
2019-11-03 17:20:43 +08:00
JinHai-CN bf2e3e790c Update milvus version
Former-commit-id: 3d345b0dc6eaaba41b78f87a46ef70e5d4ca6c19
2019-11-03 17:19:28 +08:00
yudong.cai ad395a7f06 #175 update invalid config unittest
Former-commit-id: 06ef1ca314a4ad5d55a5a3352f75ec6e265cb4a0
2019-11-03 16:05:38 +08:00
JinHai-CN 46e2655033 update
Former-commit-id: 977f322ddccf4e1b1a6b87a1fc1710d47eb5d48d
2019-11-03 15:35:28 +08:00
JinHai-CN 47d52d250d Fix typo bug
Former-commit-id: 8b544b2158f89fea48a174e2f64128fa61706259
2019-11-03 15:14:42 +08:00
JinHai-CN 3b17eb7481 Merge remote-tracking branch 'main/0.5.1' into 0.5.1
Former-commit-id: 42a8368f0bedd23d2fedeb195ee8607f42bea555
2019-11-03 15:07:55 +08:00
yudong.cai bfafb8cdef #175 fix clang-format
Former-commit-id: e7818d67ca090ced2a934e885074700b46619e15
2019-11-03 14:28:15 +08:00
JinHai-CN 54d5334ad7 Merge remote-tracking branch 'main/0.5.1' into 0.5.1
Former-commit-id: fd1ca7728f37610b8cdfaff52d8abaaa4c8cfa65
2019-11-03 14:06:06 +08:00
yudong.cai 9ff83e140e add invalid config unittest
Former-commit-id: b2201e3394a953e7e2055bdf351a094a6d6e5315
2019-11-03 12:51:47 +08:00
JinHai-CN 0ec462c603 Update faiss
Former-commit-id: ec0c88417aa5b3197b90feb53cad0b0ff791244a
2019-11-02 22:10:14 +08:00
yudong.cai 5150647eeb #168 fix reduce bug
Former-commit-id: 5c6f2e25cbf9efe4a58bf89757fc4983ebda4f35
2019-11-02 21:54:01 +08:00
yudong.cai f49d23badd #168 improve result reduce
Former-commit-id: 21887800b9afe47b759a09c1f9fbed97b467cab1
2019-11-02 21:54:01 +08:00
JinHai-CN cbdb9002fe Merge remote-tracking branch 'github/0.5.1' into 0.5.1
Former-commit-id: c4dfc96120e3fe49bc13fadeb04bd62da1e62406
2019-11-02 21:47:59 +08:00
JinHai-CN 6365640680 Merge remote-tracking branch 'main/0.5.1' into 0.5.1
Former-commit-id: b032e22a12f4b08b6944e8645e7ecd36da02dd4d
2019-11-02 21:35:48 +08:00
fishpenguin bf35fe2df3 #169 - IVF_FLAT search out of memory
Former-commit-id: 0a231da138e4a3bbefb1ca0744bb121544834b65
2019-11-02 16:28:34 +08:00
fishpenguin 2f28f053d2 change gpu_index to device_id
Former-commit-id: 6993e98e19e31f942ffee5833b593a59cffa94a7
2019-11-02 11:26:08 +08:00
fishpenguin 63033ebc1f Code format
Former-commit-id: 8c9c010fd45c0a6737b8ad6c4493469440292707
2019-11-01 20:14:18 +08:00
fishpenguin 44d648c3af #164 - Add CPU version for building index
Former-commit-id: 02f9f2a04dc765f41c474af04659f70d121cdc18
2019-11-01 17:01:57 +08:00
peng.xu b006c70e75 Merge branch 'add_debug_info' into '0.5.1'
info lint:

See merge request megasearch/milvus!810

Former-commit-id: 0fbba752a0afa734ced472a1c166327dd1c597b8
2019-11-01 16:06:05 +08:00
xiaojun.lin 70f6912533 info lint:
Former-commit-id: f3b68279e7473d817745941e2cb056489f3e8e76
2019-11-01 16:04:45 +08:00
peng.xu e93e770f89 Merge branch 'add_debug_info' into '0.5.1'
add info

See merge request megasearch/milvus!809

Former-commit-id: 980c11a02bc2b6b5f5a655b06b0c44f4439322df
2019-11-01 15:58:58 +08:00
xiaojun.lin 102aa35350 add info
Former-commit-id: e2a9b4550ff966180f6fdf3d4046e2886849ab81
2019-11-01 15:54:58 +08:00
Jin Hai 888e188f71 Merge pull request #163 from cydrain/0.5.1
change configuration name from "use_gpu_threshold" to "gpu_search_threshold"

Former-commit-id: d339a53ab7e4414f3d9aa80dc6ba214ffa698856
2019-11-01 15:16:50 +08:00
JinHai-CN be882b861c Merge remote-tracking branch 'main/0.5.1' into 0.5.1
Former-commit-id: ff4ef32c63b80aedd997085ff8c477d6f19ed3a0
2019-11-01 14:55:12 +08:00
yudong.cai 6ad1ed74e9 #159 Change the configuration name from 'use_gpu_threshold' to 'gpu_search_threshold'
Former-commit-id: b4e576b389a720d66ec5455ca05b20184c8c911d
2019-11-01 14:51:20 +08:00
xiaojun.lin cb5eb3340a Merge branch '0.5.1' into fix_ivfsqh_crash
Former-commit-id: f78784bcbae30641ea0b40bcf9351a244b60b74c
2019-11-01 14:45:52 +08:00
xiaojun.lin 85b136b364 Fix bug #161
Former-commit-id: 5daf77b3344351a8030e53ff704b7e8bf1cce400
2019-11-01 14:40:52 +08:00
jinhai d01c555604 Fix lint
Former-commit-id: 52ff843377f1463bb4cad7fcf67366b3facd8d10
2019-10-31 11:05:04 +00:00
jinhai 57e263bd55 Merge branch '0.5.1' of http://192.168.1.105:6060/jinhai/milvus into 0.5.1
Former-commit-id: 4fd76422da2c9b0bc9aa9e1522814c8016fa3193
2019-10-31 11:03:29 +00:00
jinhai 71fa8bdd05 Fix parallel merge issue
Former-commit-id: 7eae24c65e50c6c0abc423b841c14bf16a8c0a1d
2019-10-31 11:03:22 +00:00
Jin Hai 7b76696aed Merge pull request #151 from fishpenguin/branch-0.5.1-yk
Add only GPU and only CPU version for IVF_SQ8 and IVF_FLAT

Former-commit-id: bdca3006bc7b2c4456b1874d8c5eb23e67053b16
2019-10-31 17:19:04 +08:00
wxyu 335f35ed08 Merge remote-tracking branch 'main/0.5.1' into dev
Former-commit-id: a7bbf065776bbbc14c824880fdea706a66fdec93
2019-10-31 16:58:59 +08:00
wxyu 4df6f4b5a9 Not return error when search_resources and index_build_device set cpu
Former-commit-id: 0e0313e59cfbf8f8b17fc62db02f2e21a25d25a2
2019-10-31 16:58:47 +08:00
fishpenguin 32dac025af Merge remote-tracking branch 'upstream/0.5.1' into branch-0.5.1-yk
Former-commit-id: 7b3f48e3acfa6c35b62dc5de8731a6b85aaa5dce
2019-10-31 16:41:59 +08:00
fishpenguin 1dc7b321a4 Read config once in optimizer
Former-commit-id: 8fee2a3cfa20cdc8b51e86867b7b3eb71dd2e759
2019-10-31 16:41:48 +08:00
Jin Hai a6f08ac963 Merge pull request #152 from Heisenberg-Y/0.5.1-yzb
[skip ci] complete baseline

Former-commit-id: 6e9a44c98bbf95ad36d5aa581aa1878fac59dc01
2019-10-31 15:32:13 +08:00
Jin Hai a6f97a251d Merge pull request #150 from scsven/dev
Improve large query optimizer pass

Former-commit-id: 7abe61a7ca13461d3fe42acceec002acb11dac85
2019-10-31 15:30:25 +08:00
Zhiru Zhu 530b2a0f28 fix cmake error: STRING sub-command REGEX, mode REPLACE needs at least 6 arguments total to
command


Former-commit-id: 773f938125ed03582fc8242af0a23076677bf848
2019-10-31 14:57:09 +08:00
Heisenberg c8da2c3d64 add mix mode for faiss baseline
make baseline compatible for different faiss version


Former-commit-id: 90f96b4d437136539e7aa805f58c49e2d8a23ed1
2019-10-31 14:46:25 +08:00
fishpenguin a68255f9d0 clang format
Former-commit-id: 3f99d7df6b042683696dd70c9dc0f14fee57b388
2019-10-31 14:44:59 +08:00
Heisenberg 90e961649c Merge branch '0.5.1' into 0.5.1-yzb
Former-commit-id: 1e1a78a79db59c10c3ede8fd3187aea41c582c59
2019-10-31 14:43:11 +08:00
fishpenguin 68d5693a74 Merge remote-tracking branch 'upstream/0.5.1' into branch-0.5.1-yk
Former-commit-id: 2af5f3b5de04c3834c70ae1a5380b3bba40fe0bf
2019-10-31 14:39:13 +08:00
fishpenguin 49105e44f3 Add only GPU and only CPU version for IVF_SQ8 and IVF_FLAT
Former-commit-id: 14f5b095df2988d5f65ecd1cb2628fd3a3791a14
2019-10-31 14:39:02 +08:00
wxyu 1a12cd9bb5 Merge remote-tracking branch 'main/0.5.1' into dev
Former-commit-id: 110a811fa95f6d811f96f8f7bdf9b93ab0a17695
2019-10-31 14:30:31 +08:00
wxyu 892bd4daac Improve large query optimizer pass
Former-commit-id: 1f0c283ec4dc5560c14d4e17d76719d38dfc2280
2019-10-31 14:30:17 +08:00
Jin Hai b60677b474 Merge pull request #137 from youny626/0.5.1
Add Ubuntu version specific cache

Former-commit-id: c5d1150ac392f7d344f1520b2a01a01cbd0e0335
2019-10-31 14:16:04 +08:00
JinHai-CN 628876806b Merge branch '0.5.1' of http://192.168.1.105:6060/jinhai/milvus into 0.5.1
Former-commit-id: 13037d6d389716a970cbfdc55edbb01fbaf0a4c0
2019-10-31 14:07:35 +08:00
JinHai-CN eeb503f7c5 Update faiss link
Former-commit-id: 22febba9b19f8de8422eae922ec75d7106e37e7a
2019-10-31 14:07:23 +08:00
jinhai 4e33f223b7 Merge branch '0.5.1' into '0.5.1'
0.5.1

See merge request megasearch/milvus!802

Former-commit-id: 42769887dabff1e661b671b256b09ef931987fbd
2019-10-30 20:27:37 +08:00
jinhai e316271a0d Merge remote-tracking branch 'main/0.5.1' into 0.5.1
Former-commit-id: 10559bda3c1089dcac77d33b420566ad1fa7b57e
2019-10-30 12:26:57 +00:00
wxyu 87963408bf fix lint
Former-commit-id: 2f5166b4c2a461c379c55eb5a49d431e878aa19a
2019-10-30 20:24:10 +08:00
jinhai f9e74971a5 Merge branch '0.5.1' into '0.5.1'
0.5.1

See merge request megasearch/milvus!801

Former-commit-id: 26d6c4b4741295f1bfaac3ad17a54a79e49d0995
2019-10-30 20:14:50 +08:00
jinhai 233f3a9c9d Merge remote-tracking branch 'main/0.5.1' into 0.5.1
Former-commit-id: 710f0212ec7264f07a3a2373383cd49fd9e21b48
2019-10-30 12:10:40 +00:00
wxyu 7dc552fdea New config opion use_gpu_threshold
Former-commit-id: 3d33145d8fa473f2b81cc98022c1bb93853a2fbc
2019-10-30 19:57:55 +08:00
yudong.cai 74f7b359ae #89 update
Former-commit-id: 924960514c582b1c53f2115861c88e90252b63ac
2019-10-30 17:41:59 +08:00
starlord a4f0f4bd13 get branch name
Former-commit-id: eb75eb1a41845c294479a8e15176feac629be9a8
2019-10-30 17:37:44 +08:00
yudong.cai 12b8d14a10 #89 clang-format
Former-commit-id: ddfd7fe63f48b0822d536b1079a129b84ea537cc
2019-10-30 17:22:30 +08:00
yudong.cai 881e962361 Merge remote-tracking branch 'main/0.5.1' into 0.5.1
Former-commit-id: 6f882df8f6a9571e9c5bf6aab55a813dcfe9cbad
2019-10-30 17:18:07 +08:00
yudong.cai 3dd61fee06 #89 re-org faiss_benchmark_test
Former-commit-id: 0fb0c3f91e9c864b301f5a9b8d29049e456d99e4
2019-10-30 17:17:38 +08:00
Zhiru Zhu c99f407099 delete message
Former-commit-id: 577b8693eca42bf3537c8691f754dd1876d579a3
2019-10-30 15:30:28 +08:00
Zhiru Zhu c41ebb7e7d fix JFrog cache error
Former-commit-id: 8b75351080e9201d6f9f47c643dfb7eec32d5a86
2019-10-30 15:27:05 +08:00
JinHai-CN a6fd546196 Merge remote-tracking branch 'main/0.5.1' into 0.5.1
Former-commit-id: 7bf691eb73bc86b6de4030226226ea57106c6bc3
2019-10-30 14:20:24 +08:00
wxyu 3f8a3ca9fe Merge remote-tracking branch 'main/0.5.1' into dev
Former-commit-id: 1301dfebe6a4adffd65bf50a4a52f6b33765de7f
2019-10-30 12:34:21 +08:00
wxyu 3fa2c1e69a Set task state MOVED after resource copy it completed
Former-commit-id: a97e306b62f6a0a7a06c881e93a973ad75b8ac9d
2019-10-30 12:34:09 +08:00
starlord 2aa7176d46 show branch name
Former-commit-id: 8c5eca7a3372f553b13a349ad0e5407ec3683bf2
2019-10-30 11:21:28 +08:00
Jin Hai 8970efae49 Merge pull request #128 from tinkerlin/upgrade_faiss
Upgrade faiss

Former-commit-id: 0ed5ef40de13008935dbdbe3852e1af47c4d2283
2019-10-29 20:16:03 +08:00
xiaojun.lin 39e127d707 Upgrade Faiss to v1.6
Former-commit-id: 637f6933c77c2644d4d90120d9d2aed77e4e70ff
2019-10-29 20:05:01 +08:00
yudong.cai b6484475d8 #89 fix clang-format
Former-commit-id: 0c7feb7370d58e7511a1089d181d256e9c9e6905
2019-10-29 19:22:21 +08:00
yudong.cai 95b231a5cb Merge remote-tracking branch 'main/0.5.1' into 0.5.1
Former-commit-id: aecebe10c5104ebc1d77d7e21c0d79844309f371
2019-10-29 19:16:33 +08:00
yudong.cai b43b9bac27 #89 do normalize() for IP test
Former-commit-id: 11be41ee43e3dd0e2ecbcd50ba70bab2df58688d
2019-10-29 19:15:54 +08:00
starlord bb43a77130 update message
Former-commit-id: 0a5ad5dfd42d76032c5008d9d9e4e2213b161232
2019-10-29 17:19:02 +08:00
starlord dcc7fbd439 update message
Former-commit-id: 84f9b8ce2ac8050128f678754123ae2716e3b342
2019-10-29 16:50:55 +08:00
starlord bfdc80401d fix typo
Former-commit-id: bc177ec75ef30265a1358961f89966c8d6ea535c
2019-10-29 16:15:14 +08:00
starlord c63c622cf5 update message
Former-commit-id: 568dbdc5d6dc233716682ebec33e6bd3dfe45500
2019-10-29 16:06:27 +08:00
starlord 96dffcf8ab format code
Former-commit-id: f809ffd4505ada713620e4996d6fe1004bcc69dc
2019-10-29 15:37:08 +08:00
starlord a05cebf513 fix job.h header cpplint error
Former-commit-id: c5bfb2f7acdfad00adf818b9cc4b20ce42b7c9e1
2019-10-29 15:18:54 +08:00
starlord a78e928dfa #90 The server start error messages could be improved to enhance user experience
Former-commit-id: e3ad89ab67f2c46bc4cb4e6d094a7763fb098664
2019-10-29 15:16:04 +08:00
starlord e743adb373 Merge remote-tracking branch 'source/0.5.1' into 0.5.1
Former-commit-id: 4ee722e2074ee58dce001b46ff05fd4c8152beb6
2019-10-29 15:14:18 +08:00
xiaojun.lin 789403b0c1 Merge remote-tracking branch 'gitlab/0.5.1' into upgrade_faiss
Former-commit-id: 826c673ce80978ab416b0e6568328e4028cad607
2019-10-29 11:18:56 +08:00
Jin Hai 2f762900e0 Merge pull request #119 from scsven/dev
Using shared_ptr instead of weak_ptr to avoid performance loss

Former-commit-id: 1e0c9f5a1ce757f3768c5efe44b383e93f677bbe
2019-10-28 20:48:01 +08:00
Heisenberg d95b3906c8 [skip ci] refine the copy time test
Former-commit-id: d370cec5e350d3f3740d9b56182ad0a990ed2ec8
2019-10-28 20:41:08 +08:00
wxyu de2bb68daa Add unique id for Job
Former-commit-id: 1865dbd859f345a3febc3ad76682f928678e59f5
2019-10-28 20:34:26 +08:00
wxyu 7510f1f7a2 remove unused code
Former-commit-id: 630cb776ec1a736f78241835fbbc8cc95b68deaa
2019-10-28 20:28:36 +08:00
starlord 52b6307027 Merge remote-tracking branch 'source/0.5.1' into 0.5.1
Former-commit-id: f29536b8ff8ac23aa9f629da28825c1efcedcf0b
2019-10-28 20:24:42 +08:00
starlord 12b7d6f5d8 #90 The server start error messages could be improved to enhance user experience
Former-commit-id: 746b126621cd845c2848bb850b5c2eb6d3b65a6d
2019-10-28 20:24:13 +08:00
Jin Hai b1d7b02b1e Merge pull request #120 from cydrain/0.5.1
[skip ci] add faiss benchmark

Former-commit-id: 75c483a740e5c317d66ad05f48734baac6226862
2019-10-28 20:18:29 +08:00
yudong.cai b439da8a36 #89 update README.md
Former-commit-id: 0b85b430c0d4a69e0470e916a76adda16f96c12b
2019-10-28 20:17:25 +08:00
yudong.cai 97ae8a780c #89 add README.txt
Former-commit-id: a84501ce6c2c94275819ace9e7d7a4afc14fbeca
2019-10-28 19:55:43 +08:00
yudong.cai 7f6092b6ba #89 add SQ8Hybrid MIX test and pure-GPU test
Former-commit-id: 25b5f419d3deedd4ec39c014ea47822a83a0af38
2019-10-28 19:34:38 +08:00
wxyu 2b1de98912 fix cpplint
Former-commit-id: df5bb8526ac0fe0662b10fbfb7daa706900e6758
2019-10-28 19:29:44 +08:00
wxyu a3c369c076 solve conflicts
Former-commit-id: c92330680d95525afd2b11f3dbeb9db051dfc751
2019-10-28 19:20:55 +08:00
wxyu 53b3b60db2 Using shared_ptr instead of weak_ptr to avoid performance loss
Former-commit-id: 250cb7200b6eefdd9cbb9fd631379d59aca2f368
2019-10-28 19:19:42 +08:00
wxyu 5e504b3435 rename functions tasktable, make it accessing likes standard structure
Former-commit-id: c0ba41635e710e0807af0fe07d0b6a266f60d044
2019-10-28 17:27:49 +08:00
Jin Hai 8fda112ae1 Merge pull request #116 from scsven/dev
Using new structure for tasktable

Former-commit-id: 184c3c75587577c236933eabdd010df040e525df
2019-10-28 16:49:04 +08:00
wxyu 37e4b0a934 Using new structure for tasktable
Former-commit-id: 80376dce0fd24c8c541c05363d702941f69dca0e
2019-10-28 16:35:53 +08:00
wxyu 80b9c79c5d Using new structure for tasktable
Former-commit-id: 6742f21a429da87456ded0a910d248948dc948b4
2019-10-28 12:23:25 +08:00
Jin Hai 6d2dad0b53 Merge pull request #103 from youny626/0.5.1
Remove .a file in milvus/lib for docker-version

Former-commit-id: 462024cc5f1e678444b41fcad76ec3d97c2bcc73
2019-10-28 11:02:38 +08:00
yudong.cai ca0f5e465e Merge remote-tracking branch 'main/0.5.1' into 0.5.1
Former-commit-id: d98c3a065f0a643ff3c9c3b34cdc9361b34bd1a1
2019-10-28 10:24:50 +08:00
fishpenguin f32921f0fb test_scheduler core dump
Former-commit-id: 79208b55f7b016bde5100cc7474850160dc72503
2019-10-25 19:43:07 +08:00
Zhiru Zhu d65160e4a1 Remove .a file in milvus/lib for docker-version
Former-commit-id: b27fd9ddcf9d0dcbcceca2422b8bf6230bf4e21a
2019-10-25 18:01:35 +08:00
Jin Hai 8b64aa7cda Merge pull request #91 from scsven/dev
Improvement dump function in scheduler

Former-commit-id: 2b7853f866db6aa3c7000c3629dfc28327a94762
2019-10-25 10:19:12 +08:00
Jin Hai 42e1ec8bd3 Merge pull request #93 from youny626/0.5.1
Speed up CMake build process

Former-commit-id: d113c6903c01f10958d85f70152640b82838b3cd
2019-10-24 18:48:18 +08:00
Jin Hai abb6ab8de5 Merge pull request #81 from yhmo/0.5.1
#80 Print version information into log during server start

Former-commit-id: 44ccc3b0d8b23e72d2c05a2cc49ef5abd694606f
2019-10-24 14:06:28 +08:00
yudong.cai 65b46de1ac #89 code format
Former-commit-id: ced158f26d9c18e38c7afb84ad17fdb6f9057259
2019-10-24 10:56:12 +08:00
starlord f7a7f9b7da ignore easylogging files
Former-commit-id: 0b609d729f3914e8d57b2f5a7d0baa38ad92cc2f
2019-10-24 10:43:14 +08:00
yudong.cai d3d6077eb2 #89 update unittest parameter
Former-commit-id: 4692890b67109edefbd0cc0a0a5a628f6433306d
2019-10-24 10:24:02 +08:00
yudong.cai 4f5906b9bc #89 update SQ8Hybrid-gpu log
Former-commit-id: c2e70121ee65ed044c059ac3948b3412353e829e
2019-10-24 09:44:01 +08:00
yudong.cai ec022c330d #89 update unittest
Former-commit-id: f9b518f2961f3c7da30a76a53a49da8403208a0b
2019-10-24 09:33:09 +08:00
Zhiru Zhu a6279d2acb Speed up CMake build process
Former-commit-id: 2edb2ae26d93ed9b7a8d25b89d30152e60257250
2019-10-23 21:45:48 +08:00
starlord e25caa572c remove unused files of wrapper test
Former-commit-id: b2b30f0d09085207c70d386e19c3c1fb6bbc0e2f
2019-10-23 20:19:45 +08:00
yudong.cai 82ddcf8340 #89 display quant/search time
Former-commit-id: 563141ab22274ca0e3e84253df8a79af58c16eca
2019-10-23 18:39:43 +08:00
yudong.cai 4c7d590eb2 9 update unittest name
Former-commit-id: 4bd87de1ceee872b9de13c5e5c65bab7291eb9c7
2019-10-23 18:24:35 +08:00
yudong.cai 52ca4c4ae2 update test parameter
Former-commit-id: 0871f4f0acd87280b5327caf4f14dae5b0d5e165
2019-10-23 17:46:27 +08:00
yudong.cai 635434126c #89 add faiss benchmark
Former-commit-id: 12f9741900e36bb22cd8b7839f16174fd5d0c6f9
2019-10-23 17:44:57 +08:00
wxyu 72ae6f59cc clang-format
Former-commit-id: 0ef52c892fdff56800f509cecf010f95c6e7e421
2019-10-23 17:14:50 +08:00
wxyu edcb0bc5e1 Improvement dump function in scheduler
Former-commit-id: b7c550a7fb4e05c66afa217f435b401d9cae5613
2019-10-23 17:12:36 +08:00
zhenwu 883566c3f5 merge confict
Former-commit-id: c6f0a15aa6d0db794f6e7a84fed825fbc1049ad9
2019-10-23 15:06:30 +08:00
starlord e7876f6343 avoid relative header path
Former-commit-id: d4a01b720ac7011e17076b7c36a20af0ebe2b58a
2019-10-23 15:05:22 +08:00
zhenwu 79baa075bc merge confict
Former-commit-id: 3e82d3abfab86d9f64b293a45d4f8f008bfda5ac
2019-10-23 14:55:03 +08:00
del-zhenwu 7990c72c44 Merge branch '0.5.1' into 0.5.1
Former-commit-id: d846635e87183691119e418c42dccfadeb2989c1
2019-10-23 14:37:50 +08:00
zhenwu dead8ee688 add exit code in coverage.sh
Former-commit-id: 27a834232561cbda1360cd245f73d89db5d48750
2019-10-23 14:33:01 +08:00
starlord 25e49ef1a2 fix merge conflict
Former-commit-id: acef793c9eda6bcc62fc6391e49e5935612049af
2019-10-23 12:18:08 +08:00
Jin Hai 53b4f43bbd Merge pull request #83 from scsven/dev
Move easyloggingpp into external directory

Former-commit-id: 17ebea24c357123aeda8c92baaa8b8785761c6ac
2019-10-23 10:42:20 +08:00
Jin Hai 796fdcf101 Merge branch '0.5.1' into master
Former-commit-id: 1bc4e66f1cf4c07279a18715510c5a9576310e5f
2019-10-23 10:41:25 +08:00
wxyu 9f8bcb2698 update lint exclusions
Former-commit-id: 84ebefc29597fd228c4efb9f27e485b56ae9e413
2019-10-22 19:56:39 +08:00
wxyu 4f3fa67be3 Move easyloggingpp into external directory
Former-commit-id: f2392522699d094720b92e5ee281973e3835bb18
2019-10-22 19:11:17 +08:00
starlord d9138e1960 #80 Print version information into log during server start
Former-commit-id: 874acccc6856b18b9f5992a2ee7bf14382f0f3c6
2019-10-22 18:40:42 +08:00
Jin Hai 05fda8c7ee Merge pull request #70 from scsven/dev
Improvement dump function in scheduler

Former-commit-id: 02fa9712aafb5c09e709cad4f97777782469e9bd
2019-10-22 11:49:04 +08:00
wxyu e12e40f4b7 Improvement dump function in scheduler
Former-commit-id: f073c39e5cd16f919f3a7320ae5821a2ccfe6d6c
2019-10-21 19:32:38 +08:00
starlord bbc2c90741 format code
Former-commit-id: 1e15f2112b93a17958c2e663fafc79cf39dd3148
2019-10-21 19:30:54 +08:00
starlord 19dca4c969 #59 Topk result is incorrect for small dataset
Former-commit-id: f8c4a38365881252e66f280647aedf1e4c6395e5
2019-10-21 19:24:18 +08:00
Zhiru Zhu 1c5740122e update build.sh and cmake arrow
Former-commit-id: 041fd0d581abb3f338c4137e315eff59a829de1f
2019-10-21 19:21:42 +08:00
JinHai-CN 26fb6c4a52 Merge branch '0.5.0' into 0.5.1
Former-commit-id: a546a868c1ddb6725de8ebb75da843caf4e44941
2019-10-21 17:13:22 +08:00
starlord 18108119b2 #59 Topk result is incorrect for small dataset
Former-commit-id: 4961584a889ad12cc41ff2b342eec8fa6e1eb427
2019-10-21 16:46:33 +08:00
JinHai-CN 74736236e7 Merge branch '0.5.0' into 0.5.1
Former-commit-id: a04484fa5b0adfc77ea742c4d7c38a52e8209603
2019-10-21 14:31:52 +08:00
starlord 56e21a4f5c fix build error
Former-commit-id: c186ad9be4f183cbaa70f7dbaacf1f3e0a1df617
2019-10-21 11:39:15 +08:00
JinHai-CN 2256f60709 Add cost print and IVF stats
Former-commit-id: 93d721bc680fb74e488cb18498a200d785f9d3c4
2019-10-20 18:55:05 +08:00
JinHai-CN afe69c46b5 Update faiss package
Former-commit-id: c019b47b819397ebf533b47d6718190ee2dc5410
2019-10-20 18:02:49 +08:00
JinHai-CN cdb28ceaae Update ci files
Former-commit-id: 7972762f8bf8607d8f77e07a3226f08a24981308
2019-10-19 21:07:17 +08:00
jinhai 23f567c0a1 Merge branch 'branch-0.5.0' into '0.5.0'
#48 Config test failure

See merge request megasearch/milvus!773

Former-commit-id: cc66731a7af6ecc0e66f6db90008e5e6adb86393
2019-10-19 19:34:14 +08:00
jinhai 160e08b400 Merge branch '0.5.0' into '0.5.0'
update

See merge request megasearch/milvus!774

Former-commit-id: e0cc5fcb9b94db5369d30d28c20bfcc5f208f94d
2019-10-19 19:34:10 +08:00
wxyu ac20f4f9a6 update
Former-commit-id: 99939385bdc36200807099b56fc49d72578489f1
2019-10-19 19:33:06 +08:00
starlord 6e11f4e4e7 #48 Config unittest failed
Former-commit-id: e07a067382ed00efc9c5d914b4100592bb7aee44
2019-10-19 19:31:22 +08:00