From 6e364e7fdd0cc66e897d503e29013c95a76bc25e Mon Sep 17 00:00:00 2001 From: Sean Morgan Date: Mon, 13 Dec 2021 16:50:30 -0800 Subject: [PATCH 1/4] * Test CI with new auditwheel location --- tools/releases/tf_auditwheel_patch.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/releases/tf_auditwheel_patch.sh b/tools/releases/tf_auditwheel_patch.sh index 1df2eaa0de..165948db33 100644 --- a/tools/releases/tf_auditwheel_patch.sh +++ b/tools/releases/tf_auditwheel_patch.sh @@ -16,7 +16,7 @@ set -e -x -SITE_PKG_LOCATION=$(python -c "import site; print(site.getsitepackages()[0])") +SITE_PKG_LOCATION="/usr/local/lib/python3.10" TF_SHARED_LIBRARY_NAME=$(grep -r TF_SHARED_LIBRARY_NAME .bazelrc | awk -F= '{print$2}') POLICY_JSON="${SITE_PKG_LOCATION}/auditwheel/policy/policy.json" sed -i "s/libresolv.so.2\"/libresolv.so.2\", $TF_SHARED_LIBRARY_NAME/g" $POLICY_JSON From 26cf240c310153abb7246b0bd158551b41f3e6e4 Mon Sep 17 00:00:00 2001 From: Sean Morgan Date: Mon, 13 Dec 2021 20:44:20 -0800 Subject: [PATCH 2/4] * Use new manylinux policy --- tools/releases/tf_auditwheel_patch.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/releases/tf_auditwheel_patch.sh b/tools/releases/tf_auditwheel_patch.sh index 165948db33..49d2a5cf77 100644 --- a/tools/releases/tf_auditwheel_patch.sh +++ b/tools/releases/tf_auditwheel_patch.sh @@ -16,7 +16,7 @@ set -e -x -SITE_PKG_LOCATION="/usr/local/lib/python3.10" +SITE_PKG_LOCATION=$(python -c "import site; print(site.getsitepackages()[0])") TF_SHARED_LIBRARY_NAME=$(grep -r TF_SHARED_LIBRARY_NAME .bazelrc | awk -F= '{print$2}') -POLICY_JSON="${SITE_PKG_LOCATION}/auditwheel/policy/policy.json" +POLICY_JSON="${SITE_PKG_LOCATION}/auditwheel/policy/manylinux-policy.json" sed -i "s/libresolv.so.2\"/libresolv.so.2\", $TF_SHARED_LIBRARY_NAME/g" $POLICY_JSON From b20be59ce7a508a5f0de6cea715279a55a0b9289 Mon Sep 17 00:00:00 2001 From: Sean Morgan Date: Mon, 13 Dec 2021 20:46:08 -0800 Subject: [PATCH 3/4] * Use bazeliskrc --- .bazeliskrc | 1 + .bazelversion | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 .bazeliskrc delete mode 100644 .bazelversion diff --git a/.bazeliskrc b/.bazeliskrc new file mode 100644 index 0000000000..fe5e2c85d1 --- /dev/null +++ b/.bazeliskrc @@ -0,0 +1 @@ +USE_BAZEL_VERSION=3.7.2 diff --git a/.bazelversion b/.bazelversion deleted file mode 100644 index 0b2eb36f50..0000000000 --- a/.bazelversion +++ /dev/null @@ -1 +0,0 @@ -3.7.2 From 6f1911f781e96e5c206c0ed169731266c6043865 Mon Sep 17 00:00:00 2001 From: Sean Morgan Date: Mon, 13 Dec 2021 20:54:46 -0800 Subject: [PATCH 4/4] * Use bazeliskrc --- tools/docker/build_wheel.Dockerfile | 2 +- tools/docker/cpu_tests.Dockerfile | 2 +- tools/docker/sanity_check.Dockerfile | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/docker/build_wheel.Dockerfile b/tools/docker/build_wheel.Dockerfile index 8836afd536..db247b84c8 100644 --- a/tools/docker/build_wheel.Dockerfile +++ b/tools/docker/build_wheel.Dockerfile @@ -28,7 +28,7 @@ COPY requirements.txt . RUN python -m pip install -r requirements.txt COPY ./ /addons -RUN rm /addons/.bazelversion +RUN rm /addons/.bazeliskrc WORKDIR /addons # ------------------------------------------------------------------- diff --git a/tools/docker/cpu_tests.Dockerfile b/tools/docker/cpu_tests.Dockerfile index 2d5c0a299c..daa49ac291 100644 --- a/tools/docker/cpu_tests.Dockerfile +++ b/tools/docker/cpu_tests.Dockerfile @@ -5,7 +5,7 @@ ARG TF_VERSION=2.7.0 RUN pip install --default-timeout=1000 tensorflow-cpu==$TF_VERSION RUN apt-get update && apt-get install -y sudo rsync -COPY tools/install_deps/install_bazelisk.sh .bazelversion ./ +COPY tools/install_deps/install_bazelisk.sh .bazeliskrc ./ RUN bash install_bazelisk.sh COPY requirements.txt ./ diff --git a/tools/docker/sanity_check.Dockerfile b/tools/docker/sanity_check.Dockerfile index 6c20ded466..8c31bd3ac9 100644 --- a/tools/docker/sanity_check.Dockerfile +++ b/tools/docker/sanity_check.Dockerfile @@ -40,7 +40,7 @@ COPY tools/install_deps/tensorflow-cpu.txt ./ RUN pip install --default-timeout=1000 -r tensorflow-cpu.txt RUN apt-get update && apt-get install sudo -COPY tools/install_deps/install_bazelisk.sh .bazelversion ./ +COPY tools/install_deps/install_bazelisk.sh .bazeliskrc ./ RUN bash install_bazelisk.sh COPY ./ /addons @@ -109,7 +109,7 @@ COPY tools/install_deps/pytest.txt ./ RUN pip install -r pytest.txt RUN apt-get update && apt-get install -y sudo rsync -COPY tools/install_deps/install_bazelisk.sh .bazelversion ./ +COPY tools/install_deps/install_bazelisk.sh .bazeliskrc ./ RUN bash install_bazelisk.sh COPY ./ /addons