Skip to content

Commit ed8c68e

Browse files
committed
Remove debug & validation files, and calling code.
1 parent 5630016 commit ed8c68e

File tree

6 files changed

+3
-158
lines changed

6 files changed

+3
-158
lines changed

genesis/engine/solvers/rigid/constraint_solver_decomp_island.py

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,7 @@
99
import genesis.utils.array_class as array_class
1010

1111
from .contact_island import ContactIsland
12-
from .rigid_debug import Debug
1312
from .rigid_solver_decomp_util import func_wakeup_entity_and_its_temp_island
14-
from .rigid_validate import (
15-
validate_entity_hibernation_state_for_all_entities_in_temp_island,
16-
validate_next_hibernated_entity_indices_in_entire_scene,
17-
)
1813

1914
if TYPE_CHECKING:
2015
from genesis.engine.colliders.collider import Collider
@@ -234,8 +229,6 @@ def add_collision_constraints_and_wakeup_entities(self, i_island: int, i_b: int)
234229
if is_entity_a_hibernated or is_entity_b_hibernated:
235230
# wake up entities
236231
any_hibernated_entity_idx = entity_idx_a if is_entity_a_hibernated else entity_idx_b
237-
temp_island_idx = self.contact_island.entity_island[any_hibernated_entity_idx, i_b]
238-
Debug.assertf(0x7AD00004, temp_island_idx == i_island) # Temp island indices don't match
239232

240233
func_wakeup_entity_and_its_temp_island(
241234
any_hibernated_entity_idx,
@@ -250,7 +243,7 @@ def add_collision_constraints_and_wakeup_entities(self, i_island: int, i_b: int)
250243
)
251244

252245
# after all collisions added for the island
253-
if ti.static(Debug.validate):
246+
if ti.static(False): # Debug.validate
254247
validate_entity_hibernation_state_for_all_entities_in_temp_island(
255248
i_island, i_b, self._solver.entities_state, self.contact_island, expected_hibernation_state=False
256249
)

genesis/engine/solvers/rigid/contact_island.py

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,12 @@
66
import genesis as gs
77
import genesis.utils.geom as gu
88

9-
from .rigid_debug import Debug
10-
119
if TYPE_CHECKING:
1210
from genesis.engine.solvers.rigid.collider_decomp import Collider
1311
from genesis.engine.solvers.rigid.rigid_solver_decomp import RigidSolver
1412

1513
INVALID_NEXT_HIBERNATED_ENTITY_IDX = -1
1614

17-
from .rigid_validate import validate_next_hibernated_entity_indices_in_entire_scene
18-
1915

2016
@ti.data_oriented
2117
class ContactIsland:
@@ -139,11 +135,6 @@ def add_hiberanted_edges_to_islands(self):
139135
for i_e in range(n_entities):
140136
next_entity_idx = self.entity_idx_to_next_entity_idx_in_hibernated_island[i_e, i_b]
141137
if next_entity_idx != INVALID_NEXT_HIBERNATED_ENTITY_IDX and next_entity_idx != i_e:
142-
if ti.static(Debug.validate):
143-
island_idx_a = self.entity_island[i_e, i_b]
144-
island_idx_b = self.entity_island[next_entity_idx, i_b]
145-
Debug.assertf(0x7AD00012, island_idx_a == island_idx_b)
146-
147138
any_link_a = self.solver.entities_info.link_start[i_e]
148139
any_link_b = self.solver.entities_info.link_start[next_entity_idx]
149140
self.add_edge(any_link_a, any_link_b, i_b)
@@ -253,7 +244,7 @@ def construct_islands(self):
253244
self.stack[self.n_stack[i_b], i_b] = i_v
254245
self.n_stack[i_b] = self.n_stack[i_b] + 1
255246
self.entity_island[i_v, i_b] = self.n_islands[i_b]
256-
if ti.static(Debug.validate):
247+
if ti.static(False): # Debug.validate
257248
if self.n_stack[i_b] > self.stack.shape[0]:
258249
capacity = self.stack.shape[0]
259250
print(f"Stack overflow! capacity and size: {capacity} < {self.n_stack[i_b]}")
@@ -277,7 +268,7 @@ def construct_islands(self):
277268
self.stack[self.n_stack[i_b], i_b] = next_v
278269
self.n_stack[i_b] = self.n_stack[i_b] + 1
279270
self.entity_island[next_v, i_b] = self.n_islands[i_b]
280-
if ti.static(Debug.validate):
271+
if ti.static(False): # Debug.validate
281272
if self.n_stack[i_b] > self.stack.shape[0]:
282273
capacity = self.stack.shape[0]
283274
print(f"Stack overflow! capacity and size: {capacity} < {self.n_stack[i_b]}")

genesis/engine/solvers/rigid/rigid_debug.py

Lines changed: 0 additions & 24 deletions
This file was deleted.

genesis/engine/solvers/rigid/rigid_solver_decomp.py

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,6 @@
1313
from genesis.engine.entities import AvatarEntity, DroneEntity, RigidEntity
1414
from genesis.engine.entities.base_entity import Entity
1515
from genesis.engine.solvers.rigid.contact_island import ContactIsland
16-
from genesis.engine.solvers.rigid.rigid_debug import Debug
17-
from genesis.engine.solvers.rigid.rigid_validate import (
18-
validate_entity_hibernation_state_for_all_entities_in_temp_island,
19-
validate_next_hibernated_entity_indices_in_entire_scene,
20-
)
2116
from genesis.engine.states.solvers import RigidSolverState
2217
from genesis.options.solvers import RigidOptions
2318
from genesis.styles import colors, formats
@@ -4937,21 +4932,13 @@ def func_hibernate__for_all_awake_islands_either_hiberanate_or_update_aabb_sort_
49374932
for island_idx in range(ci.n_islands[i_b]):
49384933
was_island_hibernated = ci.island_hibernated[island_idx, i_b]
49394934

4940-
if ti.static(Debug.validate):
4941-
validate_entity_hibernation_state_for_all_entities_in_temp_island(
4942-
island_idx, i_b, entities_state, contact_island, expected_hibernation_state=was_island_hibernated
4943-
)
4944-
49454935
if not was_island_hibernated:
49464936
are_all_entities_okay_for_hibernation = True
49474937
entity_ref_range = ci.island_entity[island_idx, i_b]
49484938
for i_entity_ref_offset_ in range(entity_ref_range.n):
49494939
entity_ref = entity_ref_range.start + i_entity_ref_offset_
49504940
entity_idx = ci.entity_id[entity_ref, i_b]
49514941

4952-
is_entity_fixed = entities_info.n_dofs[entity_idx] == 0
4953-
Debug.assertf(0x7AD00005, not is_entity_fixed) # Fixed entity should not belong to an island
4954-
49554942
# Hibernated entities already have zero dofs_state.acc/vel
49564943
is_entity_hibernated = entities_state.hibernated[entity_idx, i_b]
49574944
if is_entity_hibernated:
@@ -4997,11 +4984,6 @@ def func_hibernate__for_all_awake_islands_either_hiberanate_or_update_aabb_sort_
49974984
)
49984985

49994986
# store entities in the hibernated islands by daisy chaining them
5000-
Debug.assertf(
5001-
0x7AD00014,
5002-
ci.entity_idx_to_next_entity_idx_in_hibernated_island[prev_entity_idx, i_b]
5003-
== INVALID_NEXT_HIBERNATED_ENTITY_IDX,
5004-
)
50054987
ci.entity_idx_to_next_entity_idx_in_hibernated_island[prev_entity_idx, i_b] = entity_idx
50064988
prev_entity_idx = entity_idx
50074989

genesis/engine/solvers/rigid/rigid_solver_decomp_util.py

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,6 @@
33
import genesis.utils.array_class as array_class
44

55
from genesis.engine.solvers.rigid.contact_island import INVALID_NEXT_HIBERNATED_ENTITY_IDX
6-
from genesis.engine.solvers.rigid.rigid_debug import Debug
7-
from genesis.engine.solvers.rigid.rigid_validate import (
8-
validate_temp_island_contains_both_hibernated_and_awake_entities,
9-
validate_entity_hibernation_state_for_all_entities_in_temp_island,
10-
validate_next_hibernated_entity_indices_in_entire_scene,
11-
)
126

137

148
@ti.func
@@ -26,32 +20,13 @@ def func_wakeup_entity_and_its_temp_island(
2620
# Note: Original function handled non-hibernated & fixed entities.
2721
# Now, we require a properly hibernated entity to be passed in.
2822
island_idx = contact_island.entity_island[i_e, i_b]
29-
Debug.assertf(
30-
0x7AD00008, not contact_island.island_hibernated[island_idx, i_b]
31-
) # Island already expected to be marked as not hibernated
32-
33-
is_entity_fixed = island_idx == -1
34-
Debug.assertf(0x7AD00007, not is_entity_fixed) # Fixed entities are excluded from hibernation logic
35-
Debug.assertf(0x7AD0000B, entities_state.hibernated[i_e, i_b])
36-
37-
if ti.static(Debug.validate):
38-
validate_temp_island_contains_both_hibernated_and_awake_entities(
39-
island_idx, i_b, entities_state, contact_island
40-
)
4123

4224
entity_ref_range = contact_island.island_entity[island_idx, i_b]
4325
for ei in range(entity_ref_range.n):
4426
entity_ref = entity_ref_range.start + ei
4527
entity_idx = contact_island.entity_id[entity_ref, i_b]
46-
Debug.assertf(
47-
0x7AD0000D, contact_island.entity_island[entity_idx, i_b] == island_idx
48-
) # Unexpected entity from outside of island
4928

5029
is_entity_hibernated = entities_state.hibernated[entity_idx, i_b]
51-
next_hibernated_entity_idx = contact_island.entity_idx_to_next_entity_idx_in_hibernated_island[entity_idx, i_b]
52-
Debug.assertf(
53-
0x7AD0000E, is_entity_hibernated == (next_hibernated_entity_idx != INVALID_NEXT_HIBERNATED_ENTITY_IDX)
54-
) # Inconsistent entity state
5530

5631
if is_entity_hibernated:
5732
contact_island.entity_idx_to_next_entity_idx_in_hibernated_island[entity_idx, i_b] = (
@@ -80,10 +55,3 @@ def func_wakeup_entity_and_its_temp_island(
8055

8156
for i_g in range(entities_info.geom_start[entity_idx], entities_info.geom_end[entity_idx]):
8257
geoms_state.hibernated[i_g, i_b] = False
83-
84-
# contact_island.island_hibernated[island_idx, i_b] = False
85-
if ti.static(Debug.validate):
86-
validate_entity_hibernation_state_for_all_entities_in_temp_island(
87-
island_idx, i_b, entities_state, contact_island, expected_hibernation_state=False
88-
)
89-
validate_next_hibernated_entity_indices_in_entire_scene(i_b, entities_state, contact_island)

genesis/engine/solvers/rigid/rigid_validate.py

Lines changed: 0 additions & 65 deletions
This file was deleted.

0 commit comments

Comments
 (0)