Skip to content

Commit

Permalink
readd hunk for removing clang/libclang
Browse files Browse the repository at this point in the history
  • Loading branch information
h-vetinari committed Nov 25, 2021
1 parent 1b61331 commit b439aec
Show file tree
Hide file tree
Showing 4 changed files with 37 additions and 28 deletions.
2 changes: 1 addition & 1 deletion recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ source:
- patches/0002-skip-read-only-debugger_cli_common-test.patch
- patches/0003-relax-precision-in-matrix_log_op_test.patch
# requires setting GRPCIO_VERSION in build script
- patches/0004-Fixup-requirements.patch
- patches/0004-loosen-requirements.patch
- patches/0005-Replace-deprecated-absl-Status-error_message-call-wi.patch
- url: https://github.com/tensorflow/estimator/archive/refs/tags/v{{ version }}.tar.gz
sha256: e5164e802638d3cf110ecc17912be9d514a9d3354ec48e77200b9403dcc15965
Expand Down
26 changes: 0 additions & 26 deletions recipe/patches/0004-Fixup-requirements.patch

This file was deleted.

35 changes: 35 additions & 0 deletions recipe/patches/0004-loosen-requirements.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
From 59100b60d2aeaa9110346995777b6ffc255e8999 Mon Sep 17 00:00:00 2001
From: "Uwe L. Korn" <[email protected]>
Date: Wed, 8 Sep 2021 06:57:09 +0200
Subject: [PATCH 4/5] loosen requirements

* Set grpcio pin to the built grpc version
* Remove unused clang requirement
---
tensorflow/tools/pip_package/setup.py | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tensorflow/tools/pip_package/setup.py b/tensorflow/tools/pip_package/setup.py
index 26306e43aaf..bf5d21aca5b 100644
--- a/tensorflow/tools/pip_package/setup.py
+++ b/tensorflow/tools/pip_package/setup.py
@@ -82,7 +82,6 @@ REQUIRED_PACKAGES = [
# Install other dependencies
'absl-py >= 0.4.0',
'astunparse >= 1.6.0',
- 'libclang >= 9.0.1',
'flatbuffers >= 1.12, < 3.0', # capped as jax 0.1.71 needs < 3.0
'google_pasta >= 0.1.1',
'h5py >= 2.9.0', # capped since 3.3.0 lacks py3.6
@@ -129,7 +128,7 @@ if 'tf_nightly' in project_name:
# BoringSSL support.
# See https://github.com/tensorflow/tensorflow/issues/17882.
if sys.byteorder == 'little':
- REQUIRED_PACKAGES.append('grpcio >= 1.24.3, < 2.0')
+ REQUIRED_PACKAGES.append('grpcio >= GRPCIO_VERSION, < 2.0')


# Packages which are only needed for testing code.
--
2.32.0.windows.2

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From ec52d49f0f1a935402e0047833073e88e14edab1 Mon Sep 17 00:00:00 2001
From 6b6e31e057a070942f9eb3acba7578be517bb173 Mon Sep 17 00:00:00 2001
From: Zachary Garrett <[email protected]>
Date: Mon, 27 Sep 2021 08:40:23 -0700
Subject: [PATCH 5/5] Replace deprecated `absl::Status::error_message` call
Expand Down

0 comments on commit b439aec

Please sign in to comment.