370 Commits

Author	SHA1	Message	Date
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
Zhiru Zhu	34c579cc1d	fix merge conflicts	2019-11-14 18:18:40 +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
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