Speed improvements in mj_solveLD (14% on Intel Skylake Xeon 36 cores).
PiperOrigin-RevId: 486960670 Change-Id: I8fce96427158ec36069dea893500059e93bd40db
This commit is contained in:
committed by
Copybara-Service
parent
9ffde761e8
commit
9fc9823a8c
@@ -30,6 +30,8 @@
|
||||
namespace mujoco {
|
||||
namespace {
|
||||
|
||||
using ::testing::NotNull;
|
||||
|
||||
ABSL_CONST_INIT static absl::Mutex handlers_mutex(absl::kConstInit);
|
||||
static int guard_count ABSL_GUARDED_BY(handlers_mutex) = 0;
|
||||
|
||||
@@ -80,6 +82,20 @@ mjModel* LoadModelFromString(std::string_view xml, char* error,
|
||||
return m;
|
||||
}
|
||||
|
||||
static void AssertModelNotNull(mjModel* model,
|
||||
const std::array<char, 1024>& error) {
|
||||
ASSERT_THAT(model, NotNull()) << "Failed to load model: " << error.data();
|
||||
}
|
||||
|
||||
mjModel* LoadModelFromPath(const char* model_path) {
|
||||
const std::string xml_path = GetModelPath(model_path);
|
||||
std::array<char, 1024> error;
|
||||
mjModel* model = mj_loadXML(
|
||||
xml_path.c_str(), nullptr, error.data(), error.size());
|
||||
AssertModelNotNull(model, error);
|
||||
return model;
|
||||
}
|
||||
|
||||
const std::string GetFileContents(const char* path) {
|
||||
std::ifstream ifs;
|
||||
ifs.open(path, std::ifstream::in);
|
||||
@@ -118,4 +134,18 @@ const std::string SaveAndReadXml(const mjModel* model) {
|
||||
return contents;
|
||||
}
|
||||
|
||||
void AddCtrlNoise(const mjModel* m, mjData* d, int step) {
|
||||
for (int i = 0; i < m->nu; i++) {
|
||||
mjtNum center = 0.0;
|
||||
mjtNum radius = 1.0;
|
||||
mjtNum* range = m->actuator_ctrlrange + 2 * i;
|
||||
if (m->actuator_ctrllimited[i]) {
|
||||
center = (range[1] + range[0]) / 2;
|
||||
radius = (range[1] - range[0]) / 2;
|
||||
}
|
||||
radius *= 0.01;
|
||||
d->ctrl[i] = center + radius * (2 * mju_Halton(step, i + 2) - 1);
|
||||
}
|
||||
}
|
||||
|
||||
} // namespace mujoco
|
||||
|
||||
Reference in New Issue
Block a user