pyfemtet 1.3.2__py3-none-any.whl → 1.4.0__py3-none-any.whl

pyfemtet/opt/interface/_femtet_interface/femtet_interface.py

@@ -425,12 +425,18 @@ class FemtetInterface(COMInterface):
         # 開く
         if self.model_name is None:
             result = self.Femtet.LoadProject(self.femprj_path, True)
+            if not result:
+                self.Femtet.ShowLastError()
         else:
+            result = self.Femtet.LoadProject(self.femprj_path, True)
+            if not result:
+                self.Femtet.ShowLastError()
+
             result = self.Femtet.LoadProjectAndAnalysisModel(
                 self.femprj_path, self.model_name, True
             )
-        if not result:
-            self.Femtet.ShowLastError()
+            if not result:
+                self.Femtet.ShowLastError()
 
     def _connect_and_open_femtet(self):
         """Connects to a Femtet process and open the femprj.

pyfemtet/opt/optimizer/_base_optimizer.py

@@ -879,7 +879,7 @@ class AbstractOptimizer:
 
             if os.environ.get('DEBUG_FEMOPT_PARALLEL'):
                 if isinstance(worker_idx, int):
-                    sleep(worker_idx)
+                    sleep((worker_idx + 1) * 2)
 
             self.run()
 

pyfemtet/opt/optimizer/scipy_optimizer/_scipy_optimizer.py

@@ -2,7 +2,8 @@ from __future__ import annotations
 
 from typing import Callable
 
-from contextlib import suppress
+from contextlib import suppress, contextmanager
+from time import time
 
 import numpy as np
 from scipy.optimize import minimize, OptimizeResult
@@ -10,9 +11,11 @@ from scipy.optimize import NonlinearConstraint
 
 from pyfemtet._i18n import Msg, _
 from pyfemtet._util.closing import closing
+from pyfemtet._util.dask_util import get_client, Lock
 from pyfemtet.opt.problem.variable_manager import *
 from pyfemtet.opt.problem.problem import *
 from pyfemtet.opt.exceptions import *
+from pyfemtet.opt.history import MAIN_FILTER
 from pyfemtet.logger import get_module_logger
 
 from pyfemtet.opt.optimizer._base_optimizer import *
@@ -26,6 +29,10 @@ __all__ = [
 logger = get_module_logger('opt.optimizer', False)
 
 
+class InterruptScipyMinimize(Exception):
+    pass
+
+
 class _ScipyCallback:
 
     def __init__(self, opt: ScipyOptimizer):
@@ -56,9 +63,6 @@ class ScipyOptimizer(AbstractOptimizer):
         
     """
 
-    _timeout: None = None
-    _n_trials: None = None
-
     def __init__(self, method: str = None, tol=None):
         super().__init__()
 
@@ -67,30 +71,42 @@ class ScipyOptimizer(AbstractOptimizer):
         self.options = {}
         self.constraint_enhancement = 0.001
         self.constraint_scaling = 1.
+        self._scheduler_address: str | None = None
+        self.timeout = None
+        self._time_start = None
+        self.__n_succeeded_trials = None
 
     @property
-    def timeout(self):
-        return self._timeout
-
-    @timeout.setter
-    def timeout(self, value):
-        if value is not None:
-            raise NotImplementedError(_(
-                en_message='`ScipyOptimizer` cannot use timeout.',
-                jp_message='`ScipyOptimizer` では timeout は指定できません。'
-            ))
-
-    @property
-    def n_trials(self):
-        return self._n_trials
-
-    @n_trials.setter
-    def n_trials(self, value):
-        if value is not None:
-            raise NotImplementedError(_(
-                en_message='`ScipyOptimizer` cannot use n_trials.',
-                jp_message='`ScipyOptimizer` では n_trials は指定できません。'
-            ))
+    def _n_succeeded_trials_in_current_optimization(self) -> int | None:  # オーバーライド不可
+        out = None
+        client = get_client(self._scheduler_address)
+        if client is not None:
+            raise NotImplementedError(
+                "ScipyOptimizer does not support parallel computing."
+            )
+        if self.__n_succeeded_trials is None:
+            self.__n_succeeded_trials = 0
+        return self.__n_succeeded_trials
+
+    @_n_succeeded_trials_in_current_optimization.setter
+    def _n_succeeded_trials_in_current_optimization(self, value: int | None):  # オーバーライド不可
+        client = get_client(self._scheduler_address)
+        with Lock('scipy_n_succeeded_trials'):
+            if client is not None:
+                raise NotImplementedError('ScipyOptimizer does not support parallel computing.')
+            self.__n_succeeded_trials = value
+
+    def _per_solve_callback(self):
+        df = self.history.get_df(equality_filters=MAIN_FILTER)
+        self._n_succeeded_trials_in_current_optimization = (
+            1 + self._n_succeeded_trials_in_current_optimization
+        )
+        if self.n_trials is not None:
+            if self._n_succeeded_trials_in_current_optimization >= self.n_trials:
+                raise InterruptScipyMinimize
+        if self.timeout is not None:
+            if time() - self._time_start >= self.timeout:
+                raise InterruptScipyMinimize
 
     def add_trial(self, parameters: dict[str, SupportedVariableTypes]):
         raise NotImplementedError(_(
@@ -98,8 +114,7 @@ class ScipyOptimizer(AbstractOptimizer):
             jp_message='`ScipyOptimizer` では `add_trial()` は使えません。',
         ))
 
-    def _get_x0(self) -> np.ndarray:
-
+    def _get_x0(self, after_finalizing_history=False) -> np.ndarray:
         # params を取得
         params: dict[str, Parameter] = self.variable_manager.get_variables(
             filter='parameter', format='raw'
@@ -112,7 +127,17 @@ class ScipyOptimizer(AbstractOptimizer):
                     jp_message='Scipy では数値パラメータのみ最適化できます。'
                 ))
 
-        # params のうち fix == True のものを除く
+        # リスタートならば最適値で初期値を上書きする
+        if after_finalizing_history:
+            df = self.history.get_df()
+            optimal_trials = df[df["optimality"]]
+            if len(optimal_trials) > 0:
+                optimal_trial = optimal_trials.iloc[-1]
+                for prm_name in params.keys():
+                    if prm_name in optimal_trial:
+                        params[prm_name].value = optimal_trial[prm_name]
+
+        # fix == True のものを除いて初期値を作成
         x0 = np.array([p.value for p in params.values() if not p.properties.get('fix', False)])
 
         return x0
@@ -133,8 +158,13 @@ class ScipyOptimizer(AbstractOptimizer):
             logger.warning(Msg.WARN_SCIPY_NELDER_MEAD_BOUND)
 
     def _setup_before_parallel(self):
-
         if not self._done_setup_before_parallel:
+            # 並列プロセスは起動のラグがあるので
+            # すべての並列プロセスで起算時刻を同じにしたい
+            self._time_start = time()
+            # 別のプロセスが計算を始めてから自分のプロセスが上書きし内容
+            # ここで初期化
+            self._n_succeeded_trials_in_current_optimization = 0
 
             super()._setup_before_parallel()  # flag inside
 
@@ -343,9 +373,7 @@ class ScipyOptimizer(AbstractOptimizer):
             ) from e
 
     def _objective(self, xk: np.ndarray) -> float:
-
         with self._logging():
-
             vm = self.variable_manager
 
             # parameter suggestion
@@ -357,6 +385,7 @@ class ScipyOptimizer(AbstractOptimizer):
             # process main fidelity model
             solve_set = self._get_solve_set()
             f_return = solve_set.solve(x)
+            self._per_solve_callback()
             assert f_return is not None
             dict_y_internal = f_return[1]
             y_internal: float = tuple(dict_y_internal.values())[0]  # type: ignore
@@ -364,26 +393,38 @@ class ScipyOptimizer(AbstractOptimizer):
             return y_internal
 
     def run(self):
-
         # ===== finalize =====
         self._finalize()
 
         # ===== construct x0 =====
-        x0 = self._get_x0()
+        x0 = self._get_x0(after_finalizing_history=True)
+
+        # ===== 終了条件 =====
+        # In case that setup_before_parallel is not called
+        if self._time_start is None:
+            self._time_start = time()
+        if self._n_succeeded_trials_in_current_optimization is None:
+            self._n_succeeded_trials_in_current_optimization = 0
 
         # ===== run =====
         with closing(self.fem):
 
-            with self._setting_status(), suppress(InterruptOptimization):
-
-                minimize(
-                    self._objective,
-                    x0,
-                    args=(),
-                    method=self.method,
-                    bounds=self._get_scipy_bounds(),
-                    constraints=self._get_scipy_constraints(),
-                    tol=self.tol,
-                    callback=self._get_scipy_callback(),
-                    options=self.options,
-                )
+            with self._setting_status(), \
+                    suppress(InterruptOptimization), \
+                    suppress(InterruptScipyMinimize):
+
+                try:
+                    minimize(
+                        self._objective,
+                        x0,
+                        args=(),
+                        method=self.method,
+                        bounds=self._get_scipy_bounds(),
+                        constraints=self._get_scipy_constraints(),
+                        tol=self.tol,
+                        callback=self._get_scipy_callback(),
+                        options=self.options,
+                    )
+                finally:
+                    self._time_start = None
+                    self._n_succeeded_trials_in_current_optimization = None

pyfemtet/opt/visualization/plotter/main_figure_creator.py

@@ -98,6 +98,12 @@ def get_hypervolume_plot(_: History, df: pd.DataFrame) -> go.Figure:
     # メインデータを抽出
     df = get_partial_df(df, equality_filters=MAIN_FILTER)
 
+    # 成功した試行のみを抽出
+    df = df[df['feasibility']]
+
+    # 番号を振り直し
+    df['trial'] = range(1, len(df) + 1)
+
     # create figure
     fig = px.line(
         df,

{pyfemtet-1.3.2.dist-info → pyfemtet-1.4.0.dist-info}/METADATA

@@ -1,18 +1,19 @@
 Metadata-Version: 2.4
 Name: pyfemtet
-Version: 1.3.2
+Version: 1.4.0
 Summary: Design parameter optimization using Femtet.
 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
+Requires-Python: >= 3.10, < 3.15
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Requires-Dist: babel (>=2.15.0,<3)
 Requires-Dist: botorch (>=0.12.0,<0.15.0)
 Requires-Dist: colorlog (>=6.8.0,<7)

{pyfemtet-1.3.2.dist-info → pyfemtet-1.4.0.dist-info}/RECORD

@@ -44,7 +44,7 @@ pyfemtet/opt/interface/_excel_interface/debug-excel-interface.xlsm,sha256=TM1CEO
 pyfemtet/opt/interface/_excel_interface/excel_interface.py,sha256=Sghavj7bcslQ5ue9xJzV6DdBfhv6XKn-XxKD-T39KEo,39854
 pyfemtet/opt/interface/_femtet_interface/__init__.py,sha256=snQruC8Rl_5rFeVmiqw9lmzdJ5mL42HpIlHIn5ytd8s,77
 pyfemtet/opt/interface/_femtet_interface/_femtet_parametric.py,sha256=Om2S1hd90nQSuOXf1ylUJiILcxVhLiCOL4dc34lJzdM,10946
-pyfemtet/opt/interface/_femtet_interface/femtet_interface.py,sha256=183BGGdXGTnI8yYypMX5dgsEtlRBSPAbuI0Nyzol_i8,45765
+pyfemtet/opt/interface/_femtet_interface/femtet_interface.py,sha256=KAJ3ff9oGNlsHz8Im4EJTYg6AIB3LDvFi8nhv9bPWuc,45985
 pyfemtet/opt/interface/_femtet_with_nx_interface/__init__.py,sha256=ppeoWVSmVsTmDNKpuFRVTnhjcoefQVEog3-FRiKpEe4,104
 pyfemtet/opt/interface/_femtet_with_nx_interface/femtet_with_nx_interface.py,sha256=IPIoNMtcJmtiv7eM3yDMWDOynTf0mXd-438LoDVqZCU,8628
 pyfemtet/opt/interface/_femtet_with_nx_interface/model1.prt,sha256=cYVw2izr4_9PCPHOpi46XmDVOuNZ5ksuwKqzBtCZfNA,104833
@@ -67,7 +67,7 @@ pyfemtet/opt/meta_script/__main__.py,sha256=9-QM6eZOLpZ_CxERpRu3RAMqpudorSJdPCiK
 pyfemtet/opt/meta_script/sample/sample.bas,sha256=2iuSYMgPDyAdiSDVGxRu3avjcZYnULz0l8e25YBa7SQ,27966
 pyfemtet/opt/meta_script/sample/sample.femprj,sha256=6_0ywhgXxZjdzZzQFog8mgMUEjKNCFVNlEgAWoptovk,292885
 pyfemtet/opt/optimizer/__init__.py,sha256=A4QYeF0KHEFdwoxLfkDND7ikDQ186Ryy3oXEGdakFSg,463
-pyfemtet/opt/optimizer/_base_optimizer.py,sha256=OfESisVldjZpPQuNRlU82-d6MQ1h-EJ6Muy6ewWw1YE,37647
+pyfemtet/opt/optimizer/_base_optimizer.py,sha256=L4-WUXBkLVUarWvHyoBLe9EdOlOOmYB1GNB4guctNAk,37657
 pyfemtet/opt/optimizer/_trial_queue.py,sha256=Yv6JlfVCYOiCukllfxk79xU4_utmxwRA3gcCWpdyG9k,2919
 pyfemtet/opt/optimizer/optuna_optimizer/__init__.py,sha256=u2Bwc79tkZTU5dMbhzzrPQi0RlFg22UgXc-m9K9G6wQ,242
 pyfemtet/opt/optimizer/optuna_optimizer/_optuna_attribute.py,sha256=7eZsruVCGgMlcnf3a9Vf55FOEE-D7V777MJQajI12Cw,1842
@@ -78,7 +78,7 @@ pyfemtet/opt/optimizer/optuna_optimizer/_pof_botorch/enable_nonlinear_constraint
 pyfemtet/opt/optimizer/optuna_optimizer/_pof_botorch/pof_botorch_sampler.py,sha256=qOAQOiC7xW1aGZ7JbMPYVjc9FEHi3hYffOfcXpy4rhI,48642
 pyfemtet/opt/optimizer/optuna_optimizer/wat_ex14_parametric_jp.femprj,sha256=-M54MTNrV7muZWPm9Tjptd6HDdtgUFBsRroC6ytyqa0,180970
 pyfemtet/opt/optimizer/scipy_optimizer/__init__.py,sha256=oXx2JAVLvgz0WwIXAknuV4p2MupaiutYYvjI8hXcFwc,45
-pyfemtet/opt/optimizer/scipy_optimizer/_scipy_optimizer.py,sha256=BhlvVi3fugDjaDqoyi3glUR0N7NOxne9E92V-BvBOt4,13079
+pyfemtet/opt/optimizer/scipy_optimizer/_scipy_optimizer.py,sha256=mszpNNxzkyA62aheA-e1M5gW47BI_VcwZ4JLdLcpskE,15641
 pyfemtet/opt/prediction/__init__.py,sha256=-XYo-l5YFjExMtqMKj1YUAhmGSQq_0YITS0qizj2Xbs,104
 pyfemtet/opt/prediction/_botorch_utils.py,sha256=cXQlQ_oC6cQaI5kGIYANlqDJPdkGEA_zK2gtJpluJNE,6001
 pyfemtet/opt/prediction/_gpytorch_modules_extension.py,sha256=B_qUtFn06dQENOmUOObbCpkeASUKI5JpXROx8zYeaq0,5224
@@ -169,14 +169,14 @@ pyfemtet/opt/visualization/history_viewer/result_viewer/tutorial_files/tutorial_
 pyfemtet/opt/visualization/history_viewer/result_viewer/tutorial_files/tutorial_gau_ex08_parametric.femprj,sha256=uPqOara56FAt_T4x2P6tvcIXnISw_fX7RECbVoJlAFs,280214
 pyfemtet/opt/visualization/plotter/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyfemtet/opt/visualization/plotter/contour_creator.py,sha256=bvGGWNBLZawHq0fAIHfZOUAXw0f9GTlNROiJThoXZ2A,3043
-pyfemtet/opt/visualization/plotter/main_figure_creator.py,sha256=7fOGs57LPbPOj5klEivKHT-hSF3GUpAuBcBnJOTRNsQ,17637
+pyfemtet/opt/visualization/plotter/main_figure_creator.py,sha256=ENJa30ua-e_R5amjRPN8ihBavcl1XagE8CK8E7YjDLo,17778
 pyfemtet/opt/visualization/plotter/parallel_plot_creator.py,sha256=VRhT0CUG1mCHDoVO8e6LR_-FiD0QB3GsB95016iXmYc,802
 pyfemtet/opt/visualization/plotter/pm_graph_creator.py,sha256=7EwmoJlnHwDrpw65NchiA63FIjgGTLq6vTcpTzrSnJo,11841
 pyfemtet/opt/wat_ex14_parametric_jp.femprj,sha256=dMwQMt6yok_PbZLyxPYdmg5wJQwgQDZ4RhS76zdGLGk,177944
 pyfemtet/opt/worker_status.py,sha256=simvPa1AkO1idmPXrF5WjYVEBx3tO7hLhbM3J1rFjdo,3824
-pyfemtet-1.3.2.dist-info/METADATA,sha256=rt0CUz2W1pjqKmf711uJQpPSaMwFwwA8kVpqrlJWLKk,3410
-pyfemtet-1.3.2.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-pyfemtet-1.3.2.dist-info/entry_points.txt,sha256=Tsb_l_8Z6pyyq2tRfuKiwfJUV3nq_cHoLS61foALtsg,134
-pyfemtet-1.3.2.dist-info/licenses/LICENSE,sha256=LWUL5LlMGjSRTvsalS8_fFuwS4VMw18fJSNWFwDK8pc,1060
-pyfemtet-1.3.2.dist-info/licenses/LICENSE_THIRD_PARTY.txt,sha256=8_9-cgzTpmeuCqItPZb9-lyAZcH2Qp9sZTU_hYuOZIQ,191
-pyfemtet-1.3.2.dist-info/RECORD,,
+pyfemtet-1.4.0.dist-info/METADATA,sha256=ldGF__xZvXssltC13o-LXUUR-ait8WW5-Rmoid5H75w,3461
+pyfemtet-1.4.0.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+pyfemtet-1.4.0.dist-info/entry_points.txt,sha256=Tsb_l_8Z6pyyq2tRfuKiwfJUV3nq_cHoLS61foALtsg,134
+pyfemtet-1.4.0.dist-info/licenses/LICENSE,sha256=LWUL5LlMGjSRTvsalS8_fFuwS4VMw18fJSNWFwDK8pc,1060
+pyfemtet-1.4.0.dist-info/licenses/LICENSE_THIRD_PARTY.txt,sha256=8_9-cgzTpmeuCqItPZb9-lyAZcH2Qp9sZTU_hYuOZIQ,191
+pyfemtet-1.4.0.dist-info/RECORD,,