pyfemtet 0.8.1__py3-none-any.whl → 0.8.2__py3-none-any.whl

pyfemtet/__init__.py

@@ -1 +1 @@
-__version__ = "0.8.1"
+__version__ = "0.8.2"

pyfemtet/_imports.py

@@ -0,0 +1,107 @@
+import types
+import importlib
+from typing import TYPE_CHECKING, Any
+
+
+__all__ = [
+    'isinstance_wrapper',
+    '_LazyImport',
+    '_lazy_class_factory',
+]
+
+
+class _MetaClass(type):
+    __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/opt/_femopt.py

@@ -31,6 +31,7 @@ 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})
@@ -366,8 +367,8 @@ class FEMOpt:
 
         # 引数の処理
         if fun is None:
-            from pyfemtet.opt.interface._surrogate._base import SurrogateModelInterfaceBase
-            if not isinstance(self.fem, SurrogateModelInterfaceBase):
+            from pyfemtet.opt.interface import SurrogateModelInterfaceBase
+            if not isinstance_wrapper(self.fem, SurrogateModelInterfaceBase):
                 raise ValueError('`fun` argument is not specified.')
         if args is None:
             args = tuple()
@@ -510,13 +511,13 @@ class FEMOpt:
             name = candidate
         if using_fem is None:
             # 自動推定機能は Femtet 特有の処理とする
-            if isinstance(self.fem, FemtetInterface):
+            if isinstance_wrapper(self.fem, FemtetInterface):
                 using_fem = _is_access_femtet(fun)
             else:
                 using_fem = False
 
         # strict constraint の場合、solve 前に評価したいので Gogh へのアクセスを禁ずる
-        if strict and isinstance(self.fem, FemtetInterface):
+        if strict and isinstance_wrapper(self.fem, FemtetInterface):
             if _is_access_gogh(fun):
                 message = Msg.ERR_CONTAIN_GOGH_ACCESS_IN_STRICT_CONSTRAINT
                 raise Exception(message)
@@ -680,7 +681,7 @@ class FEMOpt:
 
         # Femtet 特有の処理
         metadata = None
-        if isinstance(self.fem, FemtetInterface):
+        if isinstance_wrapper(self.fem, FemtetInterface):
 
             # 結果 csv に記載する femprj に関する情報の作成
             metadata = json.dumps(

pyfemtet/opt/_femopt_core.py

@@ -1,5 +1,5 @@
 # typing
-from typing import List
+from typing import List, TYPE_CHECKING
 
 # built-in
 import os
@@ -9,6 +9,7 @@ import ast
 import csv
 import ctypes
 from packaging import version
+import platform
 
 # 3rd-party
 import numpy as np
@@ -25,11 +26,17 @@ else:
 from dask.distributed import Lock, get_client, Client
 
 # win32com
-from win32com.client import constants, Constants
+if (platform.system() == 'Windows') or TYPE_CHECKING:
+    from win32com.client import constants, Constants
+else:
+    class Constants:
+        pass
+    constants = None
 
 # 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
@@ -317,7 +324,7 @@ class Function:
 
         args = self.args
         # Femtet 特有の処理
-        if isinstance(fem, FemtetInterface):
+        if isinstance_wrapper(fem, FemtetInterface):
             args = (fem.Femtet, *args)
         return float(self.fun(*args, **self.kwargs))
 

pyfemtet/opt/interface/__init__.py

@@ -1,9 +1,23 @@
+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
-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
+
+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__ = [

pyfemtet/opt/interface/_excel_interface.py

@@ -17,22 +17,25 @@ from pythoncom import CoInitialize, CoUninitialize
 # noinspection PyUnresolvedReferences
 from pywintypes import com_error
 
-from pyfemtet.opt import FEMInterface
+# pyfemtet.core
 from pyfemtet.core import SolveError
-from pyfemtet.opt.optimizer.parameter import Parameter, Expression
-
-from pyfemtet.dispatch_extensions import _get_pid, dispatch_specific_femtet
 
+# pyfemtet._util
 from pyfemtet._femtet_config_util.exit import _exit_or_force_terminate
-
 from pyfemtet._util.excel_macro_util import watch_excel_macro_error
 from pyfemtet._util.dask_util import lock_or_no_lock
 from pyfemtet._util.excel_parse_util import *
-
 from pyfemtet._warning import show_experimental_warning
 from pyfemtet._message.messages import Message as Msg
 
-from pyfemtet.opt.interface._base import logger
+# dispatch extension
+from pyfemtet.dispatch_extensions import _get_pid, dispatch_specific_femtet
+
+# interface
+from pyfemtet.opt.interface._base import FEMInterface, logger
+
+# expression
+from pyfemtet.opt.optimizer.parameter import Parameter, Expression
 
 
 class ExcelInterface(FEMInterface):

pyfemtet/opt/interface/_femtet.py

@@ -33,7 +33,7 @@ from pyfemtet.dispatch_extensions import (
     _get_pids,
     DispatchExtensionException,
 )
-from pyfemtet.opt.interface import FEMInterface
+from pyfemtet.opt.interface._base import FEMInterface
 from pyfemtet._message import Msg
 from pyfemtet._femtet_config_util.autosave import _get_autosave_enabled, _set_autosave_enabled
 from pyfemtet._femtet_config_util.exit import _exit_or_force_terminate

pyfemtet/opt/interface/_femtet_with_nx/_interface.py

@@ -6,7 +6,7 @@ import pandas as pd
 from dask.distributed import get_worker
 
 from pyfemtet.core import ModelError
-from pyfemtet.opt.interface import FemtetInterface
+from pyfemtet.opt.interface._femtet import FemtetInterface
 from pyfemtet._message import Msg
 
 

pyfemtet/opt/interface/_femtet_with_sldworks.py

@@ -10,7 +10,7 @@ from win32com.client import DispatchEx
 from pythoncom import CoInitialize, CoUninitialize, com_error
 
 from pyfemtet.core import ModelError
-from pyfemtet.opt.interface import FemtetInterface
+from pyfemtet.opt.interface._femtet import FemtetInterface
 from pyfemtet._message import Msg
 
 

{pyfemtet-0.8.1.dist-info → pyfemtet-0.8.2.dist-info}/METADATA

@@ -1,8 +1,7 @@
 Metadata-Version: 2.3
 Name: pyfemtet
-Version: 0.8.1
+Version: 0.8.2
 Summary: Design parameter optimization using Femtet.
-Home-page: https://github.com/pyfemtet/pyfemtet
 License: BSD-3-Clause
 Author: kazuma.naito
 Author-email: kazuma.naito@murata.com
@@ -21,7 +20,7 @@ Requires-Dist: dash (>=2.17.0,<3.0.0)
 Requires-Dist: dash-bootstrap-components (>=1.5.0,<2.0.0)
 Requires-Dist: dask (>=2023.12.1,<2024.0.0)
 Requires-Dist: distributed (>=2023.12.1,<2024.0.0)
-Requires-Dist: femtetutils (>=1.0.0,<2.0.0)
+Requires-Dist: femtetutils (>=1.0.0,<2.0.0) ; sys_platform == "win32"
 Requires-Dist: fire (>=0.6.0,<0.7.0)
 Requires-Dist: numpy (>=2.0.0,<3.0.0)
 Requires-Dist: openpyxl (>=3.1.2,<4.0.0)
@@ -30,9 +29,10 @@ Requires-Dist: optuna-integration (>=3.6.0,<5.0.0)
 Requires-Dist: pandas (>=2.2.3,<3.0.0)
 Requires-Dist: plotly (>=5.22.0,<6.0.0)
 Requires-Dist: psutil (>=5.9.6,<6.0.0)
-Requires-Dist: pywin32 (>=306,<307)
+Requires-Dist: pywin32 (>=306,<307) ; sys_platform == "win32"
 Requires-Dist: scipy (>=1.11.4,<2.0.0)
-Requires-Dist: torch (>=2.5.1,<2.6.0)
+Requires-Dist: torch (>=2.5.1,<2.6.0) ; sys_platform != "linux"
+Requires-Dist: torch (>=2.5.1,<2.6.0) ; sys_platform == "linux"
 Requires-Dist: tqdm (>=4.66.1,<5.0.0)
 Project-URL: Repository, https://github.com/pyfemtet/pyfemtet
 Description-Content-Type: text/markdown

{pyfemtet-0.8.1.dist-info → pyfemtet-0.8.2.dist-info}/RECORD

@@ -1,7 +1,8 @@
-pyfemtet/__init__.py,sha256=9SJ00tY4YILqfP8235Ozvn3QTMNjqfaSLUvcAIBL9pU,21
+pyfemtet/__init__.py,sha256=w9PQY1TBU1sxareCp_IL13B4hvoWkY5B-U0ml6p1Im4,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=SdsAe8x63alMsxAvYr0a3LLeTaUjAaZxG_QoXbppqfM,3241
 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
@@ -24,8 +25,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=badpzYulDFZ6FmHPmc8uXidvnQrCNjHnalBaVp54Wcg,39234
-pyfemtet/opt/_femopt_core.py,sha256=8_A8aGRd1EwiNfI9qGPY9oGAvLjlY681IePfnhmzclM,37933
+pyfemtet/opt/_femopt.py,sha256=0HOKlHDkqNimf10v2oUGEHfgVEM4-4RuyLOUHkJi3ec,39281
+pyfemtet/opt/_femopt_core.py,sha256=wd4KijbJuSSuH2n3FY6eAmK_oOJC1R7VzWYKDoJD2KM,38123
 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
@@ -39,15 +40,15 @@ 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=18qTySe5Tue0lDgNZbFZ8rBsBt_Edm7ukm6OAUPwruw,551
+pyfemtet/opt/interface/__init__.py,sha256=POOSj5AN42h7jm8ULjiKDAqPO_l0NY1FpBBUBRVGH-g,1382
 pyfemtet/opt/interface/_base.py,sha256=y0uQ5jdsWbgt5odyqPin7NXcK_IbUwPDcrrkV_JhpRw,2722
-pyfemtet/opt/interface/_excel_interface.py,sha256=gqLKOTNxdayX3jKE4GhqHMg8IzCuFhjY7gNgoFrcrp0,40301
-pyfemtet/opt/interface/_femtet.py,sha256=zIsOcqdPc5AK0XsCay60uoQvwzIMklc-1gUK9EPewjM,34628
+pyfemtet/opt/interface/_excel_interface.py,sha256=s103vePTPXXYiPwGdAEUFgtpvGXtu1nSljDtP4HsmcY,40355
+pyfemtet/opt/interface/_femtet.py,sha256=teALmp66aJ_rrmtEOjCGDG1jGLTZr2AmvMFmuuXRQkw,34634
 pyfemtet/opt/interface/_femtet_parametric.py,sha256=0pAEhHflp0wIxWBVMXI8nCC02oAyRKLinH3Y6O8bq3M,2224
 pyfemtet/opt/interface/_femtet_with_nx/__init__.py,sha256=-6W2g2FDEcKzGHmI5KAKQe-4U5jDpMj0CXuma-GZca0,83
-pyfemtet/opt/interface/_femtet_with_nx/_interface.py,sha256=oefISc6c6RPPyhPnWuzCb60tgsrzGiqoIWk1DsiKzTk,5986
+pyfemtet/opt/interface/_femtet_with_nx/_interface.py,sha256=LkaODUSpBLq05uz5Jf-JKuH6Evq8ElZoItXxFZopWeM,5994
 pyfemtet/opt/interface/_femtet_with_nx/update_model.py,sha256=P7VH0i_o-X9OUe6AGaLF1fACPeHNrMjcrOBCA3MMrI4,3092
-pyfemtet/opt/interface/_femtet_with_sldworks.py,sha256=qqo2P4qZN0d89uNQyohKxq-Yhdql5vC0QHg4bpy7Ky8,11011
+pyfemtet/opt/interface/_femtet_with_sldworks.py,sha256=rjEgebuP1w1eAFVWw4eRJUq3lsyBcmXlkMjZKIpD0kw,11019
 pyfemtet/opt/interface/_surrogate/__init__.py,sha256=2UT5NuBylyWQJNjg1zsBRCV-MzNCUswTUt6ZuSrYFUM,120
 pyfemtet/opt/interface/_surrogate/_base.py,sha256=-k02jRywxaSKMDzGitPE_qBj5nUxC7OL6guF4y6F1Zw,2923
 pyfemtet/opt/interface/_surrogate/_chaospy.py,sha256=gL72bCgs1AY_EZdJtcifSC-apwsZzp4zsWYxcpVKvtw,1969
@@ -137,8 +138,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.1.dist-info/LICENSE,sha256=sVQBhyoglGJUu65-BP3iR6ujORI6YgEU2Qm-V4fGlOA,1485
-pyfemtet-0.8.1.dist-info/METADATA,sha256=nSEcQqjKNbZya0ZmycsjEC4jnhHwNFMbVRq_mIuTuz4,3415
-pyfemtet-0.8.1.dist-info/WHEEL,sha256=RaoafKOydTQ7I_I3JTrPCg6kUmTgtm4BornzOqyEfJ8,88
-pyfemtet-0.8.1.dist-info/entry_points.txt,sha256=ZfYqRaoiPtuWqFi2_msccyrVF0LurMn-IHlYamAegZo,104
-pyfemtet-0.8.1.dist-info/RECORD,,
+pyfemtet-0.8.2.dist-info/LICENSE,sha256=sVQBhyoglGJUu65-BP3iR6ujORI6YgEU2Qm-V4fGlOA,1485
+pyfemtet-0.8.2.dist-info/METADATA,sha256=DaSB-_XkLYHL6s4R0OibyIl8JiU_Kr4p56CkdKZGZfk,3509
+pyfemtet-0.8.2.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+pyfemtet-0.8.2.dist-info/entry_points.txt,sha256=ZfYqRaoiPtuWqFi2_msccyrVF0LurMn-IHlYamAegZo,104
+pyfemtet-0.8.2.dist-info/RECORD,,

{pyfemtet-0.8.1.dist-info → pyfemtet-0.8.2.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 2.0.0
+Generator: poetry-core 2.0.1
 Root-Is-Purelib: true
 Tag: py3-none-any