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

Jump to bottom

Fix some breakages in TensorFlow Windows build #17271

Merged
merged 2 commits into from
Feb 27, 2018
Merged

Fix some breakages in TensorFlow Windows build #17271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
17c9119
Fix configure.py
meteorcloudy Feb 26, 2018
d508387
Add quantization_utils for building quantize_weights, quantize_nodes,…
meteorcloudy Feb 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 6 additions & 2 deletions configure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,11 @@ def reset_tf_configure_bazelrc(workspace_path):
if _TF_BAZELRC_FILENAME in l:
continue
f.write('%s\n' % l)
f.write('import %s\n' % _TF_BAZELRC)
if is_windows():
tf_bazelrc_path = _TF_BAZELRC.replace("\\", "/")
else:
tf_bazelrc_path = _TF_BAZELRC
f.write('import %s\n' % tf_bazelrc_path)


def cleanup_makefile():
Expand Down Expand Up @@ -444,7 +448,7 @@ def check_bazel_version(min_version):
if which('bazel') is None:
print('Cannot find bazel. Please install bazel.')
sys.exit(0)
curr_version = run_shell(['bazel', '--batch', 'version'])
curr_version = run_shell(['bazel', '--batch', '--bazelrc=/dev/null', 'version'])

for line in curr_version.split('\n'):
if 'Build label: ' in line:
Expand Down
16 changes: 12 additions & 4 deletions tensorflow/core/kernels/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5128,7 +5128,6 @@ tf_kernel_library(
srcs = [
"dequantize_op.cc",
"meta_support.cc",
"quantization_utils.cc",
"quantize_down_and_shrink_range.cc",
"quantize_op.cc",
"quantized_activation_ops.cc",
Expand All @@ -5149,7 +5148,6 @@ tf_kernel_library(
],
hdrs = [
"meta_support.h",
"quantization_utils.h",
"reference_gemm.h",
],
deps = [
Expand All @@ -5160,6 +5158,7 @@ tf_kernel_library(
":image_resizer_state",
":ops_util",
":pooling_ops",
":quantization_utils",
"//tensorflow/core:array_ops_op_lib",
"//tensorflow/core:core_cpu",
"//tensorflow/core:framework",
Expand Down Expand Up @@ -5706,6 +5705,16 @@ tf_kernel_library(
],
)

cc_library(
name = "quantization_utils",
srcs = ["quantization_utils.cc"],
hdrs = ["quantization_utils.h"],
deps = [
"//tensorflow/core:framework",
"@gemmlowp",
],
)

cc_library(
name = "remote_fused_graph_execute_utils",
srcs = [
Expand Down Expand Up @@ -6081,7 +6090,6 @@ cc_library(
srcs = [
"cwise_ops_common.cc",
"meta_support.cc",
"quantization_utils.cc",
],
hdrs = [
"cwise_ops.h",
Expand All @@ -6090,10 +6098,10 @@ cc_library(
"cwise_ops_gpu_gradients.cu.h",
"cwise_ops_gradients.h",
"meta_support.h",
"quantization_utils.h",
],
deps = [
":bounds_check",
":quantization_utils",
"//tensorflow/core:framework",
"//tensorflow/core:lib",
"//third_party/eigen3",
Expand Down
2 changes: 1 addition & 1 deletion tensorflow/tools/graph_transforms/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,8 @@ cc_library(
"//tensorflow/core:tensorflow",
"//tensorflow/contrib/rnn:gru_ops_op_lib",
"//tensorflow/contrib/rnn:lstm_ops_op_lib",
"//tensorflow/core/kernels:quantization_utils",
] + if_not_windows([
"//tensorflow/core/kernels:quantized_ops",
"//tensorflow/core/kernels:remote_fused_graph_rewriter_transform",
"//tensorflow/core/kernels/hexagon:hexagon_rewriter_transform",
]),
Expand Down