Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 31 additions & 0 deletions test/cpp/lazy/test_ir.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -142,5 +142,36 @@ TEST(IrTest, DimensionNodeTest) {
ASSERT_EQ(DIM0 * DIM1, mul_dim->getStaticValue());
}

TEST(IrTest, DimensionIsDynamicTest) {
const size_t DIM0 = 5;
const size_t DIM1 = 8;
const auto shape = Shape(c10::kFloat, {DIM0, DIM1});
NodePtr node1 = MakeNode<TsNode>(
OpKind(at::aten::view),
shape.with_symbolic_dims(std::vector<bool>{true, false}),
/*num_outputs*/ 1,
/*hash_seed*/ kHashSeed);

auto size0 =
std::dynamic_pointer_cast<SizeNode>(MakeNode<SizeNode>(Value{node1}, 0));
auto size1 =
std::dynamic_pointer_cast<SizeNode>(MakeNode<SizeNode>(Value{node1}, 1));

ASSERT_EQ(true, size0->isDynamic());
ASSERT_EQ(false, size1->isDynamic());

auto add_dim = std::dynamic_pointer_cast<SizeAdd>(
MakeNode<SizeAdd>(Value{size0}, Value{size1}));
ASSERT_EQ(true, add_dim->isDynamic());

add_dim = std::dynamic_pointer_cast<SizeAdd>(
MakeNode<SizeAdd>(Value{size1}, Value{size1}));
ASSERT_EQ(false, add_dim->isDynamic());

auto mul_dim = std::dynamic_pointer_cast<SizeMul>(
MakeNode<SizeMul>(Value{size0}, Value{size0}));
ASSERT_EQ(true, mul_dim->isDynamic());
}

} // namespace lazy
} // namespace torch
20 changes: 20 additions & 0 deletions torch/csrc/lazy/ts_backend/dynamic_ir.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,14 @@ SizeNode::SizeNode(Value input, size_t dim)
int64_t SizeNode::getStaticValue() const {
return dynamic_cast<const TsNode*>(operand(0).node)->shape(0).size(dim_);
}
bool SizeNode::isDynamic() const {
auto symbolic_vec =
dynamic_cast<const TsNode*>(operand(0).node)->shape(0).is_symbolic();
if (!symbolic_vec.has_value()) {
return true;
}
return symbolic_vec->at(dim_);
}

std::string SizeNode::ToString() const {
return "SizeNode";
Expand All @@ -55,6 +63,10 @@ int64_t SizeAdd::getStaticValue() const {
return getOpDimNode(0)->getStaticValue() + getOpDimNode(1)->getStaticValue();
}

bool SizeAdd::isDynamic() const {
return getOpDimNode(0)->isDynamic() || getOpDimNode(1)->isDynamic();
}

std::string SizeAdd::ToString() const {
return "SizeAdd";
}
Expand All @@ -66,6 +78,10 @@ int64_t SizeMul::getStaticValue() const {
return getOpDimNode(0)->getStaticValue() * getOpDimNode(1)->getStaticValue();
}

bool SizeMul::isDynamic() const {
return getOpDimNode(0)->isDynamic() || getOpDimNode(1)->isDynamic();
}

std::string SizeMul::ToString() const {
return "SizeMul";
}
Expand All @@ -80,6 +96,10 @@ int64_t SizeDiv::getStaticValue() const {
return getOpDimNode(0)->getStaticValue() / getOpDimNode(1)->getStaticValue();
}

bool SizeDiv::isDynamic() const {
return getOpDimNode(0)->isDynamic() || getOpDimNode(1)->isDynamic();
}

std::string SizeDiv::ToString() const {
return "SizeDiv";
}
Expand Down
9 changes: 5 additions & 4 deletions torch/csrc/lazy/ts_backend/dynamic_ir.h
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,7 @@ namespace lazy {
class TORCH_API DimensionNode : public lazy::TsNode {
public:
DimensionNode(OpKind op, OpList operands, hash_t hash_seed = kHashSeed);
bool isDynamic() {
return false;
}

virtual bool isDynamic() const = 0;
std::string ToString() const override;
virtual int64_t getStaticValue() const = 0;

Expand All @@ -63,6 +60,7 @@ class TORCH_API SizeNode : public DimensionNode {
public:
SizeNode(Value input, size_t dim);
int64_t getStaticValue() const override;
bool isDynamic() const override;
std::string ToString() const override;
size_t dim_ = 0;
virtual TSOpVector Lower(
Expand All @@ -74,20 +72,23 @@ class TORCH_API SizeAdd : public DimensionNode {
public:
SizeAdd(Value a, Value b);
int64_t getStaticValue() const override;
bool isDynamic() const override;
std::string ToString() const override;
};

class TORCH_API SizeMul : public DimensionNode {
public:
SizeMul(Value a, Value b);
int64_t getStaticValue() const override;
bool isDynamic() const override;
std::string ToString() const override;
};

class TORCH_API SizeDiv : public DimensionNode {
public:
SizeDiv(Value a, Value b);
int64_t getStaticValue() const override;
bool isDynamic() const override;
std::string ToString() const override;
};

Expand Down