PyFemtet 0.3.4__tar.gz → 0.3.5__tar.gz

{pyfemtet-0.3.4 → pyfemtet-0.3.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyfemtet
-Version: 0.3.4
+Version: 0.3.5
 Summary: Design parameter optimization using Femtet.
 Home-page: https://github.com/pyfemtet/pyfemtet
 License: BSD-3-Clause

pyfemtet-0.3.5/pyfemtet/__init__.py

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

{pyfemtet-0.3.4 → pyfemtet-0.3.5}/pyfemtet/dispatch_extensions.py

@@ -144,11 +144,12 @@ def _get_subprocess_log_prefix():
     return f'({current_process().name}) '
 
 
-def launch_and_dispatch_femtet(timeout=DISPATCH_TIMEOUT) -> Tuple[IFemtet, int]:
+def launch_and_dispatch_femtet(timeout=DISPATCH_TIMEOUT, strict_pid_specify=True) -> Tuple[IFemtet, int]:
     """Launch Femtet by new process and connect to it.
 
     Args:
         timeout (int or float, optional): Seconds to wait for connection. Defaults to DISPATCH_TIMEOUT.
+        strict_pid_specify (bool): If True, try to connect the launched femtet process strictly. If False, launch new process but try to connect any connectable femtet.
 
     Raises:
         FemtetNotFoundException: Launched Femtet is not found for some reason (i.e. failed to launch Femtet).
@@ -157,12 +158,26 @@ def launch_and_dispatch_femtet(timeout=DISPATCH_TIMEOUT) -> Tuple[IFemtet, int]:
     Returns:
         Tuple[IFemtet, int]:
     """
+    # launch femtet
     util.execute_femtet()
     pid = util.get_last_executed_femtet_process_id()
     logger.debug(f'Target pid is {pid}.')
-    for i in tqdm(range(5), 'wait for launch femtet...'):
+    for _ in tqdm(range(5), 'wait for launch femtet...'):
         sleep(1)
-    Femtet, pid = dispatch_specific_femtet(pid, timeout)
+
+    # dispatch femtet
+    if strict_pid_specify:
+        Femtet, pid = dispatch_specific_femtet(pid, timeout)
+    else:
+        # worker process なら排他処理する
+        try:
+            with Lock('simply-dispatch-femtet'):
+                Femtet, pid = dispatch_femtet()
+        except RuntimeError as e:
+            if "distributed.lock.Lock" in str(e):
+                Femtet, pid = dispatch_femtet()
+            else:
+                raise e
     return Femtet, pid
 
 

{pyfemtet-0.3.4 → pyfemtet-0.3.5}/pyfemtet/opt/base.py

@@ -709,7 +709,7 @@ class AbstractOptimizer(ABC):
             subprocess_idx,
             worker_status_list,
             wait_setup,
-            skip_set_fem,
+            skip_set_fem=False,
     ) -> None:
 
         # 自分の worker_status の取得
@@ -1293,7 +1293,7 @@ class FEMOpt:
         if not self.opt.is_cluster:
             subprocess_indices = subprocess_indices[1:]
         worker_addresses = list(self.client.nthreads().keys())
-        assert len(subprocess_indices) <= len(worker_addresses), 'コア数が不足しています。'
+        assert max(subprocess_indices) <= len(worker_addresses)-1, f'コア数{len(worker_addresses)}は不足しています。'
         worker_addresses = worker_addresses[:len(range(n_parallel))]  # TODO: ノードごとに適度に振り分ける
         if not self.opt.is_cluster:
             worker_addresses[0] = 'Main'
@@ -1310,7 +1310,7 @@ class FEMOpt:
 
         # actor の設定
         self.status = OptimizationStatus(self.client)
-        self.worker_status_list = [OptimizationStatus(self.client, name) for name in worker_addresses]
+        self.worker_status_list = [OptimizationStatus(self.client, name) for name in worker_addresses]  # tqdm 検討
         self.status.set(OptimizationStatus.SETTING_UP)
         self.history = History(self.history_path, self.client)
         self.history.init(

{pyfemtet-0.3.4 → pyfemtet-0.3.5}/pyfemtet/opt/interface.py

@@ -9,7 +9,7 @@ import pandas as pd
 import psutil
 from pywintypes import com_error
 from pythoncom import CoInitialize, CoUninitialize
-from win32com.client import constants
+from win32com.client import constants, Dispatch
 from dask.distributed import get_worker
 from femtetutils import util
 
@@ -119,6 +119,7 @@ class FemtetInterface(FEMInterface):
             femprj_path=None,
             model_name=None,
             connect_method='auto',
+            strict_pid_specify=False,
             **kwargs
     ):
         """Initializes the FemtetInterface.
@@ -144,12 +145,13 @@ class FemtetInterface(FEMInterface):
         self.model_name = model_name
         self.connect_method = connect_method
 
-        # その他のメンバーの宣言や初期化初期化
+        # その他のメンバーの宣言や初期化
         self.Femtet = None
         self.quit_when_destruct = False
         self.connected_method = 'unconnected'
         self.parameters = None
         self.max_api_retry = 3
+        self.strict_pid_specify = strict_pid_specify
 
         # dask サブプロセスのときは femprj を更新し connect_method を new にする
         try:
@@ -198,9 +200,12 @@ class FemtetInterface(FEMInterface):
 
     def _connect_new_femtet(self):
         logger.info('└ Try to launch and connect new Femtet process.')
-        self.Femtet, _ = launch_and_dispatch_femtet()
+
+        self.Femtet, _ = launch_and_dispatch_femtet(strict_pid_specify=self.strict_pid_specify)
+
         self.connected_method = 'new'
 
+
     def _connect_existing_femtet(self, pid: int or None = None):
         logger.info('└ Try to connect existing Femtet process.')
         # 既存の Femtet を探して Dispatch する。

{pyfemtet-0.3.4 → pyfemtet-0.3.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pyfemtet"
-version = "0.3.4"  # ignored by versioning plugin
+version = "0.3.5"  # ignored by versioning plugin
 description = "Design parameter optimization using Femtet."
 authors = ["kazuma.naito <kazuma.naito@murata.com>"]
 readme = "README.md"

pyfemtet-0.3.4/pyfemtet/__init__.py

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