Skip to content
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.

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

Simplify library installation #909

Merged
merged 109 commits into from
Sep 6, 2023
Merged
Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
109 commits
Select commit Hold shift + click to select a range
f243fdb
Add gate module in src/ansys/dpf/
PProfizi Apr 19, 2023
16849b6
remove ansys-dpf-gate from direct dependencies
PProfizi Apr 19, 2023
cf4da1b
Add grpc/dpf module to src/ansys/
PProfizi Apr 19, 2023
e7213bf
remove ansys-grpc-dpf from requirements_dev.txt
PProfizi Apr 19, 2023
ede7512
Fix assert in test_data_tree.py/test_runtime_core_config
PProfizi Apr 20, 2023
48700e2
Temporary fix to dpf_mesh_to_vtk_py
PProfizi Apr 20, 2023
5a2acb2
By default ignore changes to src/ansys/dpf/gate, ansys/dpf/gatebin an…
PProfizi Apr 20, 2023
8b0137d
Remove requirements_dev.txt with gatebin
PProfizi Apr 20, 2023
9c78323
Add gatebin for windows directly
PProfizi Apr 20, 2023
d440f84
Revert "Remove requirements_dev.txt with gatebin"
PProfizi Apr 20, 2023
585b896
Remove gatebin from requirements_dev.txt
PProfizi Apr 20, 2023
08828ca
Refactor package for single wheel
PProfizi Apr 20, 2023
9c2a90d
Add manylinux_1 versions of gatebin binaries
PProfizi Apr 20, 2023
516c5e3
Add grpcio as dependency (was working due to something in requirement…
PProfizi Apr 20, 2023
f6013a7
Add google-api-python-client as dependency (was working due to someth…
PProfizi Apr 20, 2023
6045767
Exclude gate, gatebin and grpc from api-doc generation
PProfizi Apr 20, 2023
25d774c
Fix title underlines in examples
PProfizi Apr 20, 2023
fea1aa7
Update .gitignore
PProfizi Apr 20, 2023
2a5fe22
Update .pre-commit-config.yaml
PProfizi Apr 20, 2023
cd66c96
Move everything into src/ansys/dpf/core, also move grpc to src/ansys/…
PProfizi Apr 21, 2023
2a9044b
Fix imports due to refactor
PProfizi Apr 21, 2023
c9a4a56
Fix imports due to refactor
PProfizi Apr 21, 2023
8ee7b0f
Add missing refactored files
PProfizi Apr 21, 2023
0107d26
Fix gate/load_pi.py/_try_use_gatebin()
PProfizi Apr 21, 2023
76c1bea
Merge branch 'master' into maint/integrate_pygate
PProfizi Apr 21, 2023
d3fe97c
Fix gate/load_pi.py/_find_outdated_ansys_version()
PProfizi Apr 21, 2023
a9af2fa
Add .so gatebin binaries
PProfizi Apr 21, 2023
dc7dc44
Fix expected path to gatebin module in test_service.py
PProfizi Apr 21, 2023
71c6b57
Update codacy.yml and .gitignore
PProfizi Apr 21, 2023
0d3f558
Try and fix 02-volume_averaged_stress.py for Docker
PProfizi Apr 21, 2023
8d7795a
Fix 04-extrapolation_stress_3d.py for Docker
PProfizi Apr 21, 2023
5beed3d
Switch to setuptools as backend building tool to allow for several pa…
PProfizi Apr 24, 2023
df68a6c
Fix ansys/grpc/dpf instead of ansys/dpf/grpc in ignores
PProfizi Apr 24, 2023
1f6706e
Revert operators/math changes due to testing
PProfizi Apr 24, 2023
7268dfe
Include ansys.dpf.gate.generated in packaged packages
PProfizi Apr 24, 2023
9cb010f
Include all in setup("packages")
PProfizi Apr 25, 2023
2854f72
Revert changes to 04-extrapolation_stress_3d.py
PProfizi Apr 25, 2023
219e4d6
Add a 10mn timeout to Test API Entry on Docker
PProfizi Apr 25, 2023
e442c1b
Try fix elemental_nodal_to_nodal_fc.outputs[1].type_names
PProfizi Apr 25, 2023
60502af
update_operators.yml now unzips ansys_grpc_dpf in src/ansys/
PProfizi Apr 25, 2023
2ab3265
update_operators.yml now unzips ansys_grpc_dpf in src/ansys/
PProfizi Apr 25, 2023
1c22e2e
update_operators.yml now unzips ansys_grpc_dpf in src/ansys/
PProfizi Apr 25, 2023
f94be67
update_operators.yml now unzips ansys_grpc_dpf in src/ansys/
PProfizi Apr 25, 2023
221431e
update_operators.yml now unzips ansys_grpc_dpf in src/ansys/
PProfizi Apr 25, 2023
387293b
update_operators.yml now unzips ansys_grpc_dpf in src/ansys/
PProfizi Apr 25, 2023
9f7ef26
update_operators.yml now unzips ansys_grpc_dpf in src/ansys/
PProfizi Apr 25, 2023
fe1acf7
update_operators.yml now unzips ansys_grpc_dpf in src/ansys/
PProfizi Apr 25, 2023
6e34cee
update_operators.yml now unzips ansys_grpc_dpf in src/ansys/
PProfizi Apr 25, 2023
b91ca50
update_operators.yml now unzips ansys_grpc_dpf in src/ansys/
PProfizi Apr 25, 2023
9a25b0a
update_operators.yml now unzips ansys_grpc_dpf in src/ansys/
PProfizi Apr 25, 2023
9c8db29
update_operators.yml now unzips ansys_grpc_dpf in src/ansys/ as well …
PProfizi Apr 25, 2023
0fdc616
update_operators.yml now unzips ansys_grpc_dpf in src/ansys/ as well …
PProfizi Apr 25, 2023
7fd82ac
update_operators.yml now unzips ansys_grpc_dpf in src/ansys/ as well …
PProfizi Apr 25, 2023
c9b4717
Improve debugging for operators/build;py
PProfizi Apr 25, 2023
bed5415
Temp hack to bypass broken operators sweeping_phase specs
PProfizi Apr 25, 2023
3365713
Revert "Temp hack to bypass broken operators sweeping_phase specs"
PProfizi Apr 26, 2023
5bbba2c
Temporarily bypass the mesh_to_vtk operator
PProfizi Apr 26, 2023
f79f67c
Fix use of input standalone-suffix
PProfizi Apr 26, 2023
0b8bffe
update operators (#916)
github-actions[bot] Apr 26, 2023
2cf5e0e
Remove previous grpc and gate files and force git add
PProfizi Apr 26, 2023
de4039f
Merge remote-tracking branch 'origin/maint/integrate_pygate' into mai…
PProfizi Apr 26, 2023
6ea33c6
Merge branch 'master' into maint/integrate_pygate
PProfizi Apr 26, 2023
6175b30
Merge branch 'master' into maint/integrate_pygate
PProfizi Apr 26, 2023
6c7b291
Merge branch 'master' into maint/integrate_pygate
PProfizi Apr 27, 2023
ab5f3d6
Merge branch 'master' into maint/integrate_pygate
PProfizi Apr 27, 2023
a910c3c
Still bypass mesh_to_pyvista_op
PProfizi Apr 27, 2023
d80edc2
Bypass bug on plot for 00-compute_and_average.py
PProfizi Apr 27, 2023
9adc885
Move all metadata to pyproject.toml, keep setup.py for retro-compatib…
PProfizi Apr 27, 2023
2f43b1d
Merge branch 'master' into maint/integrate_pygate
PProfizi Apr 27, 2023
494d72a
Add update_dpf_dependencies.py script
PProfizi May 15, 2023
bbedb80
Add update_dpf_dependencies.py script
PProfizi May 15, 2023
cf35e7d
Remove support for 221 (incompatible with this refactoring of the pac…
PProfizi May 15, 2023
5f1135c
Merge branch 'master' into maint/integrate_pygate
PProfizi Jul 18, 2023
de93666
Merge branch 'master' into maint/integrate_pygate
PProfizi Jul 18, 2023
0df8e05
Updated dpf dependencies
PProfizi Jul 18, 2023
594f56b
Updated dpf dependencies
PProfizi Jul 18, 2023
17e9a62
Merge remote-tracking branch 'origin/maint/integrate_pygate' into mai…
PProfizi Jul 18, 2023
7629a71
Merge branch 'master' into maint/integrate_pygate
PProfizi Jul 18, 2023
f321d17
Updated dpf dependencies
PProfizi Jul 18, 2023
4ccf5c4
Updated dpf dependencies
PProfizi Jul 18, 2023
431278c
Updated dpf dependencies
PProfizi Jul 18, 2023
0fdde42
Merge remote-tracking branch 'origin/maint/integrate_pygate' into mai…
PProfizi Jul 18, 2023
40f60f6
Updated dpf dependencies
PProfizi Jul 18, 2023
a769617
Add missing generic_data_container_pb2.py and generic_data_container_…
PProfizi Jul 19, 2023
dfc67f2
Update with latest dist from dpf-standalone
PProfizi Jul 19, 2023
2cf8dd9
Merge branch 'master' into maint/integrate_pygate
PProfizi Jul 19, 2023
61b1a8b
Update with latest dist from dpf-standalone
PProfizi Jul 19, 2023
30e0bce
Remove custom requirements and custom wheels inputs and parameters fr…
PProfizi Jul 19, 2023
70a225f
Merge branch 'master' into maint/integrate_pygate
PProfizi Aug 3, 2023
9e51db0
Rename ANSYS_DPF_GATE_ROOT -> ANSYSDPFPYGATE_ROOT, ANSYS_DPF_GRPC_ROO…
PProfizi Aug 7, 2023
f5d83cb
update operators (#1109)
github-actions[bot] Aug 8, 2023
d9f56ea
Merge branch 'master' into maint/integrate_pygate
PProfizi Aug 8, 2023
64536c4
Fix gatebin integration and core.helpers integration
PProfizi Aug 9, 2023
8cb01f5
Use branches _integrate_gate for dpf-standalone
PProfizi Aug 9, 2023
accad6c
Fix test_load_api_without_awp_root_no_gatebin
PProfizi Aug 9, 2023
55cf8fe
Fix gate.load_api._try_use_gatebin
PProfizi Aug 9, 2023
d3c52cb
Set branch for update_operators.yml to _test_pygate
PProfizi Aug 30, 2023
007d8ab
Update update_dpf_dependencies.py for debug
PProfizi Aug 30, 2023
2dfcf5d
Update update_dpf_dependencies.py for improved path treatment
PProfizi Aug 30, 2023
68a481a
Update Operators for DPF 241_test_pygate on maint/integrate_pygate (#…
github-actions[bot] Aug 31, 2023
eb830c3
Fix doc step
PProfizi Aug 31, 2023
945439c
Merge branch 'master' into maint/integrate_pygate
PProfizi Aug 31, 2023
72bdeaa
Make package discovery dynamic
PProfizi Aug 31, 2023
cbe3c27
Fix package_data
PProfizi Aug 31, 2023
6bed6a9
Fix build_doc.bat fluid images copy
PProfizi Aug 31, 2023
5ddc8f7
update operators (#1136)
github-actions[bot] Sep 6, 2023
35952af
Improve update PR text
PProfizi Sep 6, 2023
48086d6
Merge branch 'master' into maint/integrate_pygate
PProfizi Sep 6, 2023
f37f8c6
Set CI back to main dpf-standalone branches
PProfizi Sep 6, 2023
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
2 changes: 1 addition & 1 deletion .ci/build_doc.bat
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ call sphinx-apidoc -o ../docs/source/api ../src/ansys ../src/ansys/dpf/core/log.
../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/core/examples/examples.py ../src/ansys/dpf/gate/* ../src/ansys/dpf/gatebin/* ../src/ansys/dpf/grpc/* ^
-f --implicit-namespaces --separate --no-headings
pushd .
cd ../docs/
Expand Down
5 changes: 4 additions & 1 deletion .flake8
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
[flake8]
exclude = venv, src/ansys/dpf/core/operators, __init__.py, docs/build, .venv
select = W191, W391, E115, E117, E122, E124, E125, E301, W291, W293, E225, E231, E303, E501, F401, F403
per-file-ignores = __init__.py:F401,F403
per-file-ignores =
__init__.py:F401,F403
src/ansys/dpf/gate/*:E501,F401
src/ansys/dpf/grpc/*:E501,F401
count = True
max-complexity = 10
max-line-length = 100
Expand Down
7 changes: 6 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -186,4 +186,9 @@ dpf-standalone/

# to be deleted

search/
search/

# ansys-dpf-gate, ansys-grpc-dpf and ansys-dpg-gatebin
src/ansys/dpf/gate/
src/ansys/dpf/gatebin/
src/ansys/grpc/
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

###############################################################################
# Define manually the node coordinates of the polyhedrons and polygons
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# Note on these two sets of nodes, there are two nodes at [0,0,0]
# This anomaly has been taking into account for this example

Expand Down Expand Up @@ -257,7 +257,7 @@

###############################################################################
# Connectivity set in property fields
# ~~~~~~~~~~~~~~~~~~~~
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# We now set all of these information into a PropertyField regarding the meshed region

###############################################################################
Expand Down Expand Up @@ -320,7 +320,7 @@

###############################################################################
# Face/Element types set in property fields
# ~~~~~~~~~~~~~~~~~~~~
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# Set the element/face type for the meshed region
# For the ShellOnly the faces are lines and the elements are Quad
# For the SolidOnly the faces are Polygon, Quad and Tri and the elements are Polyhedrons
Expand Down Expand Up @@ -379,7 +379,7 @@

###############################################################################
# Plot the meshes
# ~~~~~~~~~~~~~~~~~~~~
# ~~~~~~~~~~~~~~~
# In order to plot the meshes, we have to set a cell_node connectivity PropertyField

###############################################################################
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
.. _ref_basic_cyclic:

Get base and duplicate sectors (real and imaginary) results for modal cyclic symmetry
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

This example shows how to extract results from a modal cyclic symmetry model.

Expand Down
5 changes: 3 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,15 @@ dependencies = [
"setuptools",
"tqdm",
"numpy",
"ansys-dpf-gate>=0.3.*",
"grpcio",
"google-api-python-client",
]

[project.optional-dependencies]
plotting = ["pyvista>=0.32.0", "matplotlib>=3.2"]

[tool.flit.module]
name = "ansys.dpf.core"
name = "ansys.dpf"
PProfizi marked this conversation as resolved.
Show resolved Hide resolved

[project.urls]
Homepage = "https://dpf.docs.pyansys.com/"
Expand Down
3 changes: 0 additions & 3 deletions requirements/requirements_dev.txt
Original file line number Diff line number Diff line change
@@ -1,3 +0,0 @@
ansys-dpf-gate==0.3.2.dev0
ansys-dpf-gatebin==0.3.2.dev0
ansys-grpc-dpf==0.7.2.dev0
1 change: 0 additions & 1 deletion requirements/requirements_install.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
ansys-dpf-gate==0.3.1
numpy==1.24.1
packaging==23.0
psutil==5.9.4
Expand Down
Empty file added src/ansys/dpf/__init__.py
PProfizi marked this conversation as resolved.
Show resolved Hide resolved
Empty file.
6 changes: 3 additions & 3 deletions src/ansys/dpf/core/server_types.py
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,7 @@ def _compare_ansys_grpc_dpf_version(right_grpc_module_version_str: str, grpc_mod


def check_ansys_grpc_dpf_version(server, timeout):
import ansys.grpc.dpf
import ansys.dpf.grpc
import grpc

state = grpc.channel_ready_future(server.channel)
Expand All @@ -350,7 +350,7 @@ def check_ansys_grpc_dpf_version(server, timeout):
f"https://dpf.docs.pyansys.com/getting_started/" f"index.html#client-server-compatibility"
)
LOG.debug("Established connection to DPF gRPC")
grpc_module_version = ansys.grpc.dpf.__version__
grpc_module_version = ansys.dpf.grpc.__version__
server_version = server.version
right_grpc_module_version = server_to_ansys_grpc_dpf_version.get(server_version, None)
if right_grpc_module_version is None: # pragma: no cover
Expand Down Expand Up @@ -1000,7 +1000,7 @@ def __init__(
context=server_context.SERVER_CONTEXT,
):
"""Start the DPF server."""
# Use ansys.grpc.dpf
# Use ansys.dpf.grpc
from ansys.dpf.core.misc import is_pypim_configured

super().__init__()
Expand Down
4 changes: 2 additions & 2 deletions src/ansys/dpf/core/vtk_helper.py
Original file line number Diff line number Diff line change
Expand Up @@ -205,8 +205,8 @@ def dpf_mesh_to_vtk_py(mesh, nodes, as_linear):
# Handle semiparabolic elements
nullmask = connectivity.data == -1
connectivity.data[nullmask] = 0
if nullmask.any():
nodes[0] = np.nan
# if nullmask.any():
# nodes[0] = np.nan

# For each polyhedron, cell = [nCellFaces, nFace0pts, i, j, k, ..., nFace1pts, i, j, k, ...]
# polys_ind = insert_ind[polyhedron_mask]
Expand Down
87 changes: 87 additions & 0 deletions src/ansys/dpf/gate/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
from .generated import dpf_vector_abstract_api
PProfizi marked this conversation as resolved.
Show resolved Hide resolved
from .generated import result_definition_capi
from .generated import string_field_capi
from .generated import collection_capi
from .generated import operator_config_capi
from .generated import time_freq_support_capi
from .generated import data_base_capi
from .generated import field_mapping_abstract_api
from .generated import field_definition_capi
from .generated import dpf_data_tree_abstract_api
from .generated import generic_data_container_capi
from .generated import data_sources_abstract_api
from .generated import dpf_vector_capi
from .generated import property_field_abstract_api
from .generated import string_field_abstract_api
from .generated import tmp_dir_abstract_api
from .generated import external_data_capi
from .generated import f_e_model_abstract_api
from .generated import client_abstract_api
from .generated import materials_container_capi
from .generated import remote_workflow_capi
from .generated import remote_operator_abstract_api
from .generated import label_space_capi
from .generated import field_mapping_capi
from .generated import field_capi
from .generated import scoping_capi
from .generated import collection_abstract_api
from .generated import data_processing_error_abstract_api
from .generated import external_operator_abstract_api
from .generated import meshed_region_abstract_api
from .generated import label_space_abstract_api
from .generated import remote_operator_capi
from .generated import operator_specification_capi
from .generated import data_processing_capi
from .generated import capi
from .generated import workflow_abstract_api
from .generated import generic_data_container_abstract_api
from .generated import fields_container_abstract_api
from .generated import support_query_abstract_api
from .generated import client_capi
from .generated import any_abstract_api
from .generated import external_operator_capi
from .generated import unit_capi
from .generated import custom_type_field_capi
from .generated import data_processing_abstract_api
from .generated import operator_specification_abstract_api
from .generated import custom_type_field_abstract_api
from .generated import data_processing_error_capi
from .generated import cyclic_support_abstract_api
from .generated import data_base_abstract_api
from .generated import external_data_abstract_api
from .generated import session_abstract_api
from .generated import streams_abstract_api
from .generated import tmp_dir_capi
from .generated import result_definition_abstract_api
from .generated import cyclic_support_capi
from .generated import unit_abstract_api
from .generated import any_capi
from .generated import data_sources_capi
from .generated import remote_workflow_abstract_api
from .generated import operator_capi
from .generated import serialization_stream_abstract_api
from .generated import field_definition_abstract_api
from .generated import session_capi
from .generated import support_capi
from .generated import streams_capi
from .generated import operator_abstract_api
from .generated import materials_container_abstract_api
from .generated import specification_externalization_capi
from .generated import support_query_capi
from .generated import support_abstract_api
from .generated import f_e_model_capi
from .generated import specification_externalization_abstract_api
from .generated import result_info_abstract_api
from .generated import fields_container_capi
from .generated import operator_config_abstract_api
from .generated import scoping_abstract_api
from .generated import time_freq_support_abstract_api
from .generated import generic_support_abstract_api
from .generated import field_abstract_api
from .generated import serialization_stream_capi
from .generated import workflow_capi
from .generated import result_info_capi
from .generated import dpf_data_tree_capi
from .generated import generic_support_capi
from .generated import meshed_region_capi
from .generated import property_field_capi
7 changes: 7 additions & 0 deletions src/ansys/dpf/gate/_version.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
"""Version for ansys-dpf-gate"""
# major, minor, patch
version_info = 0, 3, "2.dev0"
__ansys_version__ = "232"

# Nice string for the version
__version__ = ".".join(map(str, version_info))
Loading