Speed up tests

.github/workflows/pytest.yml → .github/workflows/pytest-components.yml

@@ -1,26 +1,16 @@
 ---
-name: Unit and integration tests
+name: Testing components with pytest
 
 on:
   pull_request:
     branches: [main, dev]
 
 jobs:
-  test-itwinai:
-    name: Test itwinai with pytest
+  test-components:
+    name: Testing components with pytest
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-
-      - name: Install compilers for Horovod
-        run: |
-          sudo apt-get update &&
-          sudo apt-get install -y gcc-11 g++-11 &&
-          sudo apt-get install -y cmake &&
-          sudo apt-get install openmpi-bin  openmpi-common openmpi-doc libopenmpi-dev &&
-          gcc --version &&
-          cmake --version &&
-          mpirun --version
 
       - name: Make PyTorch virtualenv
         shell: bash -l {0}
@@ -34,6 +24,6 @@ jobs:
       # Default environment names are ".venv-pytorch" and ".venv-tf"
       - name: Run pytest for workflows
         shell: bash -l {0}
-        run: .venv-pytorch/bin/pytest -v ./tests/ -m "not hpc"
+        run: .venv-pytorch/bin/pytest -v ./tests/components -m "not hpc"
 
 

.github/workflows/pytest-loggers.yml

@@ -0,0 +1,29 @@
+---
+name: Testing loggers with pytest
+
+on:
+  pull_request:
+    branches: [main, dev]
+
+jobs:
+  test-loggers:
+    name: Testing loggers with pytest
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Make PyTorch virtualenv
+        shell: bash -l {0}
+        run: make torch-env-cpu
+
+      - name: Make Tensorflow virtualenv
+        shell: bash -l {0}
+        run: make tensorflow-env-cpu
+
+      # NOTE, to change the name in which tests are run, set custom TORCH_ENV and TF_ENV env variables.
+      # Default environment names are ".venv-pytorch" and ".venv-tf"
+      - name: Run pytest for workflows
+        shell: bash -l {0}
+        run: .venv-pytorch/bin/pytest -v ./tests/loggers -m "not hpc"
+
+

.github/workflows/pytest-torch.yml

@@ -0,0 +1,29 @@
+---
+name: Testing torch with pytest
+
+on:
+  pull_request:
+    branches: [main, dev]
+
+jobs:
+  test-torch:
+    name: Testing torch with pytest
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Make PyTorch virtualenv
+        shell: bash -l {0}
+        run: make torch-env-cpu
+
+      - name: Make Tensorflow virtualenv
+        shell: bash -l {0}
+        run: make tensorflow-env-cpu
+
+      # NOTE, to change the name in which tests are run, set custom TORCH_ENV and TF_ENV env variables.
+      # Default environment names are ".venv-pytorch" and ".venv-tf"
+      - name: Run pytest for workflows
+        shell: bash -l {0}
+        run: .venv-pytorch/bin/pytest -v ./tests/torch -m "not hpc"
+
+

.github/workflows/pytest-use-cases.yml

@@ -0,0 +1,29 @@
+---
+name: Testing use cases with pytest
+
+on:
+  pull_request:
+    branches: [main, dev]
+
+jobs:
+  test-use-cases:
+    name: Testing use cases with pytest
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Make PyTorch virtualenv
+        shell: bash -l {0}
+        run: make torch-env-cpu
+
+      - name: Make Tensorflow virtualenv
+        shell: bash -l {0}
+        run: make tensorflow-env-cpu
+
+      # NOTE, to change the name in which tests are run, set custom TORCH_ENV and TF_ENV env variables.
+      # Default environment names are ".venv-pytorch" and ".venv-tf"
+      - name: Run pytest for workflows
+        shell: bash -l {0}
+        run: .venv-pytorch/bin/pytest -v -n logical ./tests/use-cases -m "not hpc"
+
+

.github/workflows/pytest-utils.yml

@@ -0,0 +1,29 @@
+---
+name: Testing utils with pytest
+
+on:
+  pull_request:
+    branches: [main, dev]
+
+jobs:
+  test-utils:
+    name: Testing utils with pytest
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Make PyTorch virtualenv
+        shell: bash -l {0}
+        run: make torch-env-cpu
+
+      - name: Make Tensorflow virtualenv
+        shell: bash -l {0}
+        run: make tensorflow-env-cpu
+
+      # NOTE, to change the name in which tests are run, set custom TORCH_ENV and TF_ENV env variables.
+      # Default environment names are ".venv-pytorch" and ".venv-tf"
+      - name: Run pytest for workflows
+        shell: bash -l {0}
+        run: .venv-pytorch/bin/pytest -v ./tests/test_utils.py -m "not hpc"
+
+

pyproject.toml

@@ -54,14 +54,15 @@ torch = [
 ]
 tf = ["tensorflow==2.16.*", "tf_keras==2.16.*"]
 tf-cuda = ["tensorflow[and-cuda]==2.16.*", "tf_keras==2.16.*"]
-
 dev = [
   "pytest>=7.4.2",
   "pytest-mock>=3.11.1",
   "pytest-cov>=4.1.0",
   "ipykernel>=6.29.5",
   "ipython>=8.30.0",
   "ruff>=0.8.3",
+  "psutil>=6.1.0",
+  "pytest-xdist>=3.6.1",
 ]
 docs = [
   "sphinx-rtd-theme>=2.0.0",

use-cases/mnist/torch/dataloader.py

@@ -33,7 +33,7 @@ def __init__(
         self.save_path = save_path
 
     @monitor_exec
-    def execute(self) -> Tuple[Dataset, Dataset]:
+    def execute(self) -> Tuple[Dataset, Dataset, None]:
         train_dataset = datasets.MNIST(
             self.save_path,
             train=True,
@@ -95,8 +95,7 @@ def __getitem__(self, index: int) -> Tuple[Any, Any]:
 
     @staticmethod
     def generate_jpg_sample(root: str, max_items: int = 100):
-        """Generate a sample dataset of JPG images starting from
-            LeCun's test dataset.
+        """Generate a sample dataset of JPG images starting from LeCun's test dataset.
 
         Args:
             root (str): sample path on disk