Release 0.0.6.1

deeppavlov · Jul 13, 2018 · bfbaf4f · bfbaf4f
2 parents 82652f3 + 26ca223
commit bfbaf4f
Show file tree

Hide file tree

Showing 61 changed files with 273 additions and 156 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -11,11 +11,9 @@ node('gpu') {
             sh """
                 virtualenv --python=python3 ".venv-$BUILD_NUMBER"
                 . .venv-$BUILD_NUMBER/bin/activate
-                sed -ri 's/^\\s*tensorflow\\s*(=|<|>|;|\$)/tensorflow-gpu\\1/g' requirements.txt
                 sed -i "s/stream=True/stream=False/g" deeppavlov/core/data/utils.py
                 python setup.py develop
-                pip install http://lnsigo.mipt.ru/export/en_core_web_sm-2.0.0.tar.gz
-                python -m spacy link en_core_web_sm en --force
+                pip install -r dp_requirements/tf-gpu.txt
                 pip install -r requirements-dev.txt
             """
         }

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,7 +1,7 @@
 include README.MD
 include LICENSE
 include requirements.txt
-recursive-include requirements *.txt
+recursive-include dp_requirements *.txt
 recursive-include deeppavlov *.json
 recursive-include deeppavlov *.md
 recursive-include utils *.json
diff --git a/deeppavlov/configs/go_bot/gobot_dstc2.json b/deeppavlov/configs/go_bot/gobot_dstc2.json
@@ -84,9 +84,9 @@
   },
   "metadata": {
     "requirements": [
-      "../requirements/tf.txt",
-      "../requirements/fasttext.txt",
-      "../requirements/spacy.txt"
+      "../dp_requirements/tf.txt",
+      "../dp_requirements/fasttext.txt",
+      "../dp_requirements/spacy.txt"
     ],
     "labels": {
       "telegram_utils": "GoalOrientedBot",

diff --git a/deeppavlov/configs/go_bot/gobot_dstc2_all.json b/deeppavlov/configs/go_bot/gobot_dstc2_all.json
@@ -89,9 +89,9 @@
   },
   "metadata": {
     "requirements": [
-      "../requirements/tf.txt",
-      "../requirements/fasttext.txt",
-      "../requirements/spacy.txt"
+      "../dp_requirements/tf.txt",
+      "../dp_requirements/fasttext.txt",
+      "../dp_requirements/spacy.txt"
     ],
     "labels": {
       "telegram_utils": "GoalOrientedBot",

diff --git a/deeppavlov/configs/go_bot/gobot_dstc2_best.json b/deeppavlov/configs/go_bot/gobot_dstc2_best.json
@@ -96,9 +96,9 @@
   },
   "metadata": {
     "requirements": [
-      "../requirements/tf.txt",
-      "../requirements/fasttext.txt",
-      "../requirements/spacy.txt"
+      "../dp_requirements/tf.txt",
+      "../dp_requirements/fasttext.txt",
+      "../dp_requirements/spacy.txt"
     ],
     "labels": {
       "telegram_utils": "GoalOrientedBot",

diff --git a/deeppavlov/configs/go_bot/gobot_dstc2_minimal.json b/deeppavlov/configs/go_bot/gobot_dstc2_minimal.json
@@ -68,9 +68,9 @@
   },
   "train": {
     "requirements": [
-      "../requirements/tf.txt",
-      "../requirements/fasttext.txt",
-      "../requirements/spacy.txt"
+      "../dp_requirements/tf.txt",
+      "../dp_requirements/fasttext.txt",
+      "../dp_requirements/spacy.txt"
     ],
 	"epochs": 200,
 	"batch_size": 4,

diff --git a/deeppavlov/configs/intents/intents_dstc2.json b/deeppavlov/configs/intents/intents_dstc2.json
@@ -108,8 +108,8 @@
   },
   "metadata": {
     "requirements": [
-      "../requirements/tf.txt",
-      "../requirements/fasttext.txt"
+      "../dp_requirements/tf.txt",
+      "../dp_requirements/fasttext.txt"
     ],
     "labels": {
       "telegram_utils": "IntentModel",

diff --git a/deeppavlov/configs/intents/intents_dstc2_big.json b/deeppavlov/configs/intents/intents_dstc2_big.json
@@ -108,8 +108,8 @@
   },
   "metadata": {
     "requirements": [
-      "../requirements/tf.txt",
-      "../requirements/fasttext.txt"
+      "../dp_requirements/tf.txt",
+      "../dp_requirements/fasttext.txt"
     ],
     "labels": {
       "telegram_utils": "IntentModel"

diff --git a/deeppavlov/configs/intents/intents_sample_csv.json b/deeppavlov/configs/intents/intents_sample_csv.json
@@ -114,8 +114,8 @@
   },
   "metadata": {
     "requirements": [
-      "../requirements/tf.txt",
-      "../requirements/fasttext.txt"
+      "../dp_requirements/tf.txt",
+      "../dp_requirements/fasttext.txt"
     ],
     "labels": {
       "telegram_utils": "IntentModel",

diff --git a/deeppavlov/configs/intents/intents_sample_json.json b/deeppavlov/configs/intents/intents_sample_json.json
@@ -109,8 +109,8 @@
   },
   "metadata": {
     "requirements": [
-      "../requirements/tf.txt",
-      "../requirements/fasttext.txt"
+      "../dp_requirements/tf.txt",
+      "../dp_requirements/fasttext.txt"
     ],
     "labels": {
       "telegram_utils": "IntentModel",

diff --git a/deeppavlov/configs/intents/intents_snips.json b/deeppavlov/configs/intents/intents_snips.json
@@ -107,8 +107,8 @@
   },
   "metadata": {
     "requirements": [
-      "../requirements/tf.txt",
-      "../requirements/fasttext.txt"
+      "../dp_requirements/tf.txt",
+      "../dp_requirements/fasttext.txt"
     ],
     "labels": {
       "telegram_utils": "IntentModel",

diff --git a/deeppavlov/configs/morpho_tagger/UD2.0/hu/morpho_hu_predict.json b/deeppavlov/configs/morpho_tagger/UD2.0/hu/morpho_hu_predict.json
@@ -65,7 +65,7 @@
   },
   "metadata": {
     "requirements": [
-      "../requirements/tf.txt"
+      "../dp_requirements/tf.txt"
     ],
     "download": [
       "http://lnsigo.mipt.ru/export/deeppavlov_data/morpho_tagger.tar.gz",

diff --git a/deeppavlov/configs/morpho_tagger/UD2.0/hu/morpho_hu_train.json b/deeppavlov/configs/morpho_tagger/UD2.0/hu/morpho_hu_train.json
@@ -67,7 +67,7 @@
   },
   "metadata": {
     "requirements": [
-      "../requirements/tf.txt"
+      "../dp_requirements/tf.txt"
     ],
     "download": [
       "http://lnsigo.mipt.ru/export/deeppavlov_data/morpho_tagger.tar.gz",

diff --git a/deeppavlov/configs/morpho_tagger/UD2.0/ru_syntagrus/morpho_ru_syntagrus_predict.json b/deeppavlov/configs/morpho_tagger/UD2.0/ru_syntagrus/morpho_ru_syntagrus_predict.json
@@ -66,7 +66,7 @@
   },
   "metadata": {
     "requirements": [
-      "../requirements/tf.txt"
+      "../dp_requirements/tf.txt"
     ],
     "download": [
       "http://lnsigo.mipt.ru/export/deeppavlov_data/morpho_tagger.tar.gz",

diff --git a/deeppavlov/configs/morpho_tagger/UD2.0/ru_syntagrus/morpho_ru_syntagrus_train.json b/deeppavlov/configs/morpho_tagger/UD2.0/ru_syntagrus/morpho_ru_syntagrus_train.json
@@ -67,7 +67,7 @@
   },
   "metadata": {
     "requirements": [
-      "../requirements/tf.txt"
+      "../dp_requirements/tf.txt"
     ],
     "download": [
       "http://lnsigo.mipt.ru/export/deeppavlov_data/morpho_tagger.tar.gz",

diff --git a/deeppavlov/configs/ner/ner_conll2003.json b/deeppavlov/configs/ner/ner_conll2003.json
@@ -145,8 +145,8 @@
   },
   "metadata": {
     "requirements": [
-      "../requirements/gensim.txt",
-      "../requirements/tf-gpu.txt"
+      "../dp_requirements/gensim.txt",
+      "../dp_requirements/tf-gpu.txt"
     ],
     "labels": {
       "telegram_utils": "NERCoNLL2003Model",

diff --git a/deeppavlov/configs/ner/ner_conll2003_pos.json b/deeppavlov/configs/ner/ner_conll2003_pos.json
@@ -163,8 +163,8 @@
   },
   "metadata": {
     "requirements": [
-      "../requirements/gensim.txt",
-      "../requirements/tf-gpu.txt"
+      "../dp_requirements/gensim.txt",
+      "../dp_requirements/tf-gpu.txt"
     ],
     "labels": {
       "telegram_utils": "NERCoNLL2003Model",

diff --git a/deeppavlov/configs/ner/ner_dstc2.json b/deeppavlov/configs/ner/ner_dstc2.json
@@ -83,7 +83,7 @@
     "epochs": 100,
     "batch_size": 64,
 
-    "metrics": ["ner_f1", "per_item_accuracy"],
+    "metrics": ["ner_f1", "per_token_accuracy"],
     "validation_patience": 5,
     "val_every_n_epochs": 5,
 
@@ -92,7 +92,7 @@
   },
   "metadata": {
     "requirements": [
-      "../requirements/tf.txt"
+      "../dp_requirements/tf.txt"
     ],
     "labels": {
       "telegram_utils": "NERModel",

diff --git a/deeppavlov/configs/ner/ner_ontonotes.json b/deeppavlov/configs/ner/ner_ontonotes.json
@@ -129,8 +129,8 @@
   },
   "metadata": {
     "requirements": [
-      "../requirements/gensim.txt",
-      "../requirements/tf-gpu.txt"
+      "../dp_requirements/gensim.txt",
+      "../dp_requirements/tf-gpu.txt"
     ],
     "labels": {
       "telegram_utils": "NERCoNLL2003Model",

diff --git a/deeppavlov/configs/ner/ner_rus.json b/deeppavlov/configs/ner/ner_rus.json
@@ -143,8 +143,8 @@
   },
   "metadata": {
     "requirements": [
-      "../requirements/fasttext.txt",
-      "../requirements/tf-gpu.txt"
+      "../dp_requirements/fasttext.txt",
+      "../dp_requirements/tf-gpu.txt"
     ],
     "labels": {
       "telegram_utils": "NERCoNLL2003Model",

diff --git a/deeppavlov/configs/ner/slotfill_dstc2.json b/deeppavlov/configs/ner/slotfill_dstc2.json
@@ -38,7 +38,7 @@
   },
   "metadata": {
     "requirements": [
-      "../requirements/tf.txt"
+      "../dp_requirements/tf.txt"
     ],
     "labels": {
       "telegram_utils": "NERModel",

diff --git a/deeppavlov/configs/ner/slotfill_dstc2_raw.json b/deeppavlov/configs/ner/slotfill_dstc2_raw.json
@@ -24,7 +24,7 @@
   },
   "metadata": {
     "requirements": [
-      "../requirements/tf.txt"
+      "../dp_requirements/tf.txt"
     ],
     "labels": {
       "telegram_utils": "NERModel"

diff --git a/deeppavlov/configs/odqa/en_odqa_infer_wiki.json b/deeppavlov/configs/odqa/en_odqa_infer_wiki.json
@@ -47,8 +47,8 @@
   },
   "metadata": {
     "requirements": [
-      "../requirements/tf-gpu.txt",
-      "../requirements/spacy.txt"
+      "../dp_requirements/tf-gpu.txt",
+      "../dp_requirements/spacy.txt"
     ],
     "labels": {
       "server_utils": "ODQA"

diff --git a/deeppavlov/configs/odqa/ru_odqa_infer_wiki.json b/deeppavlov/configs/odqa/ru_odqa_infer_wiki.json
@@ -47,7 +47,7 @@
   },
   "metadata": {
     "requirements": [
-      "../requirements/tf-gpu.txt"
+      "../dp_requirements/tf-gpu.txt"
     ],
     "labels": {
       "server_utils": "ODQA"

diff --git a/deeppavlov/configs/ranking/en_ranker_tfidf_wiki.json b/deeppavlov/configs/ranking/en_ranker_tfidf_wiki.json
@@ -52,7 +52,7 @@
   },
   "metadata": {
     "requirements": [
-      "../requirements/spacy.txt"
+      "../dp_requirements/spacy.txt"
     ],
     "labels": {
       "server_utils": "Ranker"

diff --git a/deeppavlov/configs/ranking/ranking_insurance.json b/deeppavlov/configs/ranking/ranking_insurance.json
@@ -57,8 +57,8 @@
   },
   "metadata": {
     "requirements": [
-      "../requirements/tf.txt",
-      "../requirements/gensim.txt"
+      "../dp_requirements/tf.txt",
+      "../dp_requirements/gensim.txt"
     ],
     "labels": {
       "telegram_utils": "RankingModel",

diff --git a/deeppavlov/configs/sentiment/insults_kaggle.json b/deeppavlov/configs/sentiment/insults_kaggle.json
@@ -108,8 +108,8 @@
   },
   "metadata": {
     "requirements": [
-      "../requirements/tf.txt",
-      "../requirements/fasttext.txt"
+      "../dp_requirements/tf.txt",
+      "../dp_requirements/fasttext.txt"
     ],
     "labels": {
       "telegram_utils": "IntentModel",

diff --git a/deeppavlov/configs/sentiment/sentiment_ag_news.json b/deeppavlov/configs/sentiment/sentiment_ag_news.json
@@ -107,8 +107,8 @@
   },
   "metadata": {
     "requirements": [
-      "../requirements/tf.txt",
-      "../requirements/fasttext.txt"
+      "../dp_requirements/tf.txt",
+      "../dp_requirements/fasttext.txt"
     ],
     "labels": {
       "telegram_utils": "IntentModel",

diff --git a/deeppavlov/configs/sentiment/sentiment_twitter.json b/deeppavlov/configs/sentiment/sentiment_twitter.json
@@ -108,8 +108,8 @@
   },
   "metadata": {
     "requirements": [
-      "../requirements/tf.txt",
-      "../requirements/fasttext.txt"
+      "../dp_requirements/tf.txt",
+      "../dp_requirements/fasttext.txt"
     ],
     "labels": {
       "telegram_utils": "IntentModel",

diff --git a/deeppavlov/configs/seq2seq_go_bot/bot_kvret.json b/deeppavlov/configs/seq2seq_go_bot/bot_kvret.json
@@ -108,8 +108,8 @@
   },
   "metadata": {
     "requirements": [
-      "../requirements/tf.txt",
-      "../requirements/spacy.txt"
+      "../dp_requirements/tf.txt",
+      "../dp_requirements/spacy.txt"
     ],
     "labels": {
       "telegram_utils": "Seq2SeqGoalOrientedBot",

diff --git a/deeppavlov/configs/seq2seq_go_bot/bot_kvret_infer.json b/deeppavlov/configs/seq2seq_go_bot/bot_kvret_infer.json
@@ -83,8 +83,8 @@
   },
   "metadata": {
     "requirements": [
-      "../requirements/tf.txt",
-      "../requirements/spacy.txt"
+      "../dp_requirements/tf.txt",
+      "../dp_requirements/spacy.txt"
     ],
     "labels": {
       "telegram_utils": "Seq2SeqGoalOrientedBot",

diff --git a/deeppavlov/configs/spelling_correction/brillmoore_kartaslov_ru.json b/deeppavlov/configs/spelling_correction/brillmoore_kartaslov_ru.json
@@ -60,7 +60,7 @@
   },
   "metadata": {
     "requirements": [
-      "../requirements/spelling.txt"
+      "../dp_requirements/spelling.txt"
     ],
     "labels": {
       "telegram_utils": "ErrorModel",

diff --git a/deeppavlov/configs/spelling_correction/brillmoore_kartaslov_ru_custom_vocab.json b/deeppavlov/configs/spelling_correction/brillmoore_kartaslov_ru_custom_vocab.json
@@ -62,7 +62,7 @@
   },
   "metadata": {
     "requirements": [
-      "../requirements/spelling.txt"
+      "../dp_requirements/spelling.txt"
     ],
     "labels": {
       "telegram_utils": "ErrorModel",

diff --git a/deeppavlov/configs/spelling_correction/brillmoore_kartaslov_ru_nolm.json b/deeppavlov/configs/spelling_correction/brillmoore_kartaslov_ru_nolm.json
@@ -59,7 +59,7 @@
   },
   "metadata": {
     "requirements": [
-      "../requirements/spelling.txt"
+      "../dp_requirements/spelling.txt"
     ],
     "labels": {
       "telegram_utils": "ErrorModel",

diff --git a/deeppavlov/configs/spelling_correction/brillmoore_wikitypos_en.json b/deeppavlov/configs/spelling_correction/brillmoore_wikitypos_en.json
@@ -59,7 +59,7 @@
   },
   "metadata": {
     "requirements": [
-      "../requirements/spelling.txt"
+      "../dp_requirements/spelling.txt"
     ],
     "labels": {
       "telegram_utils": "ErrorModel",

diff --git a/deeppavlov/configs/spelling_correction/levenstein_corrector_ru.json b/deeppavlov/configs/spelling_correction/levenstein_corrector_ru.json
@@ -42,7 +42,7 @@
   },
   "metadata": {
     "requirements": [
-      "../requirements/spelling.txt"
+      "../dp_requirements/spelling.txt"
     ],
     "labels": {
       "telegram_utils": "ErrorModel",

diff --git a/deeppavlov/configs/squad/squad.json b/deeppavlov/configs/squad/squad.json
@@ -105,7 +105,7 @@
   },
   "metadata": {
     "requirements": [
-      "../requirements/tf-gpu.txt"
+      "../dp_requirements/tf-gpu.txt"
     ],
     "labels": {
       "telegram_utils": "SquadModel",