Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Nt/seed propagate #135

Merged
merged 2 commits into from
Jan 10, 2025
Merged

Nt/seed propagate #135

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e5bfa4
add a seed for variant orbits in propagate_orbits
ntellis Jan 6, 2025
983fdfb
Ensure seed is passed to all VariantOrbits.create and sort varianats …
akoumjian Jan 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Ensure seed is passed to all VariantOrbits.create and sort varianats … 
…before collapse
  • Loading branch information
@akoumjian
akoumjian committed Jan 7, 2025
commit 983fdfb6d950e54dcb4ce9ffbcccdb24ef10c135
41 changes: 31 additions & 10 deletions src/adam_core/propagator/propagator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,7 @@ def generate_ephemeris(
num_samples: int = 1000,
chunk_size: int = 100,
max_processes: Optional[int] = 1,
seed: Optional[int] = None,
) -> Ephemeris:
"""
Generate ephemerides for each orbit in orbits as observed by each observer
Expand Down Expand Up @@ -376,18 +377,20 @@ def generate_ephemeris(
# Add variants to futures (if we have any)
if covariance is True and not orbits.coordinates.covariance.is_all_nan():
variants = VariantOrbits.create(
orbits, method=covariance_method, num_samples=num_samples
orbits,
method=covariance_method,
num_samples=num_samples,
seed=seed,
)

# Add variants to object store
variants_ref = ray.put(variants)

idx = np.arange(0, len(variants))
for variant_chunk in _iterate_chunks(idx, chunk_size):
idx_chunk = ray.put(variant_chunk)
for variant_chunk_idx in _iterate_chunks(idx, chunk_size):
futures.append(
ephemeris_worker_ray.remote(
idx_chunk,
variant_chunk_idx,
variants_ref,
observers_ref,
self.__class__,
Expand Down Expand Up @@ -420,7 +423,10 @@ def generate_ephemeris(

if covariance is True and not orbits.coordinates.covariance.is_all_nan():
variants = VariantOrbits.create(
orbits, method=covariance_method, num_samples=num_samples
orbits,
method=covariance_method,
num_samples=num_samples,
seed=seed,
)
ephemeris_variants = self._generate_ephemeris(variants, observers)
else:
Expand Down Expand Up @@ -553,16 +559,19 @@ def propagate_orbits(
# Add variants to propagate to futures
if covariance is True and not orbits.coordinates.covariance.is_all_nan():
variants = VariantOrbits.create(
orbits, method=covariance_method, num_samples=num_samples, seed=seed
orbits,
method=covariance_method,
num_samples=num_samples,
seed=seed,
)

variants_ref = ray.put(variants)

idx = np.arange(0, len(variants))
for variant_chunk in _iterate_chunks(idx, chunk_size):
idx_chunk = ray.put(variant_chunk)
for variant_chunk_idx in _iterate_chunks(idx, chunk_size):
futures.append(
propagation_worker_ray.remote(
idx_chunk,
variant_chunk_idx,
variants_ref,
times_ref,
self.__class__,
Expand All @@ -588,6 +597,10 @@ def propagate_orbits(
propagated = qv.concatenate(propagated_list)
if len(variants_list) > 0:
propagated_variants = qv.concatenate(variants_list)
# sort by variant_id and time
propagated_variants = propagated_variants.sort_by(
["variant_id", "coordinates.time.days", "coordinates.time.nanos"]
)
else:
propagated_variants = None

Expand All @@ -596,9 +609,17 @@ def propagate_orbits(

if covariance is True and not orbits.coordinates.covariance.is_all_nan():
variants = VariantOrbits.create(
orbits, method=covariance_method, num_samples=num_samples
orbits,
method=covariance_method,
num_samples=num_samples,
seed=seed,
)

propagated_variants = self._propagate_orbits(variants, times)
# sort by variant_id and time
propagated_variants = propagated_variants.sort_by(
["variant_id", "coordinates.time.days", "coordinates.time.nanos"]
)
else:
propagated_variants = None

Expand Down
Loading