Merge branch 'develop'

CHANGELOG.md

@@ -6,6 +6,19 @@ Most recent releases are shown at the top. Each release shows:
 - **Changed**: Additional parameters, changes to inputs or outputs, etc
 - **Fixed**: Bug fixes that don't change documented behaviour
 
+## 0.7.3 (2019-12-31)
+
+### New:
+- N/A
+
+### Changed:
+- N/A
+
+### Fixed:
+- Fixed error when using *ktrain* with v0.2.x of `fastprogress`. *ktrain* can now be used with both v0.1.x and v0.2.x of `fastprogress`
+
+
+
 ## 0.7.2 (2019-12-11)
 
 ### New:

ktrain/imports.py

@@ -170,7 +170,12 @@
 from scipy import sparse # utils
 from scipy.sparse import csr_matrix
 import pandas as pd
-from fastprogress import master_bar, progress_bar 
+try:
+    # fastprogress >= v0.2.0
+    from fastprogress.fastprogress import master_bar, progress_bar 
+except:
+    # fastprogress < v0.2.0
+    from fastprogress import master_bar, progress_bar 
 import keras_bert
 from keras_bert import Tokenizer as BERT_Tokenizer
 import requests

ktrain/text/data.py

@@ -129,9 +129,8 @@ def texts_from_csv(train_filepath,
                    sep=',', random_state=None,       
                    verbose=1):
     """
-    Loads text data from CSV file. Class labels are assumed to one of following:
-      1. integers representing classes (e.g., 1,2,3,4)
-      2. one-hot-encoded arrays representing classes
+    Loads text data from CSV file. Class labels are assumed to be
+    one-hot-encoded arrays representing classes:
          classification (a single one in each array): [[1,0,0], [0,1,0]]]
          multi-label classification (one more ones in each array): [[1,1,0], [0,1,1]]
     Args:
@@ -192,9 +191,8 @@ def texts_from_df(train_df,
                    random_state=None,
                    verbose=1):
     """
-    Loads text data from Pandas dataframe file. Class labels are assumed to one of following:
-      1. integers representing classes (e.g., 1,2,3,4)
-      2. one-hot-encoded arrays representing classes
+    Loads text data from Pandas dataframe file. Class labels are assumed to be
+    one-hot-encoded arrays representing classes:
          classification (a single one in each array): [[1,0,0], [0,1,0]]]
          multi-label classification (one more ones in each array): [[1,1,0], [0,1,1]]
     Args:

ktrain/version.py

@@ -1,2 +1,2 @@
 __all__ = ['__version__']
-__version__ = '0.7.2'
+__version__ = '0.7.3'