WIP: Update adam_core

moeyensj · May 22, 2024 · 8c52441 · 8c52441
1 parent 3172ac2
commit 8c52441
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 8 deletions.
diff --git a/thor/main.py b/thor/main.py
@@ -7,7 +7,7 @@
 
 import quivr as qv
 import ray
-from adam_core.propagator import PYOORB
+from adam_core.propagator.adam_pyoorb import PYOORB
 from adam_core.ray_cluster import initialize_use_ray
 
 from .checkpointing import create_checkpoint_data, load_initial_checkpoint_values

diff --git a/thor/orbit.py b/thor/orbit.py
@@ -18,7 +18,8 @@
 )
 from adam_core.observers import Observers
 from adam_core.orbits import Ephemeris, Orbits
-from adam_core.propagator import PYOORB, Propagator
+from adam_core.propagator import Propagator
+from adam_core.propagator.adam_pyoorb import PYOORB
 from adam_core.ray_cluster import initialize_use_ray
 from adam_core.time import Timestamp
 
@@ -231,7 +232,6 @@ def generate_ephemeris(
             observers,
             max_processes=max_processes,
             chunk_size=1,
-            parallel_backend="ray",
         )
 
     def generate_ephemeris_from_observations(

diff --git a/thor/orbit_selection.py b/thor/orbit_selection.py
@@ -13,7 +13,8 @@
 from adam_core.coordinates import KeplerianCoordinates
 from adam_core.observers import Observers
 from adam_core.orbits import Ephemeris, Orbits
-from adam_core.propagator import PYOORB, Propagator
+from adam_core.propagator import Propagator
+from adam_core.propagator.adam_pyoorb import PYOORB
 from adam_core.propagator.utils import _iterate_chunks
 from adam_core.ray_cluster import initialize_use_ray
 from adam_core.time import Timestamp

diff --git a/thor/orbits/attribution.py b/thor/orbits/attribution.py
@@ -11,7 +11,8 @@
 import ray
 from adam_core.coordinates.residuals import Residuals
 from adam_core.orbits import Orbits
-from adam_core.propagator import PYOORB, Propagator
+from adam_core.propagator import Propagator
+from adam_core.propagator.adam_pyoorb import PYOORB
 from adam_core.propagator.utils import _iterate_chunk_indices, _iterate_chunks
 from adam_core.ray_cluster import initialize_use_ray
 from sklearn.neighbors import BallTree

diff --git a/thor/orbits/iod.py b/thor/orbits/iod.py
@@ -12,7 +12,8 @@
 import ray
 from adam_core.coordinates.residuals import Residuals
 from adam_core.orbit_determination import OrbitDeterminationObservations
-from adam_core.propagator import PYOORB, Propagator
+from adam_core.propagator import Propagator
+from adam_core.propagator.adam_pyoorb import PYOORB
 from adam_core.propagator.utils import _iterate_chunk_indices, _iterate_chunks
 from adam_core.ray_cluster import initialize_use_ray
 

diff --git a/thor/orbits/od.py b/thor/orbits/od.py
@@ -12,7 +12,8 @@
 from adam_core.coordinates.residuals import Residuals
 from adam_core.orbit_determination import OrbitDeterminationObservations
 from adam_core.orbits import Orbits
-from adam_core.propagator import PYOORB, Propagator, _iterate_chunks
+from adam_core.propagator import Propagator, _iterate_chunks
+from adam_core.propagator.adam_pyoorb import PYOORB
 from adam_core.propagator.utils import _iterate_chunk_indices
 from adam_core.ray_cluster import initialize_use_ray
 from scipy.linalg import solve

diff --git a/thor/range_and_transform.py b/thor/range_and_transform.py
@@ -10,7 +10,8 @@
     OriginCodes,
     transform_coordinates,
 )
-from adam_core.propagator import PYOORB, Propagator
+from adam_core.propagator import Propagator
+from adam_core.propagator.adam_pyoorb import PYOORB
 from adam_core.ray_cluster import initialize_use_ray
 
 from .observations.observations import Observations