diff options
| author |  A. Unique TensorFlower <gardener@tensorflow.org> | 2017-12-22 12:42:59 -0800 |
|---|---|---|
| committer | TensorFlower Gardener <gardener@tensorflow.org> | 2017-12-22 12:46:28 -0800 |
| commit | e4532d20973c4c00854492362665317551661c18 (patch) | |
| tree | 398527e29bd30d39237adb4785be5069fdb646fa /third_party | |
| parent | 673641c2d6a27fa97ee05453d671853731a4c602 (diff) | |
Merge changes from github.
PiperOrigin-RevId: 179953488
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/eigen3/unsupported/Eigen/CXX11/src/NeuralNetworks/Patch3d.h | 2 | ||||
| -rw-r--r-- | third_party/flatbuffers/flatbuffers.BUILD | 19 |
2 files changed, 16 insertions, 5 deletions
diff --git a/third_party/eigen3/unsupported/Eigen/CXX11/src/NeuralNetworks/Patch3d.h b/third_party/eigen3/unsupported/Eigen/CXX11/src/NeuralNetworks/Patch3d.h index 89190eb1af..2864f83299 100644 --- a/third_party/eigen3/unsupported/Eigen/CXX11/src/NeuralNetworks/Patch3d.h +++ b/third_party/eigen3/unsupported/Eigen/CXX11/src/NeuralNetworks/Patch3d.h @@ -151,7 +151,7 @@ Extract3DPatches( // TODO(mjanusz): Consider getting rid of pad(), and stride() and extend // extract_patches to take additional parameters for padding/striding, - // similarly to etract_image_patches. + // similarly to extract_image_patches. return input.pad(paddings, padding_value).extract_patches(patch_dims).reshape(pre_stride_dims).stride(strides); } diff --git a/third_party/flatbuffers/flatbuffers.BUILD b/third_party/flatbuffers/flatbuffers.BUILD index 0a76adcf91..f6b8e6ddb0 100644 --- a/third_party/flatbuffers/flatbuffers.BUILD +++ b/third_party/flatbuffers/flatbuffers.BUILD @@ -4,6 +4,12 @@ package( licenses(["notice"]) # Apache 2.0 +config_setting( + name = "freebsd", + values = {"cpu": "freebsd"}, + visibility = ["//visibility:public"], +) + FLATBUFFERS_COPTS = [ "-fexceptions", ] + select({ @@ -107,10 +113,15 @@ cc_binary( "grpc/", "include/", ], - linkopts = [ - "-lm", - "-ldl", - ], + linkopts = select({ + ":freebsd": [ + "-lm", + ], + "//conditions:default": [ + "-lm", + "-ldl", + ], + }), deps = [ ":flatc_library", ], |