pyfemtet 0.6.6__py3-none-any.whl → 0.7.1__py3-none-any.whl

pyfemtet/opt/_femopt_core.py

@@ -22,7 +22,7 @@ if version.parse(optuna.version.__version__) < version.parse('4.0.0'):
 else:
     from optuna._hypervolume import wfg
     compute_hypervolume = wfg.compute_hypervolume
-from dask.distributed import Lock, get_client
+from dask.distributed import Lock, get_client, Client
 
 # win32com
 from win32com.client import constants, Constants
@@ -32,10 +32,9 @@ from pyfemtet.opt.interface import FEMInterface, FemtetInterface
 from pyfemtet._message import encoding, Msg
 
 # logger
-import logging
-from pyfemtet.logger import get_logger
-logger = get_logger('femopt')
-logger.setLevel(logging.INFO)
+from pyfemtet.logger import get_module_logger
+
+logger = get_module_logger('opt.core', __name__)
 
 
 __all__ = [
@@ -503,19 +502,6 @@ class ObjectivesFunc:
         return f
 
 
-class _HistoryDfCore:
-    """Class for managing a DataFrame object in a distributed manner."""
-
-    def __init__(self):
-        self.df = pd.DataFrame()
-
-    def set_df(self, df):
-        self.df = df
-
-    def get_df(self):
-        return self.df
-
-
 class History:
     """Class for managing the history of optimization results.
 
@@ -543,8 +529,6 @@ class History:
     is_restart = False
     is_processing = False
     _df = None  # in case without client
-    _future = None  # in case with client
-    _actor_data = None  # in case with client
 
     def __init__(
             self,
@@ -565,6 +549,7 @@ class History:
         self.obj_names = obj_names
         self.cns_names = cns_names
         self.additional_metadata = additional_metadata or ''
+        self.__scheduler_address = client.scheduler.address if client is not None else None
 
         # 最適化実行中かどうか
         self.is_processing = client is not None
@@ -572,10 +557,6 @@ class History:
         # 最適化実行中の process monitor である場合
         if self.is_processing:
 
-            # actor の生成
-            self._future = client.submit(_HistoryDfCore, actor=True)
-            self._actor_data = self._future.result()
-
             # csv が存在すれば続きからモード
             self.is_restart = os.path.isfile(self.path)
 
@@ -641,16 +622,36 @@ class History:
         self.set_df(df)
 
     def get_df(self) -> pd.DataFrame:
-        if self._actor_data is None:
+        if self.__scheduler_address is None:
             return self._df
         else:
-            return self._actor_data.get_df().result()
+            # scheduler がまだ存命か確認する
+            try:
+                with Lock('access-df'):
+                    client_: 'Client' = get_client(self.__scheduler_address)
+                    if 'df' in client_.list_datasets():
+                        return client_.get_dataset('df')
+                    else:
+                        logger.debug('Access df of History before it is initialized.')
+                        return pd.DataFrame()
+            except OSError:
+                logger.error('Scheduler is already dead. Most frequent reasen to show this message is that the pyfemtet monitor UI is not refreshed even if the main optimization process is terminated.')
+                return pd.DataFrame()
 
     def set_df(self, df: pd.DataFrame):
-        if self._actor_data is None:
+        if self.__scheduler_address is None:
             self._df = df
         else:
-            self._actor_data.set_df(df).result()
+            try:
+                with Lock('access-df'):
+                    client_: 'Client' = get_client(self.__scheduler_address)
+                    if 'df' in client_.list_datasets():
+                        client_.unpublish_dataset('df')  # 更新する場合は前もって削除が必要、本来は dask collection をここに入れる使い方をする。
+                    client_.publish_dataset(**dict(
+                        df=df
+                    ))
+            except OSError:
+                logger.error('Scheduler is already dead. Most frequent reasen to show this message is that the pyfemtet monitor UI is not refreshed even if the main optimization process is terminated.')
 
     def create_df_columns(self):
         """Create columns of history."""
@@ -979,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)

pyfemtet/opt/_test_utils/control_femtet.py

@@ -5,12 +5,6 @@ from tqdm import tqdm
 from win32com.client import Dispatch
 from femtetutils import util
 
-import logging
-
-
-logger = logging.getLogger("test")
-logger.setLevel(logging.DEBUG)
-
 
 def _open_femprj(femprj_path):
     Femtet = Dispatch("FemtetMacro.Femtet")

pyfemtet/opt/interface/__init__.py

@@ -1,4 +1,4 @@
-from pyfemtet.opt.interface._base import FEMInterface, logger
+from pyfemtet.opt.interface._base import FEMInterface
 from pyfemtet.opt.interface._base import NoFEM
 from pyfemtet.opt.interface._femtet import FemtetInterface
 from pyfemtet.opt.interface._femtet_with_sldworks import FemtetWithSolidworksInterface

pyfemtet/opt/interface/_base.py

@@ -5,11 +5,9 @@ from abc import ABC, abstractmethod
 
 import pandas as pd
 
-import logging
-from pyfemtet.logger import get_logger
-logger = get_logger('FEM')
-logger.setLevel(logging.INFO)
+from pyfemtet.logger import get_module_logger
 
+logger = get_module_logger('opt.interface', __name__)
 
 here, me = os.path.split(__file__)