diff --git a/golem/utilities/utils.py b/golem/utilities/utils.py deleted file mode 100644 index 34472c01..00000000 --- a/golem/utilities/utils.py +++ /dev/null @@ -1,14 +0,0 @@ -from typing import Optional - -import numpy as np -import random - -from golem.utilities.random import RandomStateHandler - - -def set_random_seed(seed: Optional[int]): - """ Sets random seed for evaluation of models. """ - if seed is not None: - np.random.seed(seed) - random.seed(seed) - RandomStateHandler.MODEL_FITTING_SEED = seed diff --git a/test/conftest.py b/test/conftest.py index 7d10e937..51ec1450 100644 --- a/test/conftest.py +++ b/test/conftest.py @@ -3,8 +3,7 @@ import pytest -from golem.utilities.utilities import urandom_mock -from golem.utilities.utils import set_random_seed +from golem.utilities.utilities import urandom_mock, set_random_seed @pytest.fixture(autouse=True) diff --git a/test/integration/test_cycled_graph_evolution.py b/test/integration/test_cycled_graph_evolution.py index 6408dece..bc3c9c94 100644 --- a/test/integration/test_cycled_graph_evolution.py +++ b/test/integration/test_cycled_graph_evolution.py @@ -14,7 +14,6 @@ from golem.core.optimisers.optimization_parameters import GraphRequirements from golem.core.optimisers.optimizer import GraphGenerationParams from golem.metrics.graph_metrics import spectral_dist -from golem.utilities.utils import set_random_seed def nxgraph_with_cycle(nodes_num): @@ -66,7 +65,6 @@ def test_cycled_graphs_evolution(): initial_graphs = [nxgraph_with_cycle(i) for i in range(4, 20)] optimiser = EvoGraphOptimizer(objective, initial_graphs, requirements, graph_gen_params, gp_params) - set_random_seed(42) found_graphs = optimiser.optimise(objective) found_graph: nx.DiGraph = graph_gen_params.adapter.restore(found_graphs[0]) assert found_graph is not None diff --git a/test/integration/test_molecule_search.py b/test/integration/test_molecule_search.py index c2e32b11..ea9e612e 100644 --- a/test/integration/test_molecule_search.py +++ b/test/integration/test_molecule_search.py @@ -2,7 +2,6 @@ from examples.molecule_search.experiment import molecule_search_setup, get_methane, get_all_mol_metrics from examples.molecule_search.mol_adapter import MolAdapter -from golem.utilities.utils import set_random_seed @pytest.mark.parametrize('metric_name, metric', get_all_mol_metrics().items()) @@ -11,7 +10,6 @@ def test_molecule_search_example(metric_name, metric): optimizer, objective = molecule_search_setup(num_iterations=10, metrics=[metric_name], initial_molecules=[initial_molecule]) - set_random_seed(42) found_graphs = optimizer.optimise(objective) assert found_graphs is not None diff --git a/test/integration/test_quality_improvement.py b/test/integration/test_quality_improvement.py index db525110..f34d64a3 100644 --- a/test/integration/test_quality_improvement.py +++ b/test/integration/test_quality_improvement.py @@ -10,7 +10,6 @@ from examples.synthetic_graph_evolution.tree_search import tree_search_setup from golem.core.optimisers.genetic.gp_optimizer import EvoGraphOptimizer from golem.core.optimisers.opt_history_objects.opt_history import OptHistory -from golem.utilities.utils import set_random_seed def run_graph_trial(optimizer_cls): @@ -36,7 +35,6 @@ def run_tree_trial(optimizer_cls): @pytest.mark.parametrize('run_fun', [run_graph_trial, run_tree_trial]) @pytest.mark.parametrize('optimizer_cls', [EvoGraphOptimizer]) def test_multiobjective_improvement(optimizer_cls, run_fun): - set_random_seed(42) found_graph, history = run_fun(optimizer_cls) quality_improved, complexity_improved = check_improvement(history) diff --git a/test/integration/test_structural_analysis.py b/test/integration/test_structural_analysis.py index 91f2a1ac..e306ac71 100644 --- a/test/integration/test_structural_analysis.py +++ b/test/integration/test_structural_analysis.py @@ -12,7 +12,6 @@ from golem.core.paths import project_root from golem.structural_analysis.graph_sa.graph_structural_analysis import GraphStructuralAnalysis from golem.structural_analysis.graph_sa.sa_requirements import StructuralAnalysisRequirements -from golem.utilities.utils import set_random_seed def get_opt_graph() -> OptGraph: @@ -64,7 +63,6 @@ def test_structural_analysis(): requirements=requirements, path_to_save=path_to_save, is_visualize_per_iteration=False) - set_random_seed(42) optimized_graph, _ = sa.optimize(graph=opt_graph, n_jobs=1, max_iter=2) diff --git a/test/integration/test_structural_diversity.py b/test/integration/test_structural_diversity.py index 666ec451..c5f4fe6a 100644 --- a/test/integration/test_structural_diversity.py +++ b/test/integration/test_structural_diversity.py @@ -11,7 +11,6 @@ from golem.core.optimisers.optimizer import STRUCTURAL_DIVERSITY_FREQUENCY_CHECK from golem.metrics.edit_distance import tree_edit_dist from golem.metrics.graph_metrics import degree_distance -from golem.utilities.utils import set_random_seed DIVERSITY_THRESHOLD = 0.5 @@ -47,7 +46,6 @@ def test_structural_diversity(): gp_params = set_up_params(gen_structural_check=gen_structural_check) # running the example - set_random_seed(42) _, history = run_trial(target_graph=target_graph, optimizer_setup=partial(tree_search_setup, algorithm_parameters=gp_params), node_types=node_types, diff --git a/test/integration/test_structure_search.py b/test/integration/test_structure_search.py index 01672a1f..e73cb529 100644 --- a/test/integration/test_structure_search.py +++ b/test/integration/test_structure_search.py @@ -12,7 +12,6 @@ from golem.core.dag.graph import Graph from golem.core.optimisers.objective import Objective from golem.metrics.edit_distance import tree_edit_dist, graph_size -from golem.utilities.utils import set_random_seed def run_search(size: int, distance_function: Callable, timeout_min: int = 1) -> Tuple[float, Graph]: @@ -45,7 +44,6 @@ def test_simple_targets_are_found(target_sizes, distance_function, indulgence): distances = [] for i in range(num_trials): # to test num_trials different options - set_random_seed(i) distance, target_graph = run_search(target_size, distance_function=distance_function, timeout_min=1) distances.append(distance)