Improve performances (#108)

Author: cbellot000

.ci/run_examples.py

@@ -3,7 +3,7 @@
 import pathlib
 from ansys.dpf import core
 
-core.disable_off_screen_rendering()
+core.settings.disable_off_screen_rendering()
 
 actual_path = pathlib.Path(__file__).parent.absolute()
 print(os.path.join(actual_path, os.path.pardir, "examples"))

ansys/dpf/core/__init__.py

@@ -14,7 +14,7 @@
     if "AWP_UNIT_TEST_FILES" not in os.environ:
         os.environ["AWP_UNIT_TEST_FILES"] = "/mnt/ansys_inc/dpf/test_files/"
 
-from ansys.dpf.core.misc import module_exists, Report
+from ansys.dpf.core.misc import Report
 from ansys.dpf.core.dpf_operator import Operator, Config
 from ansys.dpf.core.model import Model
 from ansys.dpf.core.field import Field, FieldDefinition
@@ -61,6 +61,7 @@
 )
 from ansys.dpf.core import server
 from ansys.dpf.core import check_version
+from ansys.dpf.core import settings
 
 # for matplotlib
 # solves "QApplication: invalid style override passed, ignoring it."
@@ -91,29 +92,8 @@
         pass
 
 
-# Configure PyVista's ``rcParams`` for dpf
-if module_exists("pyvista"):
-    import pyvista as pv
-
-    pv.rcParams["interactive"] = True
-    pv.rcParams["cmap"] = "jet"
-    pv.rcParams["font"]["family"] = "courier"
-    pv.rcParams["title"] = "DPF"
-
-
 SERVER = None
 
 _server_instances = []
 
-def disable_off_screen_rendering() -> None:
-    # enable matplotlib off_screen plotting to avoid test interruption
-    if module_exists("matplotlib"):
-        import matplotlib as mpl
-
-        mpl.use("Agg")
-
-    # enable off_screen plotting to avoid test interruption
-    if module_exists("pyvista"):
-        import pyvista as pv
-
-        pv.OFF_SCREEN = True
+settings.set_default_pyvista_config()

ansys/dpf/core/check_version.py

@@ -173,11 +173,11 @@ def wrapper(self, *args, **kwargs):
             """Call the original function"""
             server = self._server
             func_name = func.__name__
-            class_name = self.__class__.__name__
 
             # particular cases
             # scoping._set_ids case, must be checked in a particular way
-            if func_name == "_set_ids" and class_name == "Scoping":
+            from ansys.dpf.core import scoping
+            if func_name == "_set_ids" and isinstance(self, scoping.Scoping):
                 ids = args[0]
                 size = len(ids)
                 if size != 0:

ansys/dpf/core/core.py

@@ -13,7 +13,7 @@
 from ansys.grpc.dpf import base_pb2, base_pb2_grpc
 from ansys.dpf.core.errors import protect_grpc
 from ansys.dpf.core import server as serverlib
-from ansys.dpf.core.misc import DEFAULT_FILE_CHUNK_SIZE
+from ansys.dpf.core import misc
 from ansys.dpf.core.common import _common_progress_bar
 
 LOG = logging.getLogger(__name__)
@@ -716,7 +716,7 @@ def __file_chunk_yielder(self, file_path, to_server_file_path, use_tmp_dir=False
         i = 0
         with open(file_path, "rb") as f:
             while True:
-                piece = f.read(DEFAULT_FILE_CHUNK_SIZE)
+                piece = f.read(misc.DEFAULT_FILE_CHUNK_SIZE)
                 if len(piece) == 0:
                     break
                 request.data.data = piece

ansys/dpf/core/field_base.py

@@ -532,10 +532,13 @@ def __cache_data__(self):
         self._data_copy = super().data_as_list
         self._num_entities_reserved = len(self._data_copy)
         self._data_pointer_copy = super()._data_pointer_as_list
-        self._scoping_ids_copy = super().scoping.ids
-        self._num_entities = len(self._scoping_ids_copy)
+        self._scoping_copy = super().scoping.as_local_scoping()
         self._has_data_pointer = len(self._data_pointer_copy) > 0
 
+    @property
+    def _num_entities(self):
+        return len(self._scoping_copy)
+
     @property
     def size(self):
         """Length of the data vector.
@@ -589,7 +592,7 @@ def get_entity_data(self, index):
         if index > self._num_entities:
             raise ValueError(
                 f"Requested scoping {index} is greater than the number of "
-                f"available indices {len(self._scoping_ids_copy)}"
+                f"available indices {len(self._scoping_copy)}"
             )
         if self._has_data_pointer:
             first_index = self._data_pointer_copy[index]
@@ -649,7 +652,7 @@ def get_entity_data_by_id(self, id):
            7.69014221e+02  4.90502930e+02]]
 
         """
-        index = self._scoping_ids_copy.index(id)
+        index = self._scoping_copy.index(id)
         if index < 0:
             raise ValueError(f"The id {id} doesn't exist in the scoping")
         return self.get_entity_data(index)
@@ -687,12 +690,11 @@ def append(self, data, scopingid):
             data = np.array(data).flatten().tolist()
 
         data_size = len(self._data_copy)
-        self._scoping_ids_copy.append(scopingid)
+        self._scoping_copy.append(scopingid)
         if len(self._data_pointer_copy) > 0:
             self._data_pointer_copy.append(data_size)
 
         self._data_copy.extend(data)
-        self._num_entities += 1
         if self._has_data_pointer == False:
             if isinstance(data, (np.ndarray, np.generic)):
                 data_size = data.size
@@ -849,27 +851,46 @@ def scoping_ids(self):
         list
             List of integers representing the scoping IDs of the field.
         """
-        return self._scoping_ids_copy
+        return self._scoping_copy.ids
 
     @scoping_ids.setter
     def scoping_ids(self, data):
-        self._scoping_ids_copy = data
-        self._num_entities = len(data)
+        self._scoping_copy.ids = data
+
+    @property
+    def scoping(self):
+        """Scoping specifying where the data is.
+
+        Each entity data is on a given scoping ID.
+
+        Returns
+        -------
+        scoping : :class:`ansys.dpf.core.scoping.Scoping`
+        """
+        return self._scoping_copy
+
+    @scoping.setter
+    def scoping(self, data):
+        self._scoping_copy = data
 
     def release_data(self):
         """Release the data."""
         super()._set_data(self._data_copy)
         super()._set_data_pointer(self._data_pointer_copy)
-        super().scoping.ids = self._scoping_ids_copy
+        self._scoping_copy.release_data()
 
     def __enter__(self):
         return self
 
     def __exit__(self, type, value, tb):
         if tb is None:
+            self._is_exited = True
             self.release_data()
         else:
             print(tb)
 
     def __del__(self):
+        if not hasattr(self, "_is_exited") or not self._is_exited:
+            self._is_exited = True
+            self.release_data()
         pass

ansys/dpf/core/misc.py

@@ -5,7 +5,7 @@
 from pkgutil import iter_modules
 
 
-DEFAULT_FILE_CHUNK_SIZE = 65536
+DEFAULT_FILE_CHUNK_SIZE = 524288
 
 # ANSYS CPython Workbench environment may not have scooby installed.
 try: