pyfemtet 1.1.2__tar.gz → 1.1.4__tar.gz

{pyfemtet-1.1.2 → pyfemtet-1.1.4}/PKG-INFO

@@ -1,12 +1,13 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: pyfemtet
-Version: 1.1.2
+Version: 1.1.4
 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.2 → pyfemtet-1.1.4}/pyfemtet/_util/dask_util.py

@@ -40,9 +40,9 @@ __all__ = [
 _lock_pool = {}
 
 
-def get_client():
+def get_client(scheduler_address=None):
     try:
-        return _get_client()
+        return _get_client(scheduler_address)
     except ValueError:
         return None
 

{pyfemtet-1.1.2 → pyfemtet-1.1.4}/pyfemtet/opt/history/_history.py

@@ -136,9 +136,11 @@ class DataFrameWrapper:
     __df: pd.DataFrame
     _lock_name = 'edit-df'
     _dataset_name: str
+    _scheduler_address: str
 
     def __init__(self, df: pd.DataFrame):
         self._dataset_name = 'df-' + generate_random_id()
+        self._scheduler_address = None
         self.set_df(df)
 
     def __len__(self):
@@ -173,7 +175,7 @@ class DataFrameWrapper:
 
         """
 
-        client = get_client()
+        client = get_client(self._scheduler_address)
 
         # dask クラスターがある場合
         if client is not None:
@@ -185,6 +187,8 @@ class DataFrameWrapper:
             # 健在の場合
             else:
 
+                self._scheduler_address = client.scheduler.address
+
                 df = None
 
                 with Lock('access_dataset_df'):
@@ -192,9 +196,11 @@ class DataFrameWrapper:
                     if self._dataset_name in client.list_datasets():
                         df = client.get_dataset(self._dataset_name)
 
-                    # set の前に get されることはあってはならない
+                    # 存在しない場合は publish する
                     else:
-                        raise RuntimeError
+                        df = self.__df
+                        client.publish_dataset(**{self._dataset_name: df})
+                        sleep(0.1)
 
                 assert df is not None
 
@@ -235,10 +241,13 @@ class DataFrameWrapper:
             apply_partial_df(df, partial_df, equality_filters)
 
         # dask クラスター上のデータを更新
-        client = get_client()
+        client = get_client(self._scheduler_address)
         if client is not None:
             if client.scheduler is not None:
-                with Lock('access_dataset_df'):
+
+                self._scheduler_address = client.scheduler.address
+
+                with Lock('access_dataset_df', client):
 
                     # datasets 上に存在する場合は削除（上書きができない）
                     if self._dataset_name in client.list_datasets():
@@ -1347,7 +1356,7 @@ class History:
             @staticmethod
             def postprocess_after_recording(row):
 
-                client = get_client()
+                client = get_client(self._records.df_wrapper._scheduler_address)
 
                 trial_name = self.get_trial_name(row=row)
 
@@ -1405,7 +1414,7 @@ class History:
                     self_.postprocess_after_recording(row)
 
                 # save history if no FEMOpt
-                client = get_client()
+                client = get_client(self._records.df_wrapper._scheduler_address)
                 if client is None:
                     self.save()
 

{pyfemtet-1.1.2 → pyfemtet-1.1.4}/pyfemtet/opt/interface/_base_interface.py

@@ -41,6 +41,7 @@ class AbstractFEMInterface:
     _load_problem_from_fem: bool = False
     current_prm_values: TrialInput
     _tmp_dir: tempfile.TemporaryDirectory
+    _file_suffix: str
 
     # ===== update =====
 
@@ -70,13 +71,19 @@ class AbstractFEMInterface:
 
     # ===== dask util =====
 
-    @staticmethod
-    def _get_worker_index_from_optimizer(opt: AbstractOptimizer | None) -> str:
-        if opt is None:
-            worker_index = 'copy'
-        else:
-            worker_index = f'copy_{opt._worker_index}' if opt._worker_index is not None else 'copy'
-        return worker_index
+    def _get_file_suffix(self, opt: AbstractOptimizer | None) -> str:
+
+        file_suffix = 'copy'
+
+        if opt is not None:
+            if opt._worker_index is not None:
+                file_suffix = file_suffix + f'_{opt._worker_index}'
+
+        if hasattr(self, '_file_suffix'):
+            if self._file_suffix is not None:
+                file_suffix = file_suffix + f'_{self._file_suffix}'
+
+        return file_suffix
 
     def _rename_and_get_path_on_worker_space(self, orig_path, suffix, ignore_no_exist=False) -> str:
         # 与えられた path と同名のファイルを
@@ -106,13 +113,13 @@ class AbstractFEMInterface:
         else:
             return worker.local_directory
 
-    def _distribute_files(self, paths: list[str]) -> None:
+    def _distribute_files(self, paths: list[str], scheduler_address=None) -> None:
 
         # executor 向け
         self._copy_to_temp_space(paths)
 
         # dask worker 向け
-        client = get_client()
+        client = get_client(scheduler_address)
         if client is not None:
             for path in paths:
                 if not os.path.exists(path):
@@ -147,7 +154,7 @@ class AbstractFEMInterface:
 
     # ===== setup =====
 
-    def _setup_before_parallel(self) -> None:
+    def _setup_before_parallel(self, scheduler_address=None) -> None:
         pass
 
     def _setup_after_parallel(self, opt: AbstractOptimizer) -> None:

{pyfemtet-1.1.2 → pyfemtet-1.1.4}/pyfemtet/opt/interface/_excel_interface/excel_interface.py

@@ -322,7 +322,7 @@ class ExcelInterface(COMInterface):
         return self.excel
 
     # ===== setup =====
-    def _setup_before_parallel(self) -> None:
+    def _setup_before_parallel(self, scheduler_address=None) -> None:
         # メインプロセスで、並列プロセスを開始する前に行う前処理
 
         related_files = [self._original_input_xlsm_path]
@@ -345,7 +345,7 @@ class ExcelInterface(COMInterface):
         related_files.extend(self._original_related_file_paths)
 
         # dask worker 向け
-        self._distribute_files(related_files)
+        self._distribute_files(related_files, scheduler_address)
 
     def _re_register_paths(self, suffix):
         # self.hoge_path を dask worker space のファイルに変える
@@ -381,7 +381,7 @@ class ExcelInterface(COMInterface):
         CoInitialize()
 
         # 元のファイルを保護するため space のファイルを使用
-        suffix = self._get_worker_index_from_optimizer(opt)
+        suffix = self._get_file_suffix(opt)
         self._re_register_paths(suffix)
 
         # excel に繋ぐ

{pyfemtet-1.1.2 → pyfemtet-1.1.4}/pyfemtet/opt/interface/_femtet_interface/femtet_interface.py

@@ -199,8 +199,8 @@ class FemtetInterface(COMInterface):
         """
         return self.Femtet
 
-    def _setup_before_parallel(self):
-        self._distribute_files([self.femprj_path])
+    def _setup_before_parallel(self, scheduler_address=None):
+        self._distribute_files([self.femprj_path], scheduler_address)
 
     def _setup_after_parallel(self, opt: AbstractOptimizer = None):
 
@@ -211,7 +211,7 @@ class FemtetInterface(COMInterface):
 
         # worker space の femprj に切り替える
         else:
-            suffix = self._get_worker_index_from_optimizer(opt)
+            suffix = self._get_file_suffix(opt)
             self.femprj_path = self._rename_and_get_path_on_worker_space(self._original_femprj_path, suffix)
 
         # dask process ならば Femtet を起動

{pyfemtet-1.1.2 → pyfemtet-1.1.4}/pyfemtet/opt/interface/_femtet_with_nx_interface/femtet_with_nx_interface.py

@@ -58,12 +58,12 @@ class _NXInterface(AbstractFEMInterface):
         self.export_solids = export_solids
         self.export_flattened_assembly = export_flattened_assembly
 
-    def _setup_before_parallel(self) -> None:
-        self._distribute_files([self.prt_path])
+    def _setup_before_parallel(self, scheduler_address=None) -> None:
+        self._distribute_files([self.prt_path], scheduler_address)
 
     def _setup_after_parallel(self, opt: AbstractOptimizer = None) -> None:
         # get suffix
-        suffix = self._get_worker_index_from_optimizer(opt)
+        suffix = self._get_file_suffix(opt)
 
         # rename and get worker path
         self.prt_path = self._rename_and_get_path_on_worker_space(
@@ -189,9 +189,9 @@ class FemtetWithNXInterface(FemtetInterface, _NXInterface):
             export_flattened_assembly=export_flattened_assembly,
         )
 
-    def _setup_before_parallel(self):
-        FemtetInterface._setup_before_parallel(self)
-        _NXInterface._setup_before_parallel(self)
+    def _setup_before_parallel(self, scheduler_address=None):
+        FemtetInterface._setup_before_parallel(self, scheduler_address)
+        _NXInterface._setup_before_parallel(self, scheduler_address)
 
     def _setup_after_parallel(self, opt: AbstractOptimizer = None):
         FemtetInterface._setup_after_parallel(self, opt)

{pyfemtet-1.1.2 → pyfemtet-1.1.4}/pyfemtet/opt/interface/_femtet_with_solidworks/femtet_with_solidworks_interface.py

@@ -81,9 +81,9 @@ class FemtetWithSolidworksInterface(FemtetInterface, SolidworksInterface, Abstra
     def _check_param_and_raise(self, param_name) -> None:
         pass
 
-    def _setup_before_parallel(self):
-        SolidworksInterface._setup_before_parallel(self)
-        FemtetInterface._setup_before_parallel(self)
+    def _setup_before_parallel(self, scheduler_address=None):
+        SolidworksInterface._setup_before_parallel(self, scheduler_address)
+        FemtetInterface._setup_before_parallel(self, scheduler_address)
 
     def _setup_after_parallel(self, opt: AbstractOptimizer = None):
         SolidworksInterface._setup_after_parallel(self, opt)

{pyfemtet-1.1.2 → pyfemtet-1.1.4}/pyfemtet/opt/interface/_solidworks_interface/solidworks_interface.py

@@ -96,13 +96,13 @@ class SolidworksInterface(COMInterface):
                            'Solidworks マクロが有効であることを確認してください。'))
         self.swApp.Visible = self.solidworks_visible
 
-    def _setup_before_parallel(self):
-        self._distribute_files([self.sldprt_path])
+    def _setup_before_parallel(self, scheduler_address=None):
+        self._distribute_files([self.sldprt_path], scheduler_address)
 
     def _setup_after_parallel(self, opt: AbstractOptimizer = None):
 
         # get suffix
-        suffix = self._get_worker_index_from_optimizer(opt)
+        suffix = self._get_file_suffix(opt)
 
         # rename and get worker path
         self.sldprt_path = self._rename_and_get_path_on_worker_space(
@@ -154,7 +154,9 @@ class SolidworksInterface(COMInterface):
                 prm_name = _get_name_from_equation(eq)
                 # 対象なら処理
                 if prm_name in self.current_prm_values:
-                    new_equation = f'"{prm_name}" = {self.current_prm_values[prm_name].value}'
+                    prm = self.current_prm_values[prm_name]
+                    right = str(prm.value) + prm.properties.get('unit', '')
+                    new_equation = f'"{prm_name}" = {right}'
                     swEqnMgr.Equation(i, new_equation)
 
             # 式の計算

{pyfemtet-1.1.2 → pyfemtet-1.1.4}/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.2 → pyfemtet-1.1.4}/pyfemtet/opt/interface/_with_excel_settings/with_excel_settings.py

@@ -60,10 +60,10 @@ def _class_factory(FEMClass: type[AbstractFEMInterface]) -> type[AbstractFEMInte
             self._excel_initialized = True
             self._load_problem_from_fem = True
 
-        def _setup_before_parallel(self):
+        def _setup_before_parallel(self, scheduler_address=None):
             assert self._excel_initialized, '最初に init_excel() を呼び出してください。'
-            ExcelInterface._setup_before_parallel(self)
-            FEMClass._setup_before_parallel(self)
+            ExcelInterface._setup_before_parallel(self, scheduler_address)
+            FEMClass._setup_before_parallel(self, scheduler_address)
 
         def _setup_after_parallel(self, opt: AbstractOptimizer):
             assert self._excel_initialized, '最初に init_excel() を呼び出してください。'

{pyfemtet-1.1.2 → pyfemtet-1.1.4}/pyfemtet/opt/worker_status.py

@@ -71,6 +71,7 @@ class WorkerStatus:
     terminated = worker_status_from_float(float('inf'))
 
     def __init__(self, dataset_name: str):
+        self._scheduler_address = None
         self._dataset_name = dataset_name
         self.__value: _WorkerStatus
         self.value = WorkerStatus.undefined
@@ -80,9 +81,10 @@ class WorkerStatus:
 
         out = None
 
-        client = get_client()
+        client = get_client(self._scheduler_address)
         if client is not None:
             if client.scheduler is not None:
+                self._scheduler_address = client.scheduler.address
                 key = self._dataset_name
                 value: float | None = client.get_metadata(key, default=None)
 
@@ -111,9 +113,10 @@ class WorkerStatus:
 
     @value.setter
     def value(self, value: _WorkerStatus):
-        client = get_client()
+        client = get_client(self._scheduler_address)
         if client is not None:
             if client.scheduler is not None:
+                self._scheduler_address = client.scheduler.address
                 key = self._dataset_name
                 client.set_metadata(key, value)
                 # sleep(0.1)

{pyfemtet-1.1.2 → pyfemtet-1.1.4}/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.2"
+version = "1.1.4"
 
 [project.urls]
 Repository = "https://github.com/pyfemtet/pyfemtet"