chenlin/Mujoco_WASM
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove model/humanoid100/humanoid100.xml (used <include>), replace with model/humanoid/humanoid100.xml (uses <attach>)

Browse Source 
PiperOrigin-RevId: 673123895
Change-Id: I0c3c6dac69d9fc12a6ea76d586c34503fc167bad
This commit is contained in:
Yuval Tassa
2024-09-10 15:13:02 -07:00
committed by Copybara-Service
parent 33e56ccb88
commit 4e3dc14f8e
8 changed files with 23 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/benchmark/engine_util_sparse_benchmark_test.cc
+2 -2
View File
@@ -501,7 +501,7 @@ void ABSL_ATTRIBUTE_NO_TAIL_CALL BM_combineSparse_old(
BENCHMARK(BM_combineSparse_old);
static void BM_transposeSparse(benchmark::State& state, TransposeFuncPtr func) {
static mjModel* m = LoadModelFromPath("humanoid100/humanoid100.xml");
static mjModel* m = LoadModelFromPath("humanoid/humanoid100.xml");
// force use of sparse matrices
m->opt.jacobian = mjJAC_SPARSE;
@@ -547,7 +547,7 @@ BM_transposeSparse_old(benchmark::State& state) {
BENCHMARK(BM_transposeSparse_old);
static void BM_sqrMatTDSparse(benchmark::State& state, SqrMatTDFuncPtr func) {
static mjModel* m = LoadModelFromPath("humanoid100/humanoid100.xml");
static mjModel* m = LoadModelFromPath("humanoid/humanoid100.xml");
mjData* d = mj_makeData(m);
// force use of sparse matrices
test/benchmark/parse_benchmark_test.cc
+1 -1
View File
@@ -86,7 +86,7 @@ void ABSL_ATTRIBUTE_NO_TAIL_CALL BM_ParseHumanoid(benchmark::State& state) {
BENCHMARK(BM_ParseHumanoid);
void ABSL_ATTRIBUTE_NO_TAIL_CALL BM_ParseHumanoid100(benchmark::State& state) {
run_parse_benchmark(GetModelPath("humanoid100/humanoid100.xml"), state);
run_parse_benchmark(GetModelPath("humanoid/humanoid100.xml"), state);
}
BENCHMARK(BM_ParseHumanoid100);
test/benchmark/step_benchmark_test.cc
+1 -1
View File
@@ -103,7 +103,7 @@ BENCHMARK(BM_StepHumanoid);
void ABSL_ATTRIBUTE_NO_TAIL_CALL BM_StepHumanoid100(benchmark::State& state) {
MujocoErrorTestGuard guard;
static mjModel* model = LoadModelFromPath("humanoid100/humanoid100.xml");
static mjModel* model = LoadModelFromPath("humanoid/humanoid100.xml");
run_step_benchmark(model, state);
}
BENCHMARK(BM_StepHumanoid100);
test/engine/engine_support_test.cc
+1 -1
View File
@@ -692,7 +692,7 @@ TEST_F(SupportTest, GetSetStateStepEqual) {
using AddMTest = MujocoTest;
TEST_F(AddMTest, DenseSameAsSparse) {
mjModel* m = LoadModelFromPath("humanoid100/humanoid100.xml");
mjModel* m = LoadModelFromPath("humanoid/humanoid100.xml");
mjData* d = mj_makeData(m);
int nv = m->nv;
test/sample/compile_test.sh
+1 -1
View File
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
MODEL="${CMAKE_SOURCE_DIR}/model/humanoid100/humanoid100.xml"
MODEL="${CMAKE_SOURCE_DIR}/model/humanoid/humanoid100.xml"
OUTPUT_FILE="${TEST_TMPDIR}/compiled.mjb"