PyFemtet 0.3.9__tar.gz → 0.3.11__tar.gz

{pyfemtet-0.3.9 → pyfemtet-0.3.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyfemtet
-Version: 0.3.9
+Version: 0.3.11
 Summary: Design parameter optimization using Femtet.
 Home-page: https://github.com/pyfemtet/pyfemtet
 License: BSD-3-Clause
@@ -13,7 +13,7 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Requires-Dist: botorch (>=0.9.5,<0.10.0) ; python_version < "3.12"
+Requires-Dist: botorch (>=0.9.5,<0.10.0)
 Requires-Dist: colorlog (>=6.8.0,<7.0.0)
 Requires-Dist: dash (>=2.14.2,<3.0.0)
 Requires-Dist: dash-bootstrap-components (>=1.5.0,<2.0.0)

{pyfemtet-0.3.9 → pyfemtet-0.3.11}/pyfemtet/FemtetPJTSample/NX_ex01/NX_ex01.py

@@ -86,3 +86,4 @@ if __name__ == '__main__':
     # 最適化の実行
     femopt.set_random_seed(42)
     femopt.main(n_trials=20)
+    femopt.terminate_all()

{pyfemtet-0.3.9 → pyfemtet-0.3.11}/pyfemtet/FemtetPJTSample/gau_ex08_parametric.py

@@ -29,8 +29,6 @@ def inductance(Femtet):
 if __name__ == '__main__':
 
     # 最適化手法を定義するオブジェクトを用意
-    # BoTorch ライブラリを使わない場合、このブロックをコメントアウトし、
-    # opt = None としてください。
     opt = OptunaOptimizer(
         sampler_class=BoTorchSampler,
         sampler_kwargs=dict(
@@ -54,3 +52,4 @@ if __name__ == '__main__':
     # 最適化の実行
     femopt.set_random_seed(42)
     femopt.main(n_trials=20)
+    femopt.terminate_all()

{pyfemtet-0.3.9 → pyfemtet-0.3.11}/pyfemtet/FemtetPJTSample/her_ex40_parametric.py

@@ -107,8 +107,6 @@ if __name__ == '__main__':
     s = SParameterCalculator()
 
     # 最適化手法を定義するオブジェクトを用意
-    # BoTorch ライブラリを使わない場合、このブロックをコメントアウトし、
-    # opt = None としてください。
     opt = OptunaOptimizer(
         sampler_class=BoTorchSampler,
         sampler_kwargs=dict(
@@ -135,3 +133,4 @@ if __name__ == '__main__':
 
     femopt.set_random_seed(42)
     femopt.main(n_trials=20)
+    femopt.terminate_all()

{pyfemtet-0.3.9 → pyfemtet-0.3.11}/pyfemtet/FemtetPJTSample/wat_ex14_parallel_parametric.py

@@ -60,3 +60,4 @@ if __name__ == '__main__':
     femopt.set_random_seed(42)
     # femopt.main(n_trials=20)
     femopt.main(n_trials=20, n_parallel=3)  # ここのみ wat_ex14_parametric.py から変更しました。
+    femopt.terminate_all()

{pyfemtet-0.3.9 → pyfemtet-0.3.11}/pyfemtet/FemtetPJTSample/wat_ex14_parametric.py

@@ -59,3 +59,4 @@ if __name__ == '__main__':
     # 最適化の実行
     femopt.set_random_seed(42)
     femopt.main(n_trials=20)
+    femopt.terminate_all()

pyfemtet-0.3.11/pyfemtet/__init__.py

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

{pyfemtet-0.3.9 → pyfemtet-0.3.11}/pyfemtet/opt/base.py

@@ -2,6 +2,7 @@ from abc import ABC, abstractmethod
 from typing import List, Iterable
 
 import os
+import sys
 import datetime
 import inspect
 import ast
@@ -1330,7 +1331,7 @@ class FEMOpt:
         # monitor 用 worker を起動
         logger.info('Launching monitor server. This may take a few seconds.')
         self.monitor_process_worker_name = datetime.datetime.now().strftime("Monitor-%Y%m%d-%H%M%S")
-        cmd = f'dask worker {self.client.scheduler.address} --name {self.monitor_process_worker_name} --no-nanny'
+        cmd = f'{sys.executable} -m dask worker {self.client.scheduler.address} --name {self.monitor_process_worker_name} --no-nanny'
         current_n_workers = len(self.client.nthreads().keys())
         Popen(cmd, shell=True)  # , stdout=PIPE) --> cause stream error
 

{pyfemtet-0.3.9 → pyfemtet-0.3.11}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pyfemtet"
-version = "0.3.9"  # ignored by versioning plugin
+version = "0.3.11"  # ignored by versioning plugin
 description = "Design parameter optimization using Femtet."
 authors = ["kazuma.naito <kazuma.naito@murata.com>"]
 readme = "README.md"
@@ -23,7 +23,7 @@ plotly = "^5.18.0"
 dash-bootstrap-components = "^1.5.0"
 dask = "^2023.12.1"
 distributed = "^2023.12.1"
-botorch = { version = "^0.9.5", python = "<3.12" }
+botorch = "^0.9.5"
 colorlog = "^6.8.0"
 
 [tool.poetry.group.dev.dependencies]

pyfemtet-0.3.9/pyfemtet/__init__.py

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