Fix: Restrict ray in asking for cpu cores and infinite looping in unittest.

DimitriWeiss · DimitriWeiss · commit 2944ce28bf7b · 2025-03-03T12:14:20.000+01:00
diff --git a/.github/workflows/python-unittest.yml b/.github/workflows/python-unittest.yml
@@ -25,6 +25,4 @@ jobs:
         if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
     - name: Test with unittest
       run: |
-        pwd
-        ls
-        python -m unittest discover selector/test
+        taskset -c 0,1 python -m unittest discover selector/test
diff --git a/conf.py b/conf.py
@@ -56,6 +56,7 @@ def decorator(func):
     '_autosummary/selector.wrapper.rst',
     '_autosummary/selector.test_ray.rst',
     '_autosummary/selector.main.rst',
+    '_autosummary/selector.test.rst',
 ]
 autodoc_mock_imports = ["json", "json.JSONEncoder"]
 
diff --git a/rtd_requirements.txt b/rtd_requirements.txt
@@ -3,3 +3,12 @@ swig
 mock
 sphinx-rtd-theme==1.3.0
 sphinx==7.1.2
+sphinxcontrib-applehelp==1.0.4
+sphinxcontrib-bibtex==2.6.3
+sphinxcontrib-devhelp==1.0.2
+sphinxcontrib-htmlhelp==2.0.1
+sphinxcontrib-jquery==4.1
+sphinxcontrib-jsmath==1.0.1
+sphinxcontrib-qthelp==1.0.3
+sphinxcontrib-serializinghtml==1.1.5
+sphinx-autobuild==2021.3.14
diff --git a/selector/test/test_scenario.py b/selector/test/test_scenario.py
@@ -11,22 +11,24 @@ class ScenarioTest(unittest.TestCase):
 
     def setUp(self):
         self.scenario_dict = {'ta_cmd': 'echo test',
-                                   'paramfile': './selector/test/test_data/test_params.pcs',
-                                   'execdir': '.',
-                                   'deterministic': 0,
-                                   'run_obj': 'runtime',
-                                   'overall_obj': 'mean10',
-                                   'cutoff_time': 300,
-                                   'wallclock_limit': 172800,
-                                   'instance_file':
-                                       './selector/test/test_data/test_training.txt',
-                                   'test_instance_file':
-                                       './selector/test/test_data/test_test.txt',
-                                   'feature_file':
-                                       './selector/test/test_data/test_features.txt',
-                                   'output_dir':
-                                       'placeholder',
-                                    'instances_dir': './selector/test/test_data/instances'}
+                              'paramfile':
+                                  './selector/test/test_data/test_params.pcs',
+                              'execdir': '.',
+                              'deterministic': 0,
+                              'run_obj': 'runtime',
+                              'overall_obj': 'mean10',
+                              'cutoff_time': 300,
+                              'wallclock_limit': 172800,
+                              'instance_file':
+                                  './selector/test/test_data/test_training.txt',
+                              'test_instance_file':
+                                  './selector/test/test_data/test_test.txt',
+                              'feature_file':
+                                  './selector/test/test_data/test_features.txt',
+                              'output_dir':
+                                  'placeholder',
+                              'instances_dir':
+                                  './selector/test/test_data/instances'}
 
     def test_scenario_type(self):
         with self.assertRaises(TypeError):
@@ -45,8 +47,8 @@ def test_scenario_from_sting(self):
         self.assertEqual(scenario.instance_file, './selector/test/test_data/test_training.txt')
         self.assertEqual(scenario.test_instance_file, './selector/test/test_data/test_test.txt')
         self.assertEqual(scenario.feature_file, './selector/test/test_data/test_features.txt')
-        self.assertEqual(scenario.paramfile,'./selector/test/test_data/test_params.pcs')
-        self.assertEqual(scenario.instance_set,['./selector/test/test_data/instances/test_instance_1.cnf'])
+        self.assertEqual(scenario.paramfile, './selector/test/test_data/test_params.pcs')
+        self.assertEqual(scenario.instance_set, ['./selector/test/test_data/instances/test_instance_1.cnf'])
         self.assertEqual(scenario.test_instances, ['./selector/test/test_data/instances/test_instance_2.cnf'])
         self.assertEqual(scenario.feature_names, ['feature_1', ' feature_2'])
 
@@ -66,25 +68,25 @@ def test_scenario_from_dic(self):
         self.assertEqual(scenario.overall_obj, 'mean10')
         self.assertEqual(scenario.cutoff_time, 300)
         self.assertEqual(scenario.wallclock_limit, 172800)
-        self.assertEqual(scenario.instance_file,'./selector/test/test_data/test_training.txt')
-        self.assertEqual(scenario.test_instance_file,'./selector/test/test_data/test_test.txt')
-        self.assertEqual(scenario.feature_file,'./selector/test/test_data/test_features.txt')
-        self.assertEqual(scenario.paramfile,'./selector/test/test_data/test_params.pcs')
-        self.assertEqual(scenario.instance_set,['./selector/test/test_data/instances/test_instance_1.cnf'])
+        self.assertEqual(scenario.instance_file, './selector/test/test_data/test_training.txt')
+        self.assertEqual(scenario.test_instance_file, './selector/test/test_data/test_test.txt')
+        self.assertEqual(scenario.feature_file, './selector/test/test_data/test_features.txt')
+        self.assertEqual(scenario.paramfile, './selector/test/test_data/test_params.pcs')
+        self.assertEqual(scenario.instance_set, ['./selector/test/test_data/instances/test_instance_1.cnf'])
         self.assertEqual(scenario.test_instances, ['./selector/test/test_data/instances/test_instance_2.cnf'])
         self.assertEqual(scenario.feature_names, ['feature_1', ' feature_2'])
 
         features_1 = scenario.features['./selector/test/test_data/instances/test_instance_1.cnf']
-        self.assertTrue(np.allclose(features_1, [  90., 7650.]))
+        self.assertTrue(np.allclose(features_1, [90., 7650.]))
 
         features_2 = scenario.features['./selector/test/test_data/instances/test_instance_2.cnf']
-        self.assertTrue(np.allclose(features_2, [  30., 8045.1]))
+        self.assertTrue(np.allclose(features_2, [30., 8045.1]))
 
     def test_parameter_from_file(self):
         scenario_file = Scenario('./selector/test/test_data/test_scenario.txt')
         scenario_dic = Scenario(self.scenario_dict)
 
-        for scenario in [scenario_file,scenario_dic ]:
+        for scenario in [scenario_file, scenario_dic]:
             test_parameter_list = scenario.parameter
 
             test_no_goods = scenario.no_goods
@@ -132,13 +134,13 @@ def test_parameter_from_file(self):
             # test bce-limit
             self.assertEqual(test_parameter_list[5].name, 'bce-limit')
             self.assertEqual(test_parameter_list[5].type, ParamType.integer)
-            self.assertEqual(test_parameter_list[5].bound,[100000,200000000])
+            self.assertEqual(test_parameter_list[5].bound, [100000, 200000000])
             self.assertEqual(test_parameter_list[5].default, 100000000)
             self.assertEqual(test_parameter_list[5].condition, {})
             self.assertEqual(test_parameter_list[5].scale, 'l')
 
             # test no goods
-            self.assertEqual(test_no_goods[0], {"luby": True , "rinc": 3})
+            self.assertEqual(test_no_goods[0], {"luby": True, "rinc": 3})
 
     def test_instance_file_avail(self):
         with self.assertRaises(FileExistsError):
@@ -147,4 +149,3 @@ def test_instance_file_avail(self):
 
 if __name__ == "__main__":
     unittest.main()
-
diff --git a/selector/test/test_tournament_bookkeeping.py b/selector/test/test_tournament_bookkeeping.py
@@ -22,21 +22,26 @@ class TestTournamentBookkeeping(unittest.TestCase):
 
     def setUp(self):
         script_location = os.path.dirname(__file__)
-        self.parser = {"check_path": False, "seed": 42, "ta_run_type": "import_wrapper", "winners_per_tournament": 1,
-                  # import_wrapper
-                  "initial_instance_set_sideterministicze": 2, "tournament_size": 3, "number_tournaments": 3,
-                  "total_tournament_number": 2, "cpu_binding": False, 'instances_dir': './test/test_data/instances',
-                  "total_runtime": 1200, "generator_multiple": 3, "set_size": 50, "solve_match": [],
-                  "termination_criterion": "total_runtime", "par": 1, "ta_pid_name": "glucose-simp",
-                  "memory_limit": 1023 * 3, "log_folder": "/run_1", "initial_instance_set_size": 5, "runtime_feedback": "",
-                  "log_location": script_location + '/selector/logs'}
+        self.parser = {
+            "check_path": False, "seed": 42, "ta_run_type": "import_wrapper",
+            "winners_per_tournament": 1,
+            "initial_instance_set_sideterministicze": 2, "tournament_size": 3,
+            "number_tournaments": 3, "total_tournament_number": 2,
+            "cpu_binding": False, 'instances_dir': './test/test_data/instances',
+            "total_runtime": 1200, "generator_multiple": 3, "set_size": 50,
+            "solve_match": [], "termination_criterion": "total_runtime",
+            "par": 1, "ta_pid_name": "glucose-simp", "memory_limit": 1023 * 3,
+            "log_folder": "/run_1", "initial_instance_set_size": 5,
+            "runtime_feedback": "", "log_location": script_location + '/selector/logs'}
         self.scenario = Scenario("./selector/test/test_data/test_example.txt", self.parser)
         self.ta_wrapper = TAP_Work_Wrapper()
         self.global_cache = TargetAlgorithmObserver.remote(self.scenario)
         self.random_generator = PointGen(self.scenario, random_point)
         self.point_selector = RandomSelector()
-        self.instance_selector = InstanceSet(self.scenario.instance_set, self.scenario.initial_instance_set_size,
-                                             self.scenario.set_size)
+        self.instance_selector = \
+            InstanceSet(self.scenario.instance_set,
+                        self.scenario.initial_instance_set_size,
+                        self.scenario.set_size)
         self.tournament_dispatcher = MiniTournamentDispatcher()
         self.tournament_counter = 0
         self.tasks = []
@@ -46,20 +51,27 @@ def setUp(self):
         self.initial_assignments = []
 
         for _ in range(self.scenario.number_tournaments):
-            generated_points = [self.random_generator.point_generator() for _ in range(self.scenario.tournament_size *
-                                                                                  self.scenario.generator_multiple)]
+            generated_points = \
+                [self.random_generator.point_generator()
+                 for _ in range(
+                    self.scenario.tournament_size * self.scenario.generator_multiple)]
 
-            points_to_run = self.point_selector.select_points(generated_points, self.scenario.tournament_size,
-                                                         self.tournament_counter)
+            points_to_run = \
+                self.point_selector.select_points(
+                    generated_points, self.scenario.tournament_size,
+                    self.tournament_counter)
 
             instance_id, instances = self.instance_selector.get_subset(0)
-            tournament, initial_assignments = self.tournament_dispatcher.init_tournament(self.results, points_to_run,
-                                                                                         instances, instance_id)
+            tournament, initial_assignments = \
+                self.tournament_dispatcher.init_tournament(
+                    self.results, points_to_run,
+                    instances, instance_id)
             self.initial_assignments.append(initial_assignments)
             self.tournaments.append(tournament)
             self.global_cache.put_tournament_history.remote(tournament)
             self.global_cache.put_tournament_update.remote(tournament)
-            self.tasks = tb.update_tasks(self.tasks, initial_assignments, tournament, self.global_cache,
+            self.tasks = tb.update_tasks(self.tasks, initial_assignments,
+                                         tournament, self.global_cache,
                                          self.ta_wrapper, self.scenario)
 
     def test_get_tournament_membership(self):

Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,7 @@ def decorator(func):`
`56`	`56`	`'_autosummary/selector.wrapper.rst',`
`57`	`57`	`'_autosummary/selector.test_ray.rst',`
`58`	`58`	`'_autosummary/selector.main.rst',`
	`59`	`+ '_autosummary/selector.test.rst',`
`59`	`60`	`]`
`60`	`61`	`autodoc_mock_imports = ["json", "json.JSONEncoder"]`
`61`	`62`