Merge pull request #24295 from ROCmSoftwarePlatform:upstream-staging-rename-gpu-device-array

PiperOrigin-RevId: 238321615
This commit is contained in:
TensorFlower Gardener 2019-03-13 15:45:45 -07:00
commit dd7daa8cc7
13 changed files with 22 additions and 22 deletions

View File

@ -232,8 +232,8 @@ tf_kernel_library(
"concat_lib_gpu_impl.cu.cc", "concat_lib_gpu_impl.cu.cc",
"concat_lib.h", "concat_lib.h",
"concat_lib_gpu.h", "concat_lib_gpu.h",
"cuda_device_array.h", "gpu_device_array.h",
"cuda_device_array_gpu.h", "gpu_device_array_gpu.h",
], ],
deps = [ deps = [
":bounds_check", ":bounds_check",
@ -632,7 +632,7 @@ tf_kernel_library(
"split_lib_gpu.h", "split_lib_gpu.h",
], ],
deps = [ deps = [
":cuda_device_array", ":gpu_device_array",
"//tensorflow/core:framework", "//tensorflow/core:framework",
"//third_party/eigen3", "//third_party/eigen3",
], ],
@ -684,10 +684,10 @@ cc_header_only_library(
) )
cc_library( cc_library(
name = "cuda_device_array", name = "gpu_device_array",
hdrs = [ hdrs = [
"cuda_device_array.h", "gpu_device_array.h",
"cuda_device_array_gpu.h", "gpu_device_array_gpu.h",
], ],
visibility = ["//tensorflow:__subpackages__"], visibility = ["//tensorflow:__subpackages__"],
deps = [ deps = [
@ -1118,14 +1118,14 @@ tf_kernel_library(
tf_kernel_library( tf_kernel_library(
name = "split_op", name = "split_op",
gpu_srcs = ["cuda_device_array.h"], gpu_srcs = ["gpu_device_array.h"],
prefix = "split_op", prefix = "split_op",
deps = ARRAY_DEPS + [":split_lib"], deps = ARRAY_DEPS + [":split_lib"],
) )
tf_kernel_library( tf_kernel_library(
name = "split_v_op", name = "split_v_op",
gpu_srcs = ["cuda_device_array.h"], gpu_srcs = ["gpu_device_array.h"],
prefix = "split_v_op", prefix = "split_v_op",
deps = ARRAY_DEPS + [":split_lib"], deps = ARRAY_DEPS + [":split_lib"],
) )
@ -2160,8 +2160,8 @@ tf_kernel_library(
tf_kernel_library( tf_kernel_library(
name = "dynamic_stitch_op", name = "dynamic_stitch_op",
gpu_srcs = [ gpu_srcs = [
"cuda_device_array.h", "gpu_device_array.h",
"cuda_device_array_gpu.h", "gpu_device_array_gpu.h",
], ],
prefix = "dynamic_stitch_op", prefix = "dynamic_stitch_op",
deps = DYNAMIC_DEPS, deps = DYNAMIC_DEPS,
@ -3309,7 +3309,7 @@ tf_kernel_library(
tf_kernel_library( tf_kernel_library(
name = "bucketize_op", name = "bucketize_op",
gpu_srcs = ["cuda_device_array.h"], gpu_srcs = ["gpu_device_array.h"],
prefix = "bucketize_op", prefix = "bucketize_op",
deps = ARRAY_DEPS, deps = ARRAY_DEPS,
) )

View File

@ -24,7 +24,7 @@ limitations under the License.
#include "tensorflow/core/framework/tensor.h" #include "tensorflow/core/framework/tensor.h"
#include "tensorflow/core/framework/tensor_shape.h" #include "tensorflow/core/framework/tensor_shape.h"
#include "tensorflow/core/kernels/bucketize_op.h" #include "tensorflow/core/kernels/bucketize_op.h"
#include "tensorflow/core/kernels/cuda_device_array.h" #include "tensorflow/core/kernels/gpu_device_array.h"
#include "tensorflow/core/platform/logging.h" #include "tensorflow/core/platform/logging.h"
#include "tensorflow/core/platform/types.h" #include "tensorflow/core/platform/types.h"
#include "tensorflow/core/util/cuda_kernel_helper.h" #include "tensorflow/core/util/cuda_kernel_helper.h"

View File

@ -27,7 +27,7 @@ limitations under the License.
#if GOOGLE_CUDA #if GOOGLE_CUDA
#include "tensorflow/core/kernels/concat_lib_gpu.h" #include "tensorflow/core/kernels/concat_lib_gpu.h"
#include "tensorflow/core/kernels/cuda_device_array.h" #include "tensorflow/core/kernels/gpu_device_array.h"
namespace tensorflow { namespace tensorflow {
namespace { namespace {

View File

@ -25,7 +25,7 @@ limitations under the License.
#include "third_party/eigen3/unsupported/Eigen/CXX11/Tensor" #include "third_party/eigen3/unsupported/Eigen/CXX11/Tensor"
#include "tensorflow/core/framework/register_types.h" #include "tensorflow/core/framework/register_types.h"
#include "tensorflow/core/kernels/concat_lib.h" #include "tensorflow/core/kernels/concat_lib.h"
#include "tensorflow/core/kernels/cuda_device_array_gpu.h" #include "tensorflow/core/kernels/gpu_device_array_gpu.h"
namespace tensorflow { namespace tensorflow {

View File

@ -24,7 +24,7 @@ limitations under the License.
#include "tensorflow/core/framework/register_types.h" #include "tensorflow/core/framework/register_types.h"
#include "tensorflow/core/framework/tensor_types.h" #include "tensorflow/core/framework/tensor_types.h"
#include "tensorflow/core/kernels/concat_lib_gpu.h" #include "tensorflow/core/kernels/concat_lib_gpu.h"
#include "tensorflow/core/kernels/cuda_device_array_gpu.h" #include "tensorflow/core/kernels/gpu_device_array_gpu.h"
#include "tensorflow/core/util/cuda_kernel_helper.h" #include "tensorflow/core/util/cuda_kernel_helper.h"
namespace tensorflow { namespace tensorflow {

View File

@ -22,7 +22,7 @@ limitations under the License.
#include "tensorflow/core/lib/core/threadpool.h" #include "tensorflow/core/lib/core/threadpool.h"
#ifdef GOOGLE_CUDA #ifdef GOOGLE_CUDA
#include "tensorflow/core/kernels/cuda_device_array.h" #include "tensorflow/core/kernels/gpu_device_array.h"
#endif // GOOGLE_CUDA #endif // GOOGLE_CUDA
namespace tensorflow { namespace tensorflow {

View File

@ -19,7 +19,7 @@ limitations under the License.
#include "tensorflow/core/framework/register_types.h" #include "tensorflow/core/framework/register_types.h"
#include "tensorflow/core/framework/tensor_types.h" #include "tensorflow/core/framework/tensor_types.h"
#include "tensorflow/core/kernels/cuda_device_array_gpu.h" #include "tensorflow/core/kernels/gpu_device_array_gpu.h"
#include "tensorflow/core/util/cuda_kernel_helper.h" #include "tensorflow/core/util/cuda_kernel_helper.h"
namespace tensorflow { namespace tensorflow {

View File

@ -19,7 +19,7 @@ limitations under the License.
#include "tensorflow/core/common_runtime/gpu/gpu_event_mgr.h" #include "tensorflow/core/common_runtime/gpu/gpu_event_mgr.h"
#include "tensorflow/core/framework/op_kernel.h" #include "tensorflow/core/framework/op_kernel.h"
#include "tensorflow/core/kernels/cuda_device_array_gpu.h" #include "tensorflow/core/kernels/gpu_device_array_gpu.h"
namespace tensorflow { namespace tensorflow {

View File

@ -23,7 +23,7 @@ limitations under the License.
#include "tensorflow/core/framework/register_types.h" #include "tensorflow/core/framework/register_types.h"
#include "tensorflow/core/framework/tensor_types.h" #include "tensorflow/core/framework/tensor_types.h"
#include "tensorflow/core/kernels/cuda_device_array_gpu.h" #include "tensorflow/core/kernels/gpu_device_array_gpu.h"
#include "tensorflow/core/kernels/split_lib_gpu.h" #include "tensorflow/core/kernels/split_lib_gpu.h"
#include "tensorflow/core/util/cuda_kernel_helper.h" #include "tensorflow/core/util/cuda_kernel_helper.h"

View File

@ -24,7 +24,7 @@ limitations under the License.
#include "third_party/eigen3/unsupported/Eigen/CXX11/Tensor" #include "third_party/eigen3/unsupported/Eigen/CXX11/Tensor"
#include "tensorflow/core/framework/register_types.h" #include "tensorflow/core/framework/register_types.h"
#include "tensorflow/core/kernels/cuda_device_array_gpu.h" #include "tensorflow/core/kernels/gpu_device_array_gpu.h"
#include "tensorflow/core/kernels/split_lib.h" #include "tensorflow/core/kernels/split_lib.h"
namespace tensorflow { namespace tensorflow {

View File

@ -29,7 +29,7 @@ limitations under the License.
#include "tensorflow/core/util/work_sharder.h" #include "tensorflow/core/util/work_sharder.h"
#if GOOGLE_CUDA #if GOOGLE_CUDA
#include "tensorflow/core/common_runtime/gpu/gpu_event_mgr.h" #include "tensorflow/core/common_runtime/gpu/gpu_event_mgr.h"
#include "tensorflow/core/kernels/cuda_device_array.h" #include "tensorflow/core/kernels/gpu_device_array.h"
#include "tensorflow/core/kernels/split_lib_gpu.h" #include "tensorflow/core/kernels/split_lib_gpu.h"
#include "tensorflow/core/platform/stream_executor.h" #include "tensorflow/core/platform/stream_executor.h"
#endif // GOOGLE_CUDA #endif // GOOGLE_CUDA

View File

@ -35,7 +35,7 @@ limitations under the License.
#include "tensorflow/core/util/work_sharder.h" #include "tensorflow/core/util/work_sharder.h"
#if GOOGLE_CUDA #if GOOGLE_CUDA
#include "tensorflow/core/common_runtime/gpu/gpu_event_mgr.h" #include "tensorflow/core/common_runtime/gpu/gpu_event_mgr.h"
#include "tensorflow/core/kernels/cuda_device_array.h" #include "tensorflow/core/kernels/gpu_device_array.h"
#include "tensorflow/core/kernels/split_lib_gpu.h" #include "tensorflow/core/kernels/split_lib_gpu.h"
#include "tensorflow/core/platform/stream_executor.h" #include "tensorflow/core/platform/stream_executor.h"
#endif // GOOGLE_CUDA #endif // GOOGLE_CUDA