Skip to content
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

Update users of moved TSL headers to use new location in XLA #3052

Merged
merged 1 commit into from
Jan 9, 2025
Merged

Update users of moved TSL headers to use new location in XLA #3052

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
257 changes: 129 additions & 128 deletions tsl/platform/BUILD
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion tsl/platform/abi.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ limitations under the License.

#include "tsl/platform/abi.h"

#include "tsl/platform/types.h"
#include "xla/tsl/platform/types.h"

#if defined(_MSC_VER)
#include <windows.h>
Expand Down
2 changes: 1 addition & 1 deletion tsl/platform/abi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ limitations under the License.

#include <string>

#include "tsl/platform/types.h"
#include "xla/tsl/platform/types.h"

namespace tsl {
namespace port {
Expand Down
2 changes: 1 addition & 1 deletion tsl/platform/abi_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ limitations under the License.

#include <typeinfo>

#include "tsl/platform/test.h"
#include "xla/tsl/platform/test.h"

namespace tsl {

Expand Down
6 changes: 3 additions & 3 deletions tsl/platform/base64.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ limitations under the License.
#include <memory>

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

namespace tsl {
namespace {
Expand Down
2 changes: 1 addition & 1 deletion tsl/platform/base64.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ limitations under the License.
#include <string>

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

namespace tsl {
Expand Down
2 changes: 1 addition & 1 deletion tsl/platform/blocking_counter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ limitations under the License.

#include <atomic>

#include "tsl/platform/logging.h"
#include "xla/tsl/platform/logging.h"
#include "tsl/platform/mutex.h"

namespace tsl {
Expand Down
2 changes: 1 addition & 1 deletion tsl/platform/coding.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ limitations under the License.

#include "tsl/platform/coding.h"

#include "xla/tsl/platform/types.h"
#include "tsl/platform/byte_order.h"
#include "tsl/platform/stringpiece.h"
#include "tsl/platform/tstring.h"
#include "tsl/platform/types.h"

namespace tsl {
namespace core {
Expand Down
2 changes: 1 addition & 1 deletion tsl/platform/coding.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ limitations under the License.
#ifndef TENSORFLOW_TSL_PLATFORM_CODING_H_
#define TENSORFLOW_TSL_PLATFORM_CODING_H_

#include "xla/tsl/platform/types.h"
#include "tsl/platform/stringpiece.h"
#include "tsl/platform/tstring.h"
#include "tsl/platform/types.h"

namespace tsl {
namespace core {
Expand Down
4 changes: 2 additions & 2 deletions tsl/platform/cpu_info.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ limitations under the License.
#include "tsl/platform/cpu_info.h"

#include "absl/base/call_once.h"
#include "tsl/platform/logging.h"
#include "xla/tsl/platform/logging.h"
#include "xla/tsl/platform/types.h"
#include "tsl/platform/platform.h"
#include "tsl/platform/types.h"
#if defined(PLATFORM_IS_X86)
#include <mutex> // NOLINT
#endif
Expand Down
2 changes: 1 addition & 1 deletion tsl/platform/cpu_info_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ limitations under the License.

#include "tsl/platform/cpu_info.h"

#include "tsl/platform/test.h"
#include "xla/tsl/platform/test.h"

namespace tsl {

Expand Down
2 changes: 1 addition & 1 deletion tsl/platform/criticality_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ limitations under the License.

#include "tsl/platform/criticality.h"

#include "tsl/platform/test.h"
#include "xla/tsl/platform/test.h"

namespace tsl {
namespace criticality {
Expand Down
2 changes: 1 addition & 1 deletion tsl/platform/ctstring_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ limitations under the License.
#include <memory>
#include <string>

#include "xla/tsl/platform/test.h"
#include "tsl/platform/ctstring_internal.h"
#include "tsl/platform/test.h"

static const char kLongString[] =
"abcdefghij"
Expand Down
2 changes: 1 addition & 1 deletion tsl/platform/demangle.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ limitations under the License.
#ifndef TENSORFLOW_TSL_PLATFORM_DEMANGLE_H_
#define TENSORFLOW_TSL_PLATFORM_DEMANGLE_H_

#include "tsl/platform/types.h"
#include "xla/tsl/platform/types.h"

namespace tsl {
namespace port {
Expand Down
2 changes: 1 addition & 1 deletion tsl/platform/denormal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ limitations under the License.
#ifndef TENSORFLOW_TSL_PLATFORM_DENORMAL_H_
#define TENSORFLOW_TSL_PLATFORM_DENORMAL_H_

#include "tsl/platform/macros.h"
#include "xla/tsl/platform/macros.h"

namespace tsl {
namespace port {
Expand Down
2 changes: 1 addition & 1 deletion tsl/platform/denormal_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ limitations under the License.
#include <cstring>
#include <limits>

#include "tsl/platform/test.h"
#include "xla/tsl/platform/test.h"

namespace tsl {
namespace port {
Expand Down
2 changes: 1 addition & 1 deletion tsl/platform/fingerprint.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ limitations under the License.
#ifndef TENSORFLOW_TSL_PLATFORM_FINGERPRINT_H_
#define TENSORFLOW_TSL_PLATFORM_FINGERPRINT_H_

#include "xla/tsl/platform/types.h"
#include "tsl/platform/platform.h"
#include "tsl/platform/stringpiece.h"
#include "tsl/platform/types.h"

#if TSL_IS_IN_OSS
#define USE_OSS_FARMHASH
Expand Down
4 changes: 2 additions & 2 deletions tsl/platform/fingerprint_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ limitations under the License.

#include <unordered_set>

#include "tsl/platform/test.h"
#include "tsl/platform/types.h"
#include "xla/tsl/platform/test.h"
#include "xla/tsl/platform/types.h"

namespace tsl {
namespace {
Expand Down
4 changes: 2 additions & 2 deletions tsl/platform/hash.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ limitations under the License.

#include <string.h>

#include "tsl/platform/macros.h"
#include "xla/tsl/platform/macros.h"
#include "xla/tsl/platform/types.h"
#include "tsl/platform/raw_coding.h"
#include "tsl/platform/types.h"

namespace tsl {

Expand Down
2 changes: 1 addition & 1 deletion tsl/platform/hash.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ limitations under the License.
#include <functional>
#include <string>

#include "xla/tsl/platform/types.h"
#include "tsl/platform/stringpiece.h"
#include "tsl/platform/types.h"

namespace tsl {

Expand Down
9 changes: 5 additions & 4 deletions tsl/platform/hash_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,15 @@ See the License for the specific language governing permissions and
limitations under the License.
==============================================================================*/

#include "tsl/platform/hash.h"

#include <map>
#include <unordered_map>
#include <vector>

#include "tsl/platform/hash.h"
#include "tsl/platform/logging.h"
#include "tsl/platform/test.h"
#include "tsl/platform/test_benchmark.h"
#include "xla/tsl/platform/logging.h"
#include "xla/tsl/platform/test.h"
#include "xla/tsl/platform/test_benchmark.h"

namespace tsl {

Expand Down
2 changes: 1 addition & 1 deletion tsl/platform/host_info.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ limitations under the License.

#include <cstdint>

#include "tsl/platform/types.h"
#include "xla/tsl/platform/types.h"

namespace tsl {
namespace port {
Expand Down
2 changes: 1 addition & 1 deletion tsl/platform/human_readable_json.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ limitations under the License.

#include "absl/status/status.h"
#include "absl/status/statusor.h"
#include "xla/tsl/platform/types.h"
#include "tsl/platform/protobuf.h"
#include "tsl/platform/types.h"

namespace tsl {

Expand Down
4 changes: 2 additions & 2 deletions tsl/platform/integral_types_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
limitations under the License.
==============================================================================*/

#include "tsl/platform/test.h"
#include "tsl/platform/types.h"
#include "xla/tsl/platform/test.h"
#include "xla/tsl/platform/types.h"

namespace tsl {
namespace {
Expand Down
2 changes: 1 addition & 1 deletion tsl/platform/intrusive_ptr_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ limitations under the License.

#include "tsl/platform/intrusive_ptr.h"

#include "xla/tsl/platform/test.h"
#include "tsl/platform/refcount.h"
#include "tsl/platform/test.h"

namespace tsl {
namespace core {
Expand Down
2 changes: 1 addition & 1 deletion tsl/platform/mem.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ limitations under the License.
#define TENSORFLOW_TSL_PLATFORM_MEM_H_

// TODO(cwhipkey): remove this when callers use annotations directly.
#include "xla/tsl/platform/types.h"
#include "tsl/platform/dynamic_annotations.h"
#include "tsl/platform/platform.h"
#include "tsl/platform/types.h"

namespace tsl {
namespace port {
Expand Down
4 changes: 2 additions & 2 deletions tsl/platform/mutex_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ limitations under the License.

#include "tsl/platform/mutex.h"

#include "tsl/platform/test.h"
#include "tsl/platform/threadpool.h"
#include "xla/tsl/platform/test.h"
#include "xla/tsl/platform/threadpool.h"

namespace tsl {
namespace {
Expand Down
4 changes: 2 additions & 2 deletions tsl/platform/net_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ limitations under the License.

#include "tsl/platform/net.h"

#include "tsl/platform/logging.h"
#include "tsl/platform/test.h"
#include "xla/tsl/platform/logging.h"
#include "xla/tsl/platform/test.h"

namespace tsl {
namespace internal {
Expand Down
6 changes: 3 additions & 3 deletions tsl/platform/null_file_system.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ limitations under the License.
#include <string>
#include <vector>

#include "tsl/platform/env.h"
#include "tsl/platform/file_system.h"
#include "tsl/platform/file_system_helper.h"
#include "xla/tsl/platform/env.h"
#include "xla/tsl/platform/file_system.h"
#include "xla/tsl/platform/file_system_helper.h"

namespace tsl {

Expand Down
2 changes: 1 addition & 1 deletion tsl/platform/numa.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ limitations under the License.
#ifndef TENSORFLOW_TSL_PLATFORM_NUMA_H_
#define TENSORFLOW_TSL_PLATFORM_NUMA_H_

#include "xla/tsl/platform/types.h"
#include "tsl/platform/platform.h"
#include "tsl/platform/types.h"

namespace tsl {
namespace port {
Expand Down
4 changes: 2 additions & 2 deletions tsl/platform/numa_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ limitations under the License.

#include "tsl/platform/numa.h"

#include "tsl/platform/logging.h"
#include "tsl/platform/test.h"
#include "xla/tsl/platform/logging.h"
#include "xla/tsl/platform/test.h"

namespace tsl {
namespace internal {
Expand Down
6 changes: 3 additions & 3 deletions tsl/platform/numbers.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ limitations under the License.

#include "absl/strings/str_cat.h"
#include "absl/strings/string_view.h"
#include "tsl/platform/logging.h"
#include "tsl/platform/macros.h"
#include "xla/tsl/platform/logging.h"
#include "xla/tsl/platform/macros.h"
#include "xla/tsl/platform/types.h"
#include "tsl/platform/stringprintf.h"
#include "tsl/platform/types.h"

namespace tsl {

Expand Down
2 changes: 1 addition & 1 deletion tsl/platform/numbers.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ limitations under the License.

#include "absl/base/macros.h"
#include "absl/strings/numbers.h"
#include "xla/tsl/platform/types.h"
#include "tsl/platform/stringpiece.h"
#include "tsl/platform/types.h"

namespace tsl {
namespace strings {
Expand Down
4 changes: 2 additions & 2 deletions tsl/platform/numbers_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ limitations under the License.
#include <string>

#include "absl/strings/str_cat.h"
#include "tsl/platform/test.h"
#include "tsl/platform/types.h"
#include "xla/tsl/platform/test.h"
#include "xla/tsl/platform/types.h"

namespace tsl {
namespace strings {
Expand Down
4 changes: 2 additions & 2 deletions tsl/platform/path.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@ limitations under the License.
#include <vector>

#include "absl/algorithm/container.h"
#include "tsl/platform/logging.h"
#include "xla/tsl/platform/logging.h"
#include "xla/tsl/platform/types.h"
#include "tsl/platform/mutex.h"
#include "tsl/platform/scanner.h"
#include "tsl/platform/str_util.h"
#include "tsl/platform/strcat.h"
#include "tsl/platform/stringpiece.h"
#include "tsl/platform/types.h"

namespace tsl {
namespace io {
Expand Down
2 changes: 1 addition & 1 deletion tsl/platform/path.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ limitations under the License.

#include <string>

#include "xla/tsl/platform/types.h"
#include "tsl/platform/stringpiece.h"
#include "tsl/platform/types.h"

namespace tsl {
namespace io {
Expand Down
4 changes: 2 additions & 2 deletions tsl/platform/path_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ limitations under the License.

#include <string>

#include "tsl/platform/env.h"
#include "xla/tsl/platform/env.h"
#include "xla/tsl/platform/test.h"
#include "tsl/platform/stringpiece.h"
#include "tsl/platform/test.h"

namespace tsl {
namespace io {
Expand Down
Loading
Loading