Skip to content

Add namespace qualifier to getOrderedAxisRefs and getReplicaGroups to support the submission of cl/872962070. #38192

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
copybara-service wants to merge 1 commit into
base: main
Choose a base branch
from
+6 −4
Open

Add namespace qualifier to getOrderedAxisRefs and getReplicaGroups to support the submission of cl/872962070. #38192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 4 additions & 3 deletions xla/service/spmd/shardy/stablehlo_round_trip/export_manual_reduction_collectives.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ mlir::DenseIntElementsAttr getReplicaGroups(
sdy::AxisRefListAttr reductionAxesAttr, MeshAttr mesh,
OpBuilder& rewriter) {
SmallVector<AxisRefAttr> meshAxisRefs =
getOrderedAxisRefs(reductionAxesAttr, mesh);
xla::sdy::getOrderedAxisRefs(reductionAxesAttr, mesh);

ArrayRef<AxisRefAttr> reductionAxes = reductionAxesAttr.getValue();
int64_t groupSize = 1;
Expand Down Expand Up @@ -204,7 +204,8 @@ void convertAllReduce(sdy::AllReduceOp op, int64_t channelId,
// `CollectiveOpGroupMode::kFlattenedID` mode.
auto newAllReduce = stablehlo::AllReduceOp::create(
blockBuilder, op.getLoc(), arg.getType(), arg,
getReplicaGroups(op.getReductionAxesAttr(), mesh, blockBuilder),
xla::sdy::getReplicaGroups(op.getReductionAxesAttr(), mesh,
blockBuilder),
channelHandle,
/*use_global_device_ids=*/true);
// No need to add a sharding to the all-reduce, since it's inside a
Expand Down Expand Up @@ -233,7 +234,7 @@ int64_t convertReduceScatter(sdy::ReduceScatterOp op, int64_t nextChannelId,
continue;
}
DenseIntElementsAttr replicaGroups =
getReplicaGroups(reductionAxes, mesh, blockBuilder);
xla::sdy::getReplicaGroups(reductionAxes, mesh, blockBuilder);
int64_t groupSize = replicaGroups.getShapedType().getShape().back();
CHECK_EQ(curShape[dim] % groupSize, 0) << kNonDivisibleShardingError;
curShape[dim] /= groupSize;
Expand Down
3 changes: 2 additions & 1 deletion xla/service/spmd/shardy/stablehlo_round_trip/export_shardings.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,8 @@ HloSharding convertToHloSharding(
}

// We will add all axes and let canonicalization merge adjacent axes.
SmallVector<AxisRefAttr> meshAxisRefs = getOrderedAxisRefs(sdySharding, mesh);
SmallVector<AxisRefAttr> meshAxisRefs =
xla::sdy::getOrderedAxisRefs(sdySharding, mesh);
SmallVector<int64_t> reshapeDims(meshAxisRefs.size());
SmallVector<int> transposePerm(meshAxisRefs.size());

Expand Down
Loading