Merge pull request #129 from perib/new_search_space_def

New search space def
EpistasisLab · Apr 24, 2024 · bb8a919 · bb8a919
2 parents 1710152 + 0c2fffb
commit bb8a919
Show file tree

Hide file tree

Showing 21 changed files with 539 additions and 825 deletions.
diff --git a/setup.py b/setup.py
@@ -28,7 +28,7 @@ def calculate_version():
 
 ''',
     zip_safe=True,
-    install_requires=['numpy>=1.16.3',
+    install_requires=['numpy>=1.26.4',
                       'scipy>=1.3.1',
                       'scikit-learn>=1.3.0',
                       'update_checker>=0.16',
@@ -44,10 +44,11 @@ def calculate_version():
                       'baikal>=0.4.2',
                       'jupyter>=1.0.0',
                       'networkx>=3.0',
-                      'dask>=2023.3.1',
-                      'distributed>=2023.7.0',
-                      'dask-ml>=2022.5.27',
-                      'dask-jobqueue>=0.8.1',
+                      'dask>=2024.4.2',
+                      'distributed>=2024.4.2',
+                      'dask-expr>=1.0.12',
+                      'dask-ml>=2023.4.20',
+                      'dask-jobqueue>=0.8.5',
                       'func_timeout>=4.3.5',
                       'configspace>=0.7.1',
                      ],

diff --git a/tpot2/builtin_modules/__init__.py b/tpot2/builtin_modules/__init__.py
@@ -1,6 +1,5 @@
 from .feature_set_selector import FeatureSetSelector
 from .zero_count import ZeroCount
-from .one_hot_encoder import OneHotEncoder
 from .column_one_hot_encoder import ColumnOneHotEncoder
 from .arithmetictransformer import ArithmeticTransformer
 from .arithmetictransformer import AddTransformer, mul_neg_1_Transformer, MulTransformer, SafeReciprocalTransformer, EQTransformer, NETransformer, GETransformer, GTTransformer, LETransformer, LTTransformer, MinTransformer, MaxTransformer, ZeroTransformer, OneTransformer, NTransformer