Skip to content

Commit

Permalink
Replace the use of xla::OkStatus with absl::OkStatus now that they're…
Browse files Browse the repository at this point in the history
… the same.

PiperOrigin-RevId: 635902683
  • Loading branch information
klucke authored and tensorflower-gardener committed May 21, 2024
1 parent 8424337 commit 18dfbc3
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3289,7 +3289,7 @@ absl::Status GenerateReduceScatter(
.output_sharding);
TF_RETURN_IF_ERROR(inst->ReplaceAllUsesWith(replace_with));
}
return OkStatus();
return absl::OkStatus();
}

void AnnotateShardingWithSimpleHeuristic(
Expand Down Expand Up @@ -3447,7 +3447,7 @@ absl::Status FilterStrategy(const HloInstruction* ins, const Shape& shape,
<< ins->ToString() << " does not have any valid strategies";
strategy_group->strategies = std::move(new_strategies);

return OkStatus();
return absl::OkStatus();
}

// Return the output sharding of the reduce-scatter variant of a given strategy.
Expand Down Expand Up @@ -3744,7 +3744,7 @@ absl::Status AutoShardingImplementation::CanonicalizeLayouts(
HloModule* module) {
if (!module->layout_canonicalization_callback()) {
LOG(INFO) << "There is no registered layout_canonicalization_callback.";
return OkStatus();
return absl::OkStatus();
}
TF_ASSIGN_OR_RETURN(auto layouts,
module->layout_canonicalization_callback()(*module));
Expand All @@ -3763,7 +3763,7 @@ absl::Status AutoShardingImplementation::CanonicalizeLayouts(
}
*module->mutable_config().mutable_entry_computation_layout() =
entry_computation_layout;
return OkStatus();
return absl::OkStatus();
}

// Computes the set of instructions that lie outside any manually partitioned
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ limitations under the License.
#include "absl/container/flat_hash_set.h"
#include "absl/log/check.h"
#include "absl/log/log.h"
#include "absl/status/status.h"
#include "absl/strings/match.h"
#include "absl/strings/str_cat.h"
#include "absl/strings/str_format.h"
Expand Down Expand Up @@ -1035,7 +1036,7 @@ absl::Status DotHandler::RegisterStrategies() {
cluster_env_, batch_map_, option_));
}

return OkStatus();
return absl::OkStatus();
}

/************** ConvHandler function definitions **************/
Expand Down Expand Up @@ -1106,7 +1107,7 @@ absl::Status ConvHandler::RegisterStrategies() {
cluster_env_, batch_map_, option_));
}

return OkStatus();
return absl::OkStatus();
}

void ConvHandler::SplitLhsBatchRhsOutchannel() {
Expand Down Expand Up @@ -1233,7 +1234,7 @@ absl::Status HandleDot(std::unique_ptr<StrategyGroup>& strategy_group,
instruction_id, instruction_sequence, hlo_cost_analysis,
cluster_env, batch_map, option, call_graph);
TF_RETURN_IF_ERROR(handler.RegisterStrategies());
return OkStatus();
return absl::OkStatus();
}

// Register strategies for convolution instructions.
Expand Down Expand Up @@ -1266,7 +1267,7 @@ absl::Status HandleConv(std::unique_ptr<StrategyGroup>& strategy_group,
TF_RETURN_IF_ERROR(handler.RegisterStrategies());
}

return OkStatus();
return absl::OkStatus();
}

} // namespace spmd
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ limitations under the License.
#include <ostream>
#include <string>

#include "absl/status/status.h"
#include "xla/hlo/experimental/auto_sharding/auto_sharding.h"
#include "xla/hlo/ir/hlo_module.h"
#include "xla/service/hlo_parser.h"
Expand Down Expand Up @@ -44,7 +45,7 @@ absl::Status RunAutoShardingPassFromFile(const std::string& file_name) {
TF_ASSIGN_OR_RETURN(bool changed, AutoSharding(option).Run(hlo_module.get()));
CHECK(changed);
std::cout << hlo_module->ToString() << std::endl;
return OkStatus();
return absl::OkStatus();
}

} // namespace
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ limitations under the License.
#include "absl/container/flat_hash_set.h"
#include "absl/log/check.h"
#include "absl/log/log.h"
#include "absl/status/status.h"
#include "absl/strings/str_cat.h"
#include "absl/time/clock.h"
#include "absl/time/time.h"
Expand Down Expand Up @@ -1268,7 +1269,7 @@ absl::Status ValidateRequest(const AutoShardingSolverRequest& request) {
const int num_v_strategies = request.computation_costs(v).costs_size();
CHECK_EQ(num_strategies, num_u_strategies * num_v_strategies);
}
return OkStatus();
return absl::OkStatus();
}

} // namespace spmd
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1859,7 +1859,7 @@ absl::Status CheckAliasSetCompatibility(const AliasSet& alias_set,
}
}
}
return OkStatus();
return absl::OkStatus();
}

size_t VectorGreaterThanOneElementCount(absl::Span<const int64_t> span,
Expand Down

0 comments on commit 18dfbc3

Please sign in to comment.