pyfemtet 0.3.5__tar.gz → 0.3.6__tar.gz

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

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

pyfemtet-0.3.6/pyfemtet/__init__.py

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

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

@@ -784,6 +784,7 @@ class OptunaOptimizer(AbstractOptimizer):
 
         # 中断の確認 (FAIL loop に陥る対策)
         if self.entire_status.get() == OptimizationStatus.INTERRUPTING:
+            self.worker_status.set(OptimizationStatus.INTERRUPTING)
             trial.study.stop()  # 現在実行中の trial を最後にする
             return None  # set TrialState FAIL
 
@@ -825,6 +826,7 @@ class OptunaOptimizer(AbstractOptimizer):
 
             # 中断の確認 (解析中に interrupt されている場合対策)
             if self.entire_status.get() == OptimizationStatus.INTERRUPTING:
+                self.worker_status.set(OptimizationStatus.INTERRUPTING)
                 trial.study.stop()  # 現在実行中の trial を最後にする
                 return None  # set TrialState FAIL
 
@@ -842,6 +844,7 @@ class OptunaOptimizer(AbstractOptimizer):
 
         # 中断の確認 (解析中に interrupt されている場合対策)
         if self.entire_status.get() == OptimizationStatus.INTERRUPTING:
+            self.worker_status.set(OptimizationStatus.INTERRUPTING)
             trial.study.stop()  # 現在実行中の trial を最後にする
             return None  # set TrialState FAIL
 
@@ -1332,7 +1335,10 @@ class FEMOpt:
         # launch monitor
         self.monitor_process_future = self.client.submit(
             start_monitor_server_forever,
-            self.history, self.status,  # args
+            self.history,
+            self.status,
+            worker_addresses,
+            self.worker_status_list,
             **self.monitor_server_kwargs,  # kwargs
             workers=self.monitor_process_worker_name,  # if invalid arg,
             allow_other_workers=False
@@ -1446,7 +1452,7 @@ class FEMOpt:
         sleep(3)
 
 
-def start_monitor_server_forever(history, status, host='localhost', port=8080):
-    monitor = Monitor(history, status)
-    monitor.start_server(host, port)
+def start_monitor_server_forever(history, status, worker_addresses, worker_status_list, host='localhost', port=8080):
+    monitor = Monitor(history, status, worker_addresses, worker_status_list)
+    monitor.start_server(worker_addresses, worker_status_list, host, port)
     return 'Exit monitor server process gracefully'

{pyfemtet-0.3.5 → pyfemtet-0.3.6}/pyfemtet/opt/monitor.py

@@ -76,7 +76,7 @@ def update_scatter_matrix(history, data):
     return fig
 
 
-def setup_home():
+def create_home_layout():
     # components の設定
     # https://dash-bootstrap-components.opensource.faculty.ai/docs/components/accordion/
     dummy = html.Div('', id='dummy')
@@ -131,17 +131,57 @@ OptimizerBase.set_monitor_host() を実行してください。
     return layout
 
 
+def create_worker_monitor_layout(
+        worker_addresses,
+        worker_status_int_list
+):
+    from .base import OptimizationStatus
+
+    interval = dcc.Interval(
+        id='worker-status-update-interval',
+        interval=1*1000,  # in milliseconds
+        n_intervals=0,
+    )
+
+    rows = [interval]
+    for i, (worker_address, status_int) in enumerate(zip(worker_addresses, worker_status_int_list)):
+        status_msg = OptimizationStatus.const_to_str(status_int)
+        a = dbc.Alert(
+            children=[
+                f'({worker_address}) ',
+                html.P(
+                    status_msg,
+                    id=f'worker-status-msg-{i}'
+                ),
+            ],
+            id=f'worker-status-color-{i}',
+            color="primary",
+        )
+        rows.append(dbc.Row([dbc.Col(a)]))
+
+    layout = dbc.Container(
+        rows,
+        fluid=True
+    )
+
+    return layout
+
+
+
 class Monitor(object):
 
-    def __init__(self, history, status):
+    def __init__(self, history, status, worker_addresses, worker_status_list):
 
         from .base import OptimizationStatus
 
         # 引数の処理
         self.history = history
         self.status = status
+
+        # メインスレッドで更新してもらうメンバー
         self.current_status_int = self.status.get()
         self.current_status = self.status.get_text()
+        self.current_worker_status_list = [s.get() for s in worker_status_list]
         self.df = self.history.actor_data.copy()
 
         # ログファイルの保存場所
@@ -153,7 +193,8 @@ class Monitor(object):
         self.app = Dash(__name__, external_stylesheets=[dbc.themes.BOOTSTRAP])
 
         # ページの components と layout の設定
-        self.home = setup_home()
+        self.home = create_home_layout()
+        self.worker_monitor = create_worker_monitor_layout(worker_addresses, self.current_worker_status_list)
 
         # setup sidebar
         # https://dash-bootstrap-components.opensource.faculty.ai/examples/simple-sidebar/
@@ -186,7 +227,7 @@ class Monitor(object):
                 dbc.Nav(
                     [
                         dbc.NavLink("Home", href="/", active="exact"),
-                        # dbc.NavLink("ペアプロット", href="/page-1", active="exact"),
+                        dbc.NavLink("Workers", href="/page-1", active="exact"),
                     ],
                     vertical=True,
                     pills=True,
@@ -202,8 +243,8 @@ class Monitor(object):
         def render_page_content(pathname):
             if pathname == "/":  # p0
                 return self.home
-            # elif pathname == "/page-1":
-            #     return self.multi_pairplot_layout
+            elif pathname == "/page-1":
+                return self.worker_monitor
             # elif pathname == "/page-2":
             #     return html.P("Oh cool, this is page 2!")
             # If the user tries to reach a different page, return a 404 message
@@ -297,10 +338,41 @@ class Monitor(object):
 
             return max_intervals, button_disable, button_disable, toggle_text, graph, status_children, status_color
 
+        # worker_monitor のための callback
+        @self.app.callback(
+            [Output(f'worker-status-msg-{i}', 'children') for i in range(len(worker_addresses))],
+            [Output(f'worker-status-color-{i}', 'color') for i in range(len(worker_addresses))],
+            [Input('worker-status-update-interval', 'n_intervals'),]
+        )
+        def update_worker_state(_):
+            msgs = [OptimizationStatus.const_to_str(i) for i in self.current_worker_status_list]
+
+            colors = []
+            for status_int in self.current_worker_status_list:
+                if status_int == OptimizationStatus.INTERRUPTING:
+                    colors.append('warning')
+                elif status_int == OptimizationStatus.TERMINATED:
+                    colors.append('dark')
+                elif status_int == OptimizationStatus.TERMINATE_ALL:
+                    colors.append('dark')
+                else:
+                    colors.append('primary')
+
+            ret = msgs
+            ret.extend(colors)
+
+            return tuple(ret)
+
     def _run_server_forever(self, app, host, port):
         app.run(debug=False, host=host, port=port)
 
-    def start_server(self, host='localhost', port=8080):
+    def start_server(
+            self,
+            worker_addresses,
+            worker_status_list,  # [actor]
+            host='localhost',
+            port=8080,
+    ):
 
         from .base import OptimizationStatus
 
@@ -339,6 +411,7 @@ class Monitor(object):
             self.current_status_int = self.status.get()
             self.current_status = self.status.get_text()
             self.df = self.history.actor_data.copy()
+            self.current_worker_status_list = [s.get() for s in worker_status_list]
 
             # terminate_all 指令があれば monitor server をホストするプロセスごと終了する
             if self.status.get() == OptimizationStatus.TERMINATE_ALL:

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

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

pyfemtet-0.3.5/pyfemtet/__init__.py

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