From c60c0cf4b2dc7b60143377db0fc2f2b812503ef4 Mon Sep 17 00:00:00 2001 From: Daniel King Date: Fri, 30 Aug 2024 19:56:23 -0700 Subject: [PATCH 1/9] try again --- .github/workflows/code-quality.yaml | 2 +- .github/workflows/coverage.yaml | 2 +- .github/workflows/pr-cpu.yaml | 2 +- .github/workflows/pr-gpu.yaml | 14 +++++++------- .github/workflows/smoketest.yaml | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/code-quality.yaml b/.github/workflows/code-quality.yaml index 34d806f057..0461f7e008 100644 --- a/.github/workflows/code-quality.yaml +++ b/.github/workflows/code-quality.yaml @@ -34,7 +34,7 @@ jobs: uses: actions/checkout@v3 with: repository: mosaicml/ci-testing - ref: v0.1.2 + ref: 53965d9417983a49003182cfca64286b448f80b3 path: ./ci-testing - uses: ./ci-testing/.github/actions/code-quality with: diff --git a/.github/workflows/coverage.yaml b/.github/workflows/coverage.yaml index 6ca1651d0d..d2d756e2b0 100644 --- a/.github/workflows/coverage.yaml +++ b/.github/workflows/coverage.yaml @@ -16,7 +16,7 @@ jobs: uses: actions/checkout@v3 with: repository: mosaicml/ci-testing - ref: v0.1.2 + ref: 53965d9417983a49003182cfca64286b448f80b3 path: ./ci-testing - uses: ./ci-testing/.github/actions/coverage with: diff --git a/.github/workflows/pr-cpu.yaml b/.github/workflows/pr-cpu.yaml index 13019a83d4..c9d1a78bef 100644 --- a/.github/workflows/pr-cpu.yaml +++ b/.github/workflows/pr-cpu.yaml @@ -29,7 +29,7 @@ jobs: - name: Checkout code uses: actions/checkout@v2 - name: Run PR CPU Tests - uses: mosaicml/ci-testing/.github/actions/pytest-cpu@v0.1.2 + uses: mosaicml/ci-testing/.github/actions/pytest-cpu@53965d9417983a49003182cfca64286b448f80b3 with: name: ${{ matrix.name }} container: ${{ matrix.container }} diff --git a/.github/workflows/pr-gpu.yaml b/.github/workflows/pr-gpu.yaml index 947d78ae95..207c7c6198 100644 --- a/.github/workflows/pr-gpu.yaml +++ b/.github/workflows/pr-gpu.yaml @@ -4,7 +4,7 @@ on: branches: - main - release/* - pull_request_target: + pull_request: branches: - main - release/** @@ -27,10 +27,10 @@ jobs: markers: "gpu" pip_deps: "[all]" pytest_command: "coverage run -m pytest" - ci_repo_gpu_test_ref: v0.1.2 + ci_repo_gpu_test_ref: 53965d9417983a49003182cfca64286b448f80b3 steps: - name: Run PR GPU Tests - uses: mosaicml/ci-testing/.github/actions/pytest-gpu@v0.1.2 + uses: mosaicml/ci-testing/.github/actions/pytest-gpu@53965d9417983a49003182cfca64286b448f80b3 with: container: ${{ matrix.container }} git_repo: mosaicml/llm-foundry @@ -56,10 +56,10 @@ jobs: markers: "gpu" pip_deps: "[all]" pytest_command: "coverage run -m pytest" - ci_repo_gpu_test_ref: v0.1.2 + ci_repo_gpu_test_ref: 53965d9417983a49003182cfca64286b448f80b3 steps: - name: Run PR GPU Tests - uses: mosaicml/ci-testing/.github/actions/pytest-gpu@v0.1.2 + uses: mosaicml/ci-testing/.github/actions/pytest-gpu@53965d9417983a49003182cfca64286b448f80b3 with: container: ${{ matrix.container }} git_repo: mosaicml/llm-foundry @@ -85,10 +85,10 @@ jobs: markers: "gpu" pip_deps: "[all]" pytest_command: "coverage run -m pytest" - ci_repo_gpu_test_ref: v0.1.2 + ci_repo_gpu_test_ref: 53965d9417983a49003182cfca64286b448f80b3 steps: - name: Run PR GPU Tests - uses: mosaicml/ci-testing/.github/actions/pytest-gpu@v0.1.2 + uses: mosaicml/ci-testing/.github/actions/pytest-gpu@53965d9417983a49003182cfca64286b448f80b3 with: container: ${{ matrix.container }} git_repo: mosaicml/llm-foundry diff --git a/.github/workflows/smoketest.yaml b/.github/workflows/smoketest.yaml index fd2daf093c..251aff3e32 100644 --- a/.github/workflows/smoketest.yaml +++ b/.github/workflows/smoketest.yaml @@ -32,7 +32,7 @@ jobs: uses: actions/checkout@v3 with: repository: mosaicml/ci-testing - ref: v0.1.2 + ref: 53965d9417983a49003182cfca64286b448f80b3 path: ./ci-testing - uses: ./ci-testing/.github/actions/smoketest with: From 8fa3476be7631e93071f9ea4cefc2941cb8837b0 Mon Sep 17 00:00:00 2001 From: Daniel King Date: Fri, 30 Aug 2024 20:00:44 -0700 Subject: [PATCH 2/9] fix container --- .github/workflows/pr-cpu.yaml | 1 + .github/workflows/pr-gpu.yaml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/pr-cpu.yaml b/.github/workflows/pr-cpu.yaml index c9d1a78bef..611feef599 100644 --- a/.github/workflows/pr-cpu.yaml +++ b/.github/workflows/pr-cpu.yaml @@ -17,6 +17,7 @@ jobs: pytest-cpu: name: ${{ matrix.name }} runs-on: ubuntu-latest + container: ${{ matrix.container }} strategy: matrix: include: diff --git a/.github/workflows/pr-gpu.yaml b/.github/workflows/pr-gpu.yaml index 207c7c6198..0ec1950812 100644 --- a/.github/workflows/pr-gpu.yaml +++ b/.github/workflows/pr-gpu.yaml @@ -18,6 +18,7 @@ jobs: name: ${{ matrix.name }} if: github.repository_owner == 'mosaicml' runs-on: linux-ubuntu-latest + container: ${{ matrix.container }} strategy: fail-fast: false matrix: From b9be6f11abc7b5a0ad608d5a1759e03343deb807 Mon Sep 17 00:00:00 2001 From: Daniel King Date: Mon, 2 Sep 2024 22:48:19 -0700 Subject: [PATCH 3/9] remove container --- .github/workflows/pr-gpu.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/pr-gpu.yaml b/.github/workflows/pr-gpu.yaml index f5362fc560..079d0ae425 100644 --- a/.github/workflows/pr-gpu.yaml +++ b/.github/workflows/pr-gpu.yaml @@ -18,7 +18,6 @@ jobs: name: ${{ matrix.name }} if: github.repository_owner == 'mosaicml' runs-on: linux-ubuntu-latest - container: ${{ matrix.container }} strategy: fail-fast: false matrix: From 56f82bde3faba2ba211d276413ab36bd4bb7c2a2 Mon Sep 17 00:00:00 2001 From: Daniel King Date: Mon, 2 Sep 2024 23:26:00 -0700 Subject: [PATCH 4/9] np pin and commit update --- .github/workflows/code-quality.yaml | 2 +- .github/workflows/coverage.yaml | 2 +- .github/workflows/pr-cpu.yaml | 2 +- .github/workflows/pr-gpu.yaml | 12 ++++++------ setup.py | 1 + 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.github/workflows/code-quality.yaml b/.github/workflows/code-quality.yaml index 0461f7e008..02d38e31a3 100644 --- a/.github/workflows/code-quality.yaml +++ b/.github/workflows/code-quality.yaml @@ -34,7 +34,7 @@ jobs: uses: actions/checkout@v3 with: repository: mosaicml/ci-testing - ref: 53965d9417983a49003182cfca64286b448f80b3 + ref: a4cdd8b21b00adb8c9e13f9e7f56aa0f858072dd path: ./ci-testing - uses: ./ci-testing/.github/actions/code-quality with: diff --git a/.github/workflows/coverage.yaml b/.github/workflows/coverage.yaml index d2d756e2b0..c43943f562 100644 --- a/.github/workflows/coverage.yaml +++ b/.github/workflows/coverage.yaml @@ -16,7 +16,7 @@ jobs: uses: actions/checkout@v3 with: repository: mosaicml/ci-testing - ref: 53965d9417983a49003182cfca64286b448f80b3 + ref: a4cdd8b21b00adb8c9e13f9e7f56aa0f858072dd path: ./ci-testing - uses: ./ci-testing/.github/actions/coverage with: diff --git a/.github/workflows/pr-cpu.yaml b/.github/workflows/pr-cpu.yaml index a8b63c4a87..8e91c7033a 100644 --- a/.github/workflows/pr-cpu.yaml +++ b/.github/workflows/pr-cpu.yaml @@ -30,7 +30,7 @@ jobs: - name: Checkout code uses: actions/checkout@v2 - name: Run PR CPU Tests - uses: mosaicml/ci-testing/.github/actions/pytest-cpu@53965d9417983a49003182cfca64286b448f80b3 + uses: mosaicml/ci-testing/.github/actions/pytest-cpu@a4cdd8b21b00adb8c9e13f9e7f56aa0f858072dd with: name: ${{ matrix.name }} container: ${{ matrix.container }} diff --git a/.github/workflows/pr-gpu.yaml b/.github/workflows/pr-gpu.yaml index 079d0ae425..661de8063a 100644 --- a/.github/workflows/pr-gpu.yaml +++ b/.github/workflows/pr-gpu.yaml @@ -27,10 +27,10 @@ jobs: markers: "gpu" pip_deps: "[all]" pytest_command: "coverage run -m pytest" - ci_repo_gpu_test_ref: 53965d9417983a49003182cfca64286b448f80b3 + ci_repo_gpu_test_ref: a4cdd8b21b00adb8c9e13f9e7f56aa0f858072dd steps: - name: Run PR GPU Tests - uses: mosaicml/ci-testing/.github/actions/pytest-gpu@53965d9417983a49003182cfca64286b448f80b3 + uses: mosaicml/ci-testing/.github/actions/pytest-gpu@a4cdd8b21b00adb8c9e13f9e7f56aa0f858072dd with: container: ${{ matrix.container }} git_repo: mosaicml/llm-foundry @@ -56,10 +56,10 @@ jobs: markers: "gpu" pip_deps: "[all]" pytest_command: "coverage run -m pytest" - ci_repo_gpu_test_ref: 53965d9417983a49003182cfca64286b448f80b3 + ci_repo_gpu_test_ref: a4cdd8b21b00adb8c9e13f9e7f56aa0f858072dd steps: - name: Run PR GPU Tests - uses: mosaicml/ci-testing/.github/actions/pytest-gpu@53965d9417983a49003182cfca64286b448f80b3 + uses: mosaicml/ci-testing/.github/actions/pytest-gpu@a4cdd8b21b00adb8c9e13f9e7f56aa0f858072dd with: container: ${{ matrix.container }} git_repo: mosaicml/llm-foundry @@ -85,10 +85,10 @@ jobs: markers: "gpu" pip_deps: "[all]" pytest_command: "coverage run -m pytest" - ci_repo_gpu_test_ref: 53965d9417983a49003182cfca64286b448f80b3 + ci_repo_gpu_test_ref: a4cdd8b21b00adb8c9e13f9e7f56aa0f858072dd steps: - name: Run PR GPU Tests - uses: mosaicml/ci-testing/.github/actions/pytest-gpu@53965d9417983a49003182cfca64286b448f80b3 + uses: mosaicml/ci-testing/.github/actions/pytest-gpu@a4cdd8b21b00adb8c9e13f9e7f56aa0f858072dd with: container: ${{ matrix.container }} git_repo: mosaicml/llm-foundry diff --git a/setup.py b/setup.py index 0f4b808ae9..0a75c610b8 100644 --- a/setup.py +++ b/setup.py @@ -92,6 +92,7 @@ extra_deps['databricks'] = [ 'mosaicml[databricks]>=0.24.1,<0.25', + 'numpy<2', 'databricks-sql-connector>=3,<4', 'databricks-connect==14.1.0', 'lz4>=4,<5', From c1f66dcb09e21da4cff846f9b48ed2202338f12e Mon Sep 17 00:00:00 2001 From: Daniel King Date: Tue, 3 Sep 2024 00:05:23 -0700 Subject: [PATCH 5/9] coverage --- .github/workflows/pr-cpu.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr-cpu.yaml b/.github/workflows/pr-cpu.yaml index 8e91c7033a..56b5a1df4c 100644 --- a/.github/workflows/pr-cpu.yaml +++ b/.github/workflows/pr-cpu.yaml @@ -30,7 +30,7 @@ jobs: - name: Checkout code uses: actions/checkout@v2 - name: Run PR CPU Tests - uses: mosaicml/ci-testing/.github/actions/pytest-cpu@a4cdd8b21b00adb8c9e13f9e7f56aa0f858072dd + uses: mosaicml/ci-testing/.github/actions/pytest-cpu@try-again with: name: ${{ matrix.name }} container: ${{ matrix.container }} From ef618316d8ebb1fcf9977b9fac2bc09721a422ab Mon Sep 17 00:00:00 2001 From: Daniel King Date: Tue, 3 Sep 2024 00:44:38 -0700 Subject: [PATCH 6/9] coverage --- .github/workflows/code-quality.yaml | 2 +- .github/workflows/coverage.yaml | 2 +- .github/workflows/pr-cpu.yaml | 2 +- .github/workflows/pr-gpu.yaml | 12 ++++++------ 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/code-quality.yaml b/.github/workflows/code-quality.yaml index 02d38e31a3..e8a9ad55f4 100644 --- a/.github/workflows/code-quality.yaml +++ b/.github/workflows/code-quality.yaml @@ -34,7 +34,7 @@ jobs: uses: actions/checkout@v3 with: repository: mosaicml/ci-testing - ref: a4cdd8b21b00adb8c9e13f9e7f56aa0f858072dd + ref: ee73688ebed3852932da5d5800889889cf54cae1 path: ./ci-testing - uses: ./ci-testing/.github/actions/code-quality with: diff --git a/.github/workflows/coverage.yaml b/.github/workflows/coverage.yaml index c43943f562..7dee3a9944 100644 --- a/.github/workflows/coverage.yaml +++ b/.github/workflows/coverage.yaml @@ -16,7 +16,7 @@ jobs: uses: actions/checkout@v3 with: repository: mosaicml/ci-testing - ref: a4cdd8b21b00adb8c9e13f9e7f56aa0f858072dd + ref: ee73688ebed3852932da5d5800889889cf54cae1 path: ./ci-testing - uses: ./ci-testing/.github/actions/coverage with: diff --git a/.github/workflows/pr-cpu.yaml b/.github/workflows/pr-cpu.yaml index 56b5a1df4c..810e73e057 100644 --- a/.github/workflows/pr-cpu.yaml +++ b/.github/workflows/pr-cpu.yaml @@ -30,7 +30,7 @@ jobs: - name: Checkout code uses: actions/checkout@v2 - name: Run PR CPU Tests - uses: mosaicml/ci-testing/.github/actions/pytest-cpu@try-again + uses: mosaicml/ci-testing/.github/actions/pytest-cpu@ee73688ebed3852932da5d5800889889cf54cae1 with: name: ${{ matrix.name }} container: ${{ matrix.container }} diff --git a/.github/workflows/pr-gpu.yaml b/.github/workflows/pr-gpu.yaml index 661de8063a..93f4e6e3c8 100644 --- a/.github/workflows/pr-gpu.yaml +++ b/.github/workflows/pr-gpu.yaml @@ -27,10 +27,10 @@ jobs: markers: "gpu" pip_deps: "[all]" pytest_command: "coverage run -m pytest" - ci_repo_gpu_test_ref: a4cdd8b21b00adb8c9e13f9e7f56aa0f858072dd + ci_repo_gpu_test_ref: ee73688ebed3852932da5d5800889889cf54cae1 steps: - name: Run PR GPU Tests - uses: mosaicml/ci-testing/.github/actions/pytest-gpu@a4cdd8b21b00adb8c9e13f9e7f56aa0f858072dd + uses: mosaicml/ci-testing/.github/actions/pytest-gpu@ee73688ebed3852932da5d5800889889cf54cae1 with: container: ${{ matrix.container }} git_repo: mosaicml/llm-foundry @@ -56,10 +56,10 @@ jobs: markers: "gpu" pip_deps: "[all]" pytest_command: "coverage run -m pytest" - ci_repo_gpu_test_ref: a4cdd8b21b00adb8c9e13f9e7f56aa0f858072dd + ci_repo_gpu_test_ref: ee73688ebed3852932da5d5800889889cf54cae1 steps: - name: Run PR GPU Tests - uses: mosaicml/ci-testing/.github/actions/pytest-gpu@a4cdd8b21b00adb8c9e13f9e7f56aa0f858072dd + uses: mosaicml/ci-testing/.github/actions/pytest-gpu@ee73688ebed3852932da5d5800889889cf54cae1 with: container: ${{ matrix.container }} git_repo: mosaicml/llm-foundry @@ -85,10 +85,10 @@ jobs: markers: "gpu" pip_deps: "[all]" pytest_command: "coverage run -m pytest" - ci_repo_gpu_test_ref: a4cdd8b21b00adb8c9e13f9e7f56aa0f858072dd + ci_repo_gpu_test_ref: ee73688ebed3852932da5d5800889889cf54cae1 steps: - name: Run PR GPU Tests - uses: mosaicml/ci-testing/.github/actions/pytest-gpu@a4cdd8b21b00adb8c9e13f9e7f56aa0f858072dd + uses: mosaicml/ci-testing/.github/actions/pytest-gpu@ee73688ebed3852932da5d5800889889cf54cae1 with: container: ${{ matrix.container }} git_repo: mosaicml/llm-foundry From d8f54b4a9ad18477e2f779f5cc058be603980056 Mon Sep 17 00:00:00 2001 From: Daniel King Date: Tue, 3 Sep 2024 10:34:37 -0700 Subject: [PATCH 7/9] proper release --- .github/workflows/code-quality.yaml | 2 +- .github/workflows/coverage.yaml | 2 +- .github/workflows/pr-cpu.yaml | 2 +- .github/workflows/pr-gpu.yaml | 14 +++++++------- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/code-quality.yaml b/.github/workflows/code-quality.yaml index e8a9ad55f4..24052fc295 100644 --- a/.github/workflows/code-quality.yaml +++ b/.github/workflows/code-quality.yaml @@ -34,7 +34,7 @@ jobs: uses: actions/checkout@v3 with: repository: mosaicml/ci-testing - ref: ee73688ebed3852932da5d5800889889cf54cae1 + ref: v0.2.2 path: ./ci-testing - uses: ./ci-testing/.github/actions/code-quality with: diff --git a/.github/workflows/coverage.yaml b/.github/workflows/coverage.yaml index 7dee3a9944..e748a3119b 100644 --- a/.github/workflows/coverage.yaml +++ b/.github/workflows/coverage.yaml @@ -16,7 +16,7 @@ jobs: uses: actions/checkout@v3 with: repository: mosaicml/ci-testing - ref: ee73688ebed3852932da5d5800889889cf54cae1 + ref: v0.2.2 path: ./ci-testing - uses: ./ci-testing/.github/actions/coverage with: diff --git a/.github/workflows/pr-cpu.yaml b/.github/workflows/pr-cpu.yaml index 810e73e057..bada15fb55 100644 --- a/.github/workflows/pr-cpu.yaml +++ b/.github/workflows/pr-cpu.yaml @@ -30,7 +30,7 @@ jobs: - name: Checkout code uses: actions/checkout@v2 - name: Run PR CPU Tests - uses: mosaicml/ci-testing/.github/actions/pytest-cpu@ee73688ebed3852932da5d5800889889cf54cae1 + uses: mosaicml/ci-testing/.github/actions/pytest-cpu@v0.2.2 with: name: ${{ matrix.name }} container: ${{ matrix.container }} diff --git a/.github/workflows/pr-gpu.yaml b/.github/workflows/pr-gpu.yaml index 93f4e6e3c8..5b91d54442 100644 --- a/.github/workflows/pr-gpu.yaml +++ b/.github/workflows/pr-gpu.yaml @@ -4,7 +4,7 @@ on: branches: - main - release/* - pull_request: + pull_request_target: branches: - main - release/** @@ -27,10 +27,10 @@ jobs: markers: "gpu" pip_deps: "[all]" pytest_command: "coverage run -m pytest" - ci_repo_gpu_test_ref: ee73688ebed3852932da5d5800889889cf54cae1 + ci_repo_gpu_test_ref: v0.2.2 steps: - name: Run PR GPU Tests - uses: mosaicml/ci-testing/.github/actions/pytest-gpu@ee73688ebed3852932da5d5800889889cf54cae1 + uses: mosaicml/ci-testing/.github/actions/pytest-gpu@v0.2.2 with: container: ${{ matrix.container }} git_repo: mosaicml/llm-foundry @@ -56,10 +56,10 @@ jobs: markers: "gpu" pip_deps: "[all]" pytest_command: "coverage run -m pytest" - ci_repo_gpu_test_ref: ee73688ebed3852932da5d5800889889cf54cae1 + ci_repo_gpu_test_ref: v0.2.2 steps: - name: Run PR GPU Tests - uses: mosaicml/ci-testing/.github/actions/pytest-gpu@ee73688ebed3852932da5d5800889889cf54cae1 + uses: mosaicml/ci-testing/.github/actions/pytest-gpu@v0.2.2 with: container: ${{ matrix.container }} git_repo: mosaicml/llm-foundry @@ -85,10 +85,10 @@ jobs: markers: "gpu" pip_deps: "[all]" pytest_command: "coverage run -m pytest" - ci_repo_gpu_test_ref: ee73688ebed3852932da5d5800889889cf54cae1 + ci_repo_gpu_test_ref: v0.2.2 steps: - name: Run PR GPU Tests - uses: mosaicml/ci-testing/.github/actions/pytest-gpu@ee73688ebed3852932da5d5800889889cf54cae1 + uses: mosaicml/ci-testing/.github/actions/pytest-gpu@v0.2.2 with: container: ${{ matrix.container }} git_repo: mosaicml/llm-foundry From 2cab57328a82a4e60e80151faee3562aacf9037c Mon Sep 17 00:00:00 2001 From: Daniel King Date: Tue, 3 Sep 2024 10:39:22 -0700 Subject: [PATCH 8/9] 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 251aff3e32..a0a91671f0 100644 --- a/.github/workflows/smoketest.yaml +++ b/.github/workflows/smoketest.yaml @@ -32,7 +32,7 @@ jobs: uses: actions/checkout@v3 with: repository: mosaicml/ci-testing - ref: 53965d9417983a49003182cfca64286b448f80b3 + ref: v0.2.2 path: ./ci-testing - uses: ./ci-testing/.github/actions/smoketest with: From a8e11f6e191b4f6cd9708d981eb5c838b8fd16e9 Mon Sep 17 00:00:00 2001 From: Daniel King Date: Tue, 3 Sep 2024 11:05:47 -0700 Subject: [PATCH 9/9] remove redundant checkout --- .github/workflows/pr-cpu.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/pr-cpu.yaml b/.github/workflows/pr-cpu.yaml index bada15fb55..056b070143 100644 --- a/.github/workflows/pr-cpu.yaml +++ b/.github/workflows/pr-cpu.yaml @@ -27,8 +27,6 @@ jobs: markers: "not gpu" pytest_command: "coverage run -m pytest" steps: - - name: Checkout code - uses: actions/checkout@v2 - name: Run PR CPU Tests uses: mosaicml/ci-testing/.github/actions/pytest-cpu@v0.2.2 with: