diff --git a/doc/rtd/conf.py b/doc/rtd/conf.py index e36bcf5..3bb3919 100644 --- a/doc/rtd/conf.py +++ b/doc/rtd/conf.py @@ -18,11 +18,11 @@ # -- Project information ----------------------------------------------------- project = 'MLPro Documentations' -copyright = '2024 South Westphalia University of Applied Sciences, Germany' +copyright = '2025 South Westphalia University of Applied Sciences, Germany' author = 'Detlef Arend, Steve Yuwono, Laxmikant Shrikant Baheti et al' # The full version, including alpha/beta/rc tags -release = '1.0.1' +release = '1.0.2' # -- General configuration --------------------------------------------------- diff --git a/doc/rtd/requirements.txt b/doc/rtd/requirements.txt index 3bdcade..aa327db 100644 --- a/doc/rtd/requirements.txt +++ b/doc/rtd/requirements.txt @@ -1,4 +1,4 @@ -mlpro[full]>=1.4.0 +mlpro[full]>=2.1.0 hyperopt>=0.2.7 setuptools>=80.3.1 diff --git a/requirements.txt b/requirements.txt index b7e29b4..0c04f5a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,3 @@ -mlpro[full] >= 1.4.0 +mlpro[full] >= 2.1.0 hyperopt >= 0.2.7 setuptools >= 80.3.1 diff --git a/setup.cfg b/setup.cfg index c7ddd60..b39eed3 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = mlpro_int_hyperopt -version = 1.0.1 +version = 1.0.2 author = MLPro Team author_email = mlpro@listen.fh-swf.de description = MLPro: Integration Hyperopt @@ -18,7 +18,7 @@ classifiers = package_dir = = src packages = find: -python_requires = >=3.10 +python_requires = >=3.11 include_package_data = True [options.packages.find] @@ -26,6 +26,6 @@ where = src [options.extras_require] full = - mlpro[full] >= 1.4.0 + mlpro[full] >= 2.1.0 hyperopt >= 0.2.7 setuptools >= 80.3.1 diff --git a/src/mlpro_int_hyperopt/__init__.py b/src/mlpro_int_hyperopt/__init__.py index 70e509a..fff7b7d 100644 --- a/src/mlpro_int_hyperopt/__init__.py +++ b/src/mlpro_int_hyperopt/__init__.py @@ -1 +1 @@ -from mlpro_int_hyperopt.wrappers.hyperopt import * \ No newline at end of file +from .wrappers import * diff --git a/src/mlpro_int_hyperopt/wrappers/__init__.py b/src/mlpro_int_hyperopt/wrappers/__init__.py index 70e509a..ebd1bbd 100644 --- a/src/mlpro_int_hyperopt/wrappers/__init__.py +++ b/src/mlpro_int_hyperopt/wrappers/__init__.py @@ -1 +1 @@ -from mlpro_int_hyperopt.wrappers.hyperopt import * \ No newline at end of file +from .hyperopt import * diff --git a/src/mlpro_int_hyperopt/wrappers/hyperopt.py b/src/mlpro_int_hyperopt/wrappers/hyperopt.py index f1e28fa..cff2e5a 100644 --- a/src/mlpro_int_hyperopt/wrappers/hyperopt.py +++ b/src/mlpro_int_hyperopt/wrappers/hyperopt.py @@ -20,10 +20,11 @@ ## -- 2023-04-12 1.1.2 SY Refactoring ## -- 2024-02-01 2.0.0 LSB Migrated to the new repository ## -- 2024-04-18 2.1.0 DA Assignment with MLPro v1.4.0 +## -- 2025-08-03 2.1.1 SY Refactoring ## ------------------------------------------------------------------------------------------------- """ -Ver. 2.1.0 (2024-04-18) +Ver. 2.1.1 (2025-08-03) This module provides a wrapper class for hyperparameter tuning by reusing the Hyperopt framework. @@ -35,10 +36,16 @@ from mlpro.wrappers import Wrapper from mlpro.bf.ml import * from mlpro.bf.math import * +from mlpro.bf.data import * +from mlpro.bf import * from mlpro.bf.various import * -from mlpro.rl.models import * +from mlpro.rl import * from mlpro.gt.dynamicgames import * import os +import numpy as np + +# Export list for public API +__all__ = ['WrHPTHyperopt'] ## ------------------------------------------------------------------------------------------------- diff --git a/src/setup.py b/src/setup.py index cfdb937..7eb061d 100644 --- a/src/setup.py +++ b/src/setup.py @@ -2,7 +2,7 @@ setup(name='mlpro_int_hyperopt', -version='1.0.1', +version='1.0.2', description='MLPro: Integration Hyperopt', author='MLPro Team', author_mail='mlpro@listen.fh-swf.de', @@ -12,7 +12,7 @@ # Package dependencies for full installation extras_require={ "full": [ - "mlpro>=1.4.0", + "mlpro>=2.1.0", "hyperopt>=0.2.7", "setuptools >= 80.3.1" ], diff --git a/test/howtos/rl/howto_rl_ht_001_hyperopt.py b/test/howtos/rl/howto_rl_ht_001_hyperopt.py index e3eba91..fa80816 100644 --- a/test/howtos/rl/howto_rl_ht_001_hyperopt.py +++ b/test/howtos/rl/howto_rl_ht_001_hyperopt.py @@ -38,7 +38,13 @@ from mlpro_int_hyperopt import WrHPTHyperopt from mlpro.rl.pool.envs.bglp import BGLP from mlpro.rl import * +from mlpro.bf import * +from mlpro.bf.math import * +from mlpro.bf.systems import * +from mlpro.bf.plot import * +from mlpro.bf.ml import * import random +import numpy as np from pathlib import Path diff --git a/test/test_examples.py b/test/test_examples.py index af502cd..09a1f79 100644 --- a/test/test_examples.py +++ b/test/test_examples.py @@ -59,7 +59,7 @@ import sys import os -from mlpro.bf.various import Log +from mlpro.bf import * import runpy import pytest