pyfemtet 0.5.1__tar.gz → 0.5.3__tar.gz

{pyfemtet-0.5.1 → pyfemtet-0.5.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyfemtet
-Version: 0.5.1
+Version: 0.5.3
 Summary: Design parameter optimization using Femtet.
 Home-page: https://github.com/pyfemtet/pyfemtet
 License: BSD-3-Clause
@@ -22,8 +22,8 @@ Requires-Dist: distributed (>=2023.12.1,<2024.0.0)
 Requires-Dist: femtetutils (>=1.0.0,<2.0.0)
 Requires-Dist: numpy (>=1.26.2,<2.0.0)
 Requires-Dist: openpyxl (>=3.1.2,<4.0.0)
-Requires-Dist: optuna (>=3.4.0,<4.0.0)
-Requires-Dist: optuna-integration (>=3.6.0,<4.0.0)
+Requires-Dist: optuna (>=3.4.0,<5.0.0)
+Requires-Dist: optuna-integration (>=3.6.0,<5.0.0)
 Requires-Dist: pandas (>=2.1.3,<3.0.0)
 Requires-Dist: plotly (>=5.22.0,<6.0.0)
 Requires-Dist: psutil (>=5.9.6,<6.0.0)

pyfemtet-0.5.3/pyfemtet/__init__.py

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

{pyfemtet-0.5.1 → pyfemtet-0.5.3}/pyfemtet/opt/_femopt.py

@@ -12,7 +12,7 @@ from traceback import print_exception
 # 3rd-party
 import numpy as np
 import pandas as pd
-from dask.distributed import LocalCluster, Client
+from dask.distributed import LocalCluster, Client, Worker
 
 # pyfemtet relative
 from pyfemtet.opt.interface import FEMInterface, FemtetInterface
@@ -452,10 +452,16 @@ class FEMOpt:
         else:
             # ローカルクラスターを構築
             logger.info('Launching single machine cluster. This may take tens of seconds.')
-            cluster = LocalCluster(processes=True, n_workers=n_parallel,
-                                   threads_per_worker=1)  # n_parallel = n_parallel - 1 + 1; main 分減らし、monitor 分増やす
+            cluster = LocalCluster(
+                processes=True,
+                n_workers=n_parallel,  # n_parallel = n_parallel - 1 + 1; main 分減らし、monitor 分増やす
+                threads_per_worker=1,
+                worker_class=Worker,
+            )
+            logger.info('LocalCluster launched successfully.')
             self.client = Client(cluster, direct_to_workers=False)
             self.scheduler_address = self.client.scheduler.address
+            logger.info('Client launched successfully.')
 
             # 最適化タスクを振り分ける worker を指定
             subprocess_indices = list(range(n_parallel))[1:]
@@ -487,6 +493,7 @@ class FEMOpt:
                         indexes,
                         directions,
                     )
+                logger.info('Femtet loaded successfully.')
 
             # actor の設定
             self.status = OptimizationStatus(_client)
@@ -500,6 +507,7 @@ class FEMOpt:
                 _client,
                 metadata,
             )
+            logger.info('Status Actor initialized successfully.')
 
             # launch monitor
             self.monitor_process_future = _client.submit(
@@ -516,6 +524,7 @@ class FEMOpt:
                 workers=self.monitor_process_worker_name,
                 allow_other_workers=False
             )
+            logger.info('Process monitor initialized successfully.')
 
             # fem
             self.fem._setup_before_parallel(_client)

{pyfemtet-0.5.1 → pyfemtet-0.5.3}/pyfemtet/opt/_femopt_core.py

@@ -8,13 +8,20 @@ import inspect
 import ast
 import csv
 import ctypes
+from packaging import version
 
 # 3rd-party
 import numpy as np
 import pandas as pd
 from scipy.stats.qmc import LatinHypercube
 import optuna
-from optuna._hypervolume import WFG
+if version.parse(optuna.version.__version__) < version.parse('4.0.0'):
+    from optuna._hypervolume import WFG
+    wfg = WFG()
+    compute_hypervolume = wfg.compute
+else:
+    from optuna._hypervolume import wfg
+    compute_hypervolume = wfg.compute_hypervolume
 from dask.distributed import Lock, get_client
 
 # win32com
@@ -150,9 +157,7 @@ def _remove_indent(source: str, indent: int) -> str:  # returns source
     return edited_source
 
 
-def _check_accsess_femtet_objects(fun, target: str = None):
-    if target is None:
-        target = ''
+def _check_access_femtet_objects(fun, target: str = 'Femtet'):
 
     # 関数fのソースコードを取得
     source = inspect.getsource(fun)
@@ -162,36 +167,88 @@ def _check_accsess_femtet_objects(fun, target: str = None):
         # instanceメソッドなどの場合を想定してインデントを削除
         source = _remove_indent(source, _get_scope_indent(source))
         tree = ast.parse(source)
-    except:
+
+    except Exception:
         return False  # パースに失敗するからと言ってエラーにするまででもない
 
-    # 関数定義を見つける
+    # if function or staticmethod, 1st argument is Femtet. Find the name.
+    varname_contains_femtet = ''  # invalid variable name
     for node in ast.walk(tree):
         if isinstance(node, ast.FunctionDef):
-            # Femtet という名前の引数を取得
-            first_arg_name = 'Femtet'
-
-            # 関数内の全ての属性アクセスをチェック
-            for sub_node in ast.walk(node):
-                if isinstance(sub_node, ast.Attribute):
-                    # Femtet に対してアクセスがあるかチェック
-                    conditions = [isinstance(sub_node.value, ast.Name)]
-                    conditions.append(sub_node.value.id == first_arg_name)  # Femtet にアクセスしている
-                    if target == 'Gogh':
-                        conditions.append(sub_node.attr == 'Gogh')  # Femtet.Gogh にアクセスしている
-                    if all(conditions):
-                        return True
-
-            # ここまできてもなければアクセスしてない
-            return False
+            all_arguments: ast.arguments = node.args
+
+            args: list[ast.arg] = all_arguments.args
+            # args.extend(all_arguments.posonlyargs)  # 先にこっちを入れるべきかも
+
+            target_arg = args[0]
+
+            # if class method or instance method, 2nd argument is it.
+            # In this implementation, we cannot detect the FunctionDef is
+            # method or not because the part of source code is unindented and parsed.
+            if target_arg.arg == 'self' or target_arg.arg == 'cls':
+                if len(args) > 1:
+                    target_arg = args[1]
+                else:
+                    target_arg = None
+
+            if target_arg is not None:
+                varname_contains_femtet = target_arg.arg
+
+    # check Femtet access
+    if target == 'Femtet':
+        for node in ast.walk(tree):
+
+            # by accessing argument directory
+            if isinstance(node, ast.Name):
+                # found local variables
+                node: ast.Name
+                if node.id == varname_contains_femtet:
+                    # found Femtet
+                    return True
+
+            # by accessing inside method
+            elif isinstance(node, ast.Attribute):
+                # found attribute of something
+                node: ast.Attribute
+                if node.attr == 'Femtet':
+                    # found **.Femtet.**
+                    return True
+
+    # check Gogh access
+    elif target == 'Gogh':
+        for node in ast.walk(tree):
+            if isinstance(node, ast.Attribute):
+                if node.attr == 'Gogh':
+                    # found **.Gogh.**
+                    node: ast.Attribute
+                    parent = node.value
+
+                    # by accessing argument directory
+                    if isinstance(parent, ast.Name):
+                        # found *.Gogh.**
+                        parent: ast.Name
+                        if parent.id == varname_contains_femtet:
+                            # found Femtet.Gogh.**
+                            return True
+
+                    # by accessing inside method
+                    if isinstance(parent, ast.Attribute):
+                        # found **.*.Gogh.**
+                        parent: ast.Attribute
+                        if parent.attr == 'Femtet':
+                            # found **.Femtet.Gogh.**
+                            return True
+
+    # ここまで来たならば target へのアクセスはおそらくない
+    return False
 
 
 def _is_access_gogh(fun):
-    return _check_accsess_femtet_objects(fun, target='Gogh')
+    return _check_access_femtet_objects(fun, target='Gogh')
 
 
 def _is_access_femtet(fun):
-    return _check_accsess_femtet_objects(fun)
+    return _check_access_femtet_objects(fun, target='Femtet')
 
 
 def is_feasible(value, lb, ub):
@@ -703,10 +760,9 @@ class History:
         reference_point = r * (maximum - minimum) + minimum
 
         #### hv 履歴の計算
-        wfg = WFG()
         hvs = []
         for i in range(n):
-            hv = wfg.compute(pareto_set[:i], reference_point)
+            hv = compute_hypervolume(pareto_set[:i], reference_point)
             if np.isnan(hv):
                 hv = 0
             hvs.append(hv)

{pyfemtet-0.5.1 → pyfemtet-0.5.3}/pyfemtet/opt/optimizer/_optuna_botorchsampler_parameter_constraint_helper.py

@@ -39,12 +39,22 @@ def do_patch(
         opt (OptunaOptimizer): OptunaOptimizer.
     """
     import optuna_integration
-    target_fun = optuna_integration.botorch.optimize_acqf
+
+    from optuna_integration import version
+    if int(version.__version__.split('.')[0]) >= 4:
+        target_fun = optuna_integration.botorch.botorch.optimize_acqf
+    else:
+        target_fun = optuna_integration.botorch.optimize_acqf
+
     new_fun: callable = OptimizeReplacedACQF(target_fun)
     new_fun.set_constraints(list(constraints.values()))
     new_fun.set_study(study)
     new_fun.set_opt(opt)
-    optuna_integration.botorch.optimize_acqf = new_fun
+
+    if int(version.__version__.split('.')[0]) >= 4:
+        optuna_integration.botorch.botorch.optimize_acqf = new_fun
+    else:
+        optuna_integration.botorch.optimize_acqf = new_fun
 
 
 class GeneralFunctionWithForwardDifference(torch.autograd.Function):
@@ -173,7 +183,6 @@ class NonlinearInequalityConstraints:
                 item = (lambda x: GeneralFunctionWithForwardDifference.apply(cns_botorch, x), True)
                 self._nonlinear_inequality_constraints.append(item)
 
-
     def _filter_feasible_conditions(self, ic_batch):
         # List to store feasible initial conditions
         feasible_ic_list = []

{pyfemtet-0.5.1 → pyfemtet-0.5.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pyfemtet"
-version = "0.5.1"  # ignored by versioning plugin
+version = "0.5.3"  # ignored by versioning plugin
 description = "Design parameter optimization using Femtet."
 authors = ["kazuma.naito <kazuma.naito@murata.com>"]
 readme = "README.md"
@@ -29,8 +29,8 @@ numpy = ">=1.26.2, <2.0.0"
 pandas = "^2.1.3"
 openpyxl = "^3.1.2"
 scipy = "^1.11.4"
-optuna = "^3.4.0"
-optuna-integration = "^3.6.0"
+optuna =  ">=3.4.0, <5.0.0"
+optuna-integration = ">=3.6.0, <5.0.0"
 botorch = "==0.9.5"
 torch = "~2.3.0"
 
@@ -42,8 +42,9 @@ sphinx = "==7.2.6"
 myst-parser = "==2.0.0"
 sphinx-rtd-theme = "==2.0.0"
 sphinx-autobuild = "==2021.3.14"
-sphinx-design = "^0.5.0"
-sphinx-intl = "^2.2.0"
+sphinx-design = "==0.5.0"
+sphinx-intl = "==2.2.0"
+argostranslate = "^1.9.6"
 # debug
 bokeh = "^3.3.3"
 # test

pyfemtet-0.5.1/pyfemtet/__init__.py

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