pyfemtet 0.8.3__tar.gz → 0.8.5__tar.gz

{pyfemtet-0.8.3 → pyfemtet-0.8.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pyfemtet
-Version: 0.8.3
+Version: 0.8.5
 Summary: Design parameter optimization using Femtet.
 License: BSD-3-Clause
 Author: kazuma.naito

pyfemtet-0.8.5/pyfemtet/__init__.py

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

{pyfemtet-0.8.3 → pyfemtet-0.8.5}/pyfemtet/opt/_femopt.py

@@ -31,7 +31,6 @@ from pyfemtet.opt._femopt_core import (
 from pyfemtet._message import Msg, encoding
 from pyfemtet.opt.optimizer.parameter import Parameter, Expression
 from pyfemtet._warning import experimental_feature
-from pyfemtet._imports import *
 
 from dask import config as cfg
 cfg.set({'distributed.scheduler.worker-ttl': None})
@@ -368,7 +367,7 @@ class FEMOpt:
         # 引数の処理
         if fun is None:
             from pyfemtet.opt.interface import SurrogateModelInterfaceBase
-            if not isinstance_wrapper(self.fem, SurrogateModelInterfaceBase):
+            if not isinstance(self.fem, SurrogateModelInterfaceBase):
                 raise ValueError('`fun` argument is not specified.')
         if args is None:
             args = tuple()
@@ -404,7 +403,7 @@ class FEMOpt:
 
         if names is not None:
             if isinstance(names, str):
-                names = [f'name_{i}' for i in range(n_return)]
+                names = [f'{names}_{i}' for i in range(n_return)]
             else:
                 # names = names
                 pass
@@ -511,13 +510,13 @@ class FEMOpt:
             name = candidate
         if using_fem is None:
             # 自動推定機能は Femtet 特有の処理とする
-            if isinstance_wrapper(self.fem, FemtetInterface):
+            if isinstance(self.fem, FemtetInterface):
                 using_fem = _is_access_femtet(fun)
             else:
                 using_fem = False
 
         # strict constraint の場合、solve 前に評価したいので Gogh へのアクセスを禁ずる
-        if strict and isinstance_wrapper(self.fem, FemtetInterface):
+        if strict and isinstance(self.fem, FemtetInterface):
             if _is_access_gogh(fun):
                 message = Msg.ERR_CONTAIN_GOGH_ACCESS_IN_STRICT_CONSTRAINT
                 raise Exception(message)
@@ -681,7 +680,7 @@ class FEMOpt:
 
         # Femtet 特有の処理
         metadata = None
-        if isinstance_wrapper(self.fem, FemtetInterface):
+        if isinstance(self.fem, FemtetInterface):
 
             # 結果 csv に記載する femprj に関する情報の作成
             metadata = json.dumps(

{pyfemtet-0.8.3 → pyfemtet-0.8.5}/pyfemtet/opt/_femopt_core.py

@@ -36,7 +36,6 @@ else:
 # pyfemtet relative
 from pyfemtet.opt.interface import FEMInterface, FemtetInterface
 from pyfemtet._message import encoding, Msg
-from pyfemtet._imports import *
 
 # logger
 from pyfemtet.logger import get_module_logger
@@ -324,7 +323,7 @@ class Function:
 
         args = self.args
         # Femtet 特有の処理
-        if isinstance_wrapper(fem, FemtetInterface):
+        if isinstance(fem, FemtetInterface):
             args = (fem.Femtet, *args)
         return float(self.fun(*args, **self.kwargs))
 

{pyfemtet-0.8.3 → pyfemtet-0.8.5}/pyfemtet/opt/_test_utils/record_history.py

@@ -59,32 +59,39 @@ def _get_obj_from_csv(csv_path, encoding=ENCODING):
         reader = csv.reader(f, delimiter=",")
         meta = reader.__next__()
     obj_indices = np.where(np.array(meta) == "obj")[0]
-    out = df.iloc[:, obj_indices]
+    out: pd.DataFrame = df.iloc[:, obj_indices]
+    out = out.dropna(axis=0)
     return out, columns
 
 
-def is_equal_result(ref_path, dif_path, log_path):
+def is_equal_result(ref_path, dif_path, log_path=None, threashold=0.05):
     """Check the equality of two result csv files."""
     ref_df, ref_columns = _get_obj_from_csv(ref_path)
     dif_df, dif_columns = _get_obj_from_csv(dif_path)
 
-    with open(log_path, "a", newline="\n", encoding=ENCODING) as f:
-        f.write("\n\n===== 結果の分析 =====\n\n")
-        f.write(f"        \tref\tdif\n")
-        f.write(f"---------------------\n")
-        f.write(f"len(col)\t{len(ref_columns)}\t{len(dif_columns)}\n")
-        f.write(f"len(df) \t{len(ref_df)}\t{len(dif_df)}\n")
-        try:
-            difference = (
+    if log_path is not None:
+        with open(log_path, "a", newline="\n", encoding=ENCODING) as f:
+            f.write("\n\n===== 結果の分析 =====\n\n")
+            f.write(f"        \tref\tdif\n")
+            f.write(f"---------------------\n")
+            f.write(f"len(col)\t{len(ref_columns)}\t{len(dif_columns)}\n")
+            f.write(f"len(df) \t{len(ref_df)}\t{len(dif_df)}\n")
+            try:
+                difference = (
+                    np.abs(ref_df.values - dif_df.values) / np.abs(dif_df.values)
+                ).mean()
+                f.write(f"diff    \t{int(difference*100)}%\n")
+            except Exception:
+                f.write(f"diff    \tcannot calc\n")
+
+    else:
+        difference = (
                 np.abs(ref_df.values - dif_df.values) / np.abs(dif_df.values)
-            ).mean()
-            f.write(f"diff    \t{int(difference*100)}%\n")
-        except Exception:
-            f.write(f"diff    \tcannot calc\n")
+        ).mean()
 
     assert len(ref_columns) == len(dif_columns), "結果 csv の column 数が異なります。"
     assert len(ref_df) == len(dif_df), "結果 csv の row 数が異なります。"
-    assert difference <= 0.05, "前回の結果との平均差異が 5% を超えています。"
+    assert difference <= threashold*100, f"前回の結果との平均差異が {int(difference)}% で {int(threashold*100)}% を超えています。"
 
 
 def _get_simplified_df_values(csv_path, exclude_columns=None):

pyfemtet-0.8.5/pyfemtet/opt/interface/__init__.py

@@ -0,0 +1,37 @@
+import platform
+from typing import TYPE_CHECKING
+
+from pyfemtet.opt.interface._base import FEMInterface
+from pyfemtet.opt.interface._base import NoFEM
+
+if (platform.system() == 'Windows') or TYPE_CHECKING:
+    from pyfemtet.opt.interface._femtet import FemtetInterface
+    from pyfemtet.opt.interface._femtet_with_sldworks import FemtetWithSolidworksInterface
+    from pyfemtet.opt.interface._femtet_with_nx import FemtetWithNXInterface
+    from pyfemtet.opt.interface._excel_interface import ExcelInterface
+
+else:
+    class NotAvailableForWindows:
+        def __init__(self, *args, **kwargs):
+            raise NotImplementedError
+
+
+    FemtetInterface = type('FemtetInterface', (NotAvailableForWindows,), {})
+    FemtetWithSolidworksInterface = type('FemtetWithSolidworksInterface', (FemtetInterface,), {})
+    FemtetWithNXInterface = type('FemtetWithNXInterface', (FemtetInterface,), {})
+    ExcelInterface = type('FemtetInterface', (NotAvailableForWindows,), {})
+
+from pyfemtet.opt.interface._surrogate._base import SurrogateModelInterfaceBase
+from pyfemtet.opt.interface._surrogate._singletaskgp import PoFBoTorchInterface
+
+
+__all__ =[
+    'FEMInterface',
+    'NoFEM',
+    'FemtetInterface',
+    'FemtetWithSolidworksInterface',
+    'FemtetWithNXInterface',
+    'ExcelInterface',
+    'SurrogateModelInterfaceBase',
+    'PoFBoTorchInterface',
+]

{pyfemtet-0.8.3 → pyfemtet-0.8.5}/pyfemtet/opt/interface/_surrogate/_base.py

@@ -17,6 +17,7 @@ class SurrogateModelInterfaceBase(FEMInterface, ABC):
             self,
             history_path: str = None,
             history: History = None,
+            override_objective: bool = True,
     ):
 
         self.history: History
@@ -25,6 +26,7 @@ class SurrogateModelInterfaceBase(FEMInterface, ABC):
         self.obj: dict[str, float] = dict()
         self.df_prm: pd.DataFrame
         self.df_obj: pd.DataFrame
+        self.override_objective: bool = override_objective
 
         # history_path が与えられた場合、history をコンストラクトする
         if history_path is not None:
@@ -57,27 +59,25 @@ class SurrogateModelInterfaceBase(FEMInterface, ABC):
         FEMInterface.__init__(
             self,
             history=history,  # コンストラクト済み history を渡せば並列計算時も何もしなくてよい
+            override_objective=self.override_objective
         )
 
     def filter_feasible(self, x: np.ndarray, y: np.ndarray, return_feasibility=False):
         feasible_idx = np.where(~np.isnan(y.sum(axis=1)))
         if return_feasibility:
             # calculated or not
-            y = np.zeros_like(y)
-            y[feasible_idx] = 1.
-            # satisfy weak feasibility or not
-            infeasible_idx = np.where(~self.history.get_df()['feasible'].values)
-            y[infeasible_idx] = .0
-            return x, y.reshape((-1, 1))
+            feas = np.zeros((len(y), 1), dtype=float)
+            feas[feasible_idx] = 1.
+            return x, feas
         else:
             return x[feasible_idx], y[feasible_idx]
 
     def _setup_after_parallel(self, *args, **kwargs):
-
-        opt: AbstractOptimizer = kwargs['opt']
-        obj: Objective
-        for obj_name, obj in opt.objectives.items():
-            obj.fun = lambda: self.obj[obj_name]
+        if self.override_objective:
+            opt: AbstractOptimizer = kwargs['opt']
+            obj: Objective
+            for obj_name, obj in opt.objectives.items():
+                obj.fun = lambda obj_name_=obj_name: self.obj[obj_name_]
 
     def update_parameter(self, parameters: pd.DataFrame, with_warning=False) -> Optional[List[str]]:
         for i, row in parameters.iterrows():

{pyfemtet-0.8.3 → pyfemtet-0.8.5}/pyfemtet/opt/interface/_surrogate/_singletaskgp.py

@@ -27,8 +27,8 @@ class PoFBoTorchInterface(SurrogateModelInterfaceBase):
     def train_f(self):
         # df そのまま用いて training する
         x, y = self.filter_feasible(self.df_prm.values, self.df_obj.values, return_feasibility=True)
-        if y.min() == 1:
-            self.model_f.predict = lambda *args, **kwargs: (1., 0.001)
+        if y.min() == 1:  # feasible values only
+            self.model_f.predict = lambda *args, **kwargs: (1., 0.001)  # mean, std
         self.model_f.fit(x, y)
 
     def _setup_after_parallel(self, *args, **kwargs):
@@ -64,7 +64,8 @@ class PoFBoTorchInterface(SurrogateModelInterfaceBase):
             raise SolveError(Msg.INFO_POF_IS_LESS_THAN_THRESHOLD)
 
         # 実際の計算(mean は history.obj_names 順)
-        mean, _ = self.model.predict(np.array([x]))
+        _mean, _std = self.model.predict(np.array([x]))
+        mean = _mean[0]
 
         # 目的関数の更新
         self.obj = {obj_name: value for obj_name, value in zip(self.history.obj_names, mean)}

{pyfemtet-0.8.3 → pyfemtet-0.8.5}/pyfemtet/opt/prediction/single_task_gp.py

@@ -85,6 +85,8 @@ class SingleTaskGPModel(PredictionModelBase):
         fit_gpytorch_mll(mll)
 
     def predict(self, x: np.ndarray) -> tuple[np.ndarray, np.ndarray]:
+        assert len(x.shape) >= 2
+
         X = tensor(x)
 
         post = self.gp.posterior(X)

{pyfemtet-0.8.3 → pyfemtet-0.8.5}/pyproject.toml

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

pyfemtet-0.8.3/pyfemtet/__init__.py

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

pyfemtet-0.8.3/pyfemtet/_imports.py

@@ -1,108 +0,0 @@
-import types
-import importlib
-from typing import TYPE_CHECKING, Any
-from abc import ABCMeta
-
-
-__all__ = [
-    'isinstance_wrapper',
-    '_LazyImport',
-    '_lazy_class_factory',
-]
-
-
-class _MetaClass(ABCMeta):
-    __original_cls__: type
-
-    def __repr__(self):
-        if hasattr(self, '__original_cls__'):
-            return f'<LazyClass of {self.__original_cls__()}>'
-        else:
-            return f'<LazyClass of <unloaded class>>'
-
-
-def _lazy_class_factory(module, cls_name):
-    class LazyClass(object, metaclass=_MetaClass):
-        # 継承を正しくコピーできていないので
-        # issubclass を使う際は注意
-        def __new__(cls, *args, **kwargs):
-            OriginalClass = cls.__original_cls__()
-            self = OriginalClass(*args, **kwargs)
-            return self
-
-        @staticmethod
-        def __original_cls__():
-            return getattr(module, cls_name)
-
-    return LazyClass
-
-
-class _LazyImport(types.ModuleType):
-    """Module wrapper for lazy import.
-
-    Note:
-        This module is totally derived from `optuna._imports._LazyImport`.
-        The following author has the copyright of this code.
-
-        *******************************************
-        Copyright (c) 2018 Preferred Networks, Inc.
-        *******************************************
-
-    This class wraps the specified modules and lazily imports them only when accessed.
-    Otherwise, `import optuna` is slowed down by importing all submodules and
-    dependencies even if not required.
-    Within this project's usage, importlib override this module's attribute on the first
-    access and the imported submodule is directly accessed from the second access.
-
-    Args:
-        name: Name of module to apply lazy import.
-    """
-
-    def __init__(self, name: str) -> None:
-        super().__init__(name)
-        self._name = name
-
-    def _load(self) -> types.ModuleType:
-        module = importlib.import_module(self._name)
-        self.__dict__.update(module.__dict__)
-        return module
-
-    def __getattr__(self, item: str) -> Any:
-        return getattr(self._load(), item)
-
-
-def isinstance_wrapper(obj: object, cls: type) -> bool:
-    if isinstance(cls, _MetaClass):
-        try:
-            cls_ = cls.__original_cls__()
-        except ModuleNotFoundError:
-            return False
-        return isinstance(obj, cls_)
-    else:
-        return isinstance(obj, cls)
-
-
-if __name__ == '__main__':
-    if TYPE_CHECKING:
-        # for type check only
-        import numpy
-        NDArray = numpy.ndarray
-        import no_module
-    else:
-        # runtime
-        numpy = _LazyImport('numpy')
-        NDArray = _lazy_class_factory(numpy, 'ndarray')
-        NDArray2 = _lazy_class_factory(numpy, 'ndarray')
-        no_module = _LazyImport('no_module')
-        NoClass = _lazy_class_factory(no_module, 'NoClass')
-
-    print('numpy is loaded:', numpy.__doc__ is not None)
-    a = NDArray(shape=[1])
-    print('numpy is loaded:', numpy.__doc__ is not None)
-
-    print(f"{isinstance(None, NoClass)=}")
-    print(f"{isinstance_wrapper(None, NoClass)=}")
-    print(f"{isinstance(a, NDArray)=}")
-    print(f"{isinstance_wrapper(a, NDArray)=}")
-    print(f"{isinstance_wrapper(a, NoClass)=}")
-    print(f"{isinstance_wrapper(a, NDArray2)=}")

pyfemtet-0.8.3/pyfemtet/opt/interface/__init__.py

@@ -1,30 +0,0 @@
-from typing import TYPE_CHECKING
-from pyfemtet._imports import _LazyImport, _lazy_class_factory
-
-from pyfemtet.opt.interface._base import FEMInterface
-from pyfemtet.opt.interface._base import NoFEM
-
-if TYPE_CHECKING:
-    from pyfemtet.opt.interface._femtet import FemtetInterface
-    from pyfemtet.opt.interface._femtet_with_sldworks import FemtetWithSolidworksInterface
-    from pyfemtet.opt.interface._femtet_with_nx import FemtetWithNXInterface
-    from pyfemtet.opt.interface._surrogate import PoFBoTorchInterface
-    from pyfemtet.opt.interface._excel_interface import ExcelInterface
-
-else:
-    FemtetInterface = _lazy_class_factory(_LazyImport('pyfemtet.opt.interface._femtet'), 'FemtetInterface')
-    FemtetWithSolidworksInterface = _lazy_class_factory(_LazyImport('pyfemtet.opt.interface._femtet_with_sldworks'), 'FemtetWithSolidworksInterface')
-    FemtetWithNXInterface = _lazy_class_factory(_LazyImport('pyfemtet.opt.interface._femtet_with_nx'), 'FemtetWithNXInterface')
-    PoFBoTorchInterface = _lazy_class_factory(_LazyImport('pyfemtet.opt.interface._surrogate'), 'PoFBoTorchInterface')
-    ExcelInterface = _lazy_class_factory(_LazyImport('pyfemtet.opt.interface._excel_interface'), 'ExcelInterface')
-
-
-
-__all__ = [
-    'FEMInterface',
-    'NoFEM',
-    'FemtetInterface',
-    'FemtetWithNXInterface',
-    'FemtetWithSolidworksInterface',
-    'PoFBoTorchInterface',
-]