Move import location for Ray 2 (#721)

* ray version check when importing

* display learner_class when starting_points removed

* test ray 2

test/tune/example.py

@@ -22,9 +22,15 @@ def easy_objective(config):
 def test_blendsearch_tune(smoke_test=True):
     try:
         from ray import tune
-        from ray.tune.suggest import ConcurrencyLimiter
         from ray.tune.schedulers import AsyncHyperBandScheduler
-        from ray.tune.suggest.flaml import BlendSearch
+        from ray import __version__ as ray_version
+
+        if ray_version.startswith("1."):
+            from ray.tune.suggest import ConcurrencyLimiter
+            from ray.tune.suggest.flaml import BlendSearch
+        else:
+            from ray.tune.search import ConcurrencyLimiter
+            from ray.tune.search.flaml import BlendSearch
     except ImportError:
         print("ray[tune] is not installed, skipping test")
         return

test/tune/test_flaml_raytune_consistency.py

@@ -52,7 +52,12 @@ def _test_flaml_raytune_consistency(
     num_samples=-1, max_concurrent_trials=1, searcher_name="cfo"
 ):
     try:
-        from ray import tune as raytune
+        from ray import tune as raytune, __version__ as ray_version
+
+        if ray_version.startswith("1."):
+            from ray.tune.suggest import ConcurrencyLimiter
+        else:
+            from ray.tune.search import ConcurrencyLimiter
     except ImportError:
         print(
             "skip _test_flaml_raytune_consistency because ray tune cannot be imported."
@@ -78,7 +83,6 @@ def _test_flaml_raytune_consistency(
     print(analysis.best_trial.last_result)  # the best trial's result
 
     searcher = setup_searcher(searcher_name)
-    from ray.tune.suggest import ConcurrencyLimiter
 
     search_alg = ConcurrencyLimiter(searcher, max_concurrent_trials)
     analysis = raytune.run(

test/tune/test_searcher.py

@@ -5,7 +5,10 @@ try:
     from ray import __version__ as ray_version
 
     assert ray_version >= "1.10.0"
-    from ray.tune import sample
+    if ray_version.startswith("1."):
+        from ray.tune import sample
+    else:
+        from ray.tune.search import sample
 
     use_ray = True
 except (ImportError, AssertionError):