From 7a31db1d7ae23a8a0dbd98aacdc5ce6384a8e8a3 Mon Sep 17 00:00:00 2001 From: v-chen_data Date: Tue, 19 Nov 2024 10:34:38 -0500 Subject: [PATCH 01/20] update ubuntu version --- docker/Dockerfile | 6 ++-- docker/README.md | 18 ++++++------ docker/build_matrix.yaml | 50 ++++++++++++++++----------------- docker/generate_build_matrix.py | 12 ++++---- 4 files changed, 43 insertions(+), 43 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index c3f4dee907..9a18e3ccc9 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -11,8 +11,8 @@ ARG CUDA_VERSION=11.3.1 # Calculate the base image based on CUDA_VERSION -ARG BASE_IMAGE=${CUDA_VERSION:+"nvidia/cuda:${CUDA_VERSION}-cudnn8-devel-ubuntu20.04"} -ARG BASE_IMAGE=${BASE_IMAGE:-"ubuntu:20.04"} +ARG BASE_IMAGE=${CUDA_VERSION:+"nvidia/cuda:${CUDA_VERSION}-cudnn8-devel-ubuntu22.04"} +ARG BASE_IMAGE=${BASE_IMAGE:-"ubuntu:22.04"} # The Python version to install ARG PYTHON_VERSION=3.10 @@ -251,7 +251,7 @@ ARG MOFED_VERSION RUN if [ -n "$MOFED_VERSION" ] ; then \ wget -qO - http://www.mellanox.com/downloads/ofed/RPM-GPG-KEY-Mellanox | sudo apt-key add - && \ - wget -P /etc/apt/sources.list.d/ http://linux.mellanox.com/public/repo/mlnx_ofed/$MOFED_VERSION/ubuntu20.04/mellanox_mlnx_ofed.list && \ + wget -P /etc/apt/sources.list.d/ http://linux.mellanox.com/public/repo/mlnx_ofed/$MOFED_VERSION/ubuntu22.04/mellanox_mlnx_ofed.list && \ apt-get update && \ apt-get install -y mlnx-ofed-dpdk-upstream-libs-user-only ; \ fi diff --git a/docker/README.md b/docker/README.md index d4af7cc4ad..65fdf796f2 100644 --- a/docker/README.md +++ b/docker/README.md @@ -30,15 +30,15 @@ To install composer, once inside the image, run `pip install mosaicml`. | Linux Distro | Flavor | PyTorch Version | CUDA Version | Python Version | Docker Tags | |----------------|----------|-------------------|---------------------|------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| Ubuntu 20.04 | Base | 2.5.1 | 12.4.1 (Infiniband) | 3.11 | `mosaicml/pytorch:latest`, `mosaicml/pytorch:2.5.1_cu124-python3.11-ubuntu20.04` | -| Ubuntu 20.04 | Base | 2.5.1 | 12.4.1 (EFA) | 3.11 | `mosaicml/pytorch:latest-aws`, `mosaicml/pytorch:2.5.1_cu124-python3.11-ubuntu20.04-aws` | -| Ubuntu 20.04 | Base | 2.5.1 | cpu | 3.11 | `mosaicml/pytorch:latest_cpu`, `mosaicml/pytorch:2.5.1_cpu-python3.11-ubuntu20.04` | -| Ubuntu 20.04 | Base | 2.4.1 | 12.4.1 (Infiniband) | 3.11 | `mosaicml/pytorch:2.4.1_cu124-python3.11-ubuntu20.04` | -| Ubuntu 20.04 | Base | 2.4.1 | 12.4.1 (EFA) | 3.11 | `mosaicml/pytorch:2.4.1_cu124-python3.11-ubuntu20.04-aws` | -| Ubuntu 20.04 | Base | 2.4.1 | cpu | 3.11 | `mosaicml/pytorch:2.4.1_cpu-python3.11-ubuntu20.04` | -| Ubuntu 20.04 | Base | 2.3.1 | 12.1.1 (Infiniband) | 3.11 | `mosaicml/pytorch:2.3.1_cu121-python3.11-ubuntu20.04` | -| Ubuntu 20.04 | Base | 2.3.1 | 12.1.1 (EFA) | 3.11 | `mosaicml/pytorch:2.3.1_cu121-python3.11-ubuntu20.04-aws` | -| Ubuntu 20.04 | Base | 2.3.1 | cpu | 3.11 | `mosaicml/pytorch:2.3.1_cpu-python3.11-ubuntu20.04` | +| Ubuntu 20.04 | Base | 2.5.1 | 12.4.1 (Infiniband) | 3.11 | `mosaicml/pytorch:latest`, `mosaicml/pytorch:2.5.1_cu124-python3.11-ubuntu22.04` | +| Ubuntu 20.04 | Base | 2.5.1 | 12.4.1 (EFA) | 3.11 | `mosaicml/pytorch:latest-aws`, `mosaicml/pytorch:2.5.1_cu124-python3.11-ubuntu22.04-aws` | +| Ubuntu 20.04 | Base | 2.5.1 | cpu | 3.11 | `mosaicml/pytorch:latest_cpu`, `mosaicml/pytorch:2.5.1_cpu-python3.11-ubuntu22.04` | +| Ubuntu 20.04 | Base | 2.4.1 | 12.4.1 (Infiniband) | 3.11 | `mosaicml/pytorch:2.4.1_cu124-python3.11-ubuntu22.04` | +| Ubuntu 20.04 | Base | 2.4.1 | 12.4.1 (EFA) | 3.11 | `mosaicml/pytorch:2.4.1_cu124-python3.11-ubuntu22.04-aws` | +| Ubuntu 20.04 | Base | 2.4.1 | cpu | 3.11 | `mosaicml/pytorch:2.4.1_cpu-python3.11-ubuntu22.04` | +| Ubuntu 20.04 | Base | 2.3.1 | 12.1.1 (Infiniband) | 3.11 | `mosaicml/pytorch:2.3.1_cu121-python3.11-ubuntu22.04` | +| Ubuntu 20.04 | Base | 2.3.1 | 12.1.1 (EFA) | 3.11 | `mosaicml/pytorch:2.3.1_cu121-python3.11-ubuntu22.04-aws` | +| Ubuntu 20.04 | Base | 2.3.1 | cpu | 3.11 | `mosaicml/pytorch:2.3.1_cpu-python3.11-ubuntu22.04` | **Note**: The `mosaicml/pytorch:latest`, `mosaicml/pytorch:latest_cpu`, and `mosaicml/pytorch:latest-aws` diff --git a/docker/build_matrix.yaml b/docker/build_matrix.yaml index 9c3d9eed36..cf24bd0f6a 100644 --- a/docker/build_matrix.yaml +++ b/docker/build_matrix.yaml @@ -1,6 +1,6 @@ # This file is automatically generated by generate_build_matrix.py. DO NOT EDIT! - AWS_OFI_NCCL_VERSION: '' - BASE_IMAGE: nvidia/cuda:12.4.1-cudnn-devel-ubuntu20.04 + BASE_IMAGE: nvidia/cuda:12.4.1-cudnn-devel-ubuntu22.04 CUDA_VERSION: 12.4.1 IMAGE_NAME: torch-2-5-1-cu124 MOFED_VERSION: latest-23.10 @@ -10,14 +10,14 @@ PYTORCH_NIGHTLY_VERSION: '' PYTORCH_VERSION: 2.5.1 TAGS: - - mosaicml/pytorch:2.5.1_cu124-python3.11-ubuntu20.04 - - ghcr.io/databricks-mosaic/pytorch:2.5.1_cu124-python3.11-ubuntu20.04 + - mosaicml/pytorch:2.5.1_cu124-python3.11-ubuntu22.04 + - ghcr.io/databricks-mosaic/pytorch:2.5.1_cu124-python3.11-ubuntu22.04 - mosaicml/pytorch:latest - ghcr.io/databricks-mosaic/pytorch:latest TARGET: pytorch_stage TORCHVISION_VERSION: 0.20.1 - AWS_OFI_NCCL_VERSION: v1.11.0-aws - BASE_IMAGE: nvidia/cuda:12.4.1-cudnn-devel-ubuntu20.04 + BASE_IMAGE: nvidia/cuda:12.4.1-cudnn-devel-ubuntu22.04 CUDA_VERSION: 12.4.1 IMAGE_NAME: torch-2-5-1-cu124-aws MOFED_VERSION: '' @@ -27,8 +27,8 @@ PYTORCH_NIGHTLY_VERSION: '' PYTORCH_VERSION: 2.5.1 TAGS: - - mosaicml/pytorch:2.5.1_cu124-python3.11-ubuntu20.04-aws - - ghcr.io/databricks-mosaic/pytorch:2.5.1_cu124-python3.11-ubuntu20.04-aws + - mosaicml/pytorch:2.5.1_cu124-python3.11-ubuntu22.04-aws + - ghcr.io/databricks-mosaic/pytorch:2.5.1_cu124-python3.11-ubuntu22.04-aws - mosaicml/pytorch:latest-aws - ghcr.io/databricks-mosaic/pytorch:latest-aws TARGET: pytorch_stage @@ -44,14 +44,14 @@ PYTORCH_NIGHTLY_VERSION: '' PYTORCH_VERSION: 2.5.1 TAGS: - - mosaicml/pytorch:2.5.1_cpu-python3.11-ubuntu20.04 - - ghcr.io/databricks-mosaic/pytorch:2.5.1_cpu-python3.11-ubuntu20.04 + - mosaicml/pytorch:2.5.1_cpu-python3.11-ubuntu22.04 + - ghcr.io/databricks-mosaic/pytorch:2.5.1_cpu-python3.11-ubuntu22.04 - mosaicml/pytorch:latest_cpu - ghcr.io/databricks-mosaic/pytorch:latest_cpu TARGET: pytorch_stage TORCHVISION_VERSION: 0.20.1 - AWS_OFI_NCCL_VERSION: '' - BASE_IMAGE: nvidia/cuda:12.4.1-cudnn-devel-ubuntu20.04 + BASE_IMAGE: nvidia/cuda:12.4.1-cudnn-devel-ubuntu22.04 CUDA_VERSION: 12.4.1 IMAGE_NAME: torch-2-4-1-cu124 MOFED_VERSION: latest-23.10 @@ -61,12 +61,12 @@ PYTORCH_NIGHTLY_VERSION: '' PYTORCH_VERSION: 2.4.1 TAGS: - - mosaicml/pytorch:2.4.1_cu124-python3.11-ubuntu20.04 - - ghcr.io/databricks-mosaic/pytorch:2.4.1_cu124-python3.11-ubuntu20.04 + - mosaicml/pytorch:2.4.1_cu124-python3.11-ubuntu22.04 + - ghcr.io/databricks-mosaic/pytorch:2.4.1_cu124-python3.11-ubuntu22.04 TARGET: pytorch_stage TORCHVISION_VERSION: 0.19.1 - AWS_OFI_NCCL_VERSION: v1.11.0-aws - BASE_IMAGE: nvidia/cuda:12.4.1-cudnn-devel-ubuntu20.04 + BASE_IMAGE: nvidia/cuda:12.4.1-cudnn-devel-ubuntu22.04 CUDA_VERSION: 12.4.1 IMAGE_NAME: torch-2-4-1-cu124-aws MOFED_VERSION: '' @@ -76,8 +76,8 @@ PYTORCH_NIGHTLY_VERSION: '' PYTORCH_VERSION: 2.4.1 TAGS: - - mosaicml/pytorch:2.4.1_cu124-python3.11-ubuntu20.04-aws - - ghcr.io/databricks-mosaic/pytorch:2.4.1_cu124-python3.11-ubuntu20.04-aws + - mosaicml/pytorch:2.4.1_cu124-python3.11-ubuntu22.04-aws + - ghcr.io/databricks-mosaic/pytorch:2.4.1_cu124-python3.11-ubuntu22.04-aws TARGET: pytorch_stage TORCHVISION_VERSION: 0.19.1 - AWS_OFI_NCCL_VERSION: '' @@ -91,12 +91,12 @@ PYTORCH_NIGHTLY_VERSION: '' PYTORCH_VERSION: 2.4.1 TAGS: - - mosaicml/pytorch:2.4.1_cpu-python3.11-ubuntu20.04 - - ghcr.io/databricks-mosaic/pytorch:2.4.1_cpu-python3.11-ubuntu20.04 + - mosaicml/pytorch:2.4.1_cpu-python3.11-ubuntu22.04 + - ghcr.io/databricks-mosaic/pytorch:2.4.1_cpu-python3.11-ubuntu22.04 TARGET: pytorch_stage TORCHVISION_VERSION: 0.19.1 - AWS_OFI_NCCL_VERSION: '' - BASE_IMAGE: nvidia/cuda:12.1.1-cudnn8-devel-ubuntu20.04 + BASE_IMAGE: nvidia/cuda:12.1.1-cudnn8-devel-ubuntu22.04 CUDA_VERSION: 12.1.1 IMAGE_NAME: torch-2-3-1-cu121 MOFED_VERSION: latest-23.10 @@ -119,12 +119,12 @@ PYTORCH_NIGHTLY_VERSION: '' PYTORCH_VERSION: 2.3.1 TAGS: - - mosaicml/pytorch:2.3.1_cu121-python3.11-ubuntu20.04 - - ghcr.io/databricks-mosaic/pytorch:2.3.1_cu121-python3.11-ubuntu20.04 + - mosaicml/pytorch:2.3.1_cu121-python3.11-ubuntu22.04 + - ghcr.io/databricks-mosaic/pytorch:2.3.1_cu121-python3.11-ubuntu22.04 TARGET: pytorch_stage TORCHVISION_VERSION: 0.18.1 - AWS_OFI_NCCL_VERSION: v1.11.0-aws - BASE_IMAGE: nvidia/cuda:12.1.1-cudnn8-devel-ubuntu20.04 + BASE_IMAGE: nvidia/cuda:12.1.1-cudnn8-devel-ubuntu22.04 CUDA_VERSION: 12.1.1 IMAGE_NAME: torch-2-3-1-cu121-aws MOFED_VERSION: '' @@ -147,8 +147,8 @@ PYTORCH_NIGHTLY_VERSION: '' PYTORCH_VERSION: 2.3.1 TAGS: - - mosaicml/pytorch:2.3.1_cu121-python3.11-ubuntu20.04-aws - - ghcr.io/databricks-mosaic/pytorch:2.3.1_cu121-python3.11-ubuntu20.04-aws + - mosaicml/pytorch:2.3.1_cu121-python3.11-ubuntu22.04-aws + - ghcr.io/databricks-mosaic/pytorch:2.3.1_cu121-python3.11-ubuntu22.04-aws TARGET: pytorch_stage TORCHVISION_VERSION: 0.18.1 - AWS_OFI_NCCL_VERSION: '' @@ -162,12 +162,12 @@ PYTORCH_NIGHTLY_VERSION: '' PYTORCH_VERSION: 2.3.1 TAGS: - - mosaicml/pytorch:2.3.1_cpu-python3.11-ubuntu20.04 - - ghcr.io/databricks-mosaic/pytorch:2.3.1_cpu-python3.11-ubuntu20.04 + - mosaicml/pytorch:2.3.1_cpu-python3.11-ubuntu22.04 + - ghcr.io/databricks-mosaic/pytorch:2.3.1_cpu-python3.11-ubuntu22.04 TARGET: pytorch_stage TORCHVISION_VERSION: 0.18.1 - AWS_OFI_NCCL_VERSION: '' - BASE_IMAGE: nvidia/cuda:12.4.1-cudnn-devel-ubuntu20.04 + BASE_IMAGE: nvidia/cuda:12.4.1-cudnn-devel-ubuntu22.04 COMPOSER_INSTALL_COMMAND: mosaicml[all]==0.27.0 CUDA_VERSION: 12.4.1 IMAGE_NAME: composer-0-27-0 diff --git a/docker/generate_build_matrix.py b/docker/generate_build_matrix.py index 2d6c713a4a..1fb476b351 100644 --- a/docker/generate_build_matrix.py +++ b/docker/generate_build_matrix.py @@ -35,10 +35,10 @@ def _get_torchvision_version(pytorch_version: str): def _get_base_image(cuda_version: str): if not cuda_version: - return 'ubuntu:20.04' + return 'ubuntu:22.04' if cuda_version == '12.4.1': - return f'nvidia/cuda:12.4.1-cudnn-devel-ubuntu20.04' - return f'nvidia/cuda:{cuda_version}-cudnn8-devel-ubuntu20.04' + return f'nvidia/cuda:12.4.1-cudnn-devel-ubuntu22.04' + return f'nvidia/cuda:{cuda_version}-cudnn8-devel-ubuntu22.04' def _get_cuda_version(pytorch_version: str, use_cuda: bool): @@ -112,8 +112,8 @@ def _get_pytorch_tags(python_version: str, pytorch_version: str, cuda_version: s tags = [] cuda_version_tag = _get_cuda_version_tag(cuda_version) tags += [ - f'{base_image_name}:{pytorch_version}_{cuda_version_tag}-python{python_version}-ubuntu20.04', - f'{ghcr_base_image_name}:{pytorch_version}_{cuda_version_tag}-python{python_version}-ubuntu20.04', + f'{base_image_name}:{pytorch_version}_{cuda_version_tag}-python{python_version}-ubuntu22.04', + f'{ghcr_base_image_name}:{pytorch_version}_{cuda_version_tag}-python{python_version}-ubuntu22.04', ] if python_version == PRODUCTION_PYTHON_VERSION and pytorch_version == PRODUCTION_PYTORCH_VERSION: @@ -294,7 +294,7 @@ def _main(): interconnect = 'EFA' cuda_version = f"{entry['CUDA_VERSION']} ({interconnect})" if entry['CUDA_VERSION'] else 'cpu' table.append([ - 'Ubuntu 20.04', # Linux distro + 'Ubuntu 22.04', # Linux distro 'Base', # Flavor entry['PYTORCH_VERSION'], # Pytorch version cuda_version, # Cuda version From 88aeec3960efd155480947e934e4bc5a9d76659f Mon Sep 17 00:00:00 2001 From: v-chen_data Date: Tue, 19 Nov 2024 10:35:59 -0500 Subject: [PATCH 02/20] typo --- docker/README.md | 18 +++++++++--------- docker/build_matrix.yaml | 8 ++++---- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/docker/README.md b/docker/README.md index 65fdf796f2..41bd0e51b6 100644 --- a/docker/README.md +++ b/docker/README.md @@ -30,15 +30,15 @@ To install composer, once inside the image, run `pip install mosaicml`. | Linux Distro | Flavor | PyTorch Version | CUDA Version | Python Version | Docker Tags | |----------------|----------|-------------------|---------------------|------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| Ubuntu 20.04 | Base | 2.5.1 | 12.4.1 (Infiniband) | 3.11 | `mosaicml/pytorch:latest`, `mosaicml/pytorch:2.5.1_cu124-python3.11-ubuntu22.04` | -| Ubuntu 20.04 | Base | 2.5.1 | 12.4.1 (EFA) | 3.11 | `mosaicml/pytorch:latest-aws`, `mosaicml/pytorch:2.5.1_cu124-python3.11-ubuntu22.04-aws` | -| Ubuntu 20.04 | Base | 2.5.1 | cpu | 3.11 | `mosaicml/pytorch:latest_cpu`, `mosaicml/pytorch:2.5.1_cpu-python3.11-ubuntu22.04` | -| Ubuntu 20.04 | Base | 2.4.1 | 12.4.1 (Infiniband) | 3.11 | `mosaicml/pytorch:2.4.1_cu124-python3.11-ubuntu22.04` | -| Ubuntu 20.04 | Base | 2.4.1 | 12.4.1 (EFA) | 3.11 | `mosaicml/pytorch:2.4.1_cu124-python3.11-ubuntu22.04-aws` | -| Ubuntu 20.04 | Base | 2.4.1 | cpu | 3.11 | `mosaicml/pytorch:2.4.1_cpu-python3.11-ubuntu22.04` | -| Ubuntu 20.04 | Base | 2.3.1 | 12.1.1 (Infiniband) | 3.11 | `mosaicml/pytorch:2.3.1_cu121-python3.11-ubuntu22.04` | -| Ubuntu 20.04 | Base | 2.3.1 | 12.1.1 (EFA) | 3.11 | `mosaicml/pytorch:2.3.1_cu121-python3.11-ubuntu22.04-aws` | -| Ubuntu 20.04 | Base | 2.3.1 | cpu | 3.11 | `mosaicml/pytorch:2.3.1_cpu-python3.11-ubuntu22.04` | +| Ubuntu 22.04 | Base | 2.5.1 | 12.4.1 (Infiniband) | 3.11 | `mosaicml/pytorch:latest`, `mosaicml/pytorch:2.5.1_cu124-python3.11-ubuntu22.04` | +| Ubuntu 22.04 | Base | 2.5.1 | 12.4.1 (EFA) | 3.11 | `mosaicml/pytorch:latest-aws`, `mosaicml/pytorch:2.5.1_cu124-python3.11-ubuntu22.04-aws` | +| Ubuntu 22.04 | Base | 2.5.1 | cpu | 3.11 | `mosaicml/pytorch:latest_cpu`, `mosaicml/pytorch:2.5.1_cpu-python3.11-ubuntu22.04` | +| Ubuntu 22.04 | Base | 2.4.1 | 12.4.1 (Infiniband) | 3.11 | `mosaicml/pytorch:2.4.1_cu124-python3.11-ubuntu22.04` | +| Ubuntu 22.04 | Base | 2.4.1 | 12.4.1 (EFA) | 3.11 | `mosaicml/pytorch:2.4.1_cu124-python3.11-ubuntu22.04-aws` | +| Ubuntu 22.04 | Base | 2.4.1 | cpu | 3.11 | `mosaicml/pytorch:2.4.1_cpu-python3.11-ubuntu22.04` | +| Ubuntu 22.04 | Base | 2.3.1 | 12.1.1 (Infiniband) | 3.11 | `mosaicml/pytorch:2.3.1_cu121-python3.11-ubuntu22.04` | +| Ubuntu 22.04 | Base | 2.3.1 | 12.1.1 (EFA) | 3.11 | `mosaicml/pytorch:2.3.1_cu121-python3.11-ubuntu22.04-aws` | +| Ubuntu 22.04 | Base | 2.3.1 | cpu | 3.11 | `mosaicml/pytorch:2.3.1_cpu-python3.11-ubuntu22.04` | **Note**: The `mosaicml/pytorch:latest`, `mosaicml/pytorch:latest_cpu`, and `mosaicml/pytorch:latest-aws` diff --git a/docker/build_matrix.yaml b/docker/build_matrix.yaml index cf24bd0f6a..b062299eca 100644 --- a/docker/build_matrix.yaml +++ b/docker/build_matrix.yaml @@ -34,7 +34,7 @@ TARGET: pytorch_stage TORCHVISION_VERSION: 0.20.1 - AWS_OFI_NCCL_VERSION: '' - BASE_IMAGE: ubuntu:20.04 + BASE_IMAGE: ubuntu:22.04 CUDA_VERSION: '' IMAGE_NAME: torch-2-5-1-cpu MOFED_VERSION: '' @@ -81,7 +81,7 @@ TARGET: pytorch_stage TORCHVISION_VERSION: 0.19.1 - AWS_OFI_NCCL_VERSION: '' - BASE_IMAGE: ubuntu:20.04 + BASE_IMAGE: ubuntu:22.04 CUDA_VERSION: '' IMAGE_NAME: torch-2-4-1-cpu MOFED_VERSION: '' @@ -152,7 +152,7 @@ TARGET: pytorch_stage TORCHVISION_VERSION: 0.18.1 - AWS_OFI_NCCL_VERSION: '' - BASE_IMAGE: ubuntu:20.04 + BASE_IMAGE: ubuntu:22.04 CUDA_VERSION: '' IMAGE_NAME: torch-2-3-1-cpu MOFED_VERSION: '' @@ -185,7 +185,7 @@ TARGET: composer_stage TORCHVISION_VERSION: 0.20.1 - AWS_OFI_NCCL_VERSION: '' - BASE_IMAGE: ubuntu:20.04 + BASE_IMAGE: ubuntu:22.04 COMPOSER_INSTALL_COMMAND: mosaicml[all]==0.27.0 CUDA_VERSION: '' IMAGE_NAME: composer-0-27-0-cpu From 17ca05acc41b3cb53ac47636c3b8451c153e4391 Mon Sep 17 00:00:00 2001 From: v-chen_data Date: Tue, 19 Nov 2024 11:38:57 -0500 Subject: [PATCH 03/20] move blinker from apt to pip --- docker/Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docker/Dockerfile b/docker/Dockerfile index 9a18e3ccc9..62787b4fe6 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -325,6 +325,9 @@ RUN pip install --no-cache-dir --upgrade \ urllib3${URLLIB3_VERSION} \ python-snappy +RUN apt-get remove -y python3-blinker +RUN pip install blinker + ################################################## # Override NVIDIA mistaken env var for 11.8 images ################################################## From 1052a1672ab876f2acb8b21f9a44f2bba6e92482 Mon Sep 17 00:00:00 2001 From: v-chen_data Date: Tue, 19 Nov 2024 12:23:49 -0500 Subject: [PATCH 04/20] set tracking --- tests/utils/object_store/test_mlflow_object_store.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/utils/object_store/test_mlflow_object_store.py b/tests/utils/object_store/test_mlflow_object_store.py index fd802048bc..451d56ba92 100644 --- a/tests/utils/object_store/test_mlflow_object_store.py +++ b/tests/utils/object_store/test_mlflow_object_store.py @@ -138,6 +138,9 @@ def test_init_with_no_experiment_and_no_run(monkeypatch): assert store.experiment_id == EXPERIMENT_ID assert store.run_id == RUN_ID +@pytest.fixture(autouse=True) +def set_mlflow_tracking_uri(monkeypatch): + monkeypatch.setenv('MLFLOW_TRACKING_URI', 'databricks') @pytest.fixture() def mlflow_object_store(monkeypatch): From 78ba60c1aa00cdfe15dcb359d13e831fd4c94204 Mon Sep 17 00:00:00 2001 From: v-chen_data Date: Tue, 19 Nov 2024 12:26:56 -0500 Subject: [PATCH 05/20] revert --- tests/utils/object_store/test_mlflow_object_store.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/tests/utils/object_store/test_mlflow_object_store.py b/tests/utils/object_store/test_mlflow_object_store.py index 451d56ba92..fd802048bc 100644 --- a/tests/utils/object_store/test_mlflow_object_store.py +++ b/tests/utils/object_store/test_mlflow_object_store.py @@ -138,9 +138,6 @@ def test_init_with_no_experiment_and_no_run(monkeypatch): assert store.experiment_id == EXPERIMENT_ID assert store.run_id == RUN_ID -@pytest.fixture(autouse=True) -def set_mlflow_tracking_uri(monkeypatch): - monkeypatch.setenv('MLFLOW_TRACKING_URI', 'databricks') @pytest.fixture() def mlflow_object_store(monkeypatch): From f00bded5684019af8260e69794a10ca6a8250504 Mon Sep 17 00:00:00 2001 From: v-chen_data Date: Tue, 19 Nov 2024 13:32:57 -0500 Subject: [PATCH 06/20] set mlflow env var to None --- tests/utils/object_store/test_mlflow_object_store.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/utils/object_store/test_mlflow_object_store.py b/tests/utils/object_store/test_mlflow_object_store.py index fd802048bc..f8cea05764 100644 --- a/tests/utils/object_store/test_mlflow_object_store.py +++ b/tests/utils/object_store/test_mlflow_object_store.py @@ -19,6 +19,12 @@ DEFAULT_PATH = TEST_PATH_FORMAT.format(experiment_id=EXPERIMENT_ID, run_id=RUN_ID) +@pytest.fixture(autouse=True) +def setup_mlflow_tracking(monkeypatch): + mlflow = pytest.importorskip('mlflow') + monkeypatch.setattr(mlflow.environment_variables, 'MLFLOW_TRACKING_URI', None) + + def test_parse_dbfs_path(): full_artifact_path = DEFAULT_PATH + ARTIFACT_PATH assert MLFlowObjectStore.parse_dbfs_path(full_artifact_path) == (EXPERIMENT_ID, RUN_ID, ARTIFACT_PATH) From c9aa6e80887bc8b545511757d5df6771eac56cff Mon Sep 17 00:00:00 2001 From: v-chen_data Date: Tue, 19 Nov 2024 13:47:00 -0500 Subject: [PATCH 07/20] typo --- tests/utils/object_store/test_mlflow_object_store.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/utils/object_store/test_mlflow_object_store.py b/tests/utils/object_store/test_mlflow_object_store.py index f8cea05764..b7a5162afa 100644 --- a/tests/utils/object_store/test_mlflow_object_store.py +++ b/tests/utils/object_store/test_mlflow_object_store.py @@ -22,7 +22,7 @@ @pytest.fixture(autouse=True) def setup_mlflow_tracking(monkeypatch): mlflow = pytest.importorskip('mlflow') - monkeypatch.setattr(mlflow.environment_variables, 'MLFLOW_TRACKING_URI', None) + monkeypatch.setattr(mlflow.environment_variables.MLFLOW_TRACKING_URI, 'name', None) def test_parse_dbfs_path(): From fa8a4fcefea5dd4ef3714e651ace95ec695f5230 Mon Sep 17 00:00:00 2001 From: v-chen_data Date: Tue, 19 Nov 2024 14:43:56 -0500 Subject: [PATCH 08/20] empty string --- tests/utils/object_store/test_mlflow_object_store.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/utils/object_store/test_mlflow_object_store.py b/tests/utils/object_store/test_mlflow_object_store.py index b7a5162afa..d1021de1c3 100644 --- a/tests/utils/object_store/test_mlflow_object_store.py +++ b/tests/utils/object_store/test_mlflow_object_store.py @@ -22,7 +22,7 @@ @pytest.fixture(autouse=True) def setup_mlflow_tracking(monkeypatch): mlflow = pytest.importorskip('mlflow') - monkeypatch.setattr(mlflow.environment_variables.MLFLOW_TRACKING_URI, 'name', None) + monkeypatch.setenv(mlflow.environment_variables.MLFLOW_TRACKING_URI.name, '') def test_parse_dbfs_path(): From d0f26e86d2926231b45d827cfc885bb5c3233034 Mon Sep 17 00:00:00 2001 From: v-chen_data Date: Tue, 19 Nov 2024 14:57:15 -0500 Subject: [PATCH 09/20] enforce databricks --- tests/utils/object_store/test_mlflow_object_store.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/utils/object_store/test_mlflow_object_store.py b/tests/utils/object_store/test_mlflow_object_store.py index d1021de1c3..56cea4476b 100644 --- a/tests/utils/object_store/test_mlflow_object_store.py +++ b/tests/utils/object_store/test_mlflow_object_store.py @@ -22,7 +22,7 @@ @pytest.fixture(autouse=True) def setup_mlflow_tracking(monkeypatch): mlflow = pytest.importorskip('mlflow') - monkeypatch.setenv(mlflow.environment_variables.MLFLOW_TRACKING_URI.name, '') + monkeypatch.setenv(mlflow.environment_variables.MLFLOW_TRACKING_URI.name, 'databricks') def test_parse_dbfs_path(): From ae6c5337fb8a72b725298abd9431872629e4c0c2 Mon Sep 17 00:00:00 2001 From: v-chen_data Date: Tue, 19 Nov 2024 15:15:57 -0500 Subject: [PATCH 10/20] move to conftest --- tests/conftest.py | 6 ++++++ tests/utils/object_store/test_mlflow_object_store.py | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index c202bcf074..0d3de2a287 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -149,3 +149,9 @@ def pytest_configure(): def pytest_sessionfinish(session: pytest.Session, exitstatus: int): if exitstatus == 5: session.exitstatus = 0 # Ignore no-test-ran errors + + +@pytest.fixture(autouse=True) +def setup_mlflow_tracking(monkeypatch): + mlflow = pytest.importorskip('mlflow') + monkeypatch.setenv(mlflow.environment_variables.MLFLOW_TRACKING_URI.name, 'databricks') diff --git a/tests/utils/object_store/test_mlflow_object_store.py b/tests/utils/object_store/test_mlflow_object_store.py index 56cea4476b..fd802048bc 100644 --- a/tests/utils/object_store/test_mlflow_object_store.py +++ b/tests/utils/object_store/test_mlflow_object_store.py @@ -19,12 +19,6 @@ DEFAULT_PATH = TEST_PATH_FORMAT.format(experiment_id=EXPERIMENT_ID, run_id=RUN_ID) -@pytest.fixture(autouse=True) -def setup_mlflow_tracking(monkeypatch): - mlflow = pytest.importorskip('mlflow') - monkeypatch.setenv(mlflow.environment_variables.MLFLOW_TRACKING_URI.name, 'databricks') - - def test_parse_dbfs_path(): full_artifact_path = DEFAULT_PATH + ARTIFACT_PATH assert MLFlowObjectStore.parse_dbfs_path(full_artifact_path) == (EXPERIMENT_ID, RUN_ID, ARTIFACT_PATH) From 8ac5db863d260d0bba188b63f4e5749023b59ae3 Mon Sep 17 00:00:00 2001 From: v-chen_data Date: Tue, 19 Nov 2024 15:35:01 -0500 Subject: [PATCH 11/20] revert and conftest --- tests/conftest.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index 0d3de2a287..4ae45fd9e3 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -152,6 +152,9 @@ def pytest_sessionfinish(session: pytest.Session, exitstatus: int): @pytest.fixture(autouse=True) -def setup_mlflow_tracking(monkeypatch): +def setup_mlflow_tracking(monkeypatch, tmp_path): mlflow = pytest.importorskip('mlflow') - monkeypatch.setenv(mlflow.environment_variables.MLFLOW_TRACKING_URI.name, 'databricks') + # Use a temporary directory instead of 'databricks' + tracking_uri = str(tmp_path / "mlruns") + monkeypatch.setenv(mlflow.environment_variables.MLFLOW_TRACKING_URI.name, tracking_uri) + os.makedirs(tracking_uri, exist_ok=True) From a9d8c12ab1c93beb2012e473f2c839345721f617 Mon Sep 17 00:00:00 2001 From: v-chen_data Date: Tue, 19 Nov 2024 15:42:45 -0500 Subject: [PATCH 12/20] precommit --- tests/conftest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/conftest.py b/tests/conftest.py index 4ae45fd9e3..0e0937c476 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -155,6 +155,6 @@ def pytest_sessionfinish(session: pytest.Session, exitstatus: int): def setup_mlflow_tracking(monkeypatch, tmp_path): mlflow = pytest.importorskip('mlflow') # Use a temporary directory instead of 'databricks' - tracking_uri = str(tmp_path / "mlruns") + tracking_uri = str(tmp_path / 'mlruns') monkeypatch.setenv(mlflow.environment_variables.MLFLOW_TRACKING_URI.name, tracking_uri) os.makedirs(tracking_uri, exist_ok=True) From 0f8ae76c4465d282d1f785c00326c8d4dadf3dd2 Mon Sep 17 00:00:00 2001 From: v-chen_data Date: Tue, 19 Nov 2024 15:56:36 -0500 Subject: [PATCH 13/20] set up tracking --- tests/utils/object_store/test_mlflow_object_store.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/utils/object_store/test_mlflow_object_store.py b/tests/utils/object_store/test_mlflow_object_store.py index fd802048bc..20280cdcde 100644 --- a/tests/utils/object_store/test_mlflow_object_store.py +++ b/tests/utils/object_store/test_mlflow_object_store.py @@ -19,6 +19,11 @@ DEFAULT_PATH = TEST_PATH_FORMAT.format(experiment_id=EXPERIMENT_ID, run_id=RUN_ID) +@pytest.fixture(autouse=True) +def setup_mlflow_tracking(monkeypatch): + monkeypatch.setenv('MLFLOW_TRACKING_URI', 'databricks') + + def test_parse_dbfs_path(): full_artifact_path = DEFAULT_PATH + ARTIFACT_PATH assert MLFlowObjectStore.parse_dbfs_path(full_artifact_path) == (EXPERIMENT_ID, RUN_ID, ARTIFACT_PATH) From 5a2031599995c27a3799047299c4065398f314a4 Mon Sep 17 00:00:00 2001 From: v-chen_data Date: Tue, 19 Nov 2024 16:16:39 -0500 Subject: [PATCH 14/20] setup mlflow tracking --- tests/callbacks/test_loggers_across_callbacks.py | 9 +++++++++ tests/conftest.py | 8 -------- tests/loggers/test_mlflow_logger.py | 9 +++++++++ 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/tests/callbacks/test_loggers_across_callbacks.py b/tests/callbacks/test_loggers_across_callbacks.py index 17886874b1..828d4429f2 100644 --- a/tests/callbacks/test_loggers_across_callbacks.py +++ b/tests/callbacks/test_loggers_across_callbacks.py @@ -17,6 +17,15 @@ ) +@pytest.fixture(autouse=True) +def setup_mlflow_tracking(monkeypatch, tmp_path): + mlflow = pytest.importorskip('mlflow') + # Use a temporary directory instead of 'databricks' + tracking_uri = str(tmp_path / 'mlruns') + monkeypatch.setenv(mlflow.environment_variables.MLFLOW_TRACKING_URI.name, tracking_uri) + os.makedirs(tracking_uri, exist_ok=True) + + @pytest.mark.parametrize('logger_cls', get_cbs_and_marks(loggers=True)) @pytest.mark.parametrize('callback_cls', get_cbs_and_marks(callbacks=True)) @pytest.mark.filterwarnings('ignore::UserWarning') diff --git a/tests/conftest.py b/tests/conftest.py index 0e0937c476..cd670e2151 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -150,11 +150,3 @@ def pytest_sessionfinish(session: pytest.Session, exitstatus: int): if exitstatus == 5: session.exitstatus = 0 # Ignore no-test-ran errors - -@pytest.fixture(autouse=True) -def setup_mlflow_tracking(monkeypatch, tmp_path): - mlflow = pytest.importorskip('mlflow') - # Use a temporary directory instead of 'databricks' - tracking_uri = str(tmp_path / 'mlruns') - monkeypatch.setenv(mlflow.environment_variables.MLFLOW_TRACKING_URI.name, tracking_uri) - os.makedirs(tracking_uri, exist_ok=True) diff --git a/tests/loggers/test_mlflow_logger.py b/tests/loggers/test_mlflow_logger.py index 9d84baa06f..65a7f53ca7 100644 --- a/tests/loggers/test_mlflow_logger.py +++ b/tests/loggers/test_mlflow_logger.py @@ -25,6 +25,15 @@ ) +@pytest.fixture(autouse=True) +def setup_mlflow_tracking(monkeypatch, tmp_path): + mlflow = pytest.importorskip('mlflow') + # Use a temporary directory instead of 'databricks' + tracking_uri = str(tmp_path / 'mlruns') + monkeypatch.setenv(mlflow.environment_variables.MLFLOW_TRACKING_URI.name, tracking_uri) + os.makedirs(tracking_uri, exist_ok=True) + + def _get_latest_mlflow_run(experiment_name, tracking_uri=None): pytest.importorskip('mlflow') from mlflow import MlflowClient From 213af375c7006d608aeaf38ae88a4cd18fc5926f Mon Sep 17 00:00:00 2001 From: v-chen_data Date: Tue, 19 Nov 2024 16:17:45 -0500 Subject: [PATCH 15/20] typo --- tests/conftest.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/conftest.py b/tests/conftest.py index cd670e2151..c202bcf074 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -149,4 +149,3 @@ def pytest_configure(): def pytest_sessionfinish(session: pytest.Session, exitstatus: int): if exitstatus == 5: session.exitstatus = 0 # Ignore no-test-ran errors - From fc56d8b71685772c8a1625c187e175c3bdcd3b87 Mon Sep 17 00:00:00 2001 From: v-chen_data Date: Tue, 19 Nov 2024 16:33:49 -0500 Subject: [PATCH 16/20] update callbacks --- tests/callbacks/test_callbacks.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tests/callbacks/test_callbacks.py b/tests/callbacks/test_callbacks.py index 7a76fcd6b5..4cdf286425 100644 --- a/tests/callbacks/test_callbacks.py +++ b/tests/callbacks/test_callbacks.py @@ -3,6 +3,7 @@ from typing import cast +import os import pytest from composer.core import Callback, Engine, Event, State @@ -19,6 +20,15 @@ from tests.common import EventCounterCallback +@pytest.fixture(autouse=True) +def setup_mlflow_tracking(monkeypatch, tmp_path): + mlflow = pytest.importorskip('mlflow') + # Use a temporary directory instead of 'databricks' + tracking_uri = str(tmp_path / 'mlruns') + monkeypatch.setenv(mlflow.environment_variables.MLFLOW_TRACKING_URI.name, tracking_uri) + os.makedirs(tracking_uri, exist_ok=True) + + def test_callbacks_map_to_events(): # callback methods must be 1:1 mapping with events # exception for private methods From 2ed8a4dbb832b2f81873faf6b025e180b5b764d7 Mon Sep 17 00:00:00 2001 From: v-chen_data Date: Tue, 19 Nov 2024 16:35:30 -0500 Subject: [PATCH 17/20] rm comment --- tests/callbacks/test_callbacks.py | 1 - tests/callbacks/test_loggers_across_callbacks.py | 1 - tests/loggers/test_mlflow_logger.py | 1 - 3 files changed, 3 deletions(-) diff --git a/tests/callbacks/test_callbacks.py b/tests/callbacks/test_callbacks.py index 4cdf286425..30984bb48a 100644 --- a/tests/callbacks/test_callbacks.py +++ b/tests/callbacks/test_callbacks.py @@ -23,7 +23,6 @@ @pytest.fixture(autouse=True) def setup_mlflow_tracking(monkeypatch, tmp_path): mlflow = pytest.importorskip('mlflow') - # Use a temporary directory instead of 'databricks' tracking_uri = str(tmp_path / 'mlruns') monkeypatch.setenv(mlflow.environment_variables.MLFLOW_TRACKING_URI.name, tracking_uri) os.makedirs(tracking_uri, exist_ok=True) diff --git a/tests/callbacks/test_loggers_across_callbacks.py b/tests/callbacks/test_loggers_across_callbacks.py index 828d4429f2..3d69d3206d 100644 --- a/tests/callbacks/test_loggers_across_callbacks.py +++ b/tests/callbacks/test_loggers_across_callbacks.py @@ -20,7 +20,6 @@ @pytest.fixture(autouse=True) def setup_mlflow_tracking(monkeypatch, tmp_path): mlflow = pytest.importorskip('mlflow') - # Use a temporary directory instead of 'databricks' tracking_uri = str(tmp_path / 'mlruns') monkeypatch.setenv(mlflow.environment_variables.MLFLOW_TRACKING_URI.name, tracking_uri) os.makedirs(tracking_uri, exist_ok=True) diff --git a/tests/loggers/test_mlflow_logger.py b/tests/loggers/test_mlflow_logger.py index 65a7f53ca7..5eb3a5a2e7 100644 --- a/tests/loggers/test_mlflow_logger.py +++ b/tests/loggers/test_mlflow_logger.py @@ -28,7 +28,6 @@ @pytest.fixture(autouse=True) def setup_mlflow_tracking(monkeypatch, tmp_path): mlflow = pytest.importorskip('mlflow') - # Use a temporary directory instead of 'databricks' tracking_uri = str(tmp_path / 'mlruns') monkeypatch.setenv(mlflow.environment_variables.MLFLOW_TRACKING_URI.name, tracking_uri) os.makedirs(tracking_uri, exist_ok=True) From 902e4e0eb2fc2e6711a9c1936f166cff29620d10 Mon Sep 17 00:00:00 2001 From: v-chen_data Date: Tue, 19 Nov 2024 16:45:08 -0500 Subject: [PATCH 18/20] move to conftest --- tests/callbacks/test_callbacks.py | 8 -------- tests/callbacks/test_loggers_across_callbacks.py | 8 -------- tests/fixtures/autouse_fixtures.py | 8 ++++++++ tests/loggers/test_mlflow_logger.py | 8 -------- tests/utils/test_dist.py | 2 +- 5 files changed, 9 insertions(+), 25 deletions(-) diff --git a/tests/callbacks/test_callbacks.py b/tests/callbacks/test_callbacks.py index 30984bb48a..6317bc4b58 100644 --- a/tests/callbacks/test_callbacks.py +++ b/tests/callbacks/test_callbacks.py @@ -20,14 +20,6 @@ from tests.common import EventCounterCallback -@pytest.fixture(autouse=True) -def setup_mlflow_tracking(monkeypatch, tmp_path): - mlflow = pytest.importorskip('mlflow') - tracking_uri = str(tmp_path / 'mlruns') - monkeypatch.setenv(mlflow.environment_variables.MLFLOW_TRACKING_URI.name, tracking_uri) - os.makedirs(tracking_uri, exist_ok=True) - - def test_callbacks_map_to_events(): # callback methods must be 1:1 mapping with events # exception for private methods diff --git a/tests/callbacks/test_loggers_across_callbacks.py b/tests/callbacks/test_loggers_across_callbacks.py index 3d69d3206d..17886874b1 100644 --- a/tests/callbacks/test_loggers_across_callbacks.py +++ b/tests/callbacks/test_loggers_across_callbacks.py @@ -17,14 +17,6 @@ ) -@pytest.fixture(autouse=True) -def setup_mlflow_tracking(monkeypatch, tmp_path): - mlflow = pytest.importorskip('mlflow') - tracking_uri = str(tmp_path / 'mlruns') - monkeypatch.setenv(mlflow.environment_variables.MLFLOW_TRACKING_URI.name, tracking_uri) - os.makedirs(tracking_uri, exist_ok=True) - - @pytest.mark.parametrize('logger_cls', get_cbs_and_marks(loggers=True)) @pytest.mark.parametrize('callback_cls', get_cbs_and_marks(callbacks=True)) @pytest.mark.filterwarnings('ignore::UserWarning') diff --git a/tests/fixtures/autouse_fixtures.py b/tests/fixtures/autouse_fixtures.py index c881157353..b42a53d8dd 100644 --- a/tests/fixtures/autouse_fixtures.py +++ b/tests/fixtures/autouse_fixtures.py @@ -148,3 +148,11 @@ def remove_run_name_env_var(): os.environ['COMPOSER_RUN_NAME'] = composer_run_name if run_name is not None: os.environ['RUN_NAME'] = run_name + + +@pytest.fixture(autouse=True) +def setup_mlflow_tracking(monkeypatch, tmp_path): + mlflow = pytest.importorskip('mlflow') + tracking_uri = str(tmp_path / 'mlruns') + monkeypatch.setenv(mlflow.environment_variables.MLFLOW_TRACKING_URI.name, tracking_uri) + os.makedirs(tracking_uri, exist_ok=True) diff --git a/tests/loggers/test_mlflow_logger.py b/tests/loggers/test_mlflow_logger.py index 5eb3a5a2e7..9d84baa06f 100644 --- a/tests/loggers/test_mlflow_logger.py +++ b/tests/loggers/test_mlflow_logger.py @@ -25,14 +25,6 @@ ) -@pytest.fixture(autouse=True) -def setup_mlflow_tracking(monkeypatch, tmp_path): - mlflow = pytest.importorskip('mlflow') - tracking_uri = str(tmp_path / 'mlruns') - monkeypatch.setenv(mlflow.environment_variables.MLFLOW_TRACKING_URI.name, tracking_uri) - os.makedirs(tracking_uri, exist_ok=True) - - def _get_latest_mlflow_run(experiment_name, tracking_uri=None): pytest.importorskip('mlflow') from mlflow import MlflowClient diff --git a/tests/utils/test_dist.py b/tests/utils/test_dist.py index 608e56e5d2..c6d0429b4d 100644 --- a/tests/utils/test_dist.py +++ b/tests/utils/test_dist.py @@ -71,6 +71,6 @@ def test_busy_wait_for_local_rank_zero(tmp_path): end_time = time.time() total_time = end_time - start_time gathered_times = dist.all_gather_object(total_time) - assert os.listdir(gathered_tmp_path) == [] + assert os.listdir(gathered_tmp_path) == ['mlruns'] assert len(gathered_times) == 2 assert abs(gathered_times[0] - gathered_times[1]) < 0.1 From 7b20751f32cc7181cb523ca179d20f95ee8d657e Mon Sep 17 00:00:00 2001 From: v-chen_data Date: Tue, 19 Nov 2024 16:47:07 -0500 Subject: [PATCH 19/20] mlrun --- tests/utils/test_dist.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/utils/test_dist.py b/tests/utils/test_dist.py index c6d0429b4d..0d6115dc4d 100644 --- a/tests/utils/test_dist.py +++ b/tests/utils/test_dist.py @@ -63,7 +63,7 @@ def test_busy_wait_for_local_rank_zero(tmp_path): dist.barrier() start_time = time.time() - assert os.listdir(gathered_tmp_path) == [] + assert os.listdir(gathered_tmp_path) == ['mlruns'] with dist.busy_wait_for_local_rank_zero(gathered_tmp_path): if dist.get_local_rank() == 0: time.sleep(0.5) From ce294e6f6909d45107b3e29dd5beb3717d8af37d Mon Sep 17 00:00:00 2001 From: v-chen_data Date: Tue, 19 Nov 2024 16:53:24 -0500 Subject: [PATCH 20/20] precommit --- tests/callbacks/test_callbacks.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/callbacks/test_callbacks.py b/tests/callbacks/test_callbacks.py index 6317bc4b58..7a76fcd6b5 100644 --- a/tests/callbacks/test_callbacks.py +++ b/tests/callbacks/test_callbacks.py @@ -3,7 +3,6 @@ from typing import cast -import os import pytest from composer.core import Callback, Engine, Event, State