From 1e38dded13b3262fae23420ab032f79fab68db2c Mon Sep 17 00:00:00 2001 From: v-chen_data Date: Wed, 20 Nov 2024 13:20:03 -0500 Subject: [PATCH 1/2] bump mosaicml/pytorch images to use new ubuntu images --- .github/workflows/code-quality.yaml | 2 +- .github/workflows/daily.yaml | 38 ++++++++++++++--------------- .github/workflows/pr-cpu.yaml | 8 +++--- .github/workflows/pr-gpu.yaml | 6 ++--- .github/workflows/release.yaml | 2 +- .readthedocs.yaml | 2 +- 6 files changed, 29 insertions(+), 29 deletions(-) diff --git a/.github/workflows/code-quality.yaml b/.github/workflows/code-quality.yaml index f78bdfe60b..915c966adb 100644 --- a/.github/workflows/code-quality.yaml +++ b/.github/workflows/code-quality.yaml @@ -16,7 +16,7 @@ defaults: working-directory: . jobs: code-quality: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 timeout-minutes: 15 if: github.repository_owner == 'mosaicml' strategy: diff --git a/.github/workflows/daily.yaml b/.github/workflows/daily.yaml index ae897bb032..8d161be162 100644 --- a/.github/workflows/daily.yaml +++ b/.github/workflows/daily.yaml @@ -21,52 +21,52 @@ jobs: matrix: include: - name: cpu-3.11-2.3 - container: mosaicml/pytorch:2.3.1_cpu-python3.11-ubuntu20.04 + container: mosaicml/pytorch:2.3.1_cpu-python3.11-ubuntu22.04 markers: not daily and (remote or not remote) and not gpu and not doctest pytest_command: coverage run -m pytest composer_package_name: mosaicml - name: cpu-3.11-2.4 - container: mosaicml/pytorch:2.4.1_cpu-python3.11-ubuntu20.04 + container: mosaicml/pytorch:2.4.1_cpu-python3.11-ubuntu22.04 markers: not daily and (remote or not remote) and not gpu and not doctest pytest_command: coverage run -m pytest composer_package_name: mosaicml - name: cpu-3.11-2.5 - container: mosaicml/pytorch:2.5.1_cpu-python3.11-ubuntu20.04 + container: mosaicml/pytorch:2.5.1_cpu-python3.11-ubuntu22.04 markers: not daily and (remote or not remote) and not gpu and not doctest pytest_command: coverage run -m pytest composer_package_name: mosaicml - name: cpu-3.11-2.5-composer - container: mosaicml/pytorch:2.5.1_cpu-python3.11-ubuntu20.04 + container: mosaicml/pytorch:2.5.1_cpu-python3.11-ubuntu22.04 markers: not daily and (remote or not remote) and not gpu and not doctest pytest_command: coverage run -m pytest composer_package_name: composer - name: cpu-doctest - container: mosaicml/pytorch:2.4.1_cpu-python3.11-ubuntu20.04 + container: mosaicml/pytorch:2.4.1_cpu-python3.11-ubuntu22.04 markers: not daily and (remote or not remote) and not gpu and doctest pytest_command: coverage run -m pytest tests/test_docs.py composer_package_name: mosaicml - name: daily-cpu-3.11-2.3 - container: mosaicml/pytorch:2.3.1_cpu-python3.11-ubuntu20.04 + container: mosaicml/pytorch:2.3.1_cpu-python3.11-ubuntu22.04 markers: daily and (remote or not remote) and not gpu and not doctest pytest_command: coverage run -m pytest composer_package_name: mosaicml - name: daily-cpu-3.11-2.4 - container: mosaicml/pytorch:2.4.1_cpu-python3.11-ubuntu20.04 + container: mosaicml/pytorch:2.4.1_cpu-python3.11-ubuntu22.04 markers: daily and (remote or not remote) and not gpu and not doctest pytest_command: coverage run -m pytest composer_package_name: mosaicml - name: daily-cpu-3.11-2.5 - container: mosaicml/pytorch:2.5.1_cpu-python3.11-ubuntu20.04 + container: mosaicml/pytorch:2.5.1_cpu-python3.11-ubuntu22.04 markers: daily and (remote or not remote) and not gpu and not doctest pytest_command: coverage run -m pytest composer_package_name: mosaicml - name: daily-cpu-3.11-2.5-composer - container: mosaicml/pytorch:2.5.1_cpu-python3.11-ubuntu20.04 + container: mosaicml/pytorch:2.5.1_cpu-python3.11-ubuntu22.04 markers: daily and (remote or not remote) and not gpu and not doctest pytest_command: coverage run -m pytest composer_package_name: composer - name: daily-cpu-doctest - container: mosaicml/pytorch:2.5.1_cpu-python3.11-ubuntu20.04 + container: mosaicml/pytorch:2.5.1_cpu-python3.11-ubuntu22.04 markers: daily and (remote or not remote) and not gpu and doctest pytest_command: coverage run -m pytest tests/test_docs.py composer_package_name: mosaicml @@ -108,55 +108,55 @@ jobs: # Unlike CPU tests, we run daily tests together with GPU tests to minimize launch time # on MCLOUD and not eat up all GPUs at once - name: "gpu-3.11-2.3-1-gpu" - container: mosaicml/pytorch:2.3.1_cu121-python3.11-ubuntu20.04 + container: mosaicml/pytorch:2.3.1_cu121-python3.11-ubuntu22.04 markers: "(daily or not daily) and (remote or not remote) and gpu and (doctest or not doctest)" pytest_command: "coverage run -m pytest" composer_package_name: "mosaicml" gpu_num: 1 - name: "gpu-3.11-2.4-1-gpu" - container: mosaicml/pytorch:2.4.1_cu124-python3.11-ubuntu20.04 + container: mosaicml/pytorch:2.4.1_cu124-python3.11-ubuntu22.04 markers: "(daily or not daily) and (remote or not remote) and gpu and (doctest or not doctest)" pytest_command: "coverage run -m pytest" composer_package_name: "mosaicml" gpu_num: 1 - name: "gpu-3.11-2.5-1-gpu" - container: mosaicml/pytorch:2.5.1_cu124-python3.11-ubuntu20.04 + container: mosaicml/pytorch:2.5.1_cu124-python3.11-ubuntu22.04 markers: "(daily or not daily) and (remote or not remote) and gpu and (doctest or not doctest)" pytest_command: "coverage run -m pytest" composer_package_name: "mosaicml" gpu_num: 1 - name: "gpu-3.11-2.3-2-gpu" - container: mosaicml/pytorch:2.3.1_cu121-python3.11-ubuntu20.04 + container: mosaicml/pytorch:2.3.1_cu121-python3.11-ubuntu22.04 markers: "(daily or not daily) and (remote or not remote) and gpu and (doctest or not doctest)" pytest_command: "coverage run -m pytest" composer_package_name: "mosaicml" gpu_num: 2 - name: "gpu-3.11-2.4-2-gpu" - container: mosaicml/pytorch:2.4.1_cu124-python3.11-ubuntu20.04 + container: mosaicml/pytorch:2.4.1_cu124-python3.11-ubuntu22.04 markers: "(daily or not daily) and (remote or not remote) and gpu and (doctest or not doctest)" pytest_command: "coverage run -m pytest" composer_package_name: "mosaicml" gpu_num: 2 - name: "gpu-3.11-2.5-2-gpu" - container: mosaicml/pytorch:2.5.1_cu124-python3.11-ubuntu20.04 + container: mosaicml/pytorch:2.5.1_cu124-python3.11-ubuntu22.04 markers: "(daily or not daily) and (remote or not remote) and gpu and (doctest or not doctest)" pytest_command: "coverage run -m pytest" composer_package_name: "mosaicml" gpu_num: 2 - name: "gpu-3.11-2.3-4-gpu" - container: mosaicml/pytorch:2.3.1_cu121-python3.11-ubuntu20.04 + container: mosaicml/pytorch:2.3.1_cu121-python3.11-ubuntu22.04 markers: "(daily or not daily) and (remote or not remote) and gpu and (doctest or not doctest)" pytest_command: "coverage run -m pytest" composer_package_name: "mosaicml" gpu_num: 4 - name: "gpu-3.11-2.4-4-gpu" - container: mosaicml/pytorch:2.4.1_cu124-python3.11-ubuntu20.04 + container: mosaicml/pytorch:2.4.1_cu124-python3.11-ubuntu22.04 markers: "(daily or not daily) and (remote or not remote) and gpu and (doctest or not doctest)" pytest_command: "coverage run -m pytest" composer_package_name: "mosaicml" gpu_num: 4 - name: "gpu-3.11-2.5-4-gpu" - container: mosaicml/pytorch:2.5.1_cu124-python3.11-ubuntu20.04 + container: mosaicml/pytorch:2.5.1_cu124-python3.11-ubuntu22.04 markers: "(daily or not daily) and (remote or not remote) and gpu and (doctest or not doctest)" pytest_command: "coverage run -m pytest" composer_package_name: "mosaicml" diff --git a/.github/workflows/pr-cpu.yaml b/.github/workflows/pr-cpu.yaml index 0a88607a29..3e685c352c 100644 --- a/.github/workflows/pr-cpu.yaml +++ b/.github/workflows/pr-cpu.yaml @@ -17,19 +17,19 @@ jobs: matrix: include: - name: cpu-3.11-2.3 - container: mosaicml/pytorch:2.3.1_cpu-python3.11-ubuntu20.04 + container: mosaicml/pytorch:2.3.1_cpu-python3.11-ubuntu22.04 markers: not daily and not remote and not gpu and not doctest pytest_command: coverage run -m pytest - name: cpu-3.11-2.4 - container: mosaicml/pytorch:2.4.1_cpu-python3.11-ubuntu20.04 + container: mosaicml/pytorch:2.4.1_cpu-python3.11-ubuntu22.04 markers: not daily and not remote and not gpu and not doctest pytest_command: coverage run -m pytest - name: cpu-3.11-2.5 - container: mosaicml/pytorch:2.5.1_cpu-python3.11-ubuntu20.04 + container: mosaicml/pytorch:2.5.1_cpu-python3.11-ubuntu22.04 markers: not daily and not remote and not gpu and not doctest pytest_command: coverage run -m pytest - name: cpu-doctest - container: mosaicml/pytorch:2.5.1_cpu-python3.11-ubuntu20.04 + container: mosaicml/pytorch:2.5.1_cpu-python3.11-ubuntu22.04 markers: not daily and not remote and not gpu and doctest pytest_command: coverage run -m pytest tests/test_docs.py steps: diff --git a/.github/workflows/pr-gpu.yaml b/.github/workflows/pr-gpu.yaml index 964c2695c7..07758c6d6b 100644 --- a/.github/workflows/pr-gpu.yaml +++ b/.github/workflows/pr-gpu.yaml @@ -16,7 +16,7 @@ jobs: matrix: include: - name: gpu-3.11-2.5-1 - container: mosaicml/pytorch:2.5.1_cu124-python3.11-ubuntu20.04 + container: mosaicml/pytorch:2.5.1_cu124-python3.11-ubuntu22.04 markers: not daily and not remote and gpu and (doctest or not doctest) pytest_command: coverage run -m pytest composer_package_name: mosaicml @@ -45,7 +45,7 @@ jobs: matrix: include: - name: gpu-3.11-2.5-2 - container: mosaicml/pytorch:2.5.1_cu124-python3.11-ubuntu20.04 + container: mosaicml/pytorch:2.5.1_cu124-python3.11-ubuntu22.04 markers: not daily and not remote and gpu and (doctest or not doctest) pytest_command: coverage run -m pytest composer_package_name: mosaicml @@ -75,7 +75,7 @@ jobs: matrix: include: - name: gpu-3.11-2.5-4 - container: mosaicml/pytorch:2.5.1_cu124-python3.11-ubuntu20.04 + container: mosaicml/pytorch:2.5.1_cu124-python3.11-ubuntu22.04 markers: not daily and not remote and gpu and (doctest or not doctest) pytest_command: coverage run -m pytest composer_package_name: mosaicml diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 2bc86572f9..1f31a543d0 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -8,7 +8,7 @@ on: jobs: code-quality: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 strategy: matrix: python_version: diff --git a/.readthedocs.yaml b/.readthedocs.yaml index f8a390536d..6b06b6c353 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -7,7 +7,7 @@ version: 2 # Specify build system and tool dependencies build: - os: "ubuntu-20.04" + os: "ubuntu-22.04" tools: python: "3.10" From c327f1059bfde6ec0fe0a1d2bdf0564a970897bb Mon Sep 17 00:00:00 2001 From: v-chen_data Date: Wed, 20 Nov 2024 15:22:20 -0500 Subject: [PATCH 2/2] missed one --- .github/workflows/smoketest.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/smoketest.yaml b/.github/workflows/smoketest.yaml index f4d714bb3e..0c5ac988aa 100644 --- a/.github/workflows/smoketest.yaml +++ b/.github/workflows/smoketest.yaml @@ -17,7 +17,7 @@ defaults: working-directory: . jobs: smoketest: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 timeout-minutes: 10 if: github.repository_owner == 'mosaicml' strategy: