Remove vineyard import dep & simplify lazy_import

Author: wjsi

mars/conftest.py

@@ -27,7 +27,7 @@
 from mars.serialization.ray import register_ray_serializers, unregister_ray_serializers
 from mars.utils import lazy_import
 
-ray = lazy_import("ray", globals=globals())
+ray = lazy_import("ray")
 
 
 @pytest.fixture(scope="module")

mars/contrib/dask/tests/test_dask.py

@@ -17,8 +17,8 @@
 from ....utils import lazy_import
 from .. import convert_dask_collection, mars_scheduler
 
-dask_installed = lazy_import("dask", globals=globals()) is not None
-mimesis_installed = lazy_import("mimesis", globals=globals()) is not None
+dask_installed = lazy_import("dask") is not None
+mimesis_installed = lazy_import("mimesis") is not None
 
 
 @pytest.mark.skipif(not dask_installed, reason="dask not installed")

mars/dataframe/base/_duplicate.py

@@ -26,7 +26,7 @@
 from ..initializer import DataFrame as asdataframe
 from ..operands import DataFrameOperandMixin, DataFrameShuffleProxy
 
-cudf = lazy_import("cudf", globals=globals())
+cudf = lazy_import("cudf")
 
 
 class DuplicateOperand(MapReduceOperand, DataFrameOperandMixin):

mars/dataframe/base/describe.py

@@ -27,7 +27,7 @@
 from ..utils import parse_index, build_empty_df
 
 
-cudf = lazy_import("cudf", globals=globals())
+cudf = lazy_import("cudf")
 
 
 class DataFrameDescribe(DataFrameOperand, DataFrameOperandMixin):

mars/dataframe/base/drop_duplicates.py

@@ -28,7 +28,7 @@
 )
 from ._duplicate import DuplicateOperand, validate_subset
 
-cudf = lazy_import("cudf", globals=globals())
+cudf = lazy_import("cudf")
 
 
 class DataFrameDropDuplicates(DuplicateOperand):

mars/dataframe/base/memory_usage.py

@@ -27,7 +27,7 @@
 from ..core import IndexValue
 from ..utils import parse_index
 
-cudf = lazy_import("cudf", globals=globals())
+cudf = lazy_import("cudf")
 
 
 class DataFrameMemoryUsage(DataFrameOperand, DataFrameOperandMixin):

mars/dataframe/base/standardize_range_index.py

@@ -22,7 +22,7 @@
 from ..operands import DataFrameOperandMixin, DataFrameOperand
 
 
-cudf = lazy_import("cudf", globals=globals())
+cudf = lazy_import("cudf")
 
 
 class ChunkStandardizeRangeIndex(DataFrameOperand, DataFrameOperandMixin):

mars/dataframe/base/tests/test_base_execution.py

@@ -43,7 +43,7 @@
 
 pytestmark = pytest.mark.pd_compat
 
-cudf = lazy_import("cudf", globals=globals())
+cudf = lazy_import("cudf")
 
 _explode_with_ignore_index = pd_release_version[:2] >= (1, 1)
 

mars/dataframe/contrib/raydataset/dataset.py

@@ -16,10 +16,10 @@
 from .mldataset import _rechunk_if_needed
 from typing import Dict, List
 
-ray = lazy_import("ray", globals=globals())
+ray = lazy_import("ray")
 # Ray Datasets is available in early preview at ray.data with Ray 1.6+
 # (and ray.experimental.data in Ray 1.5)
-ray_dataset = lazy_import("ray.data", globals=globals(), rename="ray_dataset")
+ray_dataset = lazy_import("ray.data", rename="ray_dataset")
 
 
 def to_ray_dataset(df, num_shards: int = None):

mars/dataframe/contrib/raydataset/mldataset.py

@@ -19,9 +19,9 @@
 
 from ....utils import lazy_import
 
-ray = lazy_import("ray", globals=globals())
-parallel_it = lazy_import("ray.util.iter", globals=globals(), rename="parallel_it")
-ml_dataset = lazy_import("ray.util.data", globals=globals(), rename="ml_dataset")
+ray = lazy_import("ray")
+parallel_it = lazy_import("ray.util.iter", rename="parallel_it")
+ml_dataset = lazy_import("ray.util.data", rename="ml_dataset")
 
 
 class ChunkRefBatch: