pyfemtet 0.4.8__tar.gz → 0.4.9__tar.gz

{pyfemtet-0.4.8 → pyfemtet-0.4.9}/PKG-INFO

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

pyfemtet-0.4.9/pyfemtet/__init__.py

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

{pyfemtet-0.4.8 → pyfemtet-0.4.9}/pyfemtet/opt/_femopt.py

@@ -513,10 +513,7 @@ class FEMOpt:
         sleep(1)
 
         # terminate monitor process
-        if self._is_error_exit:
-            self.status.set(OptimizationStatus.CRASHED)
-        else:
-            self.status.set(OptimizationStatus.TERMINATE_ALL)
+        self.status.set(OptimizationStatus.TERMINATE_ALL)
         logger.info(self.monitor_process_future.result())
         sleep(1)
 

{pyfemtet-0.4.8 → pyfemtet-0.4.9}/pyfemtet/opt/_femopt_core.py

@@ -713,8 +713,8 @@ class OptimizationStatus:
     RUNNING = 30
     INTERRUPTING = 40
     TERMINATED = 50
-    CRASHED = 55
     TERMINATE_ALL = 60
+    CRASHED = 70
 
     def __init__(self, client, name='entire'):
         self._future = client.submit(_OptimizationStatusActor, actor=True)

{pyfemtet-0.4.8 → pyfemtet-0.4.9}/pyfemtet/opt/femprj_sample/cad_ex01_NX.py

@@ -133,4 +133,11 @@ if __name__ == '__main__':
     # Run optimization.
     femopt.set_random_seed(42)
     femopt.optimize(n_trials=20)
+
+    # Stop script to keep process alive
+    # while you check the result in process monitor.
+    print('================================')
+    print('Finished. Press Enter to quit...')
+    print('================================')
+    input()
     femopt.terminate_all()

{pyfemtet-0.4.8 → pyfemtet-0.4.9}/pyfemtet/opt/femprj_sample/cad_ex01_SW.py

@@ -129,4 +129,11 @@ if __name__ == '__main__':
     # Run optimization.
     femopt.set_random_seed(42)
     femopt.optimize(n_trials=20)
+
+    # Stop script to keep process alive
+    # while you check the result in process monitor.
+    print('================================')
+    print('Finished. Press Enter to quit...')
+    print('================================')
+    input()
     femopt.terminate_all()

{pyfemtet-0.4.8 → pyfemtet-0.4.9}/pyfemtet/opt/femprj_sample/gal_ex58_parametric.py

@@ -72,4 +72,11 @@ if __name__ == '__main__':
     # Run optimization.
     femopt.set_random_seed(42)
     femopt.optimize(n_trials=10)
+
+    # Stop script to keep process alive
+    # while you check the result in process monitor.
+    print('================================')
+    print('Finished. Press Enter to quit...')
+    print('================================')
+    input()
     femopt.terminate_all()

{pyfemtet-0.4.8 → pyfemtet-0.4.9}/pyfemtet/opt/femprj_sample/gau_ex08_parametric.py

@@ -56,4 +56,11 @@ if __name__ == '__main__':
     # Run optimization.
     femopt.set_random_seed(42)
     femopt.optimize(n_trials=20)
+
+    # Stop script to keep process alive
+    # while you check the result in process monitor.
+    print('================================')
+    print('Finished. Press Enter to quit...')
+    print('================================')
+    input()
     femopt.terminate_all()

{pyfemtet-0.4.8 → pyfemtet-0.4.9}/pyfemtet/opt/femprj_sample/her_ex40_parametric.py

@@ -134,4 +134,11 @@ if __name__ == '__main__':
 
     femopt.set_random_seed(42)
     femopt.optimize(n_trials=15)
+
+    # Stop script to keep process alive
+    # while you check the result in process monitor.
+    print('================================')
+    print('Finished. Press Enter to quit...')
+    print('================================')
+    input()
     femopt.terminate_all()

{pyfemtet-0.4.8 → pyfemtet-0.4.9}/pyfemtet/opt/femprj_sample/paswat_ex1_parametric.py

@@ -58,4 +58,11 @@ if __name__ == '__main__':
     # Run optimization.
     femopt.set_random_seed(42)
     femopt.optimize(n_trials=15)
+
+    # Stop script to keep process alive
+    # while you check the result in process monitor.
+    print('================================')
+    print('Finished. Press Enter to quit...')
+    print('================================')
+    input()
     femopt.terminate_all()

{pyfemtet-0.4.8 → pyfemtet-0.4.9}/pyfemtet/opt/femprj_sample/paswat_ex1_parametric_parallel.py

@@ -59,4 +59,11 @@ if __name__ == '__main__':
     femopt.set_random_seed(42)
     # femopt.optimize(n_trials=15)
     femopt.optimize(n_trials=30, n_parallel=3)  # This line is the only difference with no parallel pattern.
+
+    # Stop script to keep process alive
+    # while you check the result in process monitor.
+    print('================================')
+    print('Finished. Press Enter to quit...')
+    print('================================')
+    input()
     femopt.terminate_all()

{pyfemtet-0.4.8 → pyfemtet-0.4.9}/pyfemtet/opt/femprj_sample/wat_ex14_parametric.py

@@ -56,4 +56,11 @@ if __name__ == '__main__':
     # Run optimization.
     femopt.set_random_seed(42)
     femopt.optimize(n_trials=15)
+
+    # Stop script to keep process alive
+    # while you check the result in process monitor.
+    print('================================')
+    print('Finished. Press Enter to quit...')
+    print('================================')
+    input()
     femopt.terminate_all()

{pyfemtet-0.4.8 → pyfemtet-0.4.9}/pyfemtet/opt/femprj_sample_jp/cad_ex01_NX_jp.py

@@ -127,4 +127,11 @@ if __name__ == '__main__':
     # 最適化を実行
     femopt.set_random_seed(42)
     femopt.optimize(n_trials=20)
+
+    # プロセスモニタで結果を確認するために
+    # Enter キーが押されるまで処理を停止します。
+    print('================================')
+    print('Finished. Press Enter to quit...')
+    print('================================')
+    input()
     femopt.terminate_all()

{pyfemtet-0.4.8 → pyfemtet-0.4.9}/pyfemtet/opt/femprj_sample_jp/cad_ex01_SW_jp.py

@@ -123,4 +123,11 @@ if __name__ == '__main__':
     # 最適化を実行
     femopt.set_random_seed(42)
     femopt.optimize(n_trials=20)
+
+    # プロセスモニタで結果を確認するために
+    # Enter キーが押されるまで処理を停止します。
+    print('================================')
+    print('Finished. Press Enter to quit...')
+    print('================================')
+    input()
     femopt.terminate_all()

{pyfemtet-0.4.8 → pyfemtet-0.4.9}/pyfemtet/opt/femprj_sample_jp/gal_ex58_parametric_jp.py

@@ -68,4 +68,11 @@ if __name__ == '__main__':
     # 最適化を実行
     femopt.set_random_seed(42)
     femopt.optimize(n_trials=10)
+
+    # プロセスモニタで結果を確認するために
+    # Enter キーが押されるまで処理を停止します。
+    print('================================')
+    print('Finished. Press Enter to quit...')
+    print('================================')
+    input()
     femopt.terminate_all()

{pyfemtet-0.4.8 → pyfemtet-0.4.9}/pyfemtet/opt/femprj_sample_jp/gau_ex08_parametric_jp.py

@@ -55,4 +55,11 @@ if __name__ == '__main__':
     # 最適化を実行
     femopt.set_random_seed(42)
     femopt.optimize(n_trials=20)
+
+    # プロセスモニタで結果を確認するために
+    # Enter キーが押されるまで処理を停止します。
+    print('================================')
+    print('Finished. Press Enter to quit...')
+    print('================================')
+    input()
     femopt.terminate_all()

{pyfemtet-0.4.8 → pyfemtet-0.4.9}/pyfemtet/opt/femprj_sample_jp/her_ex40_parametric_jp.py

@@ -134,4 +134,11 @@ if __name__ == '__main__':
 
     femopt.set_random_seed(42)
     femopt.optimize(n_trials=15)
+
+    # プロセスモニタで結果を確認するために
+    # Enter キーが押されるまで処理を停止します。
+    print('================================')
+    print('Finished. Press Enter to quit...')
+    print('================================')
+    input()
     femopt.terminate_all()

{pyfemtet-0.4.8 → pyfemtet-0.4.9}/pyfemtet/opt/femprj_sample_jp/paswat_ex1_parametric_jp.py

@@ -56,4 +56,11 @@ if __name__ == '__main__':
     # 最適化を実行
     femopt.set_random_seed(42)
     femopt.optimize(n_trials=15)
+
+    # プロセスモニタで結果を確認するために
+    # Enter キーが押されるまで処理を停止します。
+    print('================================')
+    print('Finished. Press Enter to quit...')
+    print('================================')
+    input()
     femopt.terminate_all()

{pyfemtet-0.4.8 → pyfemtet-0.4.9}/pyfemtet/opt/femprj_sample_jp/paswat_ex1_parametric_parallel_jp.py

@@ -57,4 +57,11 @@ if __name__ == '__main__':
     femopt.set_random_seed(42)
     # femopt.optimize(n_trials=15)
     femopt.optimize(n_trials=30, n_parallel=3)  # 並列計算しない場合との差はこの行のみです。
+
+    # プロセスモニタで結果を確認するために
+    # Enter キーが押されるまで処理を停止します。
+    print('================================')
+    print('Finished. Press Enter to quit...')
+    print('================================')
+    input()
     femopt.terminate_all()

{pyfemtet-0.4.8 → pyfemtet-0.4.9}/pyfemtet/opt/femprj_sample_jp/wat_ex14_parametric_jp.py

@@ -54,4 +54,11 @@ if __name__ == '__main__':
     # 最適化を実行
     femopt.set_random_seed(42)
     femopt.optimize(n_trials=15)
+
+    # プロセスモニタで結果を確認するために
+    # Enter キーが押されるまで処理を停止します。
+    print('================================')
+    print('Finished. Press Enter to quit...')
+    print('================================')
+    input()
     femopt.terminate_all()

{pyfemtet-0.4.8 → pyfemtet-0.4.9}/pyfemtet/opt/visualization/_monitor.py

@@ -1220,7 +1220,7 @@ class ProcessMonitorApp(AppBase):
             self.local_worker_status_int_list = [s.get() for s in self.worker_status_list]
 
             # terminate_all 指令があれば monitor server をホストするプロセスごと終了する
-            if self.status.get() == OptimizationStatus.TERMINATE_ALL:
+            if self.status.get() >= OptimizationStatus.TERMINATE_ALL:
                 return 0  # take server down with me
 
             # interval

pyfemtet-0.4.9/pyfemtet/opt/visualization/result_viewer.py

@@ -0,0 +1,13 @@
+import argparse
+from pyfemtet.opt.visualization._graphs import show_static_monitor
+
+
+def main():
+    parser = argparse.ArgumentParser()
+
+    parser.add_argument('csv_path', help='pyfemtet を実行した結果の csv ファイルのパスを指定してください。', type=str)
+
+    args = parser.parse_args()
+
+    if args.csv_path:
+        show_static_monitor(args.csv_path)

{pyfemtet-0.4.8 → pyfemtet-0.4.9}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pyfemtet"
-version = "0.4.8"  # ignored by versioning plugin
+version = "0.4.9"  # ignored by versioning plugin
 description = "Design parameter optimization using Femtet."
 authors = ["kazuma.naito <kazuma.naito@murata.com>"]
 readme = "README.md"
@@ -43,7 +43,7 @@ bokeh = "^3.3.3"
 sphinx-intl = "^2.2.0"
 
 [tool.poetry.scripts]
-opt-show = "pyfemtet.opt.visualization:entry_point"
+pyfemtet-opt-result-viewer = 'pyfemtet.opt.visualization.result_viewer:main'
 
 [tool.pytest.ini_options]
 filterwarnings = [

pyfemtet-0.4.8/pyfemtet/__init__.py

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