Skip to content
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

FIX: reset random seed after setting random_state #331

Merged
merged 1 commit into from
Sep 24, 2024
Merged
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
20 changes: 14 additions & 6 deletions smash/core/model/model.py
Original file line number Diff line number Diff line change
Expand Up @@ -2591,10 +2591,10 @@ def set_nn_parameters_weight(
self, value, initializer, random_state
)

if (random_state is not None) and (initializer != "zeros") and (value is None):
np.random.seed(random_state)

if value is None:
if random_state is not None:
np.random.seed(random_state)

for i in range(self.setup.n_layers):
(n_neuron, n_in) = getattr(self._parameters.nn_parameters, f"weight_{i+1}").shape
setattr(
Expand All @@ -2603,6 +2603,10 @@ def set_nn_parameters_weight(
_initialize_nn_parameter(n_in, n_neuron, initializer),
)

# % Reset random seed if random_state is previously set
if random_state is not None:
np.random.seed(None)

else:
for i, val in enumerate(value):
setattr(self._parameters.nn_parameters, f"weight_{i+1}", val)
Expand Down Expand Up @@ -2679,10 +2683,10 @@ def set_nn_parameters_bias(
self, value, initializer, random_state
)

if (random_state is not None) and (initializer != "zeros") and (value is None):
np.random.seed(random_state)

if value is None:
if random_state is not None:
np.random.seed(random_state)

for i in range(self.setup.n_layers):
n_neuron = getattr(self._parameters.nn_parameters, f"bias_{i+1}").shape[0]
setattr(
Expand All @@ -2691,6 +2695,10 @@ def set_nn_parameters_bias(
_initialize_nn_parameter(1, n_neuron, initializer).flatten(),
)

# % Reset random seed if random_state is previously set
if random_state is not None:
np.random.seed(None)

else:
for i, val in enumerate(value):
setattr(self._parameters.nn_parameters, f"bias_{i+1}", val)
Expand Down
5 changes: 5 additions & 0 deletions smash/core/simulation/optimize/_tools.py
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,11 @@ def _merge_net_control(ret: dict, optimize_options: dict):
for layer in net.layers:
if hasattr(layer, "_initialize"):
layer._initialize(None)

# Reset random seed if random_state is previously set
if optimize_options["random_state"] is not None:
np.random.seed(None)

x = _net2vect(net)

ret["x"] = np.append(ret["x"], x)
Expand Down
44 changes: 30 additions & 14 deletions smash/factory/net/net.py
Original file line number Diff line number Diff line change
Expand Up @@ -510,6 +510,10 @@ def _compile(
if hasattr(layer, "_initialize"):
layer._initialize(opt)

# % Reset random seed if random_state is previously set
if random_state is not None:
np.random.seed(None)

def _fit_d2p(
self,
x_train: np.ndarray,
Expand Down Expand Up @@ -713,16 +717,22 @@ def set_weight(self, value: list[Any] | None = None, random_state: int | None =

value, random_state = _standardize_set_weight_args(self, value, random_state)

if (random_state is not None) and (value is None):
np.random.seed(random_state)
if value is None:
if random_state is not None:
np.random.seed(random_state)

i = 0
for layer in self.layers:
if hasattr(layer, "weight"):
if value is None:
for layer in self.layers:
if hasattr(layer, "weight"):
_set_initialized_wb_to_layer(layer, "weight")

else:
# % Reset random seed if random_state is previously set
if random_state is not None:
np.random.seed(None)

else:
i = 0
for layer in self.layers:
if hasattr(layer, "weight"):
layer.weight = value[i]
i += 1

Expand Down Expand Up @@ -784,16 +794,22 @@ def set_bias(self, value: list[Any] | None = None, random_state: int | None = No

value, random_state = _standardize_set_bias_args(self, value, random_state)

if (random_state is not None) and (value is None):
np.random.seed(random_state)
if value is None:
if random_state is not None:
np.random.seed(random_state)

i = 0
for layer in self.layers:
if hasattr(layer, "bias"):
if value is None:
for layer in self.layers:
if hasattr(layer, "bias"):
_set_initialized_wb_to_layer(layer, "bias")

else:
# % Reset random seed if random_state is previously set
if random_state is not None:
np.random.seed(None)

else:
i = 0
for layer in self.layers:
if hasattr(layer, "bias"):
layer.bias = value[i]
i += 1

Expand Down
4 changes: 4 additions & 0 deletions smash/factory/samples/samples.py
Original file line number Diff line number Diff line change
Expand Up @@ -408,4 +408,8 @@ def _generate_samples(

ret_dict["_dst_" + p] = trunc_normal.pdf(ret_dict[p])

# % Reset random seed if random_state is previously set
if random_state is not None:
np.random.seed(None)

return Samples(ret_dict)
Loading