Skip to content

Commit 78710ba

Browse files
committed
win build fix, chrono patch nsync tf
1 parent b1ac3e2 commit 78710ba

File tree

3 files changed

+34
-0
lines changed

3 files changed

+34
-0
lines changed

WORKSPACE

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -424,6 +424,7 @@ http_archive(
424424
"@mediapipe//third_party:org_tensorflow_custom_ops.diff",
425425
"@mediapipe//third_party:org_tensorflow_objc_build_fixes.diff",
426426
"tf_2.18_logging.patch",
427+
"tf_nsync_chrono.patch",
427428
],
428429
patch_args = [
429430
"-p1",

common_settings.bzl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,8 @@ WINDOWS_COMMON_STATIC_LIBS_COPTS = [
187187
"/GS",
188188
"/DYNAMICBASE",
189189
"/Qspectre",
190+
"/wd4305", # abseil after switch to build tools 22
191+
"/wd4324", # genai after switch to build tools 22
190192
"/wd4068",
191193
"/wd4458",
192194
"/wd4100",

external/tf_nsync_chrono.patch

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
diff --git a/tensorflow/workspace2.bzl b/tensorflow/workspace2.bzl
2+
index be83c971749..bd80e19896e 100644
3+
--- a/tensorflow/workspace2.bzl
4+
+++ b/tensorflow/workspace2.bzl
5+
@@ -396,7 +396,7 @@ def _tf_repositories():
6+
7+
tf_http_archive(
8+
name = "nsync",
9+
- patch_file = ["//third_party:nsync.patch"],
10+
+ patch_file = ["//third_party:nsync.patch", "//third_party:nsync_chrono.patch"],
11+
sha256 = "1d63e967973733d2c97e841e3c05fac4d3fa299f01d14c86f2695594c7a4a2ec",
12+
strip_prefix = "nsync-1.29.2",
13+
system_build_file = "//third_party/systemlibs:nsync.BUILD",
14+
diff --git a/third_party/nsync_chrono.patch b/third_party/nsync_chrono.patch
15+
new file mode 100644
16+
index 00000000000..7f0f8539727
17+
--- /dev/null
18+
+++ b/third_party/nsync_chrono.patch
19+
@@ -0,0 +1,12 @@
20+
+diff --git a/platform/c++11/platform.h b/platform/c++11/platform.h
21+
+index 2c80e0b..4fbc6d0 100644
22+
+--- a/platform/c++11/platform.h
23+
++++ b/platform/c++11/platform.h
24+
+@@ -28,6 +28,7 @@
25+
+
26+
+ #include <mutex>
27+
+ #include <condition_variable>
28+
++#include <chrono>
29+
+
30+
+ #include "nsync_cpp.h"
31+
+

0 commit comments

Comments
 (0)