Merge pull request #1141 from weixuanfu/issue1139

fix xgboost warning message issue #1139
EpistasisLab · Dec 14, 2020 · 0b444a6 · 0b444a6
2 parents 1b013b2 + a8b3014
commit 0b444a6
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 12 deletions.
diff --git a/optional-requirements.txt b/optional-requirements.txt
@@ -1,4 +1,3 @@
-xgboost==0.90
 scikit-mdr==0.4.4
 skrebate==0.3.4
 torch==1.3.1
diff --git a/requirements.txt b/requirements.txt
@@ -8,4 +8,4 @@ update-checker>=0.16
 stopit>=1.1.2
 pandas>=0.24.2
 joblib>=0.13.2
-xgboost>=0.90
+xgboost>=1.1.0
diff --git a/setup.py b/setup.py
@@ -44,7 +44,7 @@ def calculate_version():
                     'stopit>=1.1.1',
                     'pandas>=0.24.2',
                     'joblib>=0.13.2',
-                    'xgboost>=0.90'],
+                    'xgboost>=1.1.0'],
     extras_require={
         'skrebate': ['skrebate>=0.3.4'],
         'mdr': ['scikit-mdr>=0.4.4'],

diff --git a/tpot/config/classifier.py b/tpot/config/classifier.py
@@ -104,7 +104,8 @@
         'learning_rate': [1e-3, 1e-2, 1e-1, 0.5, 1.],
         'subsample': np.arange(0.05, 1.01, 0.05),
         'min_child_weight': range(1, 21),
-        'nthread': [1]
+        'n_jobs': [1],
+        'verbosity': [0]
     },
 
     'sklearn.linear_model.SGDClassifier': {

diff --git a/tpot/config/classifier_cuml.py b/tpot/config/classifier_cuml.py
@@ -50,7 +50,8 @@
         "min_child_weight": range(1, 21),
         "alpha": [1, 10],
         "tree_method": ["gpu_hist"],
-        "nthread": [1]
+        "n_jobs": [1],
+        "verbosity": [0]
     },
 
     # Sklearn Preprocesssors

diff --git a/tpot/config/classifier_nn.py b/tpot/config/classifier_nn.py
@@ -30,7 +30,7 @@
 # estimators.
 
 classifier_config_nn = {
-    
+
     'tpot.builtins.PytorchLRClassifier': {
         'learning_rate': [1e-3, 1e-2, 1e-1, 0.5, 1.],
         'batch_size': [4, 8, 16, 32],
@@ -120,7 +120,8 @@
         'learning_rate': [1e-3, 1e-2, 1e-1, 0.5, 1.],
         'subsample': np.arange(0.05, 1.01, 0.05),
         'min_child_weight': range(1, 21),
-        'nthread': [1]
+        'n_jobs': [1],
+        'verbosity': [0]
     },
 
     'sklearn.linear_model.SGDClassifier': {
@@ -239,4 +240,4 @@
             }
         }
     }
-}
+}
diff --git a/tpot/config/classifier_sparse.py b/tpot/config/classifier_sparse.py
@@ -115,6 +115,7 @@
         'learning_rate': [1e-3, 1e-2, 1e-1, 0.5, 1.],
         'subsample': np.arange(0.05, 1.01, 0.05),
         'min_child_weight': range(1, 21),
-        'nthread': [1]
+        'n_jobs': [1],
+        'verbosity': [0]
     }
 }
diff --git a/tpot/config/regressor.py b/tpot/config/regressor.py
@@ -101,7 +101,8 @@
         'learning_rate': [1e-3, 1e-2, 1e-1, 0.5, 1.],
         'subsample': np.arange(0.05, 1.01, 0.05),
         'min_child_weight': range(1, 21),
-        'nthread': [1],
+        'n_jobs': [1],
+        'verbosity': [0],
         'objective': ['reg:squarederror']
     },
 

diff --git a/tpot/config/regressor_cuml.py b/tpot/config/regressor_cuml.py
@@ -57,7 +57,8 @@
         "min_child_weight": range(1, 21),
         "alpha": [1, 10],
         "tree_method": ["gpu_hist"],
-        "nthread": [1],
+        "n_jobs": [1],
+        "verbosity": [0],
         "objective": ["reg:squarederror"]
     },
 

diff --git a/tpot/config/regressor_sparse.py b/tpot/config/regressor_sparse.py
@@ -94,6 +94,7 @@
         'learning_rate': [1e-3, 1e-2, 1e-1, 0.5, 1.],
         'subsample': np.arange(0.05, 1.01, 0.05),
         'min_child_weight': range(1, 21),
-        'nthread': [1],
+        'n_jobs': [1],
+        'verbosity': [0],
         'objective': ['reg:squarederror']
     }}