Skip to content

Commit

Permalink
fixup: metrics
Browse files Browse the repository at this point in the history
  • Loading branch information
timokau committed Jun 27, 2020
1 parent 50ebc55 commit 45267a0
Show file tree
Hide file tree
Showing 9 changed files with 24 additions and 10 deletions.
2 changes: 1 addition & 1 deletion csrank/choicefunction/fate_choice.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ def __init__(
kernel_regularizer=l2(),
optimizer=SGD,
batch_size=256,
metrics=None,
metrics=(),
random_state=None,
**kwargs,
):
Expand Down
4 changes: 3 additions & 1 deletion csrank/choicefunction/feta_choice.py
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,9 @@ def create_input_lambda(i):
model = Model(inputs=self.input_layer, outputs=scores)
self.logger.debug("Compiling complete model...")
model.compile(
loss=self.loss_function, optimizer=self.optimizer_, metrics=self.metrics
loss=self.loss_function,
optimizer=self.optimizer_,
metrics=list(self.metrics),
)
return model

Expand Down
4 changes: 3 additions & 1 deletion csrank/core/cmpnet_core.py
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,9 @@ def construct_model(self):
merged_output = concatenate([N_g, N_l])
model = Model(inputs=[self.x1, self.x2], outputs=merged_output)
model.compile(
loss=self.loss_function, optimizer=self.optimizer_, metrics=self.metrics
loss=self.loss_function,
optimizer=self.optimizer_,
metrics=list(self.metrics),
)
return model

Expand Down
4 changes: 3 additions & 1 deletion csrank/core/fate_network.py
Original file line number Diff line number Diff line change
Expand Up @@ -475,7 +475,9 @@ def construct_model(self, n_features, n_objects):
model = Model(inputs=input_layer, outputs=scores)

model.compile(
loss=self.loss_function, optimizer=self.optimizer_, metrics=self.metrics
loss=self.loss_function,
optimizer=self.optimizer_,
metrics=list(self.metrics),
)
return model

Expand Down
6 changes: 4 additions & 2 deletions csrank/core/feta_network.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ def __init__(
kernel_initializer="lecun_normal",
activation="selu",
optimizer=SGD,
metrics=None,
metrics=(),
batch_size=256,
random_state=None,
**kwargs,
Expand Down Expand Up @@ -249,7 +249,9 @@ def create_input_lambda(i):
model = Model(inputs=self.input_layer, outputs=scores)
self.logger.debug("Compiling complete model...")
model.compile(
loss=self.loss_function, optimizer=self.optimizer_, metrics=self.metrics
loss=self.loss_function,
optimizer=self.optimizer_,
metrics=list(self.metrics),
)
return model

Expand Down
4 changes: 3 additions & 1 deletion csrank/core/ranknet_core.py
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,9 @@ def construct_model(self):
output = self.output_node(merged_inputs)
model = Model(inputs=[self.x1, self.x2], outputs=output)
model.compile(
loss=self.loss_function, optimizer=self.optimizer_, metrics=self.metrics
loss=self.loss_function,
optimizer=self.optimizer_,
metrics=list(self.metrics),
)
return model

Expand Down
4 changes: 3 additions & 1 deletion csrank/discretechoice/feta_discrete_choice.py
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,9 @@ def get_score_object(i):
model = Model(inputs=self.input_layer, outputs=scores)
self.logger.debug("Compiling complete model...")
model.compile(
loss=self.loss_function, optimizer=self.optimizer_, metrics=self.metrics
loss=self.loss_function,
optimizer=self.optimizer_,
metrics=list(self.metrics),
)
return model

Expand Down
2 changes: 1 addition & 1 deletion csrank/objectranking/feta_object_ranker.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ def __init__(
kernel_initializer="lecun_normal",
activation="selu",
optimizer=SGD,
metrics=None,
metrics=(),
batch_size=256,
random_state=None,
**kwargs,
Expand Down
4 changes: 3 additions & 1 deletion csrank/objectranking/list_net.py
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,9 @@ def construct_model(self):
merged = concatenate(outputs)
model = Model(inputs=self.input_layer, outputs=merged)
model.compile(
loss=self.loss_function, optimizer=self.optimizer_, metrics=self.metrics
loss=self.loss_function,
optimizer=self.optimizer_,
metrics=list(self.metrics),
)
return model

Expand Down

0 comments on commit 45267a0

Please sign in to comment.