From e0ff2272297e9f179b883d8c2d6b05c6f33740ac Mon Sep 17 00:00:00 2001 From: Eitan Turok <150733043+eitanturok@users.noreply.github.com> Date: Fri, 9 Aug 2024 16:50:32 -0400 Subject: [PATCH 01/10] bump torch to <2.5 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index fa15ee4..bdc76dc 100644 --- a/setup.py +++ b/setup.py @@ -62,7 +62,7 @@ install_requires = [ 'numpy>=1.21.5,<2.1.0', 'packaging>=21.3.0,<24.2', - 'torch>=2.3.0,<2.4', + 'torch>=2.3.0,<2.5', 'triton>=2.1.0', 'stanford-stk @ git+https://git@github.com/stanford-futuredata/stk.git@a1ddf98466730b88a2988860a9d8000fd1833301', ] From ede0471b9c7638a180726360a01913aab5eb7f2d Mon Sep 17 00:00:00 2001 From: Eitan Turok <150733043+eitanturok@users.noreply.github.com> Date: Mon, 19 Aug 2024 17:11:06 -0400 Subject: [PATCH 02/10] bump torch --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index c72dbdf..61471bb 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -3,7 +3,7 @@ # build requirements [build-system] -requires = ["setuptools < 70.0.0", "torch >= 2.3.0, < 2.4"] +requires = ["setuptools < 70.0.0", "torch >= 2.3.0, < 2.5"] build-backend = "setuptools.build_meta" # Pytest From 3a8cea0653846f91e8519ca37484e881238213e2 Mon Sep 17 00:00:00 2001 From: Eitan Turok <150733043+eitanturok@users.noreply.github.com> Date: Mon, 19 Aug 2024 17:11:17 -0400 Subject: [PATCH 03/10] test torch 2.4 --- .github/workflows/pr-gpu.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/pr-gpu.yaml b/.github/workflows/pr-gpu.yaml index 1ca8d5b..38433e6 100644 --- a/.github/workflows/pr-gpu.yaml +++ b/.github/workflows/pr-gpu.yaml @@ -29,6 +29,14 @@ jobs: gpu_num: 2 python_version: 3.11 container: mosaicml/pytorch:2.3.1_cu121-python3.11-ubuntu20.04 + - name: "python3.11-pytorch2.4.0-gpus1" + gpu_num: 1 + python_version: 3.11 + container: mosaicml/pytorch:2.4.0_cu121-python3.11-ubuntu20.04 + - name: "python3.11-pytorch2.4.0-gpus2" + gpu_num: 2 + python_version: 3.11 + container: mosaicml/pytorch:2.4.0_cu121-python3.11-ubuntu20.04 steps: - name: Run PR GPU tests uses: mosaicml/ci-testing/.github/actions/pytest-gpu@v0.1.2 From 8d0349fc28c5364800b747174bc143be737bd49f Mon Sep 17 00:00:00 2001 From: Eitan Turok <150733043+eitanturok@users.noreply.github.com> Date: Mon, 19 Aug 2024 17:15:23 -0400 Subject: [PATCH 04/10] bump stk, gg --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index bdc76dc..ab68d4f 100644 --- a/setup.py +++ b/setup.py @@ -64,13 +64,13 @@ 'packaging>=21.3.0,<24.2', 'torch>=2.3.0,<2.5', 'triton>=2.1.0', - 'stanford-stk @ git+https://git@github.com/stanford-futuredata/stk.git@a1ddf98466730b88a2988860a9d8000fd1833301', + 'stanford-stk @ git+https://git@github.com/eitanturok/stk.git@bump-version', ] extra_deps = {} extra_deps['gg'] = [ - 'grouped_gemm @ git+https://git@github.com/tgale96/grouped_gemm.git@66c7195e35e8c4f22fa6a014037ef511bfa397cb', + 'grouped_gemm @ git+https://git@github.com/eitanturok/grouped_gemm.git@bump-version', ] extra_deps['dev'] = [ From 818c66aa238a7b17e40cc82551d10f200992fe14 Mon Sep 17 00:00:00 2001 From: Eitan Turok <150733043+eitanturok@users.noreply.github.com> Date: Mon, 19 Aug 2024 20:19:02 -0400 Subject: [PATCH 05/10] bump cuda version --- .github/workflows/pr-gpu.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pr-gpu.yaml b/.github/workflows/pr-gpu.yaml index 38433e6..a283875 100644 --- a/.github/workflows/pr-gpu.yaml +++ b/.github/workflows/pr-gpu.yaml @@ -32,11 +32,11 @@ jobs: - name: "python3.11-pytorch2.4.0-gpus1" gpu_num: 1 python_version: 3.11 - container: mosaicml/pytorch:2.4.0_cu121-python3.11-ubuntu20.04 + container: mosaicml/pytorch:2.4.0_cu124-python3.11-ubuntu20.04 - name: "python3.11-pytorch2.4.0-gpus2" gpu_num: 2 python_version: 3.11 - container: mosaicml/pytorch:2.4.0_cu121-python3.11-ubuntu20.04 + container: mosaicml/pytorch:2.4.0_cu124-python3.11-ubuntu20.04 steps: - name: Run PR GPU tests uses: mosaicml/ci-testing/.github/actions/pytest-gpu@v0.1.2 From a1f05a0f0829c7080945b9bce6012a99752ff44c Mon Sep 17 00:00:00 2001 From: Eitan Turok Date: Wed, 21 Aug 2024 15:20:32 +0000 Subject: [PATCH 06/10] torch < 2.4.1 --- pyproject.toml | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 61471bb..fc8f3dc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -3,7 +3,7 @@ # build requirements [build-system] -requires = ["setuptools < 70.0.0", "torch >= 2.3.0, < 2.5"] +requires = ["setuptools < 70.0.0", "torch >= 2.3.0, < 2.4.1"] build-backend = "setuptools.build_meta" # Pytest diff --git a/setup.py b/setup.py index ab68d4f..e39dd49 100644 --- a/setup.py +++ b/setup.py @@ -62,7 +62,7 @@ install_requires = [ 'numpy>=1.21.5,<2.1.0', 'packaging>=21.3.0,<24.2', - 'torch>=2.3.0,<2.5', + 'torch>=2.3.0,<2.4.1', 'triton>=2.1.0', 'stanford-stk @ git+https://git@github.com/eitanturok/stk.git@bump-version', ] From acad5d6e9fa6c19b2d00a0a94cb1ca0068f9d2d5 Mon Sep 17 00:00:00 2001 From: Eitan Turok Date: Wed, 21 Aug 2024 16:17:40 +0000 Subject: [PATCH 07/10] remove torch2.3 tests --- .github/workflows/pr-gpu.yaml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.github/workflows/pr-gpu.yaml b/.github/workflows/pr-gpu.yaml index a283875..d94b057 100644 --- a/.github/workflows/pr-gpu.yaml +++ b/.github/workflows/pr-gpu.yaml @@ -21,14 +21,6 @@ jobs: fail-fast: false matrix: include: - - name: "python3.11-pytorch2.3.1-gpus1" - gpu_num: 1 - python_version: 3.11 - container: mosaicml/pytorch:2.3.1_cu121-python3.11-ubuntu20.04 - - name: "python3.11-pytorch2.3.1-gpus2" - gpu_num: 2 - python_version: 3.11 - container: mosaicml/pytorch:2.3.1_cu121-python3.11-ubuntu20.04 - name: "python3.11-pytorch2.4.0-gpus1" gpu_num: 1 python_version: 3.11 From bf5be90d390988b0afc17acec8edf756ee968e1a Mon Sep 17 00:00:00 2001 From: Eitan Turok <150733043+eitanturok@users.noreply.github.com> Date: Wed, 21 Aug 2024 12:21:51 -0400 Subject: [PATCH 08/10] bump torch to <2.5 (#142) --- .github/workflows/pr-gpu.yaml | 8 ++++---- pyproject.toml | 2 +- setup.py | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/pr-gpu.yaml b/.github/workflows/pr-gpu.yaml index 1ca8d5b..d94b057 100644 --- a/.github/workflows/pr-gpu.yaml +++ b/.github/workflows/pr-gpu.yaml @@ -21,14 +21,14 @@ jobs: fail-fast: false matrix: include: - - name: "python3.11-pytorch2.3.1-gpus1" + - name: "python3.11-pytorch2.4.0-gpus1" gpu_num: 1 python_version: 3.11 - container: mosaicml/pytorch:2.3.1_cu121-python3.11-ubuntu20.04 - - name: "python3.11-pytorch2.3.1-gpus2" + container: mosaicml/pytorch:2.4.0_cu124-python3.11-ubuntu20.04 + - name: "python3.11-pytorch2.4.0-gpus2" gpu_num: 2 python_version: 3.11 - container: mosaicml/pytorch:2.3.1_cu121-python3.11-ubuntu20.04 + container: mosaicml/pytorch:2.4.0_cu124-python3.11-ubuntu20.04 steps: - name: Run PR GPU tests uses: mosaicml/ci-testing/.github/actions/pytest-gpu@v0.1.2 diff --git a/pyproject.toml b/pyproject.toml index c72dbdf..fc8f3dc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -3,7 +3,7 @@ # build requirements [build-system] -requires = ["setuptools < 70.0.0", "torch >= 2.3.0, < 2.4"] +requires = ["setuptools < 70.0.0", "torch >= 2.3.0, < 2.4.1"] build-backend = "setuptools.build_meta" # Pytest diff --git a/setup.py b/setup.py index fa15ee4..e39dd49 100644 --- a/setup.py +++ b/setup.py @@ -62,15 +62,15 @@ install_requires = [ 'numpy>=1.21.5,<2.1.0', 'packaging>=21.3.0,<24.2', - 'torch>=2.3.0,<2.4', + 'torch>=2.3.0,<2.4.1', 'triton>=2.1.0', - 'stanford-stk @ git+https://git@github.com/stanford-futuredata/stk.git@a1ddf98466730b88a2988860a9d8000fd1833301', + 'stanford-stk @ git+https://git@github.com/eitanturok/stk.git@bump-version', ] extra_deps = {} extra_deps['gg'] = [ - 'grouped_gemm @ git+https://git@github.com/tgale96/grouped_gemm.git@66c7195e35e8c4f22fa6a014037ef511bfa397cb', + 'grouped_gemm @ git+https://git@github.com/eitanturok/grouped_gemm.git@bump-version', ] extra_deps['dev'] = [ From 11f0b2131fb2ded9e7e37a06eecdf1a3ae293ff7 Mon Sep 17 00:00:00 2001 From: Eitan Turok Date: Wed, 21 Aug 2024 18:02:07 +0000 Subject: [PATCH 09/10] no torch 2.3 --- pyproject.toml | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index fc8f3dc..454868f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -3,7 +3,7 @@ # build requirements [build-system] -requires = ["setuptools < 70.0.0", "torch >= 2.3.0, < 2.4.1"] +requires = ["setuptools < 70.0.0", "torch >= 2.4.0, < 2.4.1"] build-backend = "setuptools.build_meta" # Pytest diff --git a/setup.py b/setup.py index e39dd49..062a63a 100644 --- a/setup.py +++ b/setup.py @@ -62,7 +62,7 @@ install_requires = [ 'numpy>=1.21.5,<2.1.0', 'packaging>=21.3.0,<24.2', - 'torch>=2.3.0,<2.4.1', + 'torch>=2.4.0,<2.4.1', 'triton>=2.1.0', 'stanford-stk @ git+https://git@github.com/eitanturok/stk.git@bump-version', ] From c4b3f62209d92896db86a9a571944c6b52a8af8d Mon Sep 17 00:00:00 2001 From: Eitan Turok Date: Wed, 21 Aug 2024 18:26:10 +0000 Subject: [PATCH 10/10] use version of composer that allows torch2.4 --- setup.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 062a63a..906adb0 100644 --- a/setup.py +++ b/setup.py @@ -83,7 +83,8 @@ ] extra_deps['testing'] = [ - 'mosaicml>=0.22.0', + # 'mosaicml>=0.23.6', # uses when released + 'mosaicml @ git+https://github.com/mosaicml/composer.git@7c48cfc00ed5df553c947b336fee72437d2e68a7', ] extra_deps['all'] = list({dep for key, deps in extra_deps.items() for dep in deps if key not in {'testing'}})