Skip to content

[tsl] Clean up #includes in errors.h and status.h #3517

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
Open

[tsl] Clean up #includes in errors.h and status.h #3517

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
4 changes: 1 addition & 3 deletions tsl/platform/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,11 @@ cc_library(
srcs = ["base64.cc"],
hdrs = ["base64.h"],
deps = [
":stringpiece",
":tstring",
"@com_google_absl//absl/status",
"@com_google_absl//absl/strings:string_view",
"@xla//xla/tsl/platform:errors",
"@xla//xla/tsl/platform:macros",
"@xla//xla/tsl/platform:status",
"@xla//xla/tsl/platform:types",
],
)

Expand Down
30 changes: 17 additions & 13 deletions tsl/platform/base64.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ limitations under the License.

#include "tsl/platform/base64.h"

#include <cstdint>
#include <cstring>
#include <memory>

#include "absl/status/status.h"
#include "absl/strings/string_view.h"
#include "xla/tsl/platform/errors.h"
#include "xla/tsl/platform/macros.h"
#include "xla/tsl/platform/types.h"
#include "tsl/platform/stringpiece.h"

namespace tsl {
namespace {
Expand Down Expand Up @@ -201,16 +201,20 @@ absl::Status Base64Encode(absl::string_view source, bool with_padding,
return absl::OkStatus();
}

template Status Base64Decode<std::string>(StringPiece data,
std::string* decoded);
template Status Base64Encode<std::string>(StringPiece source,
std::string* encoded);
template Status Base64Encode<std::string>(StringPiece source, bool with_padding,
std::string* encoded);

template Status Base64Decode<tstring>(StringPiece data, tstring* decoded);
template Status Base64Encode<tstring>(StringPiece source, tstring* encoded);
template Status Base64Encode<tstring>(StringPiece source, bool with_padding,
tstring* encoded);
template absl::Status Base64Decode<std::string>(absl::string_view data,
std::string* decoded);
template absl::Status Base64Encode<std::string>(absl::string_view source,
std::string* encoded);
template absl::Status Base64Encode<std::string>(absl::string_view source,
bool with_padding,
std::string* encoded);

template absl::Status Base64Decode<tstring>(absl::string_view data,
tstring* decoded);
template absl::Status Base64Encode<tstring>(absl::string_view source,
tstring* encoded);
template absl::Status Base64Encode<tstring>(absl::string_view source,
bool with_padding,
tstring* encoded);

} // namespace tsl
33 changes: 16 additions & 17 deletions tsl/platform/base64.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@ limitations under the License.

#include "absl/status/status.h"
#include "absl/strings/string_view.h"
#include "xla/tsl/platform/status.h"
#include "tsl/platform/stringpiece.h"
#include "tsl/platform/tstring.h"

namespace tsl {

Expand All @@ -42,21 +41,21 @@ template <typename T>
absl::Status Base64Decode(absl::string_view data, T* decoded);

// Explicit instantiations defined in base64.cc.
extern template Status Base64Decode<std::string>(StringPiece data,
std::string* decoded);
extern template Status Base64Encode<std::string>(StringPiece source,
std::string* encoded);
extern template Status Base64Encode<std::string>(StringPiece source,
bool with_padding,
std::string* encoded);

extern template Status Base64Decode<tstring>(StringPiece data,
tstring* decoded);
extern template Status Base64Encode<tstring>(StringPiece source,
tstring* encoded);
extern template Status Base64Encode<tstring>(StringPiece source,
bool with_padding,
tstring* encoded);
extern template absl::Status Base64Decode<std::string>(absl::string_view data,
std::string* decoded);
extern template absl::Status Base64Encode<std::string>(absl::string_view source,
std::string* encoded);
extern template absl::Status Base64Encode<std::string>(absl::string_view source,
bool with_padding,
std::string* encoded);

extern template absl::Status Base64Decode<tstring>(absl::string_view data,
tstring* decoded);
extern template absl::Status Base64Encode<tstring>(absl::string_view source,
tstring* encoded);
extern template absl::Status Base64Encode<tstring>(absl::string_view source,
bool with_padding,
tstring* encoded);

} // namespace tsl

Expand Down
Loading