From ae3b031ee6eb28d20dfe5732b17260ab5759a3a9 Mon Sep 17 00:00:00 2001 From: Lu Weizheng Date: Sun, 29 Sep 2024 23:38:49 +0800 Subject: [PATCH] CI --- .github/workflows/python.yaml | 8 +++++--- doc/source/reference/index.rst | 2 -- python/xorbits/_mars/storage/filesystem.py | 2 +- python/xorbits/_mars/storage/tests/test_libs.py | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/python.yaml b/.github/workflows/python.yaml index 4c3a6a3b3..bed41356f 100644 --- a/.github/workflows/python.yaml +++ b/.github/workflows/python.yaml @@ -90,7 +90,7 @@ jobs: - { os: ubuntu-latest, module: learn, python-version: 3.9 } - { os: ubuntu-latest, module: mars-core, python-version: 3.9 } - { os: ubuntu-20.04, module: hadoop, python-version: 3.9 } - - { os: ubuntu-latest, module: vineyard, python-version: 3.9 } + - { os: ubuntu-latest, module: vineyard, python-version: 3.11 } - { os: ubuntu-latest, module: external-storage, python-version: 3.9 } # always test compatibility with the latest version # - { os: ubuntu-latest, module: compatibility, python-version: 3.9 } @@ -131,7 +131,9 @@ jobs: - name: Install ucx dependencies if: ${{ (matrix.module != 'gpu') && (matrix.os == 'ubuntu-latest') && (matrix.module != 'doc-build') }} run: | - conda install -c conda-forge -c rapidsai ucx-proc=*=cpu ucx ucx-py + # ucx-py move to ucxx and ucxx-cu12 can be run on CPU + # conda install -c conda-forge -c rapidsai ucx-proc=*=cpu ucx ucx-py + pip install ucxx-cu12 - name: Install libomp (macOS) if: ${{ matrix.os == 'macos-latest' || matrix.os == 'macos-13' }} run: brew install libomp @@ -275,7 +277,7 @@ jobs: run: | source activate ${{ env.CONDA_ENV }} pip install --extra-index-url=https://pypi.nvidia.com cudf-cu12==24.8.* - pip install ucx-py-cu12 cython "numpy>=1.14.0,<2.0.0" cloudpickle scikit-learn \ + pip install ucxx-cu12 cython "numpy>=1.14.0,<2.0.0" cloudpickle scikit-learn \ pyyaml psutil tornado sqlalchemy defusedxml tqdm uvloop coverage \ pytest pytest-cov pytest-timeout pytest-forked pytest-asyncio pytest-mock pip install -U xoscar diff --git a/doc/source/reference/index.rst b/doc/source/reference/index.rst index 7833a82a9..29036da3b 100644 --- a/doc/source/reference/index.rst +++ b/doc/source/reference/index.rst @@ -9,6 +9,4 @@ API Reference xorbits/index datasets/index - xgboost/index - lightgbm/index experimental/index \ No newline at end of file diff --git a/python/xorbits/_mars/storage/filesystem.py b/python/xorbits/_mars/storage/filesystem.py index 478929d0a..41bff2f4f 100644 --- a/python/xorbits/_mars/storage/filesystem.py +++ b/python/xorbits/_mars/storage/filesystem.py @@ -188,7 +188,7 @@ async def setup(cls, **kwargs) -> Tuple[Dict, Dict]: if local_environ: proc = await asyncio.create_subprocess_shell( f"""$ALLUXIO_HOME/bin/alluxio fs mkdir /alluxio-storage - $ALLUXIO_HOME/integration/fuse/bin/alluxio-fuse mount {root_dirs} /alluxio-storage + $ALLUXIO_HOME/integration/fuse/bin/alluxio-fuse mount {root_dirs[0]} /alluxio-storage """ ) await proc.wait() diff --git a/python/xorbits/_mars/storage/tests/test_libs.py b/python/xorbits/_mars/storage/tests/test_libs.py index 5f6a2454a..1446447c4 100644 --- a/python/xorbits/_mars/storage/tests/test_libs.py +++ b/python/xorbits/_mars/storage/tests/test_libs.py @@ -80,7 +80,7 @@ async def storage_context(request): elif request.param == "alluxio": tempdir = tempfile.mkdtemp() params, teardown_params = await AlluxioStorage.setup( - root_dir=tempdir, local_environ=True + root_dirs=[tempdir], local_environ=True ) storage = AlluxioStorage(**params) assert storage.level == StorageLevel.MEMORY