Optimizations to Improve testing speed (#373)

TShapinsky · web-flow · commit 06cd44f6fcc3 · 2025-06-16T17:28:01.000-06:00
* Use graph subtraction instead of canonicalization to improve performance

* Make notebook tets use topquadrant

* run unit and integration tests in parallel

* organize tests in lists instead of sets for reproducability across threads

* Make library tests multi threaded

* make library tests run sparingly again
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -62,12 +62,14 @@ jobs:
           virtualenvs-path: ~/.virtualenvs
       - name: poetry install
         run: poetry install --all-extras
+      - name: install pytest-xdist for parallel tests
+        run: poetry run pip install pytest-xdist
       - name: lint
         run: poetry run flake8 buildingmotif
       - name: type check
         run: poetry run mypy --ignore-missing-imports
       - name: unit tests
-        run: poetry run pytest tests/unit --cov=./ --cov-report=xml
+        run: poetry run pytest -n auto tests/unit --cov=./ --cov-report=xml
       - name: build tests
         run: poetry build
 
@@ -101,8 +103,10 @@ jobs:
           virtualenvs-path: ~/.virtualenvs
       - name: poetry install
         run: poetry install --all-extras
+      - name: install pytest-xdist for parallel tests
+        run: poetry run pip install pytest-xdist
       - name: integration tests
-        run: poetry run pytest tests/integration
+        run: poetry run pytest -n auto tests/integration
       - name: bacnet tests
         run: |
           cd tests/integration/fixtures/bacnet
@@ -139,8 +143,10 @@ jobs:
           virtualenvs-path: ~/.virtualenvs
       - name: poetry install
         run: poetry install --all-extras
+      - name: install pytest-xdist for parallel tests
+        run: poetry run pip install pytest-xdist
       - name: library tests
-        run: poetry run pytest tests/library
+        run: poetry run pytest -n auto tests/library
 
   coverage:
     needs: testing
diff --git a/notebooks/GabeDemo.ipynb b/notebooks/GabeDemo.ipynb
@@ -41,7 +41,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 2,
+   "execution_count": null,
    "id": "81f0cddb-f98d-412a-85b8-a3b99b3a8c63",
    "metadata": {
     "execution": {
@@ -57,7 +57,7 @@
    },
    "outputs": [],
    "source": [
-    "bm = BuildingMOTIF(\"sqlite://\") # in-memory"
+    "bm = BuildingMOTIF(\"sqlite://\", \"topquadrant\") # in-memory"
    ]
   },
   {
@@ -2922,7 +2922,7 @@
  "metadata": {
   "celltoolbar": "Slideshow",
   "kernelspec": {
-   "display_name": "Python 3 (ipykernel)",
+   "display_name": ".venv",
    "language": "python",
    "name": "python3"
   },
@@ -2936,12 +2936,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.11.9"
-  },
-  "vscode": {
-   "interpreter": {
-    "hash": "15fae041f31e3c236ca4e007ba84180412c78f76afbcc47bd25b3db75fd5ecba"
-   }
+   "version": "3.10.16"
   }
  },
  "nbformat": 4,
diff --git a/notebooks/Ingress-Tutorial-CSV.ipynb b/notebooks/Ingress-Tutorial-CSV.ipynb
@@ -23,7 +23,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 2,
+   "execution_count": null,
    "id": "4ab8e1ee-ff06-4357-8c9f-5b62c898fb8a",
    "metadata": {
     "execution": {
@@ -35,7 +35,7 @@
    },
    "outputs": [],
    "source": [
-    "bm = BuildingMOTIF(\"sqlite://\") # in-memory"
+    "bm = BuildingMOTIF(\"sqlite://\", \"topquadrant\") # in-memory"
    ]
   },
   {
@@ -427,7 +427,7 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 3 (ipykernel)",
+   "display_name": ".venv",
    "language": "python",
    "name": "python3"
   },
@@ -441,7 +441,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.11.9"
+   "version": "3.10.16"
   }
  },
  "nbformat": 4,
diff --git a/notebooks/Ingress-Tutorial-XLSX-Multiple-Sheets.ipynb b/notebooks/Ingress-Tutorial-XLSX-Multiple-Sheets.ipynb
@@ -24,7 +24,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 2,
+   "execution_count": null,
    "id": "4ab8e1ee-ff06-4357-8c9f-5b62c898fb8a",
    "metadata": {
     "execution": {
@@ -36,7 +36,7 @@
    },
    "outputs": [],
    "source": [
-    "bm = BuildingMOTIF(\"sqlite://\") # in-memory"
+    "bm = BuildingMOTIF(\"sqlite://\", \"topquadrant\") # in-memory"
    ]
   },
   {
@@ -454,7 +454,7 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 3 (ipykernel)",
+   "display_name": ".venv",
    "language": "python",
    "name": "python3"
   },
@@ -468,7 +468,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.11.9"
+   "version": "3.10.16"
   }
  },
  "nbformat": 4,
diff --git a/notebooks/Ingress-Tutorial-XLSX.ipynb b/notebooks/Ingress-Tutorial-XLSX.ipynb
@@ -24,7 +24,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 2,
+   "execution_count": null,
    "id": "4ab8e1ee-ff06-4357-8c9f-5b62c898fb8a",
    "metadata": {
     "execution": {
@@ -36,7 +36,7 @@
    },
    "outputs": [],
    "source": [
-    "bm = BuildingMOTIF(\"sqlite://\") # in-memory"
+    "bm = BuildingMOTIF(\"sqlite://\", \"topquadrant\") # in-memory"
    ]
   },
   {
@@ -426,7 +426,7 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 3 (ipykernel)",
+   "display_name": ".venv",
    "language": "python",
    "name": "python3"
   },
@@ -440,7 +440,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.11.9"
+   "version": "3.10.16"
   }
  },
  "nbformat": 4,
diff --git a/notebooks/Template-Usage.ipynb b/notebooks/Template-Usage.ipynb
@@ -56,7 +56,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 3,
+   "execution_count": null,
    "id": "dfefe386-b5a5-4933-b43e-554e09a51bd1",
    "metadata": {
     "execution": {
@@ -68,7 +68,7 @@
    },
    "outputs": [],
    "source": [
-    "bm = BuildingMOTIF(\"sqlite://\")\n",
+    "bm = BuildingMOTIF(\"sqlite://\", \"topquadrant\")\n",
     "bldg = Model.create(\"https://example.com\")"
    ]
   },
@@ -1041,7 +1041,7 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 3 (ipykernel)",
+   "display_name": ".venv",
    "language": "python",
    "name": "python3"
   },
@@ -1055,7 +1055,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.11.9"
+   "version": "3.10.16"
   }
  },
  "nbformat": 4,
diff --git a/tests/library/test_223p_templates.py b/tests/library/test_223p_templates.py
@@ -102,7 +102,9 @@ def pytest_generate_tests(metafunc):
                 run_shacl_inference=False,
                 infer_templates=False,
             )
-            templates = library.get_templates()
+            templates = templates = sorted(
+                library.get_templates(), key=lambda t: t.name
+            )
             params.extend([(bm, s223, library, template) for template in templates])
 
         # remove all templates in 'to skip'
diff --git a/tests/library/test_brick_templates.py b/tests/library/test_brick_templates.py
@@ -77,7 +77,7 @@ def pytest_generate_tests(metafunc):
         ids = []
         for library_name in libraries:
             library = Library.load(directory=library_name, run_shacl_inference=False)
-            templates = library.get_templates()
+            templates = sorted(library.get_templates(), key=lambda t: t.name)
             params.extend([(bm, brick, library, template) for template in templates])
             ids.extend([f"{library.name}-{template.name}" for template in templates])
         metafunc.parametrize("bm,brick,library,template", params, ids=ids)
diff --git a/tests/unit/conftest.py b/tests/unit/conftest.py
@@ -89,18 +89,18 @@ def pytest_generate_tests(metafunc):
     if "library" in metafunc.fixturenames:
         libdir = pathlib.Path("libraries")
         libraries_files = libdir.rglob("*.yml")
-        libraries = {str(lib.parent) for lib in libraries_files}
+        libraries = [str(lib.parent) for lib in libraries_files]
 
         metafunc.parametrize("library", libraries)
 
     if "builtin_library" in metafunc.fixturenames:
-        builtin_library = {"brick", "constraints"}
+        builtin_library = ["brick", "constraints"]
         metafunc.parametrize("builtin_library", builtin_library)
 
     if "builtin_ontology" in metafunc.fixturenames:
-        builtin_ontology = {"brick/Brick.ttl", "constraints/constraints.ttl"}
+        builtin_ontology = ["brick/Brick.ttl", "constraints/constraints.ttl"]
         metafunc.parametrize("builtin_ontology", builtin_ontology)
 
     if "shacl_engine" in metafunc.fixturenames:
-        shacl_engine = {"pyshacl", "topquadrant"}
+        shacl_engine = ["pyshacl", "topquadrant"]
         metafunc.parametrize("shacl_engine", shacl_engine)
diff --git a/tests/unit/dataclasses/test_model.py b/tests/unit/dataclasses/test_model.py
@@ -1,6 +1,6 @@
 import pytest
 from rdflib import Graph, Literal, Namespace, URIRef
-from rdflib.compare import graph_diff, isomorphic, to_isomorphic
+from rdflib.compare import isomorphic
 from rdflib.exceptions import ParserError
 from rdflib.namespace import FOAF
 
@@ -260,18 +260,18 @@ def test_model_compile(bm: BuildingMOTIF, shacl_engine):
         "tests/unit/fixtures/smallOffice_brick.ttl", format="ttl"
     )
 
-    brick = Library.load(ontology_graph="libraries/brick/Brick-full.ttl")
+    brick = Library.load(
+        ontology_graph="libraries/brick/Brick-full.ttl", infer_templates=False
+    )
 
     compiled_model = small_office_model.compile([brick.get_shape_collection()])
 
     precompiled_model = Graph().parse(
         "tests/unit/fixtures/smallOffice_brick_compiled.ttl", format="ttl"
     )
 
-    # returns in_both, in_first, in_second
-    _, in_first, _ = graph_diff(
-        to_isomorphic(precompiled_model), to_isomorphic(compiled_model.graph)
-    )
+    in_first = precompiled_model - compiled_model.graph
+
     # passes if everything from precompiled_model is in compiled_model
     assert len(in_first) == 0
 
