chore(docs): bump differt_core

jeertmans · May 28, 2024 · b051301 · b051301
1 parent ccadf7c
commit b051301
Show file tree

Hide file tree

Showing 7 changed files with 94 additions and 29 deletions.
diff --git a/differt2d/scene.py b/differt2d/scene.py
@@ -19,11 +19,11 @@
     runtime_checkable,
 )
 
-import differt_core
 import equinox as eqx
 import jax
 import jax.numpy as jnp
 from beartype import beartype as typechecker
+from differt_core.rt.graph import CompleteGraph
 from jaxtyping import Array, Float, PRNGKeyArray, UInt, jaxtyped
 from matplotlib.artist import Artist
 
@@ -888,21 +888,30 @@ def all_path_candidates(
 
         Note that it only includes indices for objects.
 
+        .. note::
+
+            Internally, it uses :py:class:`differt_core.rt.graph.CompleteGraph`
+            to generate the sequence of all path candidates efficiently.
+
         :param min_order: The minimum order of the path, i.e., the
             number of interactions.
         :param max_order: The maximum order of the path, i.e., the
             number of interactions.
         :return: The list of list of indices.
         """
-        num_primitives = len(self.objects)
+        num_nodes = len(self.objects)
+
+        graph = CompleteGraph(num_nodes)
+
+        from_ = num_nodes
+        to = from_ + 1
 
         return [
-            path_candidate
+            jnp.asarray(path_candidate, dtype=jnp.uint32)
             for order in range(min_order, max_order + 1)
-            for path_candidate in jnp.asarray(
-                differt_core.generate_path_candidates(num_primitives, order),
-                dtype=jnp.uint32,
-            ).T
+            for path_candidate in graph.all_paths(
+                from_, to, order + 2, include_from_and_to=False
+            )
         ]
 
     def get_interacting_objects(

diff --git a/docs/source/GFlowNet.ipynb b/docs/source/GFlowNet.ipynb
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -124,6 +124,7 @@
 # -- Intersphinx mapping
 
 intersphinx_mapping = {
+    "differt_core": ("https://differt.eertmans.be/latest/", None),
     "equinox": ("https://docs.kidger.site/equinox/", None),
     "jax": ("https://jax.readthedocs.io/en/latest", None),
     "jaxtyping": ("https://docs.kidger.site/jaxtyping/", None),

diff --git a/examples/qt_interactive.py b/examples/qt_interactive.py
@@ -324,6 +324,7 @@ def set_path_cls(method: str) -> None:
         # Matplotlib figures
         self.fig = Figure(figsize=(10, 10), tight_layout=True)
         self.view = FigureCanvas(self.fig)
+        self.view.setMinimumHeight(200)
         self.ax = self.fig.add_subplot()
 
         # Toolbar above the figure

diff --git a/pyproject.toml b/pyproject.toml
@@ -16,7 +16,7 @@ classifiers = [
 ]
 dependencies = [
   "beartype>=0.17.2",
-  "differt-core==0.0.5",
+  "differt-core==0.0.12",
   "equinox>=0.11.2",
   "jax>=0.4.7",
   "jaxtyping>=0.2.24",

diff --git a/requirements-dev.lock b/requirements-dev.lock
@@ -74,7 +74,7 @@ decorator==5.1.1
     # via ipython
 defusedxml==0.7.1
     # via nbconvert
-differt-core==0.0.5
+differt-core==0.0.12
     # via differt2d
 distlib==0.3.8
     # via virtualenv

diff --git a/requirements.lock b/requirements.lock
@@ -19,7 +19,7 @@ contourpy==1.2.1
     # via matplotlib
 cycler==0.12.1
     # via matplotlib
-differt-core==0.0.5
+differt-core==0.0.12
     # via differt2d
 equinox==0.11.4
     # via differt2d