release version 2.2, improve more dependency models

mesolitica · Apr 21, 2019 · f47b6bd · f47b6bd
1 parent 655e005
commit f47b6bd
Show file tree

Hide file tree

Showing 33 changed files with 12,264 additions and 7,047 deletions.
diff --git a/accuracy/dependency-accuracy.png b/accuracy/dependency-accuracy.png
diff --git a/accuracy/models-accuracy.ipynb b/accuracy/models-accuracy.ipynb
diff --git a/accuracy/models-accuracy.rst b/accuracy/models-accuracy.rst
diff --git a/accuracy/models-accuracy_files/models-accuracy_67_0.png b/accuracy/models-accuracy_files/models-accuracy_67_0.png
diff --git a/docs/load-dependency.rst b/docs/load-dependency.rst
diff --git a/docs/load-dependency_files/load-dependency_10_0.svg b/docs/load-dependency_files/load-dependency_10_0.svg
diff --git a/docs/load-dependency_files/load-dependency_21_0.svg b/docs/load-dependency_files/load-dependency_21_0.svg
diff --git a/docs/load-dependency_files/load-dependency_27_0.svg b/docs/load-dependency_files/load-dependency_27_0.svg
diff --git a/docs/load-dependency_files/load-dependency_31_0.svg b/docs/load-dependency_files/load-dependency_31_0.svg
diff --git a/docs/load-dependency_files/load-dependency_44_0.png b/docs/load-dependency_files/load-dependency_44_0.png
diff --git a/docs/models-accuracy.rst b/docs/models-accuracy.rst
diff --git a/docs/models-accuracy_files/models-accuracy_67_0.png b/docs/models-accuracy_files/models-accuracy_67_0.png
diff --git a/example/dependency/README.rst b/example/dependency/README.rst
diff --git a/example/dependency/load-dependency.ipynb b/example/dependency/load-dependency.ipynb
diff --git a/example/dependency/load-dependency_files/load-dependency_10_0.svg b/example/dependency/load-dependency_files/load-dependency_10_0.svg
diff --git a/example/dependency/load-dependency_files/load-dependency_21_0.svg b/example/dependency/load-dependency_files/load-dependency_21_0.svg
diff --git a/example/dependency/load-dependency_files/load-dependency_27_0.svg b/example/dependency/load-dependency_files/load-dependency_27_0.svg
diff --git a/example/dependency/load-dependency_files/load-dependency_31_0.svg b/example/dependency/load-dependency_files/load-dependency_31_0.svg
diff --git a/example/dependency/load-dependency_files/load-dependency_44_0.png b/example/dependency/load-dependency_files/load-dependency_44_0.png
diff --git a/malaya/__init__.py b/malaya/__init__.py
@@ -17,8 +17,8 @@
 from pathlib import Path
 
 home = os.path.join(str(Path.home()), 'Malaya')
-version = '2.1'
-bump_version = '2.1.0'
+version = '2.2'
+bump_version = '2.2.0'
 version_path = os.path.join(home, 'version')
 
 

diff --git a/malaya/_utils/_paths.py b/malaya/_utils/_paths.py
@@ -710,40 +710,49 @@
     'crf': {
         'model': home + '/dependency/crf/crf-label.pkl',
         'depend': home + '/dependency/crf/crf-depend.pkl',
-        'version': 'v14',
+        'version': 'v22',
     },
     'concat': {
         'model': home + '/dependency/concat/concat-dependency.pb',
         'setting': home + '/dependency/concat/concat-dependency.json',
-        'version': 'v14',
+        'version': 'v22',
     },
     'luong': {
         'model': home + '/dependency/luong/luong-dependency.pb',
         'setting': home + '/dependency/luong/luong-dependency.json',
-        'version': 'v14',
+        'version': 'v22',
     },
     'bahdanau': {
         'model': home + '/dependency/bahdanau/bahdanau-dependency.pb',
         'setting': home + '/dependency/bahdanau/bahdanau-dependency.json',
-        'version': 'v14',
+        'version': 'v22',
+    },
+    'attention-is-all-you-need': {
+        'model': home + '/dependency/attention/attention-dependency.pb',
+        'setting': home + '/dependency/attention/attention-dependency.json',
+        'version': 'v22',
     },
 }
 
 S3_PATH_DEPEND = {
     'crf': {
-        'model': 'v14/dependency/crf-label.pkl',
-        'depend': 'v14/dependency/crf-depend.pkl',
+        'model': 'v22/dependency/crf-label.pkl',
+        'depend': 'v22/dependency/crf-depend.pkl',
     },
     'concat': {
-        'model': 'v14/dependency/concat-dependency.pb',
-        'setting': 'v14/dependency/concat-dependency.json',
+        'model': 'v22/dependency/concat-dependency.pb',
+        'setting': 'v22/dependency/concat-dependency.json',
     },
     'luong': {
-        'model': 'v14/dependency/luong-dependency.pb',
-        'setting': 'v14/dependency/luong-dependency.json',
+        'model': 'v22/dependency/luong-dependency.pb',
+        'setting': 'v22/dependency/luong-dependency.json',
     },
     'bahdanau': {
-        'model': 'v14/dependency/bahdanau-dependency.pb',
-        'setting': 'v14/dependency/bahdanau-dependency.json',
+        'model': 'v22/dependency/bahdanau-dependency.pb',
+        'setting': 'v22/dependency/bahdanau-dependency.json',
+    },
+    'attention-is-all-you-need': {
+        'model': 'v22/dependency/attention-dependency.pb',
+        'setting': 'v22/dependency/attention-dependency.json',
     },
 }
diff --git a/malaya/dependency.py b/malaya/dependency.py
@@ -30,7 +30,7 @@ def available_deep_model():
     """
     List available deep learning dependency models, ['concat', 'bahdanau', 'luong']
     """
-    return ['concat', 'bahdanau', 'luong']
+    return ['concat', 'bahdanau', 'luong', 'attention-is-all-you-need']
 
 
 def crf(validate = True):
@@ -77,6 +77,7 @@ def deep_model(model = 'bahdanau', validate = True):
         * ``'concat'`` - Concating character and word embedded for BiLSTM.
         * ``'bahdanau'`` - Concating character and word embedded including Bahdanau Attention for BiLSTM.
         * ``'luong'`` - Concating character and word embedded including Luong Attention for BiLSTM.
+        * ``'attention-is-all-you-need'`` - Attentions only.
     validate: bool, optional (default=True)
         if True, malaya will check model availability and download if not available.
 
@@ -88,7 +89,7 @@ def deep_model(model = 'bahdanau', validate = True):
         raise ValueError('model must be a string')
 
     model = model.lower()
-    if model in ['concat', 'bahdanau', 'luong']:
+    if model in ['concat', 'bahdanau', 'luong', 'attention-is-all-you-need']:
         if validate:
             check_file(PATH_DEPEND[model], S3_PATH_DEPEND[model])
         else: