mirror of
https://github.com/pytorch/pytorch.git
synced 2026-11-20 09:04:25 +08:00
[C++ API] Cursors (#8190)
* Add cursors to C++ API * Small self nits * s/struct/class * Use more STL like names for cursors
This commit is contained in:
committed by
GitHub
parent
77660a9cbb
commit
de4e97e89a
+36
-43
@@ -20,16 +20,6 @@ bool pointer_equal(at::Tensor first, at::Tensor second) {
|
||||
return first.data<float>() == second.data<float>();
|
||||
}
|
||||
|
||||
struct TestModule : public CloneableModule<TestModule> {
|
||||
void reset() override {
|
||||
weight =
|
||||
register_parameter("weight", at::ones(at::CPU(at::kFloat), {4, 4}));
|
||||
}
|
||||
|
||||
Variable weight;
|
||||
int value = 0;
|
||||
};
|
||||
|
||||
TEST_CASE("module/training-mode") {
|
||||
auto module = Linear(3, 4).build();
|
||||
REQUIRE(module->is_training());
|
||||
@@ -49,13 +39,13 @@ TEST_CASE("module/zero-grad") {
|
||||
auto loss = module->forward({weight}).front().sum();
|
||||
loss.backward();
|
||||
for (auto& parameter : module->parameters()) {
|
||||
Variable grad = parameter.second.grad();
|
||||
Variable grad = parameter->grad();
|
||||
REQUIRE(grad.defined());
|
||||
REQUIRE(grad.sum().toCFloat() != 0);
|
||||
}
|
||||
module->zero_grad();
|
||||
for (auto& parameter : module->parameters()) {
|
||||
Variable grad = parameter.second.grad();
|
||||
Variable grad = parameter->grad();
|
||||
REQUIRE(grad.defined());
|
||||
REQUIRE(grad.sum().toCFloat() == 0);
|
||||
}
|
||||
@@ -78,39 +68,39 @@ TEST_CASE("module/conversions", "[cuda]") {
|
||||
auto module = LSTM(128, 64).layers(3).dropout(0.2).build();
|
||||
SECTION("starts as float on CPU") {
|
||||
for (auto& parameter : module->parameters()) {
|
||||
REQUIRE(parameter.second.type().backend() == at::kCPU);
|
||||
REQUIRE(parameter.second.type().scalarType() == at::kFloat);
|
||||
REQUIRE(parameter->type().backend() == at::kCPU);
|
||||
REQUIRE(parameter->type().scalarType() == at::kFloat);
|
||||
}
|
||||
}
|
||||
SECTION("to(CUDA)") {
|
||||
module->cuda();
|
||||
for (auto& parameter : module->parameters()) {
|
||||
REQUIRE(parameter.second.type().backend() == at::kCUDA);
|
||||
REQUIRE(parameter->type().backend() == at::kCUDA);
|
||||
}
|
||||
}
|
||||
SECTION("to(CPU)") {
|
||||
module->to(at::kCPU);
|
||||
for (auto& parameter : module->parameters()) {
|
||||
REQUIRE(parameter.second.type().backend() == at::kCPU);
|
||||
REQUIRE(parameter->type().backend() == at::kCPU);
|
||||
}
|
||||
}
|
||||
SECTION("to(Int)") {
|
||||
module->to(at::kInt);
|
||||
for (auto& parameter : module->parameters()) {
|
||||
REQUIRE(parameter.second.type().scalarType() == at::kInt);
|
||||
REQUIRE(parameter->type().scalarType() == at::kInt);
|
||||
}
|
||||
}
|
||||
SECTION("to(Double)") {
|
||||
module->to(at::kDouble);
|
||||
for (auto& parameter : module->parameters()) {
|
||||
REQUIRE(parameter.second.type().scalarType() == at::kDouble);
|
||||
REQUIRE(parameter->type().scalarType() == at::kDouble);
|
||||
}
|
||||
}
|
||||
SECTION("to(CUDA(Float))") {
|
||||
module->to(at::CUDA(at::kFloat));
|
||||
for (auto& parameter : module->parameters()) {
|
||||
REQUIRE(parameter.second.type().backend() == at::kCUDA);
|
||||
REQUIRE(parameter.second.type().scalarType() == at::kFloat);
|
||||
REQUIRE(parameter->type().backend() == at::kCUDA);
|
||||
REQUIRE(parameter->type().scalarType() == at::kFloat);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -118,11 +108,7 @@ TEST_CASE("module/conversions", "[cuda]") {
|
||||
TEST_CASE("module/clone") {
|
||||
SECTION(
|
||||
"a module that does not override clone() throws when clone() is called") {
|
||||
struct UnCloneable : Module {
|
||||
std::vector<Variable> forward(std::vector<Variable>) {
|
||||
return {};
|
||||
}
|
||||
};
|
||||
struct UnCloneable : Module {};
|
||||
UnCloneable module;
|
||||
REQUIRE_THROWS_WITH(
|
||||
module.clone(), StartsWith("clone() has not been implemented"));
|
||||
@@ -131,9 +117,6 @@ TEST_CASE("module/clone") {
|
||||
SECTION(
|
||||
"a module that overrides clone() does not throw when clone() is called ") {
|
||||
struct Cloneable : Module {
|
||||
std::vector<Variable> forward(std::vector<Variable>) {
|
||||
return {};
|
||||
}
|
||||
std::shared_ptr<Module> clone() const override {
|
||||
return nullptr;
|
||||
}
|
||||
@@ -159,17 +142,17 @@ TEST_CASE("module/clone") {
|
||||
auto m1param = module->parameters();
|
||||
auto m2param = module2->parameters();
|
||||
for (auto& param : m1param) {
|
||||
REQUIRE(!pointer_equal(param.second, m2param[param.first]));
|
||||
REQUIRE(param.second.allclose(m2param[param.first]));
|
||||
param.second.data().mul_(2);
|
||||
REQUIRE(!pointer_equal(param.value, m2param[param.key]));
|
||||
REQUIRE(param->allclose(m2param[param.key]));
|
||||
param->data().mul_(2);
|
||||
}
|
||||
for (auto& param : m1param) {
|
||||
REQUIRE(!param.second.allclose(m2param[param.first]));
|
||||
REQUIRE(!param->allclose(m2param[param.key]));
|
||||
}
|
||||
}
|
||||
|
||||
SECTION("Cloning preserves external references") {
|
||||
struct TestModel : public CloneableModule<TestModel> {
|
||||
struct TestModule : public CloneableModule<TestModule> {
|
||||
void reset() override {
|
||||
weight =
|
||||
register_parameter("weight", at::ones(at::CPU(at::kFloat), {4, 4}));
|
||||
@@ -178,19 +161,28 @@ TEST_CASE("module/clone") {
|
||||
};
|
||||
auto module = TestModule().build();
|
||||
module->weight.data() += 1;
|
||||
REQUIRE(pointer_equal(module->weight, module->param("weight")));
|
||||
REQUIRE(module->weight.allclose(module->param("weight")));
|
||||
REQUIRE(pointer_equal(module->weight, module->parameters()["weight"]));
|
||||
REQUIRE(module->weight.allclose(module->parameters()["weight"]));
|
||||
|
||||
auto module2 = std::dynamic_pointer_cast<TestModule>(
|
||||
std::shared_ptr<Module>(module->clone()));
|
||||
REQUIRE(!pointer_equal(module2->weight, module->weight));
|
||||
REQUIRE(pointer_equal(module2->weight, module2->param("weight")));
|
||||
REQUIRE(module2->weight.allclose(module2->param("weight")));
|
||||
REQUIRE(pointer_equal(module2->weight, module2->parameters()["weight"]));
|
||||
REQUIRE(module2->weight.allclose(module2->parameters()["weight"]));
|
||||
REQUIRE(module2->weight.allclose(module->weight));
|
||||
REQUIRE(!pointer_equal(module2->weight, module->param("weight")));
|
||||
REQUIRE(!pointer_equal(module2->weight, module->parameters()["weight"]));
|
||||
}
|
||||
|
||||
SECTION("Cloning copies the values of variables of submodules") {
|
||||
struct TestModule : public CloneableModule<TestModule> {
|
||||
void reset() override {
|
||||
weight =
|
||||
register_parameter("weight", at::ones(at::CPU(at::kFloat), {4, 4}));
|
||||
}
|
||||
|
||||
Variable weight;
|
||||
int value = 0;
|
||||
};
|
||||
struct NestedModule : public CloneableModule<NestedModule> {
|
||||
void reset() override {
|
||||
module = register_module("module", TestModule().build());
|
||||
@@ -205,8 +197,9 @@ TEST_CASE("module/clone") {
|
||||
auto b = std::static_pointer_cast<NestedModule>(a->clone());
|
||||
|
||||
REQUIRE(!pointer_equal(b->module->weight, a->module->weight));
|
||||
REQUIRE(pointer_equal(b->module->weight, b->module->param("weight")));
|
||||
REQUIRE(b->module->param("weight").allclose(a->module->weight));
|
||||
REQUIRE(
|
||||
pointer_equal(b->module->weight, b->module->parameters()["weight"]));
|
||||
REQUIRE(b->module->parameters()["weight"].allclose(a->module->weight));
|
||||
REQUIRE(b->module->weight.allclose(a->module->weight));
|
||||
REQUIRE(b->module->value == a->module->value);
|
||||
}
|
||||
@@ -231,8 +224,8 @@ TEST_CASE("module/parameters") {
|
||||
|
||||
SECTION("contains parameters with the correct name") {
|
||||
auto parameters = module.parameters();
|
||||
REQUIRE(parameters.count("a"));
|
||||
REQUIRE(parameters.count("b"));
|
||||
REQUIRE(parameters.count("c"));
|
||||
REQUIRE(parameters.contains("a"));
|
||||
REQUIRE(parameters.contains("b"));
|
||||
REQUIRE(parameters.contains("c"));
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user