Grab CI patch

Author: chris-langfield

.github/workflows/workflow.yml

@@ -101,6 +101,6 @@ jobs:
       run: |
         ASPIREDIR=${{ env.WORK_DIR }} python -c \
         "import aspire; print(aspire.config['ray']['temp_dir'])"
-        ASPIREDIR=${{ env.WORK_DIR }} pytest
+        ASPIREDIR=${{ env.WORK_DIR }} pytest --durations=50
     - name: Cleanup
       run: rm -rf ${{ env.WORK_DIR }}

azure-pipelines.yml

@@ -27,7 +27,8 @@ jobs:
   - bash: |
       source activate myEnvironment
       pip install -e .[dev]
-      pytest --random-order
+      pip freeze --all
+      pytest --durations=50 --random-order
     displayName: pytest
 
 - job:
@@ -52,7 +53,8 @@ jobs:
   - bash: |
       source activate myEnvironment
       pip install -e .[dev]
-      pytest --random-order
+      pip freeze --all
+      pytest --durations=50 --random-order
     displayName: pytest
 
 - job:
@@ -82,7 +84,8 @@ jobs:
   - bash: |
       source activate myEnvironment
       pip install -e .[dev]
-      pytest -s
+      pip freeze --all
+      pytest --durations=50 -s
     displayName: pytest
 
 - job:
@@ -112,7 +115,8 @@ jobs:
   - bash: |
       source activate myEnvironment
       pip install -e .[dev]
-      pytest -s
+      pip freeze --all
+      pytest --durations=50 -s
     displayName: pytest
 
 - job:
@@ -137,5 +141,6 @@ jobs:
   - script: |
       call activate myEnvironment
       pip install -e .[dev]
-      pytest --random-order 
+      pip freeze --all
+      pytest --durations=50 --random-order
     displayName: pytest

src/aspire/classification/averager2d.py

@@ -215,7 +215,11 @@ def _innerloop(i):
                 b_avgs[i] = _innerloop(i)
         else:
             logger.info(f"Starting Pool({self.num_procs})")
-            ray.init(_temp_dir=config["ray"]["temp_dir"].as_filename())
+            ray.init(
+                _temp_dir=config["ray"]["temp_dir"].as_filename(),
+                num_cpus=self.num_procs,
+                num_gpus=0,
+            )
             with Pool(self.num_procs) as p:
                 results = p.map(_innerloop, range(n_classes))
             ray.shutdown()
@@ -563,7 +567,11 @@ def _innerloop(k):
 
         else:
             logger.info(f"Starting Pool({self.num_procs})")
-            ray.init(_temp_dir=config["ray"]["temp_dir"].as_filename())
+            ray.init(
+                _temp_dir=config["ray"]["temp_dir"].as_filename(),
+                num_cpus=self.num_procs,
+                num_gpus=0,
+            )
             with Pool(self.num_procs) as p:
                 results = p.map(_innerloop, range(n_classes))
             ray.shutdown()
@@ -623,7 +631,11 @@ def _innerloop(i):
             b_avgs[i] = _innerloop(i)
         else:
             logger.info(f"Starting Pool({self.num_procs})")
-            ray.init(_temp_dir=config["ray"]["temp_dir"].as_filename())
+            ray.init(
+                _temp_dir=config["ray"]["temp_dir"].as_filename(),
+                num_cpus=self.num_procs,
+                num_gpus=0,
+            )
             with Pool(self.num_procs) as p:
                 results = p.map(_innerloop, range(n_classes))
             ray.shutdown()
@@ -750,7 +762,11 @@ def _innerloop(k):
                 rotations[k], shifts[k], correlations[k] = _innerloop(k)
         else:
             logger.info(f"Starting Pool({self.num_procs})")
-            ray.init(_temp_dir=config["ray"]["temp_dir"].as_filename())
+            ray.init(
+                _temp_dir=config["ray"]["temp_dir"].as_filename(),
+                num_cpus=self.num_procs,
+                num_gpus=0,
+            )
             with Pool(self.num_procs) as p:
                 results = p.map(_innerloop, range(n_classes))
             ray.shutdown()

tests/test_averager2d.py

@@ -300,7 +300,7 @@ def testAverager(self):
 class ReddyChatterjiAverager2DTestCase(BFSRAverager2DTestCase):
 
     averager = ReddyChatterjiAverager2D
-    num_procs = 1 if xfail_ray_dev() else None
+    num_procs = 1 if xfail_ray_dev() else 3
 
     def testAverager(self):
         """

tox.ini

@@ -17,10 +17,10 @@ deps =
 commands =
     python -V
     py{3.7,3.8,3.9,3.10}-dev: sh -c "pip freeze | cut -d@ -f1 | cut -d= -f1 | xargs -n1 pip install -U"
-    pip freeze
+    pip freeze --all
     python -c "import numpy; numpy.show_config()"
     # --cov should generate `Coverage` data
-    pytest --cov=aspire --cov-report=xml {posargs}
+    pytest --durations=50 --cov=aspire --cov-report=xml {posargs}
 
 [testenv:docs]
 changedir = docs