Skip to content

Commit 888069b

Browse files
Change everywhere linesearch to iterative (newton-physics#1573)
1 parent b64ff5a commit 888069b

File tree

7 files changed

+8
-14
lines changed

7 files changed

+8
-14
lines changed

asv/benchmarks/benchmark_mujoco.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,55 +40,55 @@
4040
"integrator": "implicitfast",
4141
"njmax": 80,
4242
"nconmax": 25,
43-
"ls_parallel": True,
43+
"ls_parallel": False,
4444
"cone": "pyramidal",
4545
},
4646
"g1": {
4747
"solver": "newton",
4848
"integrator": "implicitfast",
4949
"njmax": 210,
5050
"nconmax": 35,
51-
"ls_parallel": True,
51+
"ls_parallel": False,
5252
"cone": "pyramidal",
5353
},
5454
"h1": {
5555
"solver": "newton",
5656
"integrator": "implicitfast",
5757
"njmax": 65,
5858
"nconmax": 15,
59-
"ls_parallel": True,
59+
"ls_parallel": False,
6060
"cone": "pyramidal",
6161
},
6262
"cartpole": {
6363
"solver": "newton",
6464
"integrator": "implicitfast",
6565
"njmax": 5,
6666
"nconmax": 0,
67-
"ls_parallel": True,
67+
"ls_parallel": False,
6868
"cone": "pyramidal",
6969
},
7070
"ant": {
7171
"solver": "newton",
7272
"integrator": "implicitfast",
7373
"njmax": 38,
7474
"nconmax": 15,
75-
"ls_parallel": True,
75+
"ls_parallel": False,
7676
"cone": "pyramidal",
7777
},
7878
"quadruped": {
7979
"solver": "newton",
8080
"integrator": "implicitfast",
8181
"njmax": 75,
8282
"nconmax": 50,
83-
"ls_parallel": True,
83+
"ls_parallel": False,
8484
"cone": "pyramidal",
8585
},
8686
"allegro": {
8787
"solver": "newton",
8888
"integrator": "implicitfast",
8989
"njmax": 60,
9090
"nconmax": 40,
91-
"ls_parallel": True,
91+
"ls_parallel": False,
9292
"cone": "elliptic",
9393
},
9494
"kitchen": {

newton/examples/contacts/example_sdf.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,6 @@ def __init__(self, viewer, num_worlds=1, num_per_world=1, scene="nut_bolt", solv
174174
nconmax=num_per_world,
175175
iterations=15,
176176
ls_iterations=100,
177-
ls_parallel=True,
178177
impratio=1.0,
179178
)
180179
else:

newton/examples/ik/example_ik_cube_stacking.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,6 @@ def __init__(self, viewer, num_worlds=4, headless=False, args=None):
238238
solver="newton",
239239
integrator="implicitfast",
240240
iterations=20,
241-
ls_parallel=True,
242241
ls_iterations=100,
243242
nconmax=1000,
244243
njmax=2000,

newton/examples/mpm/example_mpm_anymal.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,6 @@ def __init__(
154154
# setup solvers
155155
self.solver = newton.solvers.SolverMuJoCo(
156156
self.model,
157-
ls_parallel=True,
158157
ls_iterations=50,
159158
njmax=50, # ls_iterations=50 for determinism
160159
)

newton/examples/robot/example_robot_anymal_c_walk.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ def __init__(self, viewer, args=None):
171171
self.model,
172172
use_mujoco_contacts=use_mujoco_contacts,
173173
solver="newton",
174-
ls_parallel=True,
174+
ls_parallel=False,
175175
ls_iterations=50, # Increased from default 10 for determinism
176176
njmax=50,
177177
nconmax=100, # Increased from 75 to handle peak contact count of ~77

newton/examples/robot/example_robot_panda_hydro.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,6 @@ def __init__(self, viewer, scene=SceneType.PEN, num_worlds=1, test_mode=False):
251251
nconmax=500,
252252
iterations=15,
253253
ls_iterations=100,
254-
ls_parallel=True,
255254
impratio=1000.0,
256255
)
257256

newton/tests/test_hydroelastic.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ class ShapeType(Enum):
6262
njmax=500,
6363
nconmax=200,
6464
solver="newton",
65-
ls_parallel=True,
6665
ls_iterations=100,
6766
),
6867
"xpbd": lambda model: newton.solvers.SolverXPBD(model, iterations=10),
@@ -322,7 +321,6 @@ def test_mujoco_hydroelastic_penetration_depth(test, device):
322321
nconmax=2000,
323322
iterations=20,
324323
ls_iterations=100,
325-
ls_parallel=True,
326324
impratio=1000.0,
327325
)
328326

0 commit comments

Comments
 (0)