wassname/ray
1
0
Fork 0
mirror of https://github.com/wassname/ray.git synced 2026-08-09 12:20:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

[tune] Auto-init Ray + default SearchAlg (#4815)

Browse Source
This commit is contained in:
Richard Liaw
2019-05-29 12:09:34 -07:00
committed by GitHub
parent 64eb7b322c
commit acee89b1f6
6 changed files with 63 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/ray/tune/tests/test_trial_runner.py
+23 -28
View File
@@ -1218,7 +1218,7 @@ class TrialRunnerTest(unittest.TestCase):
def testExtraResources(self):
ray.init(num_cpus=4, num_gpus=2)
runner = TrialRunner(BasicVariantGenerator())
runner = TrialRunner()
kwargs = {
"stopping_criterion": {
"training_iteration": 1
@@ -1239,7 +1239,7 @@ class TrialRunnerTest(unittest.TestCase):
def testCustomResources(self):
ray.init(num_cpus=4, num_gpus=2, resources={"a": 2})
runner = TrialRunner(BasicVariantGenerator())
runner = TrialRunner()
kwargs = {
"stopping_criterion": {
"training_iteration": 1
@@ -1260,7 +1260,7 @@ class TrialRunnerTest(unittest.TestCase):
def testExtraCustomResources(self):
ray.init(num_cpus=4, num_gpus=2, resources={"a": 2})
runner = TrialRunner(BasicVariantGenerator())
runner = TrialRunner()
kwargs = {
"stopping_criterion": {
"training_iteration": 1
@@ -1283,7 +1283,7 @@ class TrialRunnerTest(unittest.TestCase):
def testCustomResources2(self):
ray.init(num_cpus=4, num_gpus=2, resources={"a": 2})
runner = TrialRunner(BasicVariantGenerator())
runner = TrialRunner()
resource1 = Resources(cpu=1, gpu=0, extra_custom_resources={"a": 2})
self.assertTrue(runner.has_resources(resource1))
resource2 = Resources(cpu=1, gpu=0, custom_resources={"a": 2})
@@ -1295,7 +1295,7 @@ class TrialRunnerTest(unittest.TestCase):
def testFractionalGpus(self):
ray.init(num_cpus=4, num_gpus=1)
runner = TrialRunner(BasicVariantGenerator())
runner = TrialRunner()
kwargs = {
"resources": Resources(cpu=1, gpu=0.5),
}
@@ -1318,7 +1318,7 @@ class TrialRunnerTest(unittest.TestCase):
def testResourceScheduler(self):
ray.init(num_cpus=4, num_gpus=1)
runner = TrialRunner(BasicVariantGenerator())
runner = TrialRunner()
kwargs = {
"stopping_criterion": {
"training_iteration": 1
@@ -1347,7 +1347,7 @@ class TrialRunnerTest(unittest.TestCase):
def testMultiStepRun(self):
ray.init(num_cpus=4, num_gpus=2)
runner = TrialRunner(BasicVariantGenerator())
runner = TrialRunner()
kwargs = {
"stopping_criterion": {
"training_iteration": 5
@@ -1377,7 +1377,7 @@ class TrialRunnerTest(unittest.TestCase):
def testMultiStepRun2(self):
"""Checks that runner.step throws when overstepping."""
ray.init(num_cpus=1)
runner = TrialRunner(BasicVariantGenerator())
runner = TrialRunner()
kwargs = {
"stopping_criterion": {
"training_iteration": 2
@@ -1411,8 +1411,7 @@ class TrialRunnerTest(unittest.TestCase):
executor.start_trial(trial)
return TrialScheduler.CONTINUE
runner = TrialRunner(
BasicVariantGenerator(), scheduler=ChangingScheduler())
runner = TrialRunner(scheduler=ChangingScheduler())
kwargs = {
"stopping_criterion": {
"training_iteration": 2
@@ -1434,7 +1433,7 @@ class TrialRunnerTest(unittest.TestCase):
def testErrorHandling(self):
ray.init(num_cpus=4, num_gpus=2)
runner = TrialRunner(BasicVariantGenerator())
runner = TrialRunner()
kwargs = {
"stopping_criterion": {
"training_iteration": 1
@@ -1456,7 +1455,7 @@ class TrialRunnerTest(unittest.TestCase):
def testThrowOnOverstep(self):
ray.init(num_cpus=1, num_gpus=1)
runner = TrialRunner(BasicVariantGenerator())
runner = TrialRunner()
runner.step()
self.assertRaises(TuneError, runner.step)
@@ -1550,7 +1549,7 @@ class TrialRunnerTest(unittest.TestCase):
def testFailureRecoveryMaxFailures(self):
ray.init(num_cpus=1, num_gpus=1)
runner = TrialRunner(BasicVariantGenerator())
runner = TrialRunner()
kwargs = {
"resources": Resources(cpu=1, gpu=1),
"checkpoint_freq": 1,
@@ -1579,7 +1578,7 @@ class TrialRunnerTest(unittest.TestCase):
def testCheckpointing(self):
ray.init(num_cpus=1, num_gpus=1)
runner = TrialRunner(BasicVariantGenerator())
runner = TrialRunner()
kwargs = {
"stopping_criterion": {
"training_iteration": 1
@@ -1610,7 +1609,7 @@ class TrialRunnerTest(unittest.TestCase):
def testRestoreMetricsAfterCheckpointing(self):
ray.init(num_cpus=1, num_gpus=1)
runner = TrialRunner(BasicVariantGenerator())
runner = TrialRunner()
kwargs = {
"resources": Resources(cpu=1, gpu=1),
}
@@ -1642,7 +1641,7 @@ class TrialRunnerTest(unittest.TestCase):
def testCheckpointingAtEnd(self):
ray.init(num_cpus=1, num_gpus=1)
runner = TrialRunner(BasicVariantGenerator())
runner = TrialRunner()
kwargs = {
"stopping_criterion": {
"training_iteration": 2
@@ -1663,7 +1662,7 @@ class TrialRunnerTest(unittest.TestCase):
def testResultDone(self):
"""Tests that last_result is marked `done` after trial is complete."""
ray.init(num_cpus=1, num_gpus=1)
runner = TrialRunner(BasicVariantGenerator())
runner = TrialRunner()
kwargs = {
"stopping_criterion": {
"training_iteration": 2
@@ -1682,7 +1681,7 @@ class TrialRunnerTest(unittest.TestCase):
def testPauseThenResume(self):
ray.init(num_cpus=1, num_gpus=1)
runner = TrialRunner(BasicVariantGenerator())
runner = TrialRunner()
kwargs = {
"stopping_criterion": {
"training_iteration": 2
@@ -1713,7 +1712,7 @@ class TrialRunnerTest(unittest.TestCase):
def testStepHook(self):
ray.init(num_cpus=4, num_gpus=2)
runner = TrialRunner(BasicVariantGenerator())
runner = TrialRunner()
def on_step_begin(self):
self._update_avail_resources()
@@ -1743,7 +1742,7 @@ class TrialRunnerTest(unittest.TestCase):
def testStopTrial(self):
ray.init(num_cpus=4, num_gpus=2)
runner = TrialRunner(BasicVariantGenerator())
runner = TrialRunner()
kwargs = {
"stopping_criterion": {
"training_iteration": 5
@@ -1953,8 +1952,7 @@ class TrialRunnerTest(unittest.TestCase):
ray.init(num_cpus=3)
tmpdir = tempfile.mkdtemp()
runner = TrialRunner(
BasicVariantGenerator(), metadata_checkpoint_dir=tmpdir)
runner = TrialRunner(metadata_checkpoint_dir=tmpdir)
trials = [
Trial(
"__fake",
@@ -2013,8 +2011,7 @@ class TrialRunnerTest(unittest.TestCase):
ray.init(num_cpus=3)
tmpdir = tempfile.mkdtemp()
runner = TrialRunner(
BasicVariantGenerator(), metadata_checkpoint_dir=tmpdir)
runner = TrialRunner(metadata_checkpoint_dir=tmpdir)
runner.add_trial(
Trial(
@@ -2069,8 +2066,7 @@ class TrialRunnerTest(unittest.TestCase):
},
checkpoint_freq=1)
tmpdir = tempfile.mkdtemp()
runner = TrialRunner(
BasicVariantGenerator(), metadata_checkpoint_dir=tmpdir)
runner = TrialRunner(metadata_checkpoint_dir=tmpdir)
runner.add_trial(trial)
for i in range(5):
runner.step()
@@ -2091,8 +2087,7 @@ class TrialRunnerTest(unittest.TestCase):
ray.init()
trial = Trial("__fake", checkpoint_freq=1)
tmpdir = tempfile.mkdtemp()
runner = TrialRunner(
BasicVariantGenerator(), metadata_checkpoint_dir=tmpdir)
runner = TrialRunner(metadata_checkpoint_dir=tmpdir)
runner.add_trial(trial)
for i in range(5):
runner.step()