Skip to content

Type checker #527

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

Open
wants to merge 7 commits into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -145,3 +145,6 @@ cython_debug/

# tmp dir
**tmp*

# Avoid add of DS_Store files
**.DS_Store
8 changes: 6 additions & 2 deletions docs/source/_rst/_code.rst
Original file line number Diff line number Diff line change
Expand Up @@ -68,15 +68,19 @@ Solvers
SolverInterface <solver/solver_interface.rst>
SingleSolverInterface <solver/single_solver_interface.rst>
MultiSolverInterface <solver/multi_solver_interface.rst>
SupervisedSolverInterface <solver/supervised_solver/supervised_solver_interface>
DeepEnsembleSolverInterface <solver/ensemble_solver/ensemble_solver_interface>
PINNInterface <solver/physics_informed_solver/pinn_interface.rst>
PINN <solver/physics_informed_solver/pinn.rst>
GradientPINN <solver/physics_informed_solver/gradient_pinn.rst>
CausalPINN <solver/physics_informed_solver/causal_pinn.rst>
CompetitivePINN <solver/physics_informed_solver/competitive_pinn.rst>
SelfAdaptivePINN <solver/physics_informed_solver/self_adaptive_pinn.rst>
RBAPINN <solver/physics_informed_solver/rba_pinn.rst>
SupervisedSolver <solver/supervised.rst>
ReducedOrderModelSolver <solver/reduced_order_model.rst>
DeepEnsemblePINN <solver/ensemble_solver/ensemble_pinn>
SupervisedSolver <solver/supervised_solver/supervised.rst>
DeepEnsembleSupervisedSolver <solver/ensemble_solver/ensemble_supervised>
ReducedOrderModelSolver <solver/supervised_solver/reduced_order_model.rst>
GAROM <solver/garom.rst>


Expand Down
8 changes: 8 additions & 0 deletions docs/source/_rst/solver/ensemble_solver/ensemble_pinn.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
DeepEnsemblePINN
==================
.. currentmodule:: pina.solver.ensemble_solver.ensemble_pinn

.. autoclass:: DeepEnsemblePINN
:show-inheritance:
:members:

Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
DeepEnsembleSolverInterface
=============================
.. currentmodule:: pina.solver.ensemble_solver.ensemble_solver_interface

.. autoclass:: DeepEnsembleSolverInterface
:show-inheritance:
:members:

Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
DeepEnsembleSupervisedSolver
=============================
.. currentmodule:: pina.solver.ensemble_solver.ensemble_supervised

.. autoclass:: DeepEnsembleSupervisedSolver
:show-inheritance:
:members:

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ReducedOrderModelSolver
==========================
.. currentmodule:: pina.solver.reduced_order_model
.. currentmodule:: pina.solver.supervised_solver.reduced_order_model

.. autoclass:: ReducedOrderModelSolver
:members:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
SupervisedSolver
===================
.. currentmodule:: pina.solver.supervised
.. currentmodule:: pina.solver.supervised_solver.supervised

.. autoclass:: SupervisedSolver
:members:
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
SupervisedSolverInterface
==========================
.. currentmodule:: pina.solver.supervised_solver.supervised_solver_interface

.. autoclass:: SupervisedSolverInterface
:show-inheritance:
:members:

14 changes: 7 additions & 7 deletions pina/graph.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import torch
from torch_geometric.data import Data, Batch
from torch_geometric.utils import to_undirected
from torch_geometric.utils.loop import remove_self_loops
from .label_tensor import LabelTensor
from .utils import check_consistency, is_function

Expand Down Expand Up @@ -209,6 +210,7 @@ def __new__(
x=None,
edge_attr=False,
custom_edge_func=None,
loop=True,
**kwargs,
):
"""
Expand All @@ -224,18 +226,19 @@ def __new__(
:param x: Optional tensor of node features of shape ``(N, F)``, where
``F`` is the number of features per node.
:type x: torch.Tensor | LabelTensor, optional
:param edge_attr: Optional tensor of edge attributes of shape ``(E, F)``
, where ``F`` is the number of features per edge.
:type edge_attr: torch.Tensor, optional
:param bool edge_attr: Whether to compute the edge attributes.
:param custom_edge_func: A custom function to compute edge attributes.
If provided, overrides ``edge_attr``.
:type custom_edge_func: Callable, optional
:param bool loop: Whether to include self-loops.
:param kwargs: Additional keyword arguments passed to the
:class:`~pina.graph.Graph` class constructor.
:return: A :class:`~pina.graph.Graph` instance constructed using the
provided information.
:rtype: Graph
"""
if not loop:
edge_index = remove_self_loops(edge_index)[0]
edge_attr = cls._create_edge_attr(
pos, edge_index, edge_attr, custom_edge_func or cls._build_edge_attr
)
Expand Down Expand Up @@ -374,11 +377,8 @@ def compute_knn_graph(points, neighbours):
representing the edge indices of the graph.
:rtype: torch.Tensor
"""

dist = torch.cdist(points, points, p=2)
knn_indices = torch.topk(dist, k=neighbours + 1, largest=False).indices[
:, 1:
]
knn_indices = torch.topk(dist, k=neighbours, largest=False).indices
row = torch.arange(points.size(0)).repeat_interleave(neighbours)
col = knn_indices.flatten()
return torch.stack([row, col], dim=0).as_subclass(torch.Tensor)
Expand Down
2 changes: 1 addition & 1 deletion pina/label_tensor.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ def __init__(self, x, labels):
>>> from pina import LabelTensor
>>> tensor = LabelTensor(
>>> torch.rand((2000, 3)),
... {1: {"name": "space", "dof": ['a', 'b', 'c'])
... {1: {"name": "space", "dof": ['a', 'b', 'c']}})
>>> tensor = LabelTensor(
>>> torch.rand((2000, 3)),
... ["a", "b", "c"])
Expand Down
Loading
Loading