Skip to content

Update generated code for DPF 251 on fix/hidden_operators_exposure #1822

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 7 commits into from
Closed

Update generated code for DPF 251 on fix/hidden_operators_exposure #1822

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6076766
Fix mustache code style
PProfizi Oct 18, 2024
bddf712
Filter-out hidden operators from available operators in ansys.dpf.cor…
PProfizi Oct 18, 2024
5ab5e74
Use binary string to not change line endings when writing to file
PProfizi Oct 18, 2024
a71dce5
Generate __init__py files directly in ansys.dpf.core.operators.build.…
PProfizi Oct 21, 2024
4ca42c2
Remove usage of python_generator operator in .ci/code_generation.py
PProfizi Oct 21, 2024
7fba1a5
Fix operator import
PProfizi Oct 21, 2024
09d1b44
update generated code
PProfizi Oct 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
77 changes: 2 additions & 75 deletions .ci/code_generation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,49 +5,9 @@
import os
import glob
from pathlib import Path
import time
import shutil


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, "*"))
Expand All @@ -65,41 +25,8 @@
os.remove(f)
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()
8 changes: 4 additions & 4 deletions doc/source/_static/dpf_operators.html
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions src/ansys/dpf/core/operators/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from . import averaging
from . import compression
from . import filter
from . import geo
from . import invariant
Expand All @@ -11,4 +12,5 @@
from . import result
from . import scoping
from . import serialization
from . import server
from . import utility
51 changes: 24 additions & 27 deletions src/ansys/dpf/core/operators/averaging/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,24 @@
from .elemental_difference import elemental_difference
from .elemental_difference_fc import elemental_difference_fc
from .elemental_fraction_fc import elemental_fraction_fc
from .elemental_mean import elemental_mean
from .elemental_mean_fc import elemental_mean_fc
from .elemental_nodal_to_nodal import elemental_nodal_to_nodal
from .elemental_nodal_to_nodal_elemental import elemental_nodal_to_nodal_elemental
from .elemental_nodal_to_nodal_elemental_fc import elemental_nodal_to_nodal_elemental_fc
from .elemental_nodal_to_nodal_fc import elemental_nodal_to_nodal_fc
from .elemental_to_elemental_nodal import elemental_to_elemental_nodal
from .elemental_to_elemental_nodal_fc import elemental_to_elemental_nodal_fc
from .elemental_to_nodal import elemental_to_nodal
from .elemental_to_nodal_fc import elemental_to_nodal_fc
from .extend_to_mid_nodes import extend_to_mid_nodes
from .extend_to_mid_nodes_fc import extend_to_mid_nodes_fc
from .force_summation import force_summation
from .gauss_to_node_fc import gauss_to_node_fc
from .nodal_difference import nodal_difference
from .nodal_difference_fc import nodal_difference_fc
from .nodal_extend_to_mid_nodes import nodal_extend_to_mid_nodes
from .nodal_fraction_fc import nodal_fraction_fc
from .nodal_to_elemental import nodal_to_elemental
from .nodal_to_elemental_fc import nodal_to_elemental_fc
from .to_elemental_fc import to_elemental_fc
from .to_elemental_nodal_fc import to_elemental_nodal_fc
from .to_nodal import to_nodal
from .to_nodal_fc import to_nodal_fc
from .elemental_difference import elemental_difference
from .elemental_difference_fc import elemental_difference_fc
from .elemental_fraction_fc import elemental_fraction_fc
from .elemental_mean import elemental_mean
from .elemental_mean_fc import elemental_mean_fc
from .elemental_nodal_to_nodal import elemental_nodal_to_nodal
from .elemental_nodal_to_nodal_elemental import elemental_nodal_to_nodal_elemental
from .elemental_nodal_to_nodal_elemental_fc import elemental_nodal_to_nodal_elemental_fc
from .elemental_nodal_to_nodal_fc import elemental_nodal_to_nodal_fc
from .elemental_to_elemental_nodal import elemental_to_elemental_nodal
from .elemental_to_elemental_nodal_fc import elemental_to_elemental_nodal_fc
from .elemental_to_nodal import elemental_to_nodal
from .extend_to_mid_nodes import extend_to_mid_nodes
from .extend_to_mid_nodes_fc import extend_to_mid_nodes_fc
from .force_summation import force_summation
from .gauss_to_node_fc import gauss_to_node_fc
from .nodal_difference import nodal_difference
from .nodal_difference_fc import nodal_difference_fc
from .nodal_fraction_fc import nodal_fraction_fc
from .nodal_to_elemental import nodal_to_elemental
from .nodal_to_elemental_fc import nodal_to_elemental_fc
from .to_elemental_fc import to_elemental_fc
from .to_nodal import to_nodal
from .to_nodal_fc import to_nodal_fc
Loading
Loading