diff --git a/UD/launch.sh b/UD/launch.sh index a57b9e9f6169dfae10cea8f993a6f138edc0bc6b..b0cac5ad00f5075dcf7d787a0f1c3a69fa992987 100755 --- a/UD/launch.sh +++ b/UD/launch.sh @@ -1,191 +1,191 @@ -make -C ../UD_Ancient_Greek clean -make _LANG=UD_Ancient_Greek _CODE=grc -C ../UD_Ancient_Greek all +# make -C ../UD_Ancient_Greek clean +# make _LANG=UD_Ancient_Greek _CODE=grc -C ../UD_Ancient_Greek all -make -C ../UD_Ancient_Greek-PROIEL clean -make _LANG=UD_Ancient_Greek-PROIEL _CODE=grc_proiel -C ../UD_Ancient_Greek-PROIEL all +# make -C ../UD_Ancient_Greek-PROIEL clean +# make _LANG=UD_Ancient_Greek-PROIEL _CODE=grc_proiel -C ../UD_Ancient_Greek-PROIEL all -make -C ../UD_Arabic clean -make _LANG=UD_Arabic _CODE=ar -C ../UD_Arabic all +# make -C ../UD_Arabic clean +# make _LANG=UD_Arabic _CODE=ar -C ../UD_Arabic all -make -C ../UD_Basque clean -make _LANG=UD_Basque _CODE=eu -C ../UD_Basque all +# make -C ../UD_Basque clean +# make _LANG=UD_Basque _CODE=eu -C ../UD_Basque all -make -C ../UD_Bulgarian clean -make _LANG=UD_Bulgarian _CODE=bg -C ../UD_Bulgarian all +# make -C ../UD_Bulgarian clean +# make _LANG=UD_Bulgarian _CODE=bg -C ../UD_Bulgarian all -make -C ../UD_Catalan clean -make _LANG=UD_Catalan _CODE=ca -C ../UD_Catalan all +# make -C ../UD_Catalan clean +# make _LANG=UD_Catalan _CODE=ca -C ../UD_Catalan all -make -C ../UD_Chinese clean -make _LANG=UD_Chinese _CODE=zh -C ../UD_Chinese all +# make -C ../UD_Chinese clean +# make _LANG=UD_Chinese _CODE=zh -C ../UD_Chinese all -make -C ../UD_Croatian clean -make _LANG=UD_Croatian _CODE=hr -C ../UD_Croatian all +# make -C ../UD_Croatian clean +# make _LANG=UD_Croatian _CODE=hr -C ../UD_Croatian all -make -C ../UD_Czech-CAC clean -make _LANG=UD_Czech-CAC _CODE=cs_cac -C ../UD_Czech-CAC all +# make -C ../UD_Czech-CAC clean +# make _LANG=UD_Czech-CAC _CODE=cs_cac -C ../UD_Czech-CAC all -make -C ../UD_Czech-CLTT clean -make _LANG=UD_Czech-CLTT _CODE=cs_cltt -C ../UD_Czech-CLTT all +# make -C ../UD_Czech-CLTT clean +# make _LANG=UD_Czech-CLTT _CODE=cs_cltt -C ../UD_Czech-CLTT all -make -C ../UD_Czech clean -make _LANG=UD_Czech _CODE=cs -C ../UD_Czech all +# make -C ../UD_Czech clean +# make _LANG=UD_Czech _CODE=cs -C ../UD_Czech all -make -C ../UD_Danish clean -make _LANG=UD_Danish _CODE=da -C ../UD_Danish all +# make -C ../UD_Danish clean +# make _LANG=UD_Danish _CODE=da -C ../UD_Danish all -make -C ../UD_Dutch clean -make _LANG=UD_Dutch _CODE=nl -C ../UD_Dutch all +# make -C ../UD_Dutch clean +# make _LANG=UD_Dutch _CODE=nl -C ../UD_Dutch all -make -C ../UD_Dutch-LassySmall clean -make _LANG=UD_Dutch-LassySmall _CODE=nl_lassysmall -C ../UD_Dutch-LassySmall all +# make -C ../UD_Dutch-LassySmall clean +# make _LANG=UD_Dutch-LassySmall _CODE=nl_lassysmall -C ../UD_Dutch-LassySmall all -make -C ../UD_English clean -make _LANG=UD_English _CODE=en -C ../UD_English all +# make -C ../UD_English clean +# make _LANG=UD_English _CODE=en -C ../UD_English all -make -C ../UD_English-LinES clean -make _LANG=UD_English-LinES _CODE=en_lines -C ../UD_English-LinES all +# make -C ../UD_English-LinES clean +# make _LANG=UD_English-LinES _CODE=en_lines -C ../UD_English-LinES all -make -C ../UD_English-ParTUT clean -make _LANG=UD_English-ParTUT _CODE=en_partut -C ../UD_English-ParTUT all +# make -C ../UD_English-ParTUT clean +# make _LANG=UD_English-ParTUT _CODE=en_partut -C ../UD_English-ParTUT all -make -C ../UD_Estonian clean -make _LANG=UD_Estonian _CODE=et -C ../UD_Estonian all +# make -C ../UD_Estonian clean +# make _LANG=UD_Estonian _CODE=et -C ../UD_Estonian all -make -C ../UD_Finnish clean -make _LANG=UD_Finnish _CODE=fi -C ../UD_Finnish all +# make -C ../UD_Finnish clean +# make _LANG=UD_Finnish _CODE=fi -C ../UD_Finnish all -make -C ../UD_Finnish-FTB clean -make _LANG=UD_Finnish-FTB _CODE=fi_ftb -C ../UD_Finnish-FTB all +# make -C ../UD_Finnish-FTB clean +# make _LANG=UD_Finnish-FTB _CODE=fi_ftb -C ../UD_Finnish-FTB all make -C ../UD_French clean make _LANG=UD_French _CODE=fr -C ../UD_French all -make -C ../UD_French-ParTUT clean -make _LANG=UD_French-ParTUT _CODE=fr_partut -C ../UD_French-ParTUT all +# make -C ../UD_French-ParTUT clean +# make _LANG=UD_French-ParTUT _CODE=fr_partut -C ../UD_French-ParTUT all -make -C ../UD_French-Sequoia clean -make _LANG=UD_French-Sequoia _CODE=fr_sequoia -C ../UD_French-Sequoia all +# make -C ../UD_French-Sequoia clean +# make _LANG=UD_French-Sequoia _CODE=fr_sequoia -C ../UD_French-Sequoia all -make -C ../UD_Galician clean -make _LANG=UD_Galician _CODE=gl -C ../UD_Galician all +# make -C ../UD_Galician clean +# make _LANG=UD_Galician _CODE=gl -C ../UD_Galician all -make -C ../UD_Galician-TreeGal clean -make _LANG=UD_Galician-TreeGal _CODE=gl_treegal -C ../UD_Galician-TreeGal all +# make -C ../UD_Galician-TreeGal clean +# make _LANG=UD_Galician-TreeGal _CODE=gl_treegal -C ../UD_Galician-TreeGal all -make -C ../UD_German clean -make _LANG=UD_German _CODE=de -C ../UD_German all +# make -C ../UD_German clean +# make _LANG=UD_German _CODE=de -C ../UD_German all -make -C ../UD_Gothic clean -make _LANG=UD_Gothic _CODE=got -C ../UD_Gothic all +# make -C ../UD_Gothic clean +# make _LANG=UD_Gothic _CODE=got -C ../UD_Gothic all -make -C ../UD_Greek clean -make _LANG=UD_Greek _CODE=el -C ../UD_Greek all +# make -C ../UD_Greek clean +# make _LANG=UD_Greek _CODE=el -C ../UD_Greek all -make -C ../UD_Hebrew clean -make _LANG=UD_Hebrew _CODE=he -C ../UD_Hebrew all +# make -C ../UD_Hebrew clean +# make _LANG=UD_Hebrew _CODE=he -C ../UD_Hebrew all -make -C ../UD_Hindi clean -make _LANG=UD_Hindi _CODE=hi -C ../UD_Hindi all +# make -C ../UD_Hindi clean +# make _LANG=UD_Hindi _CODE=hi -C ../UD_Hindi all -make -C ../UD_Hungarian clean -make _LANG=UD_Hungarian _CODE=hu -C ../UD_Hungarian all +# make -C ../UD_Hungarian clean +# make _LANG=UD_Hungarian _CODE=hu -C ../UD_Hungarian all -make -C ../UD_Indonesian clean -make _LANG=UD_Indonesian _CODE=id -C ../UD_Indonesian all +# make -C ../UD_Indonesian clean +# make _LANG=UD_Indonesian _CODE=id -C ../UD_Indonesian all -make -C ../UD_Irish clean -make _LANG=UD_Irish _CODE=ga -C ../UD_Irish all +# make -C ../UD_Irish clean +# make _LANG=UD_Irish _CODE=ga -C ../UD_Irish all -make -C ../UD_Italian clean -make _LANG=UD_Italian _CODE=it -C ../UD_Italian all +# make -C ../UD_Italian clean +# make _LANG=UD_Italian _CODE=it -C ../UD_Italian all -make -C ../UD_Italian-ParTUT clean -make _LANG=UD_Italian-ParTUT _CODE=it_partut -C ../UD_Italian-ParTUT all +# make -C ../UD_Italian-ParTUT clean +# make _LANG=UD_Italian-ParTUT _CODE=it_partut -C ../UD_Italian-ParTUT all -make -C ../UD_Japanese clean -make _LANG=UD_Japanese _CODE=ja -C ../UD_Japanese all +# make -C ../UD_Japanese clean +# make _LANG=UD_Japanese _CODE=ja -C ../UD_Japanese all -make -C ../UD_Kazakh clean -make _LANG=UD_Kazakh _CODE=kk -C ../UD_Kazakh all +# make -C ../UD_Kazakh clean +# make _LANG=UD_Kazakh _CODE=kk -C ../UD_Kazakh all -make -C ../UD_Korean clean -make _LANG=UD_Korean _CODE=ko -C ../UD_Korean all +# make -C ../UD_Korean clean +# make _LANG=UD_Korean _CODE=ko -C ../UD_Korean all -make -C ../UD_Latin clean -make _LANG=UD_Latin _CODE=la -C ../UD_Latin all +# make -C ../UD_Latin clean +# make _LANG=UD_Latin _CODE=la -C ../UD_Latin all -make -C ../UD_Latin-ITTB clean -make _LANG=UD_Latin-ITTB _CODE=la_ittb -C ../UD_Latin-ITTB all +# make -C ../UD_Latin-ITTB clean +# make _LANG=UD_Latin-ITTB _CODE=la_ittb -C ../UD_Latin-ITTB all -make -C ../UD_Latin-PROIEL clean -make _LANG=UD_Latin-PROIEL _CODE=la_proiel -C ../UD_Latin-PROIEL all +# make -C ../UD_Latin-PROIEL clean +# make _LANG=UD_Latin-PROIEL _CODE=la_proiel -C ../UD_Latin-PROIEL all -make -C ../UD_Latvian clean -make _LANG=UD_Latvian _CODE=lv -C ../UD_Latvian all +# make -C ../UD_Latvian clean +# make _LANG=UD_Latvian _CODE=lv -C ../UD_Latvian all -make -C ../UD_Norwegian-Bokmaal clean -make _LANG=UD_Norwegian-Bokmaal _CODE=no_bokmaal -C ../UD_Norwegian-Bokmaal all +# make -C ../UD_Norwegian-Bokmaal clean +# make _LANG=UD_Norwegian-Bokmaal _CODE=no_bokmaal -C ../UD_Norwegian-Bokmaal all -make -C ../UD_Norwegian-Nynorsk clean -make _LANG=UD_Norwegian-Nynorsk _CODE=no_nynorsk -C ../UD_Norwegian-Nynorsk all +# make -C ../UD_Norwegian-Nynorsk clean +# make _LANG=UD_Norwegian-Nynorsk _CODE=no_nynorsk -C ../UD_Norwegian-Nynorsk all -make -C ../UD_Old_Church_Slavonic clean -make _LANG=UD_Old_Church_Slavonic _CODE=cu -C ../UD_Old_Church_Slavonic all +# make -C ../UD_Old_Church_Slavonic clean +# make _LANG=UD_Old_Church_Slavonic _CODE=cu -C ../UD_Old_Church_Slavonic all -make -C ../UD_Persian clean -make _LANG=UD_Persian _CODE=fa -C ../UD_Persian all +# make -C ../UD_Persian clean +# make _LANG=UD_Persian _CODE=fa -C ../UD_Persian all -make -C ../UD_Polish clean -make _LANG=UD_Polish _CODE=pl -C ../UD_Polish all +# make -C ../UD_Polish clean +# make _LANG=UD_Polish _CODE=pl -C ../UD_Polish all -make -C ../UD_Portuguese-BR clean -make _LANG=UD_Portuguese-BR _CODE=pt_br -C ../UD_Portuguese-BR all +# make -C ../UD_Portuguese-BR clean +# make _LANG=UD_Portuguese-BR _CODE=pt_br -C ../UD_Portuguese-BR all -make -C ../UD_Portuguese clean -make _LANG=UD_Portuguese _CODE=pt -C ../UD_Portuguese all +# make -C ../UD_Portuguese clean +# make _LANG=UD_Portuguese _CODE=pt -C ../UD_Portuguese all -make -C ../UD_Romanian clean -make _LANG=UD_Romanian _CODE=ro -C ../UD_Romanian all +# make -C ../UD_Romanian clean +# make _LANG=UD_Romanian _CODE=ro -C ../UD_Romanian all -make -C ../UD_Russian clean -make _LANG=UD_Russian _CODE=ru -C ../UD_Russian all +# make -C ../UD_Russian clean +# make _LANG=UD_Russian _CODE=ru -C ../UD_Russian all -#make -C ../UD_Russian-SynTagRus clean -#make _LANG=UD_Russian-SynTagRus _CODE=ru_syntagrus -C ../UD_Russian-SynTagRus all +## make -C ../UD_Russian-SynTagRus clean +## make _LANG=UD_Russian-SynTagRus _CODE=ru_syntagrus -C ../UD_Russian-SynTagRus all -make -C ../UD_Slovak clean -make _LANG=UD_Slovak _CODE=sk -C ../UD_Slovak all +# make -C ../UD_Slovak clean +# make _LANG=UD_Slovak _CODE=sk -C ../UD_Slovak all -make -C ../UD_Slovenian clean -make _LANG=UD_Slovenian _CODE=sl -C ../UD_Slovenian all +# make -C ../UD_Slovenian clean +# make _LANG=UD_Slovenian _CODE=sl -C ../UD_Slovenian all -make -C ../UD_Slovenian-SST clean -make _LANG=UD_Slovenian-SST _CODE=sl_sst -C ../UD_Slovenian-SST all +# make -C ../UD_Slovenian-SST clean +# make _LANG=UD_Slovenian-SST _CODE=sl_sst -C ../UD_Slovenian-SST all -make -C ../UD_Spanish-AnCora clean -make _LANG=UD_Spanish-AnCora _CODE=es_ancora -C ../UD_Spanish-AnCora all +# make -C ../UD_Spanish-AnCora clean +# make _LANG=UD_Spanish-AnCora _CODE=es_ancora -C ../UD_Spanish-AnCora all -make -C ../UD_Spanish clean -make _LANG=UD_Spanish _CODE=es -C ../UD_Spanish all +# make -C ../UD_Spanish clean +# make _LANG=UD_Spanish _CODE=es -C ../UD_Spanish all -make -C ../UD_Swedish clean -make _LANG=UD_Swedish _CODE=sv -C ../UD_Swedish all +# make -C ../UD_Swedish clean +# make _LANG=UD_Swedish _CODE=sv -C ../UD_Swedish all -make -C ../UD_Swedish-LinES clean -make _LANG=UD_Swedish-LinES _CODE=sv_lines -C ../UD_Swedish-LinES all +# make -C ../UD_Swedish-LinES clean +# make _LANG=UD_Swedish-LinES _CODE=sv_lines -C ../UD_Swedish-LinES all -make -C ../UD_Turkish clean -make _LANG=UD_Turkish _CODE=tr -C ../UD_Turkish all +# make -C ../UD_Turkish clean +# make _LANG=UD_Turkish _CODE=tr -C ../UD_Turkish all -make -C ../UD_Ukrainian clean -make _LANG=UD_Ukrainian _CODE=uk -C ../UD_Ukrainian all +# make -C ../UD_Ukrainian clean +# make _LANG=UD_Ukrainian _CODE=uk -C ../UD_Ukrainian all -make -C ../UD_Urdu clean -make _LANG=UD_Urdu _CODE=ur -C ../UD_Urdu all +# make -C ../UD_Urdu clean +# make _LANG=UD_Urdu _CODE=ur -C ../UD_Urdu all -make -C ../UD_Uyghur clean -make _LANG=UD_Uyghur _CODE=ug -C ../UD_Uyghur all +# make -C ../UD_Uyghur clean +# make _LANG=UD_Uyghur _CODE=ug -C ../UD_Uyghur all -make -C ../UD_Vietnamese clean -make _LANG=UD_Vietnamese _CODE=vi -C ../UD_Vietnamese all +# make -C ../UD_Vietnamese clean +# make _LANG=UD_Vietnamese _CODE=vi -C ../UD_Vietnamese all diff --git a/UD/template/Makefile b/UD/template/Makefile index 331ac3be5c18e43852198a58deb677f065bc5b6c..db18ddfde9305b28f3390dae10014b629dd1759e 100644 --- a/UD/template/Makefile +++ b/UD/template/Makefile @@ -14,6 +14,7 @@ compile: $(MAKE) -C maca_trans_tagger compile $(MAKE) -C maca_trans_morpho compile $(MAKE) -C maca_trans_parser compile + $(MAKE) -C maca_trans_parser_nn compile # $(MAKE) -C maca_crf_tagger compile install: @@ -23,6 +24,7 @@ install: $(MAKE) -C maca_trans_morpho install $(MAKE) -C maca_lemmatizer install $(MAKE) -C maca_trans_parser install + $(MAKE) -C maca_trans_parser_nn install # $(MAKE) -C maca_crf_tagger install # @tar -cvzf ./maca_datas.tgz bin @@ -36,5 +38,6 @@ clean: $(MAKE) -C maca_trans_tagger clean $(MAKE) -C maca_trans_morpho clean $(MAKE) -C maca_trans_parser clean + $(MAKE) -C maca_trans_parser_nn clean # $(MAKE) -C maca_crf_tagger clean $(MAKE) -C eval clean diff --git a/UD/ud_template.tgz b/UD/ud_template.tgz index 3a068f9ad8b0c3eaa79a41cd1f88c6824f7c5917..501c251ce3db886539d7f7dbef5ddbcd72745e1c 100644 Binary files a/UD/ud_template.tgz and b/UD/ud_template.tgz differ diff --git a/fm/maca_trans_parser_fann.fm b/fm/maca_trans_parser_nn.fm similarity index 100% rename from fm/maca_trans_parser_fann.fm rename to fm/maca_trans_parser_nn.fm diff --git a/fr/Makefile b/fr/Makefile index 7dbf865bc290baecb537070787efa4167412eaee..b711f2a0b12e4dadd13f6018eb4e651711218a64 100644 --- a/fr/Makefile +++ b/fr/Makefile @@ -9,6 +9,7 @@ compile: $(MAKE) -C maca_trans_tagger compile $(MAKE) -C maca_trans_morpho compile $(MAKE) -C maca_trans_parser compile + $(MAKE) -C maca_trans_parser_nn compile # $(MAKE) -C maca_crf_tagger compile install: @@ -16,6 +17,7 @@ install: $(MAKE) -C maca_trans_tagger install $(MAKE) -C maca_trans_morpho install $(MAKE) -C maca_trans_parser install + $(MAKE) -C maca_trans_parser_nn install $(MAKE) -C maca_lemmatizer install $(MAKE) -C maca_lexer install # $(MAKE) -C maca_crf_tagger install @@ -29,6 +31,7 @@ clean: $(MAKE) -C data/treebank clean $(MAKE) -C maca_lexer clean $(MAKE) -C maca_trans_parser clean + $(MAKE) -C maca_trans_parser_nn clean $(MAKE) -C maca_trans_morpho clean $(MAKE) -C maca_trans_tagger clean $(MAKE) -C maca_crf_tagger clean diff --git a/makefiles/eval_ud.makefile b/makefiles/eval_ud.makefile index 804ea0e28324d75efb67a944f920864cb486cf84..178ab53a934230258ea899b627f306a37880e64a 100644 --- a/makefiles/eval_ud.makefile +++ b/makefiles/eval_ud.makefile @@ -1,4 +1,5 @@ TAGGER=maca_trans_tagger +#PARSER=maca_trans_parser_nn PARSER=maca_trans_parser CRF_TAGGER=crf_barebones_decoder MORPHO_ANALYZER=maca_trans_morpho diff --git a/makefiles/maca_trans_parser.makefile b/makefiles/maca_trans_parser.makefile index 5c1b9e20cac83ee1b2f2b69b9a92116dfbd5093c..daeff3816191043c2194659df96d26277384d495 100644 --- a/makefiles/maca_trans_parser.makefile +++ b/makefiles/maca_trans_parser.makefile @@ -2,7 +2,7 @@ ## compile ##----------------------------------------------------------------------- -compile: $(MODEL_FILENAME) $(FANN_TRAIN) +compile: $(MODEL_FILENAME) #$(FANN_TRAIN) $(CFF_TRAIN): $(MCF_TRAIN) maca_trans_parser_arc_eager_mcf2cff -C $(MCD_FILENAME) --input $< --mode TRAIN --feat_model $(FEATURES_MODEL_FILENAME) --vocabs $(VOCABS_FILENAME) --cff $@ -s $(NUMBER_OF_SENTENCES) $(OPTIONS) @@ -38,7 +38,7 @@ clean: - rm -f $(MODEL_FILENAME) - rm -f $(CFF_TRAIN) - rm -f $(CFF_CUTOFF_TRAIN) - - rm -f $(CFF_FANN_TRAIN) - - rm -f $(FANN_TRAIN) +# - rm -f $(CFF_FANN_TRAIN) +# - rm -f $(FANN_TRAIN)