Merge pull request #15 from NiftyPET/devel

next release v0.10.0

Author: casperdcl

.github/workflows/test.yml

@@ -67,10 +67,10 @@ jobs:
     - id: dist
       uses: casperdcl/deploy-pypi@v2
       with:
+        requirements: twine setuptools wheel setuptools_scm[toml] tqdm miutil[web]
         build: true
         password: ${{ secrets.PYPI_TOKEN }}
         upload: ${{ github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags') }}
-        requirements: twine setuptools>=42 wheel setuptools_scm[toml]>=3.4 tqdm miutil[web]>=0.7.0
     - name: Changelog
       run: git log --pretty='format:%d%n- %s%n%b---' $(git tag --sort=v:refname | tail -n2 | head -n1)..HEAD > _CHANGES.md
     - if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags')

niftypet/ninst/cudasetup.py

@@ -23,7 +23,8 @@
 
 prefix = sys.prefix
 pyhdr = get_python_inc()  # Python header paths
-mincc = 35  # minimum required CUDA compute capability
+minc_c = 3, 5  # minimum required CUDA compute capability
+mincc = minc_c[0] * 10 + minc_c[1]
 
 
 def path_niftypet_local():
@@ -103,17 +104,40 @@ def dev_setup():
 
     from miutil import cuinfo
 
+    # map from CUDA device order (CC) to NVML order (PCI bus)
+    nvml_id = [
+        i
+        for _, i in sorted(
+            ((cuinfo.compute_capability(i), i) for i in range(cuinfo.num_devices())),
+            reverse=True,
+        )
+    ]
     if "DEVID" in Cnt:
         devid = int(Cnt["DEVID"])
-        ccstr = cuinfo.nvcc_flags(devid)
-        ccs = ["{:d}{:d}".format(*cuinfo.compute_capability(devid))]
+        ccstr = cuinfo.nvcc_flags(nvml_id[devid])
+        ccs = ["{:d}{:d}".format(*cuinfo.compute_capability(nvml_id[devid]))]
     else:
-        devid = cuinfo.num_devices() - 1
-        if devid == -1:
+        devid = 0
+        devs = cuinfo.num_devices()
+        if devs < 1:
+            return ""
+        ccstr = ";".join(
+            sorted(
+                {
+                    cuinfo.nvcc_flags(i)
+                    for i in range(devs)
+                    if cuinfo.compute_capability(i) >= minc_c
+                }
+            )
+        )
+        if not ccstr:
             return ""
-        ccstr = ";".join(set(map(cuinfo.nvcc_flags, range(devid + 1))))
         ccs = sorted(
-            {"{:d}{:d}".format(*cuinfo.compute_capability(i)) for i in range(devid + 1)}
+            {
+                "{:d}{:d}".format(*cuinfo.compute_capability(i))
+                for i in range(devs)
+                if cuinfo.compute_capability(i) >= minc_c
+            }
         )
 
     # passing this setting to resources.py