Merge branch 'master' into vector-tests

Pometry · Oct 2, 2023 · c2a7db3 · c2a7db3
2 parents 45960e6 + de4b942
commit c2a7db3
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 18 deletions.
diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
@@ -41,13 +41,13 @@ jobs:
         name: Setup Rust
         with:
           profile: minimal
-          toolchain: nightly
+          toolchain: stable
           override: true
           components: rustfmt, clippy
       - name: Run benchmark (Unix)
         run: |
           set -o pipefail
-          cargo +nightly bench --bench base -p raphtory-benchmark -- --output-format=bencher | tee benchmark-result.txt
+          cargo bench --bench base -p raphtory-benchmark -- --output-format=bencher | tee benchmark-result.txt
       - name: Delete cargo.lock if it exists
         run: |
           rm -f Cargo.lock

diff --git a/docs/source/reference/algorithms/algorithmresult.rst b/docs/source/reference/algorithms/algorithmresult.rst
@@ -1,7 +1,7 @@
 Algorithm Result
 *****************
 
-.. autoclass:: raphtory.AlgorithmResultStrU64
+.. autoclass:: raphtory.AlgorithmResult
    :autosummary:
    :members:
    :undoc-members:

diff --git a/docs/source/reference/export/libraries.rst b/docs/source/reference/export/libraries.rst
@@ -2,3 +2,5 @@ Libraries
 ***********
 
 .. autofunction:: raphtory.export.to_networkx
+
+.. autofunction:: raphtory.export.to_pyvis
diff --git a/docs/source/reference/index.rst b/docs/source/reference/index.rst
@@ -11,7 +11,6 @@ methods.
    core/index
    algorithms/index
    export/index
-   visualisation/index
    nullmodels/index
    graphql/index
    graphgen/index
diff --git a/docs/source/reference/visualisation/draw.rst b/docs/source/reference/visualisation/draw.rst
diff --git a/docs/source/reference/visualisation/index.rst b/docs/source/reference/visualisation/index.rst
diff --git a/python/src/lib.rs b/python/src/lib.rs
@@ -5,7 +5,7 @@ use graphql::*;
 use pyo3::prelude::*;
 use raphtory_core::python::{
     graph::{
-        algorithm_result::AlgorithmResultStrU64,
+        algorithm_result::AlgorithmResult,
         edge::{PyDirection, PyEdge, PyEdges},
         graph::PyGraph,
         graph_with_deletions::PyGraphWithDeletions,
@@ -44,7 +44,7 @@ fn raphtory(py: Python<'_>, m: &PyModule) -> PyResult<()> {
     let algorithm_module = PyModule::new(py, "algorithms")?;
     algorithm_module.add_function(wrap_pyfunction!(global_reciprocity, algorithm_module)?)?;
     algorithm_module.add_function(wrap_pyfunction!(all_local_reciprocity, algorithm_module)?)?;
-    m.add_class::<AlgorithmResultStrU64>()?;
+    m.add_class::<AlgorithmResult>()?;
 
     algorithm_module.add_function(wrap_pyfunction!(triplet_count, algorithm_module)?)?;
     algorithm_module.add_function(wrap_pyfunction!(local_triangle_count, algorithm_module)?)?;

diff --git a/raphtory/src/python/graph/algorithm_result.rs b/raphtory/src/python/graph/algorithm_result.rs
@@ -171,6 +171,9 @@ macro_rules! py_algorithm_result_ord_hash_eq {
     };
 }
 
+py_algorithm_result!(AlgorithmResult, String, String);
+py_algorithm_result_ord_hash_eq!(AlgorithmResult, String, String);
+
 py_algorithm_result!(AlgorithmResultStrU64, String, u64);
 py_algorithm_result_ord_hash_eq!(AlgorithmResultStrU64, String, u64);
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,3 +2,5 @@ Libraries
		***********

		.. autofunction:: raphtory.export.to_networkx

		.. autofunction:: raphtory.export.to_pyvis