From eb239237b284c7b872685a78c2f2a7fae6e77363 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Rozet?= Date: Wed, 6 Nov 2024 17:16:40 -0500 Subject: [PATCH 1/4] Fix setuptools config --- pyproject.toml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index fea460f..80210b1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -45,12 +45,14 @@ Repository = "https://github.com/facebookresearch/optimizers.git" "Bug Tracker" = "https://github.com/facebookresearch/optimizers/issues" [tool.setuptools] -packages = ["distributed_shampoo"] py-modules = [ "matrix_functions", "matrix_functions_types", "optimizer_modules", ] +[tool.setuptools.packages.find] +include = ["distributed_shampoo*"] + [tool.usort] first_party_detection = false From 986ef4568892e8929d4e30da7d91d469d4f4e521 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Rozet?= Date: Wed, 6 Nov 2024 18:18:25 -0500 Subject: [PATCH 2/4] Drop -e in CI --- .github/workflows/gpu-tests.yaml | 2 +- .github/workflows/tests.yaml | 2 +- .github/workflows/type-check-mypy.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/gpu-tests.yaml b/.github/workflows/gpu-tests.yaml index b41338f..99939a6 100644 --- a/.github/workflows/gpu-tests.yaml +++ b/.github/workflows/gpu-tests.yaml @@ -19,7 +19,7 @@ jobs: run: | uv venv && source .venv/bin/activate uv pip install setuptools - uv pip install -e ".[dev]" + uv pip install ".[dev]" - name: Run tests. run: | source .venv/bin/activate diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 6cf6899..7d74406 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -17,7 +17,7 @@ jobs: - name: Create venv and install the package. run: | uv venv && source .venv/bin/activate - uv pip install -e ".[dev]" + uv pip install ".[dev]" - name: Run tests. run: | source .venv/bin/activate diff --git a/.github/workflows/type-check-mypy.yaml b/.github/workflows/type-check-mypy.yaml index 020b39c..86ea5dd 100644 --- a/.github/workflows/type-check-mypy.yaml +++ b/.github/workflows/type-check-mypy.yaml @@ -16,7 +16,7 @@ jobs: - name: Create venv and install the package. run: | uv venv && source .venv/bin/activate - uv pip install -e ".[dev]" + uv pip install ".[dev]" - name: Run type checking with mypy. run: | source .venv/bin/activate From 4b6cb518dc038195d84b2fbd2371d67921660892 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Rozet?= Date: Wed, 6 Nov 2024 18:33:34 -0500 Subject: [PATCH 3/4] Use -e for mypy test --- .github/workflows/type-check-mypy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/type-check-mypy.yaml b/.github/workflows/type-check-mypy.yaml index 86ea5dd..020b39c 100644 --- a/.github/workflows/type-check-mypy.yaml +++ b/.github/workflows/type-check-mypy.yaml @@ -16,7 +16,7 @@ jobs: - name: Create venv and install the package. run: | uv venv && source .venv/bin/activate - uv pip install ".[dev]" + uv pip install -e ".[dev]" - name: Run type checking with mypy. run: | source .venv/bin/activate From 2ec4511dd8a471253d41893bc93f77fbbda57887 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Rozet?= Date: Wed, 6 Nov 2024 19:30:42 -0500 Subject: [PATCH 4/4] Update .github/workflows/gpu-tests.yaml Co-authored-by: Runa Eschenhagen <33333409+runame@users.noreply.github.com> --- .github/workflows/gpu-tests.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gpu-tests.yaml b/.github/workflows/gpu-tests.yaml index 99939a6..b41338f 100644 --- a/.github/workflows/gpu-tests.yaml +++ b/.github/workflows/gpu-tests.yaml @@ -19,7 +19,7 @@ jobs: run: | uv venv && source .venv/bin/activate uv pip install setuptools - uv pip install ".[dev]" + uv pip install -e ".[dev]" - name: Run tests. run: | source .venv/bin/activate