Remove plugin support from Composite particles.
This functionality is replaced by FlexComp. PiperOrigin-RevId: 672503965 Change-Id: I58953267de285f82e416f9f60576a336b7d0da4c
This commit is contained in:
committed by
Copybara-Service
parent
44145742a7
commit
4862b9e765
@@ -348,7 +348,7 @@ void ABSL_ATTRIBUTE_NOINLINE mulMatVecSparse_8(mjtNum* res,
|
||||
// ----------------------------- benchmark ------------------------------------
|
||||
|
||||
static void BM_MatVecSparse(benchmark::State& state, int unroll) {
|
||||
static mjModel* m = LoadModelFromPath("plugin/elasticity/flag.xml");
|
||||
static mjModel* m = LoadModelFromPath("plugin/elasticity/flag_flex.xml");
|
||||
mjData* d = mj_makeData(m);
|
||||
|
||||
// warm-up rollout to get a typical state
|
||||
|
||||
@@ -70,7 +70,7 @@ static void run_parse_benchmark(const std::string xml_path,
|
||||
// run_parse_benchmark).
|
||||
|
||||
void ABSL_ATTRIBUTE_NO_TAIL_CALL BM_ParseFlagPlugin(benchmark::State& state) {
|
||||
run_parse_benchmark(GetModelPath("plugin/elasticity/flag.xml"), state);
|
||||
run_parse_benchmark(GetModelPath("plugin/elasticity/flag_flex.xml"), state);
|
||||
}
|
||||
BENCHMARK(BM_ParseFlagPlugin);
|
||||
|
||||
|
||||
@@ -74,7 +74,7 @@ static void run_step_benchmark(const mjModel* model, benchmark::State& state) {
|
||||
|
||||
void ABSL_ATTRIBUTE_NO_TAIL_CALL BM_StepFlagPlugin(benchmark::State& state) {
|
||||
MujocoErrorTestGuard guard;
|
||||
static mjModel* model = LoadModelFromPath("plugin/elasticity/flag.xml");
|
||||
static mjModel* model = LoadModelFromPath("plugin/elasticity/flag_flex.xml");
|
||||
run_step_benchmark(model, state);
|
||||
}
|
||||
BENCHMARK(BM_StepFlagPlugin);
|
||||
|
||||
Reference in New Issue
Block a user