[REFACTOR] Add progress meter to equinox

diffrax/__init__.py

@@ -1,5 +1,12 @@
 import importlib.metadata
 
+from equinox.internal import (
+    AbstractProgressMeter as AbstractProgressMeter,
+    NoProgressMeter as NoProgressMeter,
+    TextProgressMeter as TextProgressMeter,
+    TqdmProgressMeter as TqdmProgressMeter,
+)
+
 from ._adjoint import (
     AbstractAdjoint as AbstractAdjoint,
     BacksolveAdjoint as BacksolveAdjoint,
@@ -49,12 +56,6 @@
 )
 from ._misc import adjoint_rms_seminorm as adjoint_rms_seminorm
 from ._path import AbstractPath as AbstractPath
-from ._progress_meter import (
-    AbstractProgressMeter as AbstractProgressMeter,
-    NoProgressMeter as NoProgressMeter,
-    TextProgressMeter as TextProgressMeter,
-    TqdmProgressMeter as TqdmProgressMeter,
-)
 from ._root_finder import (
     VeryChord as VeryChord,
     with_stepsize_controller_tols as with_stepsize_controller_tols,

diffrax/_integrate.py

@@ -19,6 +19,10 @@
 import numpy as np
 import optimistix as optx
 import wadler_lindig as wl
+from equinox.internal import (
+    AbstractProgressMeter,
+    NoProgressMeter,
+)
 from jaxtyping import Array, ArrayLike, Float, Inexact, PyTree, Real
 
 from ._adjoint import AbstractAdjoint, RecursiveCheckpointAdjoint
@@ -38,10 +42,6 @@
 from ._global_interpolation import DenseInterpolation
 from ._heuristics import is_sde, is_unsafe_sde
 from ._misc import linear_rescale, static_select
-from ._progress_meter import (
-    AbstractProgressMeter,
-    NoProgressMeter,
-)
 from ._root_finder import use_stepsize_tol
 from ._saveat import save_y, SaveAt, SubSaveAt
 from ._solution import is_okay, is_successful, RESULTS, Solution