Commit Graph

12 Commits (ebd40ed65e09ec918786603fff53fc173c79e96f)

Author SHA1 Message Date
ZoeyYoung dce353f88b merge from master
ZoeyYoung 2857ae45cc Merge branch 'master' into jieba3k
Conflicts:
	Changelog
	jieba/__init__.py
	jieba/finalseg/__init__.py
	jieba/posseg/__init__.py
	setup.py
	test/parallel/test_file.py
	test/test_file.py
fxsjy b77645b3aa modify test_file.py; use less memory
Linker Lin 5d83855088 自动检测CPU数目,启动合适数目的进程。
Linker Lin 2ceb981da0 自动检测CPU数目,启动合适数目的进程。
Sun Junyi b62f052927 PEP8
Sun Junyi 45daf561c7 follow PEP8: change tab to 4 white spaces
fxsjy aae91b6fb6 merge change from master to jieba3k
fxsjy 9bebe6120b utf-8 output is more friendly to Linux
fxsjy b46166f768 use CRLF as seperator to make chunks in parallel mode
fxsjy 6b83593b5a rm stub.log
fxsjy 62cf22121f new feature: parallel segment with multiprocessing