diff --git a/pina/adaptive_function/__init__.py b/pina/adaptive_function/__init__.py index 0fa0ecd..911cf29 100644 --- a/pina/adaptive_function/__init__.py +++ b/pina/adaptive_function/__init__.py @@ -14,7 +14,7 @@ __all__ = [ "AdaptiveExp", ] -from .adaptive_func import ( +from .adaptive_function import ( AdaptiveReLU, AdaptiveSigmoid, AdaptiveTanh, @@ -28,4 +28,4 @@ from .adaptive_func import ( AdaptiveSIREN, AdaptiveExp, ) -from .adaptive_func_interface import AdaptiveActivationFunctionInterface +from .adaptive_function_interface import AdaptiveActivationFunctionInterface diff --git a/pina/adaptive_function/adaptive_func.py b/pina/adaptive_function/adaptive_function.py similarity index 99% rename from pina/adaptive_function/adaptive_func.py rename to pina/adaptive_function/adaptive_function.py index 30966f1..36e2a95 100644 --- a/pina/adaptive_function/adaptive_func.py +++ b/pina/adaptive_function/adaptive_function.py @@ -2,7 +2,7 @@ import torch from ..utils import check_consistency -from .adaptive_func_interface import AdaptiveActivationFunctionInterface +from .adaptive_function_interface import AdaptiveActivationFunctionInterface class AdaptiveReLU(AdaptiveActivationFunctionInterface): diff --git a/pina/adaptive_function/adaptive_func_interface.py b/pina/adaptive_function/adaptive_function_interface.py similarity index 100% rename from pina/adaptive_function/adaptive_func_interface.py rename to pina/adaptive_function/adaptive_function_interface.py diff --git a/pina/callback/__init__.py b/pina/callback/__init__.py index f4bbffe..3bb12ad 100644 --- a/pina/callback/__init__.py +++ b/pina/callback/__init__.py @@ -6,5 +6,5 @@ __all__ = [ ] from .optimizer_callback import SwitchOptimizer -from .adaptive_refinment_callback import R3Refinement +from .adaptive_refinement_callback import R3Refinement from .processing_callback import MetricTracker, PINAProgressBar diff --git a/pina/callback/adaptive_refinment_callback.py b/pina/callback/adaptive_refinement_callback.py similarity index 100% rename from pina/callback/adaptive_refinment_callback.py rename to pina/callback/adaptive_refinement_callback.py diff --git a/pina/model/__init__.py b/pina/model/__init__.py index c75f9b6..0b1f2df 100644 --- a/pina/model/__init__.py +++ b/pina/model/__init__.py @@ -16,9 +16,9 @@ __all__ = [ from .feed_forward import FeedForward, ResidualFeedForward from .multi_feed_forward import MultiFeedForward from .deeponet import DeepONet, MIONet -from .fno import FNO, FourierIntegralKernel -from .base_no import KernelNeuralOperator -from .avno import AveragingNeuralOperator -from .lno import LowRankNeuralOperator +from .fourier_neural_operator import FNO, FourierIntegralKernel +from .kernel_neural_operator import KernelNeuralOperator +from .average_neural_operator import AveragingNeuralOperator +from .low_rank_neural_operator import LowRankNeuralOperator from .spline import Spline -from .gno import GraphNeuralOperator \ No newline at end of file +from .graph_neural_operator import GraphNeuralOperator \ No newline at end of file diff --git a/pina/model/avno.py b/pina/model/average_neural_operator.py similarity index 98% rename from pina/model/avno.py rename to pina/model/average_neural_operator.py index c3d63b5..c0ddb12 100644 --- a/pina/model/avno.py +++ b/pina/model/average_neural_operator.py @@ -3,7 +3,7 @@ import torch from torch import nn, cat from .block import AVNOBlock -from .base_no import KernelNeuralOperator +from .kernel_neural_operator import KernelNeuralOperator from ..utils import check_consistency diff --git a/pina/model/block/__init__.py b/pina/model/block/__init__.py index 3e3e716..32e8572 100644 --- a/pina/model/block/__init__.py +++ b/pina/model/block/__init__.py @@ -25,11 +25,11 @@ from .spectral import ( SpectralConvBlock2D, SpectralConvBlock3D, ) -from .fourier import FourierBlock1D, FourierBlock2D, FourierBlock3D -from .pod import PODBlock +from .fourier_block import FourierBlock1D, FourierBlock2D, FourierBlock3D +from .pod_block import PODBlock from .orthogonal import OrthogonalBlock from .embedding import PeriodicBoundaryEmbedding, FourierFeatureEmbedding -from .avno_layer import AVNOBlock -from .lowrank_layer import LowRankBlock -from .rbf_layer import RBFBlock +from .average_neural_operator_block import AVNOBlock +from .lowrank_block import LowRankBlock +from .rbf_block import RBFBlock from .gno_block import GNOBlock diff --git a/pina/model/block/avno_layer.py b/pina/model/block/average_neural_operator_block.py similarity index 98% rename from pina/model/block/avno_layer.py rename to pina/model/block/average_neural_operator_block.py index 62ed8f1..256dbbb 100644 --- a/pina/model/block/avno_layer.py +++ b/pina/model/block/average_neural_operator_block.py @@ -1,7 +1,7 @@ """ Module for Averaging Neural Operator Layer class. """ from torch import nn, mean -from pina.utils import check_consistency +from ...utils import check_consistency class AVNOBlock(nn.Module): diff --git a/pina/model/block/fourier.py b/pina/model/block/fourier_block.py similarity index 99% rename from pina/model/block/fourier.py rename to pina/model/block/fourier_block.py index defe5ae..22bebe1 100644 --- a/pina/model/block/fourier.py +++ b/pina/model/block/fourier_block.py @@ -2,7 +2,7 @@ import torch import torch.nn as nn from ...utils import check_consistency -from pina.model.block import ( +from . import ( SpectralConvBlock1D, SpectralConvBlock2D, SpectralConvBlock3D, diff --git a/pina/model/block/lowrank_layer.py b/pina/model/block/lowrank_block.py similarity index 100% rename from pina/model/block/lowrank_layer.py rename to pina/model/block/lowrank_block.py diff --git a/pina/model/block/messa_passing.py b/pina/model/block/messa_passing.py deleted file mode 100644 index 8599734..0000000 --- a/pina/model/block/messa_passing.py +++ /dev/null @@ -1,11 +0,0 @@ -""" Module for Averaging Neural Operator Layer class. """ - -from torch import nn, mean -from torch_geometric.nn import MessagePassing, InstanceNorm, radius_graph - -from pina.utils import check_consistency - - -class MessagePassingBlock(nn.Module): - - diff --git a/pina/model/block/pod.py b/pina/model/block/pod_block.py similarity index 100% rename from pina/model/block/pod.py rename to pina/model/block/pod_block.py diff --git a/pina/model/block/rbf_layer.py b/pina/model/block/rbf_block.py similarity index 100% rename from pina/model/block/rbf_layer.py rename to pina/model/block/rbf_block.py diff --git a/pina/model/fno.py b/pina/model/fourier_neural_operator.py similarity index 98% rename from pina/model/fno.py rename to pina/model/fourier_neural_operator.py index 0f68fb6..0fa2d3e 100644 --- a/pina/model/fno.py +++ b/pina/model/fourier_neural_operator.py @@ -7,8 +7,8 @@ import torch.nn as nn from ..label_tensor import LabelTensor import warnings from ..utils import check_consistency -from .block.fourier import FourierBlock1D, FourierBlock2D, FourierBlock3D -from .base_no import KernelNeuralOperator +from .block.fourier_block import FourierBlock1D, FourierBlock2D, FourierBlock3D +from .kernel_neural_operator import KernelNeuralOperator class FourierIntegralKernel(torch.nn.Module): diff --git a/pina/model/gno.py b/pina/model/graph_neural_operator.py similarity index 99% rename from pina/model/gno.py rename to pina/model/graph_neural_operator.py index 300d7f9..1932953 100644 --- a/pina/model/gno.py +++ b/pina/model/graph_neural_operator.py @@ -1,7 +1,7 @@ import torch from torch.nn import Tanh from .block import GNOBlock -from .base_no import KernelNeuralOperator +from .kernel_neural_operator import KernelNeuralOperator class GraphNeuralKernel(torch.nn.Module): diff --git a/pina/model/base_no.py b/pina/model/kernel_neural_operator.py similarity index 100% rename from pina/model/base_no.py rename to pina/model/kernel_neural_operator.py diff --git a/pina/model/lno.py b/pina/model/low_rank_neural_operator.py similarity index 98% rename from pina/model/lno.py rename to pina/model/low_rank_neural_operator.py index 9f24436..fece869 100644 --- a/pina/model/lno.py +++ b/pina/model/low_rank_neural_operator.py @@ -5,8 +5,8 @@ from torch import nn, cat from ..utils import check_consistency -from .base_no import KernelNeuralOperator -from .block.lowrank_layer import LowRankBlock +from .kernel_neural_operator import KernelNeuralOperator +from .block.lowrank_block import LowRankBlock class LowRankNeuralOperator(KernelNeuralOperator): diff --git a/pina/problem/__init__.py b/pina/problem/__init__.py index 35251aa..3f77cb0 100644 --- a/pina/problem/__init__.py +++ b/pina/problem/__init__.py @@ -8,6 +8,6 @@ __all__ = [ from .abstract_problem import AbstractProblem from .spatial_problem import SpatialProblem -from .timedep_problem import TimeDependentProblem +from .time_dependent_problem import TimeDependentProblem from .parametric_problem import ParametricProblem from .inverse_problem import InverseProblem diff --git a/pina/problem/timedep_problem.py b/pina/problem/time_dependent_problem.py similarity index 100% rename from pina/problem/timedep_problem.py rename to pina/problem/time_dependent_problem.py diff --git a/pina/solver/__init__.py b/pina/solver/__init__.py index 8467ae4..d3f515e 100644 --- a/pina/solver/__init__.py +++ b/pina/solver/__init__.py @@ -17,5 +17,5 @@ __all__ = [ from .solver import SolverInterface, SingleSolverInterface, MultiSolverInterface from .physic_informed_solver import * from .supervised import SupervisedSolver -from .rom import ReducedOrderModelSolver +from .reduced_order_model import ReducedOrderModelSolver from .garom import GAROM diff --git a/pina/solver/rom.py b/pina/solver/reduced_order_model.py similarity index 99% rename from pina/solver/rom.py rename to pina/solver/reduced_order_model.py index c7847be..16580e1 100644 --- a/pina/solver/rom.py +++ b/pina/solver/reduced_order_model.py @@ -2,7 +2,7 @@ import torch -from pina.solver import SupervisedSolver +from . import SupervisedSolver class ReducedOrderModelSolver(SupervisedSolver): diff --git a/tests/test_blocks/test_conv.py b/tests/test_blocks/test_convolution.py similarity index 100% rename from tests/test_blocks/test_conv.py rename to tests/test_blocks/test_convolution.py diff --git a/tests/test_blocks/test_pod.py b/tests/test_blocks/test_pod.py index c3d2325..b4fdc1f 100644 --- a/tests/test_blocks/test_pod.py +++ b/tests/test_blocks/test_pod.py @@ -1,7 +1,7 @@ import torch import pytest -from pina.model.block.pod import PODBlock +from pina.model.block.pod_block import PODBlock x = torch.linspace(-1, 1, 100) toy_snapshots = torch.vstack([torch.exp(-x**2)*c for c in torch.linspace(0, 1, 10)]) diff --git a/tests/test_blocks/test_rbf.py b/tests/test_blocks/test_rbf.py index ca0eb9c..ff33d69 100644 --- a/tests/test_blocks/test_rbf.py +++ b/tests/test_blocks/test_rbf.py @@ -2,7 +2,7 @@ import torch import pytest import math -from pina.model.block.rbf_layer import RBFBlock +from pina.model.block.rbf_block import RBFBlock x = torch.linspace(-1, 1, 100) toy_params = torch.linspace(0, 1, 10).unsqueeze(1) diff --git a/tests/test_blocks/test_spectral_conv.py b/tests/test_blocks/test_spectral_convolution.py similarity index 100% rename from tests/test_blocks/test_spectral_conv.py rename to tests/test_blocks/test_spectral_convolution.py diff --git a/tests/test_callback/test_adaptive_refinment_callback.py b/tests/test_callback/test_adaptive_refinement_callback.py similarity index 100% rename from tests/test_callback/test_adaptive_refinment_callback.py rename to tests/test_callback/test_adaptive_refinement_callback.py diff --git a/tests/test_data/test_datamodule.py b/tests/test_data/test_data_module.py similarity index 100% rename from tests/test_data/test_datamodule.py rename to tests/test_data/test_data_module.py diff --git a/tests/test_equations/test_systemequation.py b/tests/test_equations/test_system_equation.py similarity index 100% rename from tests/test_equations/test_systemequation.py rename to tests/test_equations/test_system_equation.py diff --git a/tests/test_solver/test_rom_solver.py b/tests/test_solver/test_reduced_order_model_solver.py similarity index 100% rename from tests/test_solver/test_rom_solver.py rename to tests/test_solver/test_reduced_order_model_solver.py