Skip to content

Commit 8cc567b

Browse files
Vijay Vasudevantensorflower-gardener
Vijay Vasudevan
authored and
tensorflower-gardener
committed
Merge changes from github.
Change: 123342870
1 parent 9a69f39 commit 8cc567b

33 files changed

Lines changed: 282 additions & 323 deletions

File tree

‎WORKSPACE‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
workspace(name = "org_tensorflow")
2+
13
# Uncomment and update the paths in these entries to build the Android demo.
24
#android_sdk_repository(
35
# name = "androidsdk",

‎tensorflow/contrib/util/BUILD‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,10 @@ cc_binary(
3636
cc_test(
3737
name = "convert_graphdef_memmapped_format_test",
3838
srcs = ["convert_graphdef_memmapped_format_test.cc"],
39+
linkopts = select({
40+
"//tensorflow:darwin": ["-headerpad_max_install_names"],
41+
"//conditions:default": [],
42+
}),
3943
deps = [
4044
":convert_graphdef_memmapped_format_lib",
4145
"//tensorflow/cc:cc_ops",

‎tensorflow/core/BUILD‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1231,6 +1231,10 @@ cc_test(
12311231
# higher level tests
12321232
tf_cc_tests(
12331233
size = "small",
1234+
linkopts = select({
1235+
"//tensorflow:darwin": ["-headerpad_max_install_names"],
1236+
"//conditions:default": [],
1237+
}),
12341238
linkstatic = tf_kernel_tests_linkstatic(),
12351239
tests = glob(
12361240
[

‎tensorflow/core/distributed_runtime/rpc/BUILD‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -324,6 +324,10 @@ cc_library(
324324

325325
tf_cuda_cc_tests(
326326
size = "small",
327+
linkopts = select({
328+
"//tensorflow:darwin": ["-headerpad_max_install_names"],
329+
"//conditions:default": [],
330+
}),
327331
linkstatic = tf_kernel_tests_linkstatic(),
328332
tags = tf_cuda_tests_tags() + [],
329333
tests = [

‎tensorflow/core/kernels/BUILD‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -473,6 +473,10 @@ tf_cc_test(
473473
tf_cc_test(
474474
name = "slice_op_test",
475475
size = "small",
476+
linkopts = select({
477+
"//tensorflow:darwin": ["-headerpad_max_install_names"],
478+
"//conditions:default": [],
479+
}),
476480
deps = [
477481
":ops_testutil",
478482
":ops_util",
@@ -768,6 +772,10 @@ tf_cc_tests(
768772
)
769773

770774
tf_cc_tests(
775+
linkopts = select({
776+
"//tensorflow:darwin": ["-headerpad_max_install_names"],
777+
"//conditions:default": [],
778+
}),
771779
tests = [
772780
"adjust_contrast_op_test",
773781
"colorspace_op_test",
@@ -1058,6 +1066,10 @@ tf_cuda_cc_test(
10581066
tf_cuda_cc_test(
10591067
name = "reduction_ops_test",
10601068
size = "small",
1069+
linkopts = select({
1070+
"//tensorflow:darwin": ["-headerpad_max_install_names"],
1071+
"//conditions:default": [],
1072+
}),
10611073
deps = [
10621074
":ops_testutil",
10631075
":ops_util",

‎tensorflow/core/kernels/matmul_op.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ REGISTER_CPU(complex64);
210210
REGISTER_CPU(complex128);
211211
#if GOOGLE_CUDA
212212
REGISTER_GPU(float);
213-
// REGISTER_GPU(double);
213+
REGISTER_GPU(double);
214214
#if CUDA_VERSION >= 7050
215215
REGISTER_GPU(Eigen::half);
216216
#endif

‎tensorflow/core/kernels/transpose_functor_gpu.cu.cc‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,10 @@ Status DoTranspose<Device>(const Device& d, const Tensor& in,
130130
internal::Transpose<Device, uint64>(d, in, perm, out);
131131
break;
132132

133+
case DT_COMPLEX128:
134+
internal::Transpose<Device, float4>(d, in, perm, out);
135+
break;
136+
133137
default:
134138
return errors::Unimplemented("Unsupported dtype on GPU: ", in.dtype());
135139
}

0 commit comments

Comments
 (0)