rlst branch

bempp · Oct 24, 2023 · df7fd7f · df7fd7f
1 parent 5281b1e
commit df7fd7f
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 9 deletions.
diff --git a/element/Cargo.toml b/element/Cargo.toml
@@ -26,8 +26,8 @@ bempp-quadrature = { path = "../quadrature" }
 paste = "1.*"
 libc = "0.2"
 approx = "0.5"
-rlst = { git = "https://github.com/linalg-rs/rlst.git" }
-rlst-blis-src = { git = "https://github.com/linalg-rs/rlst.git" }
-rlst-dense = { git = "https://github.com/linalg-rs/rlst.git" }
-rlst-algorithms = { git = "https://github.com/linalg-rs/rlst.git" }
+rlst = { git = "https://github.com/linalg-rs/rlst.git", branch="mscroggs/rsmpi-0.7.0" }
+rlst-blis-src = { git = "https://github.com/linalg-rs/rlst.git", branch="mscroggs/rsmpi-0.7.0" }
+rlst-dense = { git = "https://github.com/linalg-rs/rlst.git", branch="mscroggs/rsmpi-0.7.0" }
+rlst-algorithms = { git = "https://github.com/linalg-rs/rlst.git", branch="mscroggs/rsmpi-0.7.0" }
 
diff --git a/kernel/Cargo.toml b/kernel/Cargo.toml
@@ -28,7 +28,7 @@ approx = "0.5"
 rayon = "1.7"
 num = "0.4"
 num_cpus = "1"
-rlst = { git = "https://github.com/linalg-rs/rlst.git" }
-rlst-dense = { git = "https://github.com/linalg-rs/rlst.git" }
+rlst = { git = "https://github.com/linalg-rs/rlst.git", branch="mscroggs/rsmpi-0.7.0" }
+rlst-dense = { git = "https://github.com/linalg-rs/rlst.git", branch="mscroggs/rsmpi-0.7.0" }
 
 [dev-dependencies]
diff --git a/python/test/test_dependencies.py b/python/test/test_dependencies.py
@@ -31,10 +31,15 @@ def test_dependencies():
             if "dependencies" in data:
                 for d, info in data["dependencies"].items():
                     if isinstance(info, dict):
-                        if "version" not in info:
-                            info = None
-                        else:
+                        if "version" in info:
                             info = info["version"]
+                        elif "git" in info:
+                            if "branch" in info:
+                                info = f"{info['git']}@{info['branch']}"
+                            else:
+                                info = info["git"]
+                        else:
+                            info = None
                     if d not in deps:
                         deps[d] = (info, c)
                     elif deps[d][0] != info: