Skip to content

Commit

Permalink
chore: CI fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
sebcrozet committed Jan 22, 2024
1 parent 9b87f06 commit bef72df
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 3 deletions.
1 change: 1 addition & 0 deletions src/dynamics/island_manager.rs
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@ impl IslandManager {
}

#[cfg(feature = "parallel")]
#[allow(dead_code)] // That will likely be useful when we re-introduce intra-island parallelism.
pub(crate) fn active_island_range(&self, island_id: usize) -> std::ops::Range<usize> {
self.active_islands[island_id]..self.active_islands[island_id + 1]
}
Expand Down
1 change: 1 addition & 0 deletions src/dynamics/joint/impulse_joint/impulse_joint_set.rs
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,7 @@ impl ImpulseJointSet {
// }

// #[cfg(not(feature = "parallel"))]
#[allow(dead_code)] // That will likely be useful when we re-introduce intra-island parallelism.
pub(crate) fn joints_mut(&mut self) -> &mut [JointGraphEdge] {
&mut self.joint_graph.graph.edges[..]
}
Expand Down
1 change: 1 addition & 0 deletions src/dynamics/joint/multibody_joint/multibody.rs
Original file line number Diff line number Diff line change
Expand Up @@ -943,6 +943,7 @@ impl Multibody {

#[cfg(feature = "parallel")]
#[inline]
#[allow(dead_code)] // That will likely be useful when we re-introduce intra-island parallelism.
pub(crate) fn num_active_internal_constraints_and_jacobian_lines(&self) -> (usize, usize) {
let num_constraints: usize = self
.links
Expand Down
2 changes: 2 additions & 0 deletions src/dynamics/solver/interaction_groups.rs
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ impl<'a> PairInteraction for JointGraphEdge {
}

#[cfg(feature = "parallel")]
#[allow(dead_code)] // That will likely be useful when we re-introduce intra-island parallelism.
pub(crate) struct ParallelInteractionGroups {
bodies_color: Vec<u128>, // Workspace.
interaction_indices: Vec<usize>, // Workspace.
Expand All @@ -41,6 +42,7 @@ pub(crate) struct ParallelInteractionGroups {
}

#[cfg(feature = "parallel")]
#[allow(dead_code)] // That will likely be useful when we re-introduce intra-island parallelism.
impl ParallelInteractionGroups {
pub fn new() -> Self {
Self {
Expand Down
6 changes: 3 additions & 3 deletions src/pipeline/physics_pipeline.rs
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ impl PhysicsPipeline {
// Intra-island parallelism (that hasn’t been ported to the new
// solver yet) will be supported in the future.
self.counters.solver.velocity_resolution_time.resume();
rayon::scope(|scope| {
rayon::scope(|_scope| {
enable_flush_to_zero!();

solvers
Expand All @@ -287,9 +287,9 @@ impl PhysicsPipeline {
islands,
bodies,
&mut manifolds[..],
&self.manifold_indices[island_id],
&manifold_indices[island_id],
impulse_joints,
&self.joint_constraint_indices[island_id],
&joint_constraint_indices[island_id],
multibody_joints,
)
});
Expand Down

0 comments on commit bef72df

Please sign in to comment.