From 2291f86fb5cf439653ca0db5621bed68d4bf1427 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Wed, 10 Jun 2020 16:56:02 +0200 Subject: [PATCH] Do not override the optimizer's default parameters As discussed in https://github.com/kiudee/cs-ranking/pull/119. The reasoning is that we don't have good reason to override those, the library user will likely have to tune them anyways (or use a different optimizer altogether). At the same time, they make the design proposed in #119 (passing uninitialized optimizers and their parameters separately) more difficult. --- HISTORY.rst | 4 +++- csrank/choicefunction/cmpnet_choice.py | 2 +- csrank/choicefunction/fate_choice.py | 2 +- csrank/choicefunction/feta_choice.py | 2 +- csrank/choicefunction/ranknet_choice.py | 2 +- csrank/core/cmpnet_core.py | 2 +- csrank/core/fate_network.py | 2 +- csrank/core/feta_network.py | 2 +- csrank/core/ranknet_core.py | 2 +- csrank/discretechoice/cmpnet_discrete_choice.py | 2 +- csrank/discretechoice/fate_discrete_choice.py | 2 +- csrank/discretechoice/feta_discrete_choice.py | 2 +- csrank/discretechoice/ranknet_discrete_choice.py | 2 +- csrank/objectranking/cmp_net.py | 2 +- csrank/objectranking/fate_object_ranker.py | 2 +- csrank/objectranking/feta_object_ranker.py | 2 +- csrank/objectranking/list_net.py | 2 +- csrank/objectranking/rank_net.py | 2 +- 18 files changed, 20 insertions(+), 18 deletions(-) diff --git a/HISTORY.rst b/HISTORY.rst index 400f6f19..87372ef4 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -5,7 +5,9 @@ History Unreleased ------------------ -No changes yet. +* We no longer override any of the defaults of our default optimizer (SGD). In + particular, the parameters nesterov, momentum and lr are now set to the + default values set by keras. 1.2.1 (2020-06-08) ------------------ diff --git a/csrank/choicefunction/cmpnet_choice.py b/csrank/choicefunction/cmpnet_choice.py index 664eb8bf..4eec3496 100644 --- a/csrank/choicefunction/cmpnet_choice.py +++ b/csrank/choicefunction/cmpnet_choice.py @@ -19,7 +19,7 @@ def __init__( kernel_regularizer=l2(1e-4), kernel_initializer="lecun_normal", activation="relu", - optimizer=SGD(lr=1e-4, nesterov=True, momentum=0.9), + optimizer=SGD(), metrics=["binary_accuracy"], batch_size=256, random_state=None, diff --git a/csrank/choicefunction/fate_choice.py b/csrank/choicefunction/fate_choice.py index 0fb677c2..3acb7932 100644 --- a/csrank/choicefunction/fate_choice.py +++ b/csrank/choicefunction/fate_choice.py @@ -21,7 +21,7 @@ def __init__( activation="selu", kernel_initializer="lecun_normal", kernel_regularizer=l2(0.01), - optimizer=SGD(lr=1e-4, nesterov=True, momentum=0.9), + optimizer=SGD(), batch_size=256, metrics=None, random_state=None, diff --git a/csrank/choicefunction/feta_choice.py b/csrank/choicefunction/feta_choice.py index d9b36e05..7e08f145 100644 --- a/csrank/choicefunction/feta_choice.py +++ b/csrank/choicefunction/feta_choice.py @@ -34,7 +34,7 @@ def __init__( kernel_regularizer=l2(1e-4), kernel_initializer="lecun_normal", activation="selu", - optimizer=SGD(lr=1e-4, nesterov=True, momentum=0.9), + optimizer=SGD(), metrics=["binary_accuracy"], batch_size=256, random_state=None, diff --git a/csrank/choicefunction/ranknet_choice.py b/csrank/choicefunction/ranknet_choice.py index ed9ff848..6ee9095d 100644 --- a/csrank/choicefunction/ranknet_choice.py +++ b/csrank/choicefunction/ranknet_choice.py @@ -19,7 +19,7 @@ def __init__( kernel_regularizer=l2(1e-4), kernel_initializer="lecun_normal", activation="relu", - optimizer=SGD(lr=1e-4, nesterov=True, momentum=0.9), + optimizer=SGD(), metrics=["binary_accuracy"], batch_size=256, random_state=None, diff --git a/csrank/core/cmpnet_core.py b/csrank/core/cmpnet_core.py index bc747996..7d3e38dd 100644 --- a/csrank/core/cmpnet_core.py +++ b/csrank/core/cmpnet_core.py @@ -29,7 +29,7 @@ def __init__( kernel_regularizer=l2(1e-4), kernel_initializer="lecun_normal", activation="relu", - optimizer=SGD(lr=1e-4, nesterov=True, momentum=0.9), + optimizer=SGD(), metrics=["binary_accuracy"], batch_size=256, random_state=None, diff --git a/csrank/core/fate_network.py b/csrank/core/fate_network.py index 8ee072d9..86e62dce 100644 --- a/csrank/core/fate_network.py +++ b/csrank/core/fate_network.py @@ -29,7 +29,7 @@ def __init__( activation="selu", kernel_initializer="lecun_normal", kernel_regularizer=l2(0.01), - optimizer=SGD(lr=1e-4, nesterov=True, momentum=0.9), + optimizer=SGD(), batch_size=256, random_state=None, **kwargs, diff --git a/csrank/core/feta_network.py b/csrank/core/feta_network.py index dcc7b257..01bc1c40 100644 --- a/csrank/core/feta_network.py +++ b/csrank/core/feta_network.py @@ -36,7 +36,7 @@ def __init__( kernel_regularizer=l2(1e-4), kernel_initializer="lecun_normal", activation="selu", - optimizer=SGD(lr=1e-4, nesterov=True, momentum=0.9), + optimizer=SGD(), metrics=None, batch_size=256, random_state=None, diff --git a/csrank/core/ranknet_core.py b/csrank/core/ranknet_core.py index 3467bc82..9d9c3f4c 100644 --- a/csrank/core/ranknet_core.py +++ b/csrank/core/ranknet_core.py @@ -28,7 +28,7 @@ def __init__( kernel_regularizer=l2(1e-4), kernel_initializer="lecun_normal", activation="relu", - optimizer=SGD(lr=1e-4, nesterov=True, momentum=0.9), + optimizer=SGD(), metrics=["binary_accuracy"], batch_size=256, random_state=None, diff --git a/csrank/discretechoice/cmpnet_discrete_choice.py b/csrank/discretechoice/cmpnet_discrete_choice.py index abcc1d59..1aca2dfa 100644 --- a/csrank/discretechoice/cmpnet_discrete_choice.py +++ b/csrank/discretechoice/cmpnet_discrete_choice.py @@ -18,7 +18,7 @@ def __init__( kernel_regularizer=l2(1e-4), kernel_initializer="lecun_normal", activation="relu", - optimizer=SGD(lr=1e-4, nesterov=True, momentum=0.9), + optimizer=SGD(), metrics=["binary_accuracy"], batch_size=256, random_state=None, diff --git a/csrank/discretechoice/fate_discrete_choice.py b/csrank/discretechoice/fate_discrete_choice.py index 5029cb7b..01451fa0 100644 --- a/csrank/discretechoice/fate_discrete_choice.py +++ b/csrank/discretechoice/fate_discrete_choice.py @@ -20,7 +20,7 @@ def __init__( activation="selu", kernel_initializer="lecun_normal", kernel_regularizer=l2(0.01), - optimizer=SGD(lr=1e-4, nesterov=True, momentum=0.9), + optimizer=SGD(), batch_size=256, random_state=None, **kwargs, diff --git a/csrank/discretechoice/feta_discrete_choice.py b/csrank/discretechoice/feta_discrete_choice.py index e8ed0fd0..0628c7e1 100644 --- a/csrank/discretechoice/feta_discrete_choice.py +++ b/csrank/discretechoice/feta_discrete_choice.py @@ -32,7 +32,7 @@ def __init__( kernel_regularizer=l2(1e-4), kernel_initializer="lecun_normal", activation="selu", - optimizer=SGD(lr=1e-4, nesterov=True, momentum=0.9), + optimizer=SGD(), metrics=["categorical_accuracy"], batch_size=256, random_state=None, diff --git a/csrank/discretechoice/ranknet_discrete_choice.py b/csrank/discretechoice/ranknet_discrete_choice.py index e5e54585..26a91ed6 100644 --- a/csrank/discretechoice/ranknet_discrete_choice.py +++ b/csrank/discretechoice/ranknet_discrete_choice.py @@ -18,7 +18,7 @@ def __init__( kernel_regularizer=l2(1e-4), kernel_initializer="lecun_normal", activation="relu", - optimizer=SGD(lr=1e-4, nesterov=True, momentum=0.9), + optimizer=SGD(), metrics=["binary_accuracy"], batch_size=256, random_state=None, diff --git a/csrank/objectranking/cmp_net.py b/csrank/objectranking/cmp_net.py index 3ef1d5ca..7afc8017 100644 --- a/csrank/objectranking/cmp_net.py +++ b/csrank/objectranking/cmp_net.py @@ -20,7 +20,7 @@ def __init__( kernel_regularizer=l2(1e-4), kernel_initializer="lecun_normal", activation="relu", - optimizer=SGD(lr=1e-4, nesterov=True, momentum=0.9), + optimizer=SGD(), metrics=["binary_accuracy"], batch_size=256, random_state=None, diff --git a/csrank/objectranking/fate_object_ranker.py b/csrank/objectranking/fate_object_ranker.py index 4e55fb2b..cb0e180b 100644 --- a/csrank/objectranking/fate_object_ranker.py +++ b/csrank/objectranking/fate_object_ranker.py @@ -19,7 +19,7 @@ def __init__( activation="selu", kernel_initializer="lecun_normal", kernel_regularizer=l2(0.01), - optimizer=SGD(lr=1e-4, nesterov=True, momentum=0.9), + optimizer=SGD(), batch_size=256, loss_function=hinged_rank_loss, metrics=[zero_one_rank_loss_for_scores_ties], diff --git a/csrank/objectranking/feta_object_ranker.py b/csrank/objectranking/feta_object_ranker.py index 6a348ff0..a1554dd8 100644 --- a/csrank/objectranking/feta_object_ranker.py +++ b/csrank/objectranking/feta_object_ranker.py @@ -23,7 +23,7 @@ def __init__( kernel_regularizer=l2(1e-4), kernel_initializer="lecun_normal", activation="selu", - optimizer=SGD(lr=1e-4, nesterov=True, momentum=0.9), + optimizer=SGD(), metrics=None, batch_size=256, random_state=None, diff --git a/csrank/objectranking/list_net.py b/csrank/objectranking/list_net.py index 98bf7c2e..af2eddf0 100644 --- a/csrank/objectranking/list_net.py +++ b/csrank/objectranking/list_net.py @@ -34,7 +34,7 @@ def __init__( kernel_regularizer=l2(1e-4), activation="selu", kernel_initializer="lecun_normal", - optimizer=SGD(lr=1e-4, nesterov=True, momentum=0.9), + optimizer=SGD(), metrics=[zero_one_rank_loss_for_scores_ties], batch_size=256, random_state=None, diff --git a/csrank/objectranking/rank_net.py b/csrank/objectranking/rank_net.py index 6bf65cd4..53cd3f4f 100644 --- a/csrank/objectranking/rank_net.py +++ b/csrank/objectranking/rank_net.py @@ -20,7 +20,7 @@ def __init__( kernel_regularizer=l2(1e-4), kernel_initializer="lecun_normal", activation="relu", - optimizer=SGD(lr=1e-4, nesterov=True, momentum=0.9), + optimizer=SGD(), metrics=["binary_accuracy"], batch_size=256, random_state=None,