Merge with master

Author: PProfizi

.ci/build_doc.bat

@@ -1,28 +1,28 @@
-set SPHINX_APIDOC_OPTIONS=inherited-members
-call sphinx-apidoc -o ../doc/source/api ../src/ansys ../src/ansys/dpf/core/log.py ^
-../src/ansys/dpf/core/help.py ../src/ansys/dpf/core/mapping_types.py ../src/ansys/dpf/core/ipconfig.py ^
-../src/ansys/dpf/core/field_base.py ../src/ansys/dpf/core/cache.py ../src/ansys/dpf/core/misc.py ^
-../src/ansys/dpf/core/check_version.py ../src/ansys/dpf/core/operators/build.py ../src/ansys/dpf/core/operators/specification.py ^
-../src/ansys/dpf/core/vtk_helper.py ../src/ansys/dpf/core/label_space.py ../src/ansys/dpf/core/examples/python_plugins/* ^
-../src/ansys/dpf/core/examples/examples.py ../src/ansys/dpf/gate/* ../src/ansys/dpf/gatebin/* ../src/ansys/grpc/dpf/* ^
- ../src/ansys/dpf/core/property_fields_container.py ^
- -f --implicit-namespaces --separate  --no-headings
+@echo off
+
+REM Move to the documentation directory
 pushd .
 cd ../doc/
+
+REM Clean the previous build
 call make clean
+
+REM Build the HTML documentation
 call make html -v -v -v -P
 
+REM Display the directory contents for verification
 dir
 
-rem Patch pyVista issue with elemental plots
+REM Patch pyVista issue with elemental plots by copying necessary images
+xcopy source\examples\04-advanced\02-volume_averaged_stress\sphx_glr_02-volume_averaged_stress_001.png build\html\_images\ /y /f
+xcopy source\examples\12-fluids\02-fluids_results\sphx_glr_02-fluids_results_001.png build\html\_images\ /y /f
+xcopy source\examples\12-fluids\02-fluids_results\sphx_glr_02-fluids_results_002.png build\html\_images\ /y /f
+xcopy source\examples\12-fluids\02-fluids_results\sphx_glr_02-fluids_results_003.png build\html\_images\ /y /f
+xcopy source\examples\12-fluids\02-fluids_results\sphx_glr_02-fluids_results_004.png build\html\_images\ /y /f
+xcopy source\examples\12-fluids\02-fluids_results\sphx_glr_02-fluids_results_005.png build\html\_images\ /y /f
+xcopy source\examples\12-fluids\02-fluids_results\sphx_glr_02-fluids_results_006.png build\html\_images\ /y /f
+xcopy source\examples\12-fluids\02-fluids_results\sphx_glr_02-fluids_results_007.png build\html\_images\ /y /f
+xcopy source\examples\12-fluids\02-fluids_results\sphx_glr_02-fluids_results_thumb.png build\html\_images\ /y /f
 
-xcopy  source\examples\04-advanced\02-volume_averaged_stress\sphx_glr_02-volume_averaged_stress_001.png   build\html\_images\  /y /f
-xcopy  source\examples\12-fluids\02-fluids_results\sphx_glr_02-fluids_results_001.png                     build\html\_images\  /y /f
-xcopy  source\examples\12-fluids\02-fluids_results\sphx_glr_02-fluids_results_002.png                     build\html\_images\  /y /f
-xcopy  source\examples\12-fluids\02-fluids_results\sphx_glr_02-fluids_results_003.png                     build\html\_images\  /y /f
-xcopy  source\examples\12-fluids\02-fluids_results\sphx_glr_02-fluids_results_004.png                     build\html\_images\  /y /f
-xcopy  source\examples\12-fluids\02-fluids_results\sphx_glr_02-fluids_results_005.png                     build\html\_images\  /y /f
-xcopy  source\examples\12-fluids\02-fluids_results\sphx_glr_02-fluids_results_006.png                     build\html\_images\  /y /f
-xcopy  source\examples\12-fluids\02-fluids_results\sphx_glr_02-fluids_results_007.png                     build\html\_images\  /y /f
-xcopy  source\examples\12-fluids\02-fluids_results\sphx_glr_02-fluids_results_thumb.png                   build\html\_images\  /y /f
+REM Return to the original directory
 popd

.ci/build_wheel.py

@@ -2,18 +2,22 @@
 # Input can be one of ["any", "win", "manylinux1", "manylinux_2_17"]
 
 import argparse
-import subprocess
 import os
-import sys
+from pathlib import Path
 import shutil
+import subprocess
+import sys
 import tempfile
 
-
 supported_platforms = {
     "any": "any",
     "win": "win_amd64",
     "manylinux1": "manylinux1_x86_64",
     "manylinux_2_17": "manylinux_2_17_x86_64",
+    # Accommodate tox.ini automatic platform substitutions
+    "linux": "manylinux_2_17_x86_64",
+    "win32": "win_amd64",
+    "darwin": "any",
 }
 
 argParser = argparse.ArgumentParser()
@@ -39,15 +43,13 @@
     print("Created temporary directory: ", tmpdirname)
 
     # Create the temporary build-opts.cfg
-    build_opts_path = os.path.join(tmpdirname, "build-opts.cfg")
-    with open(build_opts_path, "w") as build_opts_file:
-        build_opts_file.write(f"[bdist_wheel]\nplat-name={requested_platform}")
-    os.environ["DIST_EXTRA_CONFIG"] = build_opts_path
+    build_opts_path = Path(tmpdirname) / "build-opts.cfg"
+
+    build_opts_path.write_text(f"[bdist_wheel]\nplat-name={requested_platform}", encoding="utf-8")
+    os.environ["DIST_EXTRA_CONFIG"] = str(build_opts_path)
 
     # Move the binaries
-    gatebin_folder_path = os.path.join(
-        os.path.curdir, os.path.join("src", "ansys", "dpf", "gatebin")
-    )
+    gatebin_folder_path = Path.cwd() / "src" / "ansys" / "dpf" / "gatebin"
     binaries_to_move = []
     moved = []
     if "win" in requested_platform or "any" == requested_platform:
@@ -60,15 +62,15 @@
         binaries_to_move.extend(["_version.py"])
 
     for binary_name in binaries_to_move:
-        src = os.path.join(gatebin_folder_path, binary_name)
-        dst = os.path.join(tmpdirname, binary_name)
+        src = gatebin_folder_path / binary_name
+        dst = Path(tmpdirname) / binary_name
         print(f"Moving {src} to {dst}")
         shutil.move(src=src, dst=dst)
         moved.append([dst, src])
 
     if "any" == requested_platform:
         # Also remove the gatebin folder
-        os.rmdir(gatebin_folder_path)
+        gatebin_folder_path.rmdir()
 
     # Call the build
     if not args.wheelhouse:
@@ -83,7 +85,7 @@
 
     if "any" == requested_platform:
         # Recreate the gatebin folder
-        os.mkdir(gatebin_folder_path)
+        gatebin_folder_path.mkdir()
 
     # Move binaries back
     for move_back in moved:

.ci/code_generation.py

@@ -1,105 +1,32 @@
 # import subprocess
 
-from ansys.dpf import core
-from ansys.dpf.core.operators import build
-import os
 import glob
+import os
 from pathlib import Path
-import time
 import shutil
 
+from ansys.dpf import core
+from ansys.dpf.core.operators import build
 
-core.set_default_server_context(core.AvailableServerContexts.premium)
-
-if os.name == "posix":
-    LIB_TO_GENERATE = [
-        "libAns.Dpf.Native.so",
-        "libAns.Dpf.FEMutils.so",
-        "libmapdlOperatorsCore.so",
-        "libmeshOperatorsCore.so",
-        "libAns.Dpf.Math.so",
-        "libAns.Dpf.Hdf5.so",
-        "libAns.Dpf.LSDYNAHGP.so",
-        "libAns.Dpf.LivePost.so",
-        "libans.dpf.pointcloudsearch.so",
-        "libAns.Dpf.Vtk.so",
-        "libAns.Dpf.MechanicalResults.so",
-    ]
-    LIB_OPTIONAL_TO_GENERATE = [
-        "libAns.Dpf.SystemCouplingMapping.so",
-    ]
-else:
-    LIB_TO_GENERATE = [
-        "Ans.Dpf.Native.dll",
-        "Ans.Dpf.FEMutils.dll",
-        "meshOperatorsCore.dll",
-        "mapdlOperatorsCore.dll",
-        "Ans.Dpf.Math.dll",
-        "Ans.Dpf.PythonPluginWrapper.dll",
-        "Ans.Dpf.Hdf5.dll",
-        "Ans.Dpf.FlowDiagram.dll",
-        "Ans.Dpf.LSDYNAHGP.dll",
-        "Ans.Dpf.LivePost.dll",
-        "Ans.Dpf.PointCloudSearch.dll",
-        "Ans.Dpf.Vtk.dll",
-        "Ans.Dpf.MechanicalResults.dll",
-    ]
-    LIB_OPTIONAL_TO_GENERATE = [
-        "Ans.Dpf.SystemCouplingMapping.dll",
-    ]
-
-local_dir = os.path.dirname(os.path.abspath(__file__))
-TARGET_PATH = os.path.join(local_dir, os.pardir, "src", "ansys", "dpf", "core", "operators")
-files = glob.glob(os.path.join(TARGET_PATH, "*"))
-for f in files:
-    if Path(f).stem == "specification":
+local_dir = Path(__file__).parent
+TARGET_PATH = local_dir.parent / "src" / "ansys" / "dpf" / "core" / "operators"
+files = TARGET_PATH.glob("*")
+for file_path in files:
+    if file_path.stem == "specification":
         continue
-    if Path(f).name == "build.py":
+    if file_path.name == "build.py":
         continue
-    if Path(f).name == "operator.mustache":
+    if file_path.name == "operator.mustache":
         continue
     try:
-        if os.path.isdir(f):
-            shutil.rmtree(f)
+        if file_path.is_dir():
+            shutil.rmtree(file_path)
         else:
-            os.remove(f)
+            file_path.unlink()
     except:
         pass
-core.start_local_server(config=core.AvailableServerConfigs.LegacyGrpcServer)
-code_gen = core.Operator("python_generator")
-code_gen.connect(1, TARGET_PATH)
-for lib in LIB_TO_GENERATE:
-    try:
-        code_gen.connect(0, lib)
-        if lib != LIB_TO_GENERATE[0]:
-            code_gen.connect(2, False)
-        else:
-            code_gen.connect(2, True)
-        print(f"Generating {lib} operators for server {core.SERVER.version}...")
-        code_gen.run()
-        time.sleep(0.1)
-    except Exception as e:
-        print(f"Could not generate operators for library {lib}:\n{str(e)}")
-        raise e
-
-for lib in LIB_OPTIONAL_TO_GENERATE:
-    try:
-        code_gen.connect(0, lib)
-        if lib != LIB_OPTIONAL_TO_GENERATE[0]:
-            code_gen.connect(2, False)
-        else:
-            code_gen.connect(2, True)
-        print(f"Generating optional {lib} operators for server {core.SERVER.version}...")
-        code_gen.run()
-        time.sleep(0.1)
-    except Exception as e:
-        print(f"Could not generate operators for optional library {lib}:\n{str(e)}")
 
-# Reorder imports alphabetically in __init__.py files to reduce changes raised
-for init_file_path in glob.glob(os.path.join(TARGET_PATH, "**/__init__.py"), recursive=True):
-    with open(init_file_path, "r") as init_file:
-        lines = init_file.readlines()
-    with open(init_file_path, "w") as init_file:
-        init_file.writelines(sorted(lines))
+core.set_default_server_context(core.AvailableServerContexts.premium)
+core.start_local_server(config=core.AvailableServerConfigs.LegacyGrpcServer)
 
 build.build_operators()

.ci/run_examples.py

@@ -1,45 +1,45 @@
-import os
 import glob
-import pathlib
+import os
+from pathlib import Path
 import subprocess
 import sys
 
 import ansys.dpf.core as dpf
 from ansys.dpf.core.examples import get_example_required_minimum_dpf_version
 
-
 os.environ["PYVISTA_OFF_SCREEN"] = "true"
 os.environ["MPLBACKEND"] = "Agg"
 
-actual_path = pathlib.Path(__file__).parent.absolute()
-print(os.path.join(actual_path, os.path.pardir, "examples"))
+actual_path = Path(__file__).parent.absolute()
+examples_path = actual_path.parent / "examples"
+print(examples_path)
 
 # Get the DPF server version
 server = dpf.server.get_or_create_server(None)
 server_version = server.version
 server.shutdown()
 print(f"Server version: {server_version}")
 
-for root, subdirectories, files in os.walk(os.path.join(actual_path, os.path.pardir, "examples")):
+for root, subdirectories, files in os.walk(examples_path):
     for subdirectory in subdirectories:
-        subdir = os.path.join(root, subdirectory)
-        for file in glob.iglob(os.path.join(subdir, "*.py")):
-            if sys.platform == "linux" and "08-python-operators" in file:
+        subdir = Path(root) / subdirectory
+        for file in subdir.glob("*.py"):
+            if sys.platform == "linux" and "08-python-operators" in str(file):
                 continue
-            elif "win" in sys.platform and "06-distributed_stress_averaging" in file:
+            elif "win" in sys.platform and "06-distributed_stress_averaging" in str(file):
                 # Currently very unstable in the GH CI
                 continue
             print("\n--------------------------------------------------")
             print(file)
             minimum_version_str = get_example_required_minimum_dpf_version(file)
             if float(server_version) - float(minimum_version_str) < -0.05:
-                print(f"Example skipped as it requires DPF {minimum_version_str}.")
+                print(f"Example skipped as it requires DPF {minimum_version_str}.", flush=True)
                 continue
             try:
-                out = subprocess.check_output([sys.executable, file])
+                out = subprocess.check_output([sys.executable, str(file)])
             except subprocess.CalledProcessError as e:
                 sys.stderr.write(str(e.args))
                 if e.returncode != 3221225477:
-                    print(out)
+                    print(out, flush=True)
                     raise e
-            print("PASS")
+            print("PASS", flush=True)

.ci/run_non_regression_examples.py

@@ -1,57 +1,39 @@
-import os
 import glob
-from ansys.dpf import core
+import os
 import pathlib
 import subprocess
 import sys
 
+from ansys.dpf import core
+
 os.environ["PYVISTA_OFF_SCREEN"] = "true"
 os.environ["MPLBACKEND"] = "Agg"
 
 actual_path = pathlib.Path(__file__).parent.absolute()
-print(os.path.join(actual_path, os.path.pardir, "examples"))
+examples_path = actual_path.parent / "examples"
+print(examples_path)
 
 
 list_tests = [
-    os.path.join(actual_path, os.path.pardir, "examples", "00-basic"),
-    os.path.join(actual_path, os.path.pardir, "examples", "01-transient_analyses"),
-    os.path.join(actual_path, os.path.pardir, "examples", "02-modal_analyses"),
-    os.path.join(actual_path, os.path.pardir, "examples", "03-harmonic_analyses"),
-    os.path.join(actual_path, os.path.pardir, "examples", "06-plotting", "00-basic_plotting.py"),
-    os.path.join(
-        actual_path,
-        os.path.pardir,
-        "examples",
-        "06-plotting",
-        "05-plot_on_warped_mesh.py",
-    ),
-    os.path.join(
-        actual_path,
-        os.path.pardir,
-        "examples",
-        "07-distributed-post",
-        "00-distributed_total_disp.py",
-    ),
+    examples_path / "00-basic",
+    examples_path / "01-transient_analyses",
+    examples_path / "02-modal_analyses",
+    examples_path / "03-harmonic_analyses",
+    examples_path / "06-plotting" / "00-basic_plotting.py",
+    examples_path / "06-plotting" / "05-plot_on_warped_mesh.py",
+    examples_path / "07-distributed-post" / "00-distributed_total_disp.py",
 ]
 
 if core.SERVER_CONFIGURATION != core.AvailableServerConfigs.InProcessServer:
-    list_tests.append(
-        os.path.join(
-            actual_path,
-            os.path.pardir,
-            "examples",
-            "08-python-operators",
-            "00-wrapping_numpy_capabilities.py",
-        )
-    )
+    list_tests.append(examples_path / "08-python-operators" / "00-wrapping_numpy_capabilities.py")
 
 for path in list_tests:
-    if os.path.isdir(path):
-        for file in glob.iglob(os.path.join(path, "*.py")):
+    if path.is_dir():
+        for file in path.glob("*.py"):
             print("\n--------------------------------------------------")
             print(file)
             try:
-                subprocess.check_call([sys.executable, file])
+                subprocess.check_call([sys.executable, str(file)])
             except subprocess.CalledProcessError as e:
                 sys.stderr.write(str(e.args))
                 if e.returncode != 3221225477:
@@ -61,7 +43,7 @@
         print("\n--------------------------------------------------")
         print(path)
         try:
-            subprocess.check_call([sys.executable, file])
+            subprocess.check_call([sys.executable, str(file)])
         except subprocess.CalledProcessError as e:
             sys.stderr.write(str(e.args))
             if e.returncode != 3221225477: