Merge branch 'master' of github.com:DataCanvasIO/DeepTables into dev_wuhf

Author: oaksharks

deeptables/models/deeptable.py

@@ -22,6 +22,7 @@
 from .deepmodel import DeepModel
 from .preprocessor import DefaultPreprocessor
 from ..utils import dt_logging, consts
+from ..utils.tf_version import tf_less_than
 
 logger = dt_logging.get_logger()
 
@@ -648,11 +649,11 @@ def __inject_callbacks(self, callbacks):
         #    callbacks.append(mcp)
         #    print(f'Injected a callback [ModelCheckpoint].\nfilepath:{mcp.filepath}\nmonitor:{mcp.monitor}')
         if es is None:
-            es = EarlyStopping(monitor=self.monitor,
+            es = EarlyStopping(monitor=self.monitor if tf_less_than('2.2') else self.monitor.lower(),
                                restore_best_weights=True,
                                patience=self.config.earlystopping_patience,
                                verbose=1,
-                               #min_delta=0.0001,
+                               # min_delta=0.0001,
                                mode=mode,
                                baseline=None,
                                )

deeptables/utils/tf_version.py

@@ -0,0 +1,15 @@
+# -*- coding:utf-8 -*-
+__author__ = 'yangjian'
+"""
+
+"""
+import tensorflow as tf
+from packaging.version import parse
+
+
+def tf_less_than(version):
+    return parse(tf.__version__) < parse(version)
+
+
+def tf_greater_than(version):
+    return parse(tf.__version__) > parse(version)

docs/source/examples.md

@@ -1,4 +1,4 @@
-# Exapmles
+# Examples
 
 ## Binary Classification
 
@@ -78,4 +78,4 @@ X_train, X_test, y_train, y_test = train_test_split(X, y, test_size=0.2, random_
 model, history = dt.fit(X_train, y_train, epochs=100)
 
 score = dt.evaluate(X_test, y_test)
-```
+```

requirements.txt

@@ -9,4 +9,5 @@ scikit-optimize==0.7.1
 tables==3.6.1
 category_encoders==2.1.0
 hypernets>=0.1.2
+h5py==2.10.0
 eli5

setup.py

@@ -19,6 +19,7 @@
     'category_encoders==2.1.0',
     'tables==3.6.1',
     'hypernets>=0.1.2',
+    'h5py==2.10.0',
     'eli5',
 ]