pyfemtet 0.8.3__py3-none-any.whl → 0.8.4__py3-none-any.whl

pyfemtet/__init__.py

@@ -1 +1 @@
-__version__ = "0.8.3"
+__version__ = "0.8.4"

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()
@@ -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/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/opt/interface/__init__.py

@@ -1,30 +1,34 @@
+import platform
 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:
+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._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')
+    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,), {})
 
-__all__ = [
+from pyfemtet.opt.interface._surrogate import PoFBoTorchInterface
+
+__all__ =[
     'FEMInterface',
     'NoFEM',
     'FemtetInterface',
-    'FemtetWithNXInterface',
     'FemtetWithSolidworksInterface',
+    'FemtetWithNXInterface',
+    'ExcelInterface',
     'PoFBoTorchInterface',
 ]

{pyfemtet-0.8.3.dist-info → pyfemtet-0.8.4.dist-info}/METADATA

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

{pyfemtet-0.8.3.dist-info → pyfemtet-0.8.4.dist-info}/RECORD

@@ -1,8 +1,7 @@
-pyfemtet/__init__.py,sha256=uU_hzq15Wx5XpYHPCxZI1TgnfSGCFymQwugCWVkFva0,21
+pyfemtet/__init__.py,sha256=oR63M0ef9dMrWZnMjTb9xk69cW2iS6rluqpyJ5_0C84,21
 pyfemtet/_femtet_config_util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyfemtet/_femtet_config_util/autosave.py,sha256=dNirA9XGuFehas8_Jkj2BW9GOzMbPyhnt1WHcH_ObSU,2070
 pyfemtet/_femtet_config_util/exit.py,sha256=0BWID-tjOkmZwmgPFkcJMkWW39voccz5ARIBWvZbHaw,1877
-pyfemtet/_imports.py,sha256=sO_YNotNCG6IeoA0ge34YnH7q6q_qx2VFDKei3ZfvSk,3268
 pyfemtet/_message/1. make_pot.bat,sha256=wrTA0YaL7nUfNB0cS8zljOmwq2qgyG6RMwHQbrwjvY4,476
 pyfemtet/_message/2. make_mo.bat,sha256=6shJ3Yn4BXjDc0hhv_kiGUtVTq4oSRz8-iS4vW29rNE,155
 pyfemtet/_message/__init__.py,sha256=gE1-XX_PzHj9BbhqPaK5VcIHuv6_Tec5qlPMC3IRiBg,100
@@ -25,8 +24,8 @@ pyfemtet/dispatch_extensions/_impl.py,sha256=yH_yeAnQ-Xi9GfjX-FQt9u3yHnrLYIteRb6
 pyfemtet/logger/__init__.py,sha256=UOJ9n_U2xwdTrp0Xgg-N6geySxNzKqTBQlXsaH0kW_w,420
 pyfemtet/logger/_impl.py,sha256=rsAd0HpmveOaLS39ucp3U2OcDhQMWjC5fnVGhbJtWVw,6375
 pyfemtet/opt/__init__.py,sha256=wRR8LbEhb5I6MUgmnCgjB6-tqHlOVxDIo7yPkq0QbBs,758
-pyfemtet/opt/_femopt.py,sha256=0HOKlHDkqNimf10v2oUGEHfgVEM4-4RuyLOUHkJi3ec,39281
-pyfemtet/opt/_femopt_core.py,sha256=wd4KijbJuSSuH2n3FY6eAmK_oOJC1R7VzWYKDoJD2KM,38123
+pyfemtet/opt/_femopt.py,sha256=vqLUGMMHn0lp0bRE_FEV0sOoUcVAbohy9_8OLYw3ZrU,39217
+pyfemtet/opt/_femopt_core.py,sha256=mA2wQ5h_mmbTQ9ilhDHLUyN-jsWFDpJE2r5guUWlS10,38083
 pyfemtet/opt/_test_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyfemtet/opt/_test_utils/control_femtet.py,sha256=8oAl9y5V2n8Nnsgx_ebcZVzwFt1eI3swkdiKg6pg3-M,1085
 pyfemtet/opt/_test_utils/hyper_sphere.py,sha256=nQhw8EIY0DwvcTqrbKhkxiITLZifr4-nG77E-_6ggmA,700
@@ -40,7 +39,7 @@ pyfemtet/opt/advanced_samples/surrogate_model/gal_ex13_create_training_data_jp.p
 pyfemtet/opt/advanced_samples/surrogate_model/gal_ex13_optimize_with_surrogate.py,sha256=s0b31wuN3iXjb78dt0ro0ZjxHa8uLIH94jRfEuj1EVY,3090
 pyfemtet/opt/advanced_samples/surrogate_model/gal_ex13_optimize_with_surrogate_jp.py,sha256=OAOpHKyMMo1StSqNMqx4saYDn4hiGOKDypyK6uhTILQ,3215
 pyfemtet/opt/advanced_samples/surrogate_model/gal_ex13_parametric.femprj,sha256=iIHH1X-wWBqEYj4cFJXco73LCJXSrYBsSKOD0HxYu60,87599
-pyfemtet/opt/interface/__init__.py,sha256=POOSj5AN42h7jm8ULjiKDAqPO_l0NY1FpBBUBRVGH-g,1382
+pyfemtet/opt/interface/__init__.py,sha256=dkQ8PoIzYJVRtckNN2VgL7FEwci9RbYM3owOvqnPm80,1219
 pyfemtet/opt/interface/_base.py,sha256=y0uQ5jdsWbgt5odyqPin7NXcK_IbUwPDcrrkV_JhpRw,2722
 pyfemtet/opt/interface/_excel_interface.py,sha256=s103vePTPXXYiPwGdAEUFgtpvGXtu1nSljDtP4HsmcY,40355
 pyfemtet/opt/interface/_femtet.py,sha256=teALmp66aJ_rrmtEOjCGDG1jGLTZr2AmvMFmuuXRQkw,34634
@@ -138,8 +137,8 @@ pyfemtet/opt/visualization/result_viewer/.gitignore,sha256=ryvb4aqbbsHireHWlPQfx
 pyfemtet/opt/visualization/result_viewer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyfemtet/opt/visualization/result_viewer/application.py,sha256=WcHBx_J5eNLKSaprpk9BGifwhO04oN8FiNGYTWorrXA,1691
 pyfemtet/opt/visualization/result_viewer/pages.py,sha256=zcsRmVpVK7xbmOpnKkSypNPsRyHcV3ingfNmuqln6nw,32171
-pyfemtet-0.8.3.dist-info/LICENSE,sha256=sVQBhyoglGJUu65-BP3iR6ujORI6YgEU2Qm-V4fGlOA,1485
-pyfemtet-0.8.3.dist-info/METADATA,sha256=oVuFWAGVv9bS8O05OqEDoUg0QhNvf9ebmTYWB4ZA8qg,3509
-pyfemtet-0.8.3.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-pyfemtet-0.8.3.dist-info/entry_points.txt,sha256=ZfYqRaoiPtuWqFi2_msccyrVF0LurMn-IHlYamAegZo,104
-pyfemtet-0.8.3.dist-info/RECORD,,
+pyfemtet-0.8.4.dist-info/LICENSE,sha256=sVQBhyoglGJUu65-BP3iR6ujORI6YgEU2Qm-V4fGlOA,1485
+pyfemtet-0.8.4.dist-info/METADATA,sha256=gm8_jNbFddbgs4cCz1XchxJDMSfcTlBn-GHxCu0ikrE,3509
+pyfemtet-0.8.4.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+pyfemtet-0.8.4.dist-info/entry_points.txt,sha256=ZfYqRaoiPtuWqFi2_msccyrVF0LurMn-IHlYamAegZo,104
+pyfemtet-0.8.4.dist-info/RECORD,,

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)=}")