Skip to content

Commit 05f7d2f

Browse files
committed
codacy
1 parent 746c2f3 commit 05f7d2f

11 files changed

Lines changed: 25 additions & 24 deletions

File tree

pina/solver/ensemble_solver/ensemble_pinn.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ def loss_data(self, input, target):
127127
:rtype: torch.Tensor
128128
"""
129129
loss = sum(
130-
self.loss(self.forward(input, idx), target)
130+
self._loss_fn(self.forward(input, idx), target)
131131
for idx in range(self.num_ensembles)
132132
)
133133
return loss / self.num_ensembles
@@ -162,5 +162,5 @@ def _residual_loss(self, samples, equation):
162162
loss = 0
163163
for idx in range(self.num_ensembles):
164164
residuals = equation.residual(samples, self.forward(samples, idx))
165-
loss = loss + self.loss(residuals, torch.zeros_like(residuals))
165+
loss = loss + self._loss_fn(residuals, torch.zeros_like(residuals))
166166
return loss / self.num_ensembles

pina/solver/ensemble_solver/ensemble_supervised.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ def loss_data(self, input, target):
115115
:rtype: torch.Tensor
116116
"""
117117
loss = sum(
118-
self.loss(self.forward(input, idx), target)
118+
self._loss_fn(self.forward(input, idx), target)
119119
for idx in range(self.num_ensembles)
120120
)
121121
return loss / self.num_ensembles

pina/solver/garom.py

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ def __init__(
5151
If ``None``, the :class:`torch.optim.Adam` optimizer is used.
5252
Default is ``None``.
5353
:param Optimizer optimizer_discriminator: The optimizer for the
54-
discriminator. If ``None``, the :class:`torch.optim.Adam`
54+
discriminator. If ``None``, the :class:`torch.optim.Adam`
5555
optimizer is used. Default is ``None``.
5656
:param Scheduler scheduler_generator: The learning rate scheduler for
5757
the generator.
@@ -88,7 +88,7 @@ def __init__(
8888
check_consistency(
8989
loss, (LossInterface, _Loss, torch.nn.Module), subclass=False
9090
)
91-
self._loss = loss
91+
self._loss_fn = loss
9292

9393
# set automatic optimization for GANs
9494
self.automatic_optimization = False
@@ -157,10 +157,11 @@ def _train_generator(self, parameters, snapshots):
157157
generated_snapshots = self.sample(parameters)
158158

159159
# generator loss
160-
r_loss = self._loss(snapshots, generated_snapshots)
160+
r_loss = self._loss_fn(snapshots, generated_snapshots)
161161
d_fake = self.discriminator([generated_snapshots, parameters])
162162
g_loss = (
163-
self._loss(d_fake, generated_snapshots) + self.regularizer * r_loss
163+
self._loss_fn(d_fake, generated_snapshots)
164+
+ self.regularizer * r_loss
164165
)
165166

166167
# backward step
@@ -189,8 +190,8 @@ def _train_discriminator(self, parameters, snapshots):
189190
d_fake = self.discriminator([generated_snapshots, parameters])
190191

191192
# evaluate loss
192-
d_loss_real = self._loss(d_real, snapshots)
193-
d_loss_fake = self._loss(d_fake, generated_snapshots.detach())
193+
d_loss_real = self._loss_fn(d_real, snapshots)
194+
d_loss_fake = self._loss_fn(d_fake, generated_snapshots.detach())
194195
d_loss = d_loss_real - self.k * d_loss_fake
195196

196197
# backward step
@@ -270,7 +271,7 @@ def validation_step(self, batch):
270271
points["target"],
271272
)
272273
snapshots_gen = self.generator(parameters)
273-
condition_loss[condition_name] = self._loss(
274+
condition_loss[condition_name] = self._loss_fn(
274275
snapshots, snapshots_gen
275276
)
276277
loss = self.weighting.aggregate(condition_loss)
@@ -293,7 +294,7 @@ def test_step(self, batch):
293294
points["target"],
294295
)
295296
snapshots_gen = self.generator(parameters)
296-
condition_loss[condition_name] = self._loss(
297+
condition_loss[condition_name] = self._loss_fn(
297298
snapshots, snapshots_gen
298299
)
299300
loss = self.weighting.aggregate(condition_loss)

pina/solver/physics_informed_solver/causal_pinn.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ def loss_phys(self, samples, equation):
134134
chunk.labels = labels
135135
# classical PINN loss
136136
residual = self.compute_residual(samples=chunk, equation=equation)
137-
loss_val = self.loss(
137+
loss_val = self._loss_fn(
138138
torch.zeros_like(residual, requires_grad=True), residual
139139
)
140140
time_loss.append(loss_val)

pina/solver/physics_informed_solver/competitive_pinn.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ def loss_phys(self, samples, equation):
156156
residual = residual * discriminator_bets
157157

158158
# Compute competitive residual.
159-
loss_val = self.loss(
159+
loss_val = self._loss_fn(
160160
torch.zeros_like(residual, requires_grad=True),
161161
residual,
162162
)
@@ -175,7 +175,7 @@ def loss_data(self, input, target):
175175
:return: The supervised loss, averaged over the number of observations.
176176
:rtype: LabelTensor
177177
"""
178-
return self.loss(self.forward(input), target)
178+
return self._loss_fn(self.forward(input), target)
179179

180180
def configure_optimizers(self):
181181
"""

pina/solver/physics_informed_solver/gradient_pinn.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,15 +116,15 @@ def loss_phys(self, samples, equation):
116116
"""
117117
# classical PINN loss
118118
residual = self.compute_residual(samples=samples, equation=equation)
119-
loss_value = self.loss(
119+
loss_value = self._loss_fn(
120120
torch.zeros_like(residual, requires_grad=True), residual
121121
)
122122

123123
# gradient PINN loss
124124
loss_value = loss_value.reshape(-1, 1)
125125
loss_value.labels = ["__loss"]
126126
loss_grad = grad(loss_value, samples, d=self.problem.spatial_variables)
127-
g_loss_phys = self.loss(
127+
g_loss_phys = self._loss_fn(
128128
torch.zeros_like(loss_grad, requires_grad=True), loss_grad
129129
)
130130
return loss_value + g_loss_phys

pina/solver/physics_informed_solver/pinn.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ def loss_data(self, input, target):
9595
:return: The supervised loss, averaged over the number of observations.
9696
:rtype: LabelTensor
9797
"""
98-
return self.loss(self.forward(input), target)
98+
return self._loss_fn(self.forward(input), target)
9999

100100
def loss_phys(self, samples, equation):
101101
"""
@@ -108,7 +108,7 @@ def loss_phys(self, samples, equation):
108108
:rtype: LabelTensor
109109
"""
110110
residuals = self.compute_residual(samples, equation)
111-
return self.loss(residuals, torch.zeros_like(residuals))
111+
return self._loss_fn(residuals, torch.zeros_like(residuals))
112112

113113
def configure_optimizers(self):
114114
"""

pina/solver/physics_informed_solver/pinn_interface.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ def _residual_loss(self, samples, equation):
195195
:rtype: torch.Tensor
196196
"""
197197
residuals = self.compute_residual(samples, equation)
198-
return self.loss(residuals, torch.zeros_like(residuals))
198+
return self._loss_fn(residuals, torch.zeros_like(residuals))
199199

200200
def _clamp_inverse_problem_params(self):
201201
"""

pina/solver/physics_informed_solver/self_adaptive_pinn.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ def loss_data(self, input, target):
299299
:return: The supervised loss, averaged over the number of observations.
300300
:rtype: LabelTensor
301301
"""
302-
return self.loss(self.forward(input), target)
302+
return self._loss_fn(self.forward(input), target)
303303

304304
def _vect_to_scalar(self, loss_value):
305305
"""

pina/solver/supervised_solver/reduced_order_model.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,10 +181,10 @@ def loss_data(self, input, target):
181181
# encoded representations loss
182182
encode_repr_inter_net = interpolation_network(input)
183183
encode_repr_reduction_network = reduction_network.encode(target)
184-
loss_encode = self.loss(
184+
loss_encode = self._loss_fn(
185185
encode_repr_inter_net, encode_repr_reduction_network
186186
)
187187
# reconstruction loss
188188
decode = reduction_network.decode(encode_repr_reduction_network)
189-
loss_reconstruction = self.loss(decode, target)
189+
loss_reconstruction = self._loss_fn(decode, target)
190190
return loss_encode + loss_reconstruction

0 commit comments

Comments
 (0)