Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

TEST-#7419: Fix CI #7420

Merged
merged 8 commits into from
Jan 16, 2025
Merged

TEST-#7419: Fix CI #7420

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8b248f6
TEST-#7419: Fix mypy
sfc-gh-mvashishtha Jan 11, 2025
3b1df10
Switch miniforge variant to Miniforge3 per https://github.com/conda-i…
sfc-gh-mvashishtha Jan 13, 2025
f47fb91
Switch miniforge variant to Miniforge3 in mamba-env file per https://…
sfc-gh-mvashishtha Jan 13, 2025
a0d0569
Remove manual conda caching with CONDA_PKGS_DIR
sfc-gh-mvashishtha Jan 14, 2025
0aea0ae
Cap libmpich-dev under 4.2
sfc-gh-mvashishtha Jan 15, 2025
22f4a24
Pin libmpich-dev to 4.0-3
sfc-gh-mvashishtha Jan 15, 2025
595a5d9
Skip MPI clean install via APT on ubuntu
sfc-gh-mvashishtha Jan 15, 2025
195d3e2
Remove unused conda packages before running BaseOnPython xgboost tests.
sfc-gh-mvashishtha Jan 15, 2025
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
View file
Open in desktop
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
28 changes: 10 additions & 18 deletions .github/workflows/ci.yml
View file
Open in desktop
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 @@ -202,7 +204,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 +495,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 +622,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
View file
Open in desktop
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