Update formatting and remove changes that broke tests

IsaevIlya · Aug 13, 2024 · 0868119 · 0868119
1 parent d035b88
commit 0868119
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 13 deletions.
diff --git a/.github/workflows/python-checks.yml b/.github/workflows/python-checks.yml
@@ -62,12 +62,6 @@ jobs:
       - name: s3torchconnector lightning unit tests
         run: pytest s3torchconnector/tst/unit/lightning --hypothesis-profile ci --hypothesis-show-statistics -c ./
 
-      - name: Install Lightning dependency
-        run: |
-          python -m pip install -e "s3torchconnector[lightning]"
-      - name: s3torchconnector lightning unit tests
-        run: pytest s3torchconnector/tst/unit/lightning --hypothesis-profile ci --hypothesis-show-statistics
-
   lint:
     name: Python lints
     runs-on: ubuntu-22.04

diff --git a/s3torchbenchmarking/pyproject.toml b/s3torchbenchmarking/pyproject.toml
@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 name = "s3torchbenchmarking"
 version = "0.0.1"
 description = "Tools to run and compare benchmarks against various PyTorch connectors like the s3torchconnector."
-requires-python = ">=3.8,<3.12"
+requires-python = ">=3.8,<3.13"
 readme = "README.md"
 dependencies = [
     #TODO: Remove torch != 2.3.0 restriction when https://github.com/pytorch/data/issues/1244 is fixed

diff --git a/s3torchbenchmarking/src/s3torchbenchmarking/hydra_callbacks.py b/s3torchbenchmarking/src/s3torchbenchmarking/hydra_callbacks.py
@@ -43,9 +43,11 @@ def _collate_results(self) -> List:
             job_result_path = os.path.join(job_output_dir, "result.json")
             with open(job_result_path) as infile:
                 item = {
-                    "job_id": job_return.hydra_cfg["hydra"]["job"]["id"]
-                    if job_return.hydra_cfg
-                    else "",
+                    "job_id": (
+                        job_return.hydra_cfg["hydra"]["job"]["id"]
+                        if job_return.hydra_cfg
+                        else ""
+                    ),
                     "cfg": OmegaConf.to_container(job_return.cfg),
                     "result": json.load(infile),
                 }

diff --git a/s3torchbenchmarking/utils/download_and_transform_results.py b/s3torchbenchmarking/utils/download_and_transform_results.py
@@ -89,9 +89,11 @@ def extract_fields_dataloading(json_data: JsonData) -> ExtractedData:
 
         extracted_data.append(
             {
-                "sharding": cfg["dataset"].get("sharding")
-                if cfg["dataset"].get("sharding")
-                else "None",
+                "sharding": (
+                    cfg["dataset"].get("sharding")
+                    if cfg["dataset"].get("sharding")
+                    else "None"
+                ),
                 "model": cfg["training"]["model"],
                 "max_epochs": cfg["training"]["max_epochs"],
                 "prefix_uri_suffix": prefix_uri_suffix,