Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/actions/mamba-env/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ runs:
${{ runner.os }}-conda-${{ steps.get-week.outputs.thisweek }}-${{ hashFiles(inputs.environment-file) }}
- uses: conda-incubator/setup-miniconda@v3
with:
miniforge-variant: Mambaforge
miniforge-variant: Miniforge3
miniforge-version: latest
use-mamba: true
activate-environment: ${{ inputs.activate-environment }}
Expand Down
32 changes: 14 additions & 18 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -115,13 +115,15 @@ jobs:
run: |
MODIN_ENGINE=dask python -c "import modin.pandas as pd; print(pd.DataFrame([1,2,3]))"
MODIN_ENGINE=ray python -c "import modin.pandas as pd; print(pd.DataFrame([1,2,3]))"
- name: Ensure MPI engine start up
# Install a working MPI implementation beforehand so mpi4py can link to it
run: |
sudo apt install libmpich-dev
python -m pip install -e ".[mpi]"
MODIN_ENGINE=unidist UNIDIST_BACKEND=mpi mpiexec -n 1 python -c "import modin.pandas as pd; print(pd.DataFrame([1,2,3]))"
if: matrix.os == 'ubuntu'
# - name: Ensure MPI engine start up
# Install a working MPI implementation beforehand so mpi4py can link to it.
# TODO(https://github.com/modin-project/modin/issues/7421): Find a
# way to make MPI installed via APT work. Then uncomment this section.
# run: |
# sudo apt install libmpich-dev
# python -m pip install -e ".[mpi]"
# MODIN_ENGINE=unidist UNIDIST_BACKEND=mpi mpiexec -n 1 python -c "import modin.pandas as pd; print(pd.DataFrame([1,2,3]))"
# if: matrix.os == 'ubuntu'

test-internals:
needs: [lint-flake8, python-filter]
Expand Down Expand Up @@ -174,6 +176,10 @@ jobs:
run: |
# TODO(https://github.com/modin-project/modin/issues/5194): Uncap xgboost
# when we use collective instead of rabit.
# Per the thread https://github.com/conda-forge/miniforge/issues/513,
# remove unused conda packages and caches to avoid `Found incorrect
# download: joblib` error from mamba.
mamba clean --all
mamba install "xgboost>=1.7.1,<2.0.0" scikit-learn -c conda-forge
python -m pytest modin/tests/experimental/xgboost/test_default.py --execution=${{ matrix.execution }}
- run: python -m pytest -n 2 modin/tests/core/storage_formats/base/test_internals.py --execution=${{ matrix.execution }}
Expand Down Expand Up @@ -202,7 +208,7 @@ jobs:
with:
auto-activate-base: true
activate-environment: ""
miniforge-variant: Mambaforge
miniforge-variant: Miniforge3
miniforge-version: latest
use-mamba: true
- name: Running benchmarks
Expand Down Expand Up @@ -493,11 +499,6 @@ jobs:
- name: Stop local ray cluster
run: ray stop
if: matrix.os == 'windows' && matrix.engine == 'ray'
- name: Rename the dirs with conda packages so it won't be deleted, it's too slow on Windows.
run: |
mkdir -p "${CONDA_PKGS_DIR}_do_not_cache" && \
find "${CONDA_PKGS_DIR}" -mindepth 1 -maxdepth 1 -type d -exec mv {} "${CONDA_PKGS_DIR}_do_not_cache" \;
if: matrix.os == 'windows'

test-sanity:
needs: [lint-flake8, execution-filter, python-filter]
Expand Down Expand Up @@ -625,11 +626,6 @@ jobs:
- name: Stop local ray cluster
run: ray stop
if: matrix.os == 'windows' && matrix.execution.name == 'ray'
- name: Rename the dirs with conda packages so it won't be deleted, it's too slow on Windows.
run: |
mkdir -p "${CONDA_PKGS_DIR}_do_not_cache" && \
find "${CONDA_PKGS_DIR}" -mindepth 1 -maxdepth 1 -type d -exec mv {} "${CONDA_PKGS_DIR}_do_not_cache" \;
if: matrix.os == 'windows'
- uses: ./.github/actions/upload-coverage

test-experimental:
Expand Down
9 changes: 2 additions & 7 deletions modin/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,7 @@
# governing permissions and limitations under the License.

import warnings
from typing import TYPE_CHECKING, Any, Optional, Tuple, Type, Union

if TYPE_CHECKING:
from .config import Engine, StorageFormat
from typing import Any, Optional, Tuple, Type, Union

from . import _version

Expand All @@ -37,9 +34,7 @@ def custom_formatwarning(
warnings.filterwarnings("ignore", message="Large object of size")


def set_execution(
engine: Any = None, storage_format: Any = None
) -> Tuple["Engine", "StorageFormat"]:
def set_execution(engine: Any = None, storage_format: Any = None) -> Tuple[Any, Any]:
"""
Method to set the _pair_ of execution engine and storage format format simultaneously.
This is needed because there might be cases where switching one by one would be
Expand Down
Loading