15 Commits

Author	SHA1	Message	Date
huntzhan	60acefd9b1	Bugfix for HMM=False in parallelism.	2016-08-04 17:43:35 +08:00
Dingyuan Wang	22bcf8be7a	Merge master and jieba3k, make the code Python 2/3 compatible	2015-02-10 20:54:55 +08:00
Dingyuan Wang	6fad5fbb2c	update to v0.33	2014-09-06 23:28:47 +08:00
ZoeyYoung	dce353f88b	merge from master	2013-08-21 15:32:46 +08:00
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	2013-08-21 13:55:21 +08:00
fxsjy	b77645b3aa	modify test_file.py; use less memory	2013-07-29 10:17:39 +08:00
Linker Lin	5d83855088	自动检测CPU数目，启动合适数目的进程。	2013-07-28 00:12:00 +08:00
Linker Lin	2ceb981da0	自动检测CPU数目，启动合适数目的进程。	2013-07-28 00:07:29 +08:00
Sun Junyi	b62f052927	PEP8	2013-07-03 17:21:21 +08:00
Sun Junyi	45daf561c7	follow PEP8: change tab to 4 white spaces	2013-07-03 16:58:22 +08:00
fxsjy	aae91b6fb6	merge change from master to jieba3k	2013-04-27 16:04:16 +08:00
fxsjy	9bebe6120b	utf-8 output is more friendly to Linux	2013-04-26 16:19:00 +08:00
fxsjy	b46166f768	use CRLF as seperator to make chunks in parallel mode	2013-04-20 18:46:04 +08:00
fxsjy	6b83593b5a	rm stub.log	2013-04-20 14:13:10 +08:00
fxsjy	62cf22121f	new feature: parallel segment with multiprocessing	2013-04-20 14:11:31 +08:00