pyfemtet 1.1.3__tar.gz → 1.1.5__tar.gz

{pyfemtet-1.1.3 → pyfemtet-1.1.5}/PKG-INFO

@@ -1,12 +1,13 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: pyfemtet
-Version: 1.1.3
+Version: 1.1.5
 Summary: Design parameter optimization using Femtet.
-License: MIT
+License-Expression: MIT
+License-File: LICENSE
+License-File: LICENSE_THIRD_PARTY.txt
 Author: pyfemtet
 Author-email: 148934231+pyfemtet@users.noreply.github.com
 Requires-Python: >= 3.10, < 3.14
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
@@ -29,8 +30,7 @@ Requires-Dist: optuna-integration (>=3.6.0,<5.0.0)
 Requires-Dist: pandas (>=2.2.3,<3)
 Requires-Dist: plotly (>=5.22.0,<6)
 Requires-Dist: psutil (>=5.9.6,<6)
-Requires-Dist: pywin32 (<307) ; sys_platform == "win32" and python_version < "3.13"
-Requires-Dist: pywin32 (>=309) ; sys_platform == "win32" and python_version >= "3.13"
+Requires-Dist: pywin32 (>=310) ; sys_platform == "win32"
 Requires-Dist: pyyaml (>=6.0.2,<7)
 Requires-Dist: scipy (>=1.11.4,<2)
 Requires-Dist: torch

{pyfemtet-1.1.3 → pyfemtet-1.1.5}/pyfemtet/logger/_impl.py

@@ -81,6 +81,7 @@ def __create_formatter(colored=True):
 # ===== handler config =====
 
 STDOUT_HANDLER_NAME = 'stdout-handler'
+STDERR_HANDLER_NAME = 'stderr-handler'
 
 
 def __get_stdout_handler():
@@ -94,6 +95,17 @@ def __has_stdout_handler(logger):
     return any([handler.get_name() != STDOUT_HANDLER_NAME for handler in logger.handlers])
 
 
+def __get_stderr_handler():
+    stderr_handler = logging.StreamHandler(sys.stderr)
+    stderr_handler.set_name(STDERR_HANDLER_NAME)
+    stderr_handler.setFormatter(__create_formatter(colored=True))
+    return stderr_handler
+
+
+def __has_stderr_handler(logger):
+    return any([handler.get_name() != STDERR_HANDLER_NAME for handler in logger.handlers])
+
+
 def set_stdout_output(logger, level=logging.INFO):
 
     if not __has_stdout_handler(logger):
@@ -107,6 +119,19 @@ def remove_stdout_output(logger):
         logger.removeHandler(__get_stdout_handler())
 
 
+def set_stderr_output(logger, level=logging.INFO):
+
+    if not __has_stderr_handler(logger):
+        logger.addHandler(__get_stderr_handler())
+
+    logger.setLevel(level)
+
+
+def remove_stderr_output(logger):
+    if __has_stderr_handler(logger):
+        logger.removeHandler(__get_stderr_handler())
+
+
 def add_file_output(logger, filepath=None, level=logging.INFO) -> str:
     """Add FileHandler to the logger.
 
@@ -165,7 +190,7 @@ def setup_package_root_logger(package_name):
         with __lock:
             logger = logging.getLogger(package_name)
             logger.propagate = True
-            set_stdout_output(logger)
+            set_stderr_output(logger)
             logger.setLevel(logging.INFO)
             __initialized_root_packages.append(package_name)
     else:

{pyfemtet-1.1.3 → pyfemtet-1.1.5}/pyfemtet/opt/interface/_surrogate_model_interface/botorch_interface.py

@@ -26,6 +26,8 @@ __all__ = [
 
 class BoTorchInterface(AbstractSurrogateModelInterfaceBase):
 
+    current_obj_std_values: dict[str, float]
+
     def __init__(
             self,
             history_path: str = None,
@@ -45,6 +47,7 @@ class BoTorchInterface(AbstractSurrogateModelInterfaceBase):
 
         self.model = SingleTaskGPModel()
         self.pyfemtet_model = PyFemtetModel()
+        self.current_obj_std_values = {}
 
         # get main only
         df = self.train_history.get_df(MAIN_FILTER)
@@ -64,11 +67,13 @@ class BoTorchInterface(AbstractSurrogateModelInterfaceBase):
         # update current objective values
         x = np.array([[variable.value for variable in self.current_prm_values.values()]])
 
-        y, _ = self.pyfemtet_model.predict(x)
+        y, s = self.pyfemtet_model.predict(x)
         y = y[0]
+        s = s[0]
 
-        for obj_name, obj_value in zip(self.train_history.obj_names, y):
+        for obj_name, obj_value, obj_std in zip(self.train_history.obj_names, y, s):
             self.current_obj_values.update({obj_name: obj_value})
+            self.current_obj_std_values.update({obj_name: obj_std})
 
 
 class PoFBoTorchInterface(BoTorchInterface, AbstractSurrogateModelInterfaceBase):
@@ -103,6 +108,7 @@ class PoFBoTorchInterface(BoTorchInterface, AbstractSurrogateModelInterfaceBase)
         self.train_history_c.load_csv(history_path, with_finalize=True)
         self.pof_threshold = 0.5
         self.feasibility_cdf_threshold = feasibility_cdf_threshold
+        self.current_obj_std_values = {}
 
         # use feasibility as a single objective
         self.train_history_c.obj_names = ['feasibility']

{pyfemtet-1.1.3 → pyfemtet-1.1.5}/pyfemtet/opt/optimizer/optuna_optimizer/_optuna_optimizer.py

@@ -43,6 +43,20 @@ warnings.filterwarnings('ignore', 'Argument ``constraints_func`` is an experimen
 _MESSAGE_ENQUEUED = 'Enqueued trial.'
 
 
+def check_float_and_raise(value, check_target):
+    if isinstance(value, int | float):
+        if np.isnan(value):
+            raise ValueError(_(
+                en_message=f'{check_target} is NaN.',
+                jp_message=f'{check_target} は NaN です。',
+            ))
+    else:
+        raise ValueError(_(
+            en_message=f'{check_target} should be a number, but {value} ({type(value)}) passed.',
+            jp_message=f'{check_target} は数値でなくてはなりませんが、{value} ({type(value)}) が与えられました。',
+        ))
+
+
 class MaxTrialsCallbackExcludingEnqueued(MaxTrialsCallback):
     def __call__(self, study: Study, trial: FrozenTrial) -> None:
         """
@@ -167,14 +181,31 @@ class OptunaOptimizer(AbstractOptimizer):
             self,
             name: str,
             initial_value: float,
-            lower_bound: float,
-            upper_bound: float,
+            lower_bound: float | None = None,
+            upper_bound: float | None = None,
             step: float | None = None,
             properties: dict[str, ...] | None = None,
             *,
             pass_to_fem: bool = True,
             fix: bool = False,
     ) -> None:
+
+        if lower_bound is None or upper_bound is None:
+            properties = properties or {}
+            if properties.get('dynamic_bounds_fun') is None:
+                raise ValueError(_(
+                    en_message='When using `OptunaOptimizer`, you must either specify `lower_bound` and `upper_bound`, ' \
+                               'or include `dynamic_bounds_fun` (Callable[[AbstractOptimizer], float]) in `properties`.',
+                    jp_message='OptunaOptimizer では、lower_bound と upper_bound を両方指定するか、' \
+                               'または properties に dynamic_bounds_fun (Callable[[AbstractOptimizer], float]) ' \
+                               'を含めなければなりません。'
+                ))
+            else:
+                logger.warning(_(
+                    en_message='`dynamic_bounds_fun` is under development. The functionally can be changed without any announcement.',
+                    jp_message='dynamic_bounds_fun は開発中の機能です。機能は予告なく変更されることがあります。',
+                ))
+
         AbstractOptimizer.add_parameter(self, name, initial_value, lower_bound, upper_bound, step, properties,
                                         pass_to_fem=pass_to_fem, fix=fix)
 
@@ -271,6 +302,13 @@ class OptunaOptimizer(AbstractOptimizer):
                     continue
 
                 if isinstance(prm, NumericParameter):
+                    dynamic_bounds_fun = prm.properties.get('dynamic_bounds_fun')
+                    if dynamic_bounds_fun:
+                        lb, ub = dynamic_bounds_fun(self)
+                        check_float_and_raise(lb, _(f'lower_bound of {prm.name}', f'{prm.name} の lower_bound'))
+                        check_float_and_raise(ub, _(f'upper_bound of {prm.name}', f'{prm.name} の upper_bound'))
+                        prm.lower_bound = lb
+                        prm.upper_bound = ub
                     prm.value = trial.suggest_float(
                         name,
                         prm.lower_bound,

{pyfemtet-1.1.3 → pyfemtet-1.1.5}/pyfemtet/opt/problem/variable_manager/_variable_manager.py

@@ -311,6 +311,7 @@ class VariableManager:
         | dict[str, SupportedVariableTypes]
         | np.ndarray
     ):
+        # 参照を返す仕様を dynamic bounds で利用
 
         raw = {}
 

{pyfemtet-1.1.3 → pyfemtet-1.1.5}/pyfemtet/opt/visualization/history_viewer/_complex_components/pm_graph.py

@@ -428,9 +428,10 @@ class PredictionModelGraph(AbstractPage):
                     self.CommandState.ready.value,
                     self.alert_region.create_alerts(
                         _(
-                            en_message='Cannot draw the graph because the selected parameter '
-                                       'is a fixed and its bounds are not given.',
-                            jp_message='選択された変数は固定値で上下限も与えられていないため、'
+                            en_message='Cannot draw the graph because '
+                                       'the bounds of selected parameter '
+                                       'are not given.',
+                            jp_message='選択された変数は上下限が与えられていないため、'
                                        'グラフを描画できません。',
                         ),
                         color='danger',

{pyfemtet-1.1.3 → pyfemtet-1.1.5}/pyproject.toml

@@ -11,8 +11,7 @@ dependencies = [
     "tqdm>=4.66.1,<5",
     "colorlog>=6.8.0,<7",
     "psutil>=5.9.6,<6",
-    "pywin32<307 ; sys_platform == 'win32' and python_version < '3.13'",
-    "pywin32>=309 ; sys_platform == 'win32' and python_version >= '3.13'",
+    "pywin32>=310; sys_platform == 'win32'",
     "femtetutils>=1.0.0,<2 ; sys_platform=='win32'",
     "dask~=2024.12.1",
     "distributed~=2024.12.1",
@@ -34,7 +33,7 @@ dependencies = [
 
 #[project.optional-dependencies]
 #brep = ["brepmatching>=0.1.8,<0.2"]
-version = "1.1.3"
+version = "1.1.5"
 
 [project.urls]
 Repository = "https://github.com/pyfemtet/pyfemtet"