pyfemtet 0.8.1__tar.gz → 0.8.3__tar.gz

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

@@ -1,8 +1,7 @@
 Metadata-Version: 2.3
 Name: pyfemtet
-Version: 0.8.1
+Version: 0.8.3
 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.3/pyfemtet/__init__.py

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

pyfemtet-0.8.3/pyfemtet/_imports.py

@@ -0,0 +1,108 @@
+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.1 → pyfemtet-0.8.3}/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-0.8.1 → pyfemtet-0.8.3}/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-0.8.3/pyfemtet/opt/interface/__init__.py

@@ -0,0 +1,30 @@
+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',
+]

{pyfemtet-0.8.1 → pyfemtet-0.8.3}/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-0.8.1 → pyfemtet-0.8.3}/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-0.8.1 → pyfemtet-0.8.3}/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-0.8.1 → pyfemtet-0.8.3}/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 → pyfemtet-0.8.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pyfemtet"
-version = "0.8.1"  # ignored by versioning plugin
+version = "0.8.3"  # ignored by versioning plugin
 description = "Design parameter optimization using Femtet."
 authors = ["kazuma.naito <kazuma.naito@murata.com>"]
 readme = "README.md"
@@ -15,8 +15,9 @@ tqdm = "^4.66.1"
 colorlog = "^6.8.0"
 psutil = "^5.9.6"
 # win32 / Femtet
-pywin32 = "^306"
-femtetutils = "^1.0.0"
+# markers equires ```poetry config installer.re-resolve false```
+pywin32 = { version = "^306", markers = "sys_platform=='win32'" }
+femtetutils = { version = "^1.0.0", markers = "sys_platform=='win32'" }
 # distributed
 dask = "^2023.12.1"
 distributed = "^2023.12.1"
@@ -32,7 +33,10 @@ scipy = "^1.11.4"
 optuna =  ">=3.4.0, <5.0.0"
 optuna-integration = ">=3.6.0, <5.0.0"
 botorch = "~0.12.0"
-torch = "~2.5.1"
+torch = [
+    { version = "~2.5.1", source = "pytorch-cpu", markers = "sys_platform=='linux'" },
+    { version = "~2.5.1", markers = "sys_platform!='linux'"  },
+]
 brepmatching = {version = "^0.1.8", optional = true}
 fire = "^0.6.0"
 
@@ -55,6 +59,11 @@ pytest = "^7.4.3"
 pytest-dashboard = "^0.1.2"
 fire = "^0.6.0"
 
+[[tool.poetry.source]]
+name = "pytorch-cpu"
+url = "https://download.pytorch.org/whl/cpu"
+priority = "explicit"
+
 [tool.poetry.extras]
 brep = ["brepmatching"]  # pip install pyfemtet[brep]
 

pyfemtet-0.8.1/pyfemtet/__init__.py

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

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

@@ -1,16 +0,0 @@
-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
-
-
-__all__ = [
-    'FEMInterface',
-    'NoFEM',
-    'FemtetInterface',
-    'FemtetWithNXInterface',
-    'FemtetWithSolidworksInterface',
-    'PoFBoTorchInterface',
-]