Commit22908ce

committed

Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:#python/dnlp/core/dnn_crf.py

2 parentsde56277 +bb93e22 commit22908ceCopy full SHA for 22908ce

File tree

-6

lines changed

-6

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,9 @@`
`2`	`2`
`3`	`3`
`4`	`4`	`classDnnCrfConfig(object):`
`5`		`-def__init__(self,*,skip_left:int=0,skip_right:int=0,embed_size:int=100,hidden_units:int=200,`
`6`		`-learning_rate:float=0.1,lam:float=5e-3,dropout_rate:float=0.5,batch_length:int=300,`
`7`		`-batch_size=50):`
	`5`	`+def__init__(self,*,skip_left:int=1,skip_right:int=0,embed_size:int=200,hidden_units:int=150,`
	`6`	`+learning_rate:float=0.01,lam:float=1e-4,dropout_rate:float=0.6,batch_length:int=300,`
	`7`	`+batch_size=20):`
`8`	`8`	`self.__skip_left=skip_left`
`9`	`9`	`self.__skip_right=skip_right`
`10`	`10`	`self.__embed_size=embed_size`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`
`9`	`9`
`10`	`10`	`deftrain_cws():`
`11`		`-data_path='../dnlp/data/cws/msr_training.pickle'`
	`11`	`+data_path='../dnlp/data/cws/pku_training.pickle'`
`12`	`12`	`config=DnnCrfConfig()`
`13`	`13`	`dnncrf=DnnCrf(config=config,data_path=data_path,nn='bilstm')`
`14`	`14`	`dnncrf.fit()`
`@@ -17,12 +17,12 @@ def train_cws():`
`17`	`17`	`deftest_cws():`
`18`	`18`	`sentence='小明来自南京师范大学'`
`19`	`19`	`sentence='中国人民决心继承邓小平同志的遗志，继续把建设有中国特色社会主义事业推向前进。'`
`20`		`-model_path='../dnlp/models/cws4.ckpt'`
	`20`	`+model_path='../dnlp/models/cws32.ckpt'`
`21`	`21`	`config=DnnCrfConfig()`
`22`	`22`	`dnncrf=DnnCrf(config=config,mode='predict',model_path=model_path,nn='bilstm')`
`23`	`23`	`res,labels=dnncrf.predict_ll(sentence,return_labels=True)`
`24`	`24`	`print(res)`
`25`		`-evaluate_cws(dnncrf,'../dnlp/data/cws/msr_test.pickle')`
	`25`	`+evaluate_cws(dnncrf,'../dnlp/data/cws/pku_test.pickle')`
`26`	`26`
`27`	`27`
`28`	`28`	`deftrain_emr():`

Comments

(0)