pyfemtet 0.7.0__tar.gz → 0.7.1__tar.gz

{pyfemtet-0.7.0 → pyfemtet-0.7.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyfemtet
-Version: 0.7.0
+Version: 0.7.1
 Summary: Design parameter optimization using Femtet.
 Home-page: https://github.com/pyfemtet/pyfemtet
 License: BSD-3-Clause
@@ -22,6 +22,7 @@ Requires-Dist: dash-bootstrap-components (>=1.5.0,<2.0.0)
 Requires-Dist: dask (>=2023.12.1,<2024.0.0)
 Requires-Dist: distributed (>=2023.12.1,<2024.0.0)
 Requires-Dist: femtetutils (>=1.0.0,<2.0.0)
+Requires-Dist: fire (>=0.6.0,<0.7.0)
 Requires-Dist: numpy (>=1.26.2,<2.0.0)
 Requires-Dist: openpyxl (>=3.1.2,<4.0.0)
 Requires-Dist: optuna (>=3.4.0,<5.0.0)

pyfemtet-0.7.1/pyfemtet/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.7.1"

pyfemtet-0.7.1/pyfemtet/_util/dask_util.py

@@ -0,0 +1,10 @@
+from contextlib import nullcontext
+from dask.distributed import Lock
+
+
+def lock_or_no_lock(name: str, client=None):
+    lock = Lock(name, client)
+    if lock.client is None:
+        return nullcontext()
+    else:
+        return lock

{pyfemtet-0.7.0 → pyfemtet-0.7.1}/pyfemtet/_util/excel_macro_util.py

@@ -5,16 +5,27 @@ import asyncio  # for timeout
 import win32gui
 import win32con
 import win32api
+import win32process
 
 from pyfemtet.logger import get_module_logger
 
 logger = get_module_logger('util.excel', __name__)
 
 
+def _get_pid(hwnd):
+    """Window handle から process ID を取得します."""
+    if hwnd > 0:
+        _, pid = win32process.GetWindowThreadProcessId(hwnd)
+    else:
+        pid = 0
+    return pid
+
+
 class _ExcelDialogProcessor:
 
     def __init__(self, excel_, timeout, restore_book=True):
         self.excel = excel_
+        self.excel_pid = _get_pid(excel_.hWnd)
         self.__excel_window_title = f' - Excel'  # {basename} - Excel
         self.__error_dialog_title = 'Microsoft Visual Basic'
         self.__vbe_window_title = f'Microsoft Visual Basic for Applications - '  # Microsoft Visual Basic for Applications - {basename}
@@ -42,6 +53,7 @@ class _ExcelDialogProcessor:
             win32gui.EnumWindows(self.enum_callback_to_close_dialog, found)
             await asyncio.sleep(0.5)
             if any(found):
+                await asyncio.sleep(1.)
                 break
 
         logger.debug('ブックを閉じます。')
@@ -56,7 +68,7 @@ class _ExcelDialogProcessor:
     def enum_callback_to_activate(self, hwnd, _):
         title = win32gui.GetWindowText(hwnd)
         # Excel 本体
-        if self.__excel_window_title in title:
+        if (self.excel_pid == _get_pid(hwnd)) and (self.__excel_window_title in title):
             # Visible == True の際、エラーが発生した際、
             # 一度 Excel ウィンドウをアクティブ化しないと dialog が出てこない
             # が、これだけではダメかも。
@@ -65,7 +77,7 @@ class _ExcelDialogProcessor:
     def enum_callback_to_close_dialog(self, hwnd, found):
         title = win32gui.GetWindowText(hwnd)
         # エラーダイアログ
-        if self.__error_dialog_title == title:
+        if (self.excel_pid == _get_pid(hwnd)) and (self.__error_dialog_title == title):
             # 何故かこのコマンド以外受け付けず、
             # このコマンドで問答無用でデバッグモードに入る
             logger.debug('エラーダイアログを見つけました。')
@@ -77,14 +89,14 @@ class _ExcelDialogProcessor:
     def enum_callback_to_close_confirm_dialog(self, hwnd, _):
         title = win32gui.GetWindowText(hwnd)
         # 確認ダイアログ
-        if "Microsoft Excel" in title:
+        if (self.excel_pid == _get_pid(hwnd)) and ("Microsoft Excel" in title):
             # DisplayAlerts が False の場合は不要
             win32gui.SendMessage(hwnd, win32con.WM_SYSCOMMAND, win32con.SC_CLOSE, 0)
 
     def enum_callback_to_close_book(self, hwnd, _):
         title = win32gui.GetWindowText(hwnd)
         # VBE
-        if self.__vbe_window_title in title:
+        if (self.excel_pid == _get_pid(hwnd)) and (self.__vbe_window_title in title):
             # 何故かこれで book 本体が閉じる
             win32gui.SendMessage(hwnd, win32con.WM_CLOSE, 0, 0)
 

{pyfemtet-0.7.0 → pyfemtet-0.7.1}/pyfemtet/opt/_femopt.py

@@ -12,7 +12,7 @@ from traceback import print_exception
 # 3rd-party
 import numpy as np
 import pandas as pd
-from dask.distributed import LocalCluster, Client
+from dask.distributed import LocalCluster, Client, get_worker, Nanny
 
 # pyfemtet relative
 from pyfemtet.opt.interface import FEMInterface, FemtetInterface
@@ -136,6 +136,7 @@ class FEMOpt:
         self.monitor_server_kwargs = dict()
         self.monitor_process_worker_name = None
         self._hv_reference = None
+        self._extra_space_dir = None
 
     # multiprocess 時に pickle できないオブジェクト参照の削除
     def __getstate__(self):
@@ -675,10 +676,6 @@ class FEMOpt:
                     directions,
                 )
 
-            # Femtet の confirm_before_exit のセット
-            self.fem.confirm_before_exit = confirm_before_exit
-            self.fem.kwargs['confirm_before_exit'] = confirm_before_exit
-
             logger.info('Femtet loaded successfully.')
 
         # クラスターの設定
@@ -718,30 +715,43 @@ class FEMOpt:
             #   これは CLI の --no-nanny オプションも同様らしい。
 
             # クラスターの構築
+            # noinspection PyTypeChecker
             cluster = LocalCluster(
                 processes=True,
                 n_workers=n_parallel,
                 threads_per_worker=1,
+                worker_class=Nanny,
             )
             logger.info('LocalCluster launched successfully.')
 
-            self.client = Client(cluster, direct_to_workers=False)
-            self.scheduler_address = self.client.scheduler.address
+            self.client = Client(
+                cluster,
+                direct_to_workers=False,
+            )
             logger.info('Client launched successfully.')
 
-            # 最適化タスクを振り分ける worker を指定
-            subprocess_indices = list(range(n_parallel))[1:]
-            worker_addresses = list(self.client.nthreads().keys())
+            self.scheduler_address = self.client.scheduler.address
 
-            # monitor worker の設定
-            self.monitor_process_worker_name = worker_addresses[0]
-            worker_addresses[0] = 'Main'
+            # worker address を取得
+            nannies_dict: dict[Any, Nanny] = self.client.cluster.workers
+            nannies = tuple(nannies_dict.values())
+
+            # ひとつの Nanny を選んで monitor 用にしつつ
+            # その space は main process に使わせるために記憶する
+            self.monitor_process_worker_name = nannies[0].worker_address
+            self._extra_space_dir = nannies[0].worker_dir
+
+            # 名前と address がごちゃごちゃになっていて可読性が悪いが
+            # 選んだ以外の Nanny は計算を割り当てる用にする
+            worker_addresses = ['Main']
+            worker_addresses.extend([n.worker_address for n in nannies[1:]])
+            subprocess_indices = list(range(n_parallel))[1:]
 
         with self.client.cluster as _cluster, self.client as _client:
 
             # actor の設定
-            self.status = OptimizationStatus(_client)
-            self.worker_status_list = [OptimizationStatus(_client, name) for name in worker_addresses]  # tqdm 検討
+            self.status = OptimizationStatus(_client, worker_address=self.monitor_process_worker_name)
+            self.worker_status_list = [OptimizationStatus(_client, worker_address=self.monitor_process_worker_name, name=name) for name in worker_addresses]  # tqdm 検討
             self.status.set(OptimizationStatus.SETTING_UP)
             self.history = History(
                 self.history_path,
@@ -773,7 +783,6 @@ class FEMOpt:
             logger.info('Process monitor initialized successfully.')
 
             # fem
-            # TODO: n_parallel=1 のときもアップロードしている。これを使うべきか、アップロードしないべき。
             self.fem._setup_before_parallel(_client)
 
             # opt
@@ -794,7 +803,7 @@ class FEMOpt:
                 subprocess_indices,
                 [self.worker_status_list] * len(subprocess_indices),
                 [wait_setup] * len(subprocess_indices),
-                workers=worker_addresses,
+                workers=worker_addresses if self.opt.is_cluster else worker_addresses[1:],
                 allow_other_workers=False,
             )
 
@@ -818,6 +827,7 @@ class FEMOpt:
                     ),
                     kwargs=dict(
                         skip_reconstruct=True,
+                        space_dir=self._extra_space_dir,
                     )
                 )
                 t_main.start()

{pyfemtet-0.7.0 → pyfemtet-0.7.1}/pyfemtet/opt/_femopt_core.py

@@ -980,8 +980,13 @@ class OptimizationStatus:
     TERMINATE_ALL = 60
     CRASHED = 70
 
-    def __init__(self, client, name='entire'):
-        self._future = client.submit(_OptimizationStatusActor, actor=True)
+    def __init__(self, client, worker_address, name='entire'):
+        self._future = client.submit(
+            _OptimizationStatusActor,
+            actor=True,
+            workers=[worker_address],
+            allow_other_workers=False,
+        )
         self._actor = self._future.result()
         self.name = name
         self.set(self.INITIALIZING)