diff --git a/0001-Bumps-google-auth-oauthlib-dependency-restriction.patch b/0001-Bumps-google-auth-oauthlib-dependency-restriction.patch deleted file mode 100644 index 1bcd136079225fa828962076e7c5f862f19b72fb..0000000000000000000000000000000000000000 --- a/0001-Bumps-google-auth-oauthlib-dependency-restriction.patch +++ /dev/null @@ -1,25 +0,0 @@ -From c90d63595e513d424bbe281c1d4888ea12f7307e Mon Sep 17 00:00:00 2001 -From: Super User -Date: Sat, 5 Aug 2023 20:30:07 +0800 -Subject: [PATCH] Bumps-google-auth-oauthlib-dependency-restriction - ---- - tensorboard-2.12.0.dist-info/METADATA | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tensorboard-2.12.0.dist-info/METADATA b/tensorboard-2.12.0.dist-info/METADATA -index 8c39dd9..ad49f7d 100644 ---- a/tensorboard-2.12.0.dist-info/METADATA -+++ b/tensorboard-2.12.0.dist-info/METADATA -@@ -26,7 +26,7 @@ License-File: LICENSE - Requires-Dist: absl-py (>=0.4) - Requires-Dist: grpcio (>=1.48.2) - Requires-Dist: google-auth (<3,>=1.6.3) --Requires-Dist: google-auth-oauthlib (<0.5,>=0.4.1) -+Requires-Dist: google-auth-oauthlib (<1.1,>=0.5) - Requires-Dist: markdown (>=2.6.8) - Requires-Dist: numpy (>=1.12.0) - Requires-Dist: protobuf (>=3.19.6) --- -2.41.0 - diff --git a/2.12.1.tar.gz b/2.12.1.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..6e13e74dfaf9f1b3d3fc4ac6a48a8d8982cc89a7 Binary files /dev/null and b/2.12.1.tar.gz differ diff --git a/bazel-execroot.tar.gzaa b/bazel-execroot.tar.gzaa new file mode 100644 index 0000000000000000000000000000000000000000..ebadb141ba4089c1d55345a225463f42173d84aa Binary files /dev/null and b/bazel-execroot.tar.gzaa differ diff --git a/bazel-external.tar.gzaa b/bazel-external.tar.gzaa new file mode 100644 index 0000000000000000000000000000000000000000..ad4fefb9f21d23f849ca217ab87254ae6363e07b Binary files /dev/null and b/bazel-external.tar.gzaa differ diff --git a/bazel-external.tar.gzab b/bazel-external.tar.gzab new file mode 100644 index 0000000000000000000000000000000000000000..1c51f7b39bf96215781b29b2e6fafd0fbc5670eb Binary files /dev/null and b/bazel-external.tar.gzab differ diff --git a/bazel-external.tar.gzac b/bazel-external.tar.gzac new file mode 100644 index 0000000000000000000000000000000000000000..9e84767501081957fb5527416061f433922a0a4d Binary files /dev/null and b/bazel-external.tar.gzac differ diff --git a/tensorboard-2.12.0-py3-none-any.whl b/tensorboard-2.12.0-py3-none-any.whl deleted file mode 100644 index 16045e7eeaab152f55954ae12b52110a2c8384c1..0000000000000000000000000000000000000000 Binary files a/tensorboard-2.12.0-py3-none-any.whl and /dev/null differ diff --git a/tensorboard.spec b/tensorboard.spec index 4e3b5373e606fdad95c022d108188d6486a97ac5..882858b81d7acbf0c3c27fee4e52ba8617e44285 100644 --- a/tensorboard.spec +++ b/tensorboard.spec @@ -1,19 +1,16 @@ %global _empty_manifest_terminate_build 0 Name: python-tensorboard -Version: 2.12.0 +Version: 2.12.1 Release: 1 Summary: TensorBoard lets you watch Tensors Flow License: Apache 2.0 URL: https://github.com/tensorflow/tensorboard -Source0: https://files.pythonhosted.org/packages/8d/71/75fcfab1ff98e3fad240f760d3a6b5ca6bdbcc5ed141fb7abd35cf63134c/tensorboard-2.12.0-py3-none-any.whl +Source0: https://github.com/tensorflow/tensorboard/archive/refs/tags/%{version}.tar.gz Source1: https://files.pythonhosted.org/packages/da/61/6e9ff8258422d287eec718872fb71e05324356722ab658c8afda25f51539/tensorboard_data_server-0.7.1-py3-none-any.whl -#Source2: bazel-tensorboard-external.tar.gzaa -#Source3: bazel-tensorboard-external.tar.gzab -#Source4: bazel-tensorboard-external.tar.gzac -#Source5: adapt-external-for-aarch64.patch -#Source6: adds-external-for-aarch64.tar.gzaa -#Source7: adds-external-for-aarch64.tar.gzab -Source8: 0001-Bumps-google-auth-oauthlib-dependency-restriction.patch +Source2: bazel-external.tar.gzaa +Source3: bazel-external.tar.gzab +Source4: bazel-external.tar.gzac +Source5: bazel-execroot.tar.gzaa Requires: python3-absl-py Requires: python3-grpcio @@ -47,6 +44,7 @@ BuildRequires: python3-packaging BuildRequires: python3-numpy BuildRequires: python3-absl-py BuildRequires: python3-virtualenv +BuildRequires: python3-google-api-client BuildRequires: bazel == 5.1.1 gcc gcc-c++ %description -n python3-tensorboard TensorBoard is a suite of web applications for inspecting and understanding @@ -76,15 +74,51 @@ Releases prior to 1.6.0 were published under the ``tensorflow-tensorboard`` name and may be found at https://pypi.python.org/pypi/tensorflow-tensorboard. %prep +%autosetup -p1 -n tensorboard-%{version} -b 0 +extdir=$(bazel --output_user_root=`pwd`/../output_user_root info output_base) +srcdir=`pwd` +mkdir -p ${extdir} +cat %{SOURCE2} %{SOURCE3} %{SOURCE4} > bazel-external.tar.gz +tar xzvf bazel-external.tar.gz -C ${extdir} +cat %{SOURCE5} > bazel-execroot.tar.gz +tar xzvf bazel-execroot.tar.gz -C ${extdir} +%ifarch aarch64 +#patch -d ${extdir}/external -p1 < %{SOURCE5} +#cat %{SOURCE6} %{SOURCE7} > adds-aarch64-cache.tar.gz +#tar xzvf adds-aarch64-cache.tar.gz -C ${extdir} +%endif +# relinks adpapt to ebs&obs +ln -sfn $(find ${extdir}/../install -name embedded_tools) ${extdir}/external/bazel_tools +ln -sfn $(find /usr/lib/jvm -maxdepth 1 -name java-11-openjdk)/bin ${extdir}/external/local_jdk/bin +ln -sfn $(find /usr/lib/jvm -maxdepth 1 -name java-11-openjdk)/conf ${extdir}/external/local_jdk/conf +ln -sfn $(find /usr/lib/jvm -maxdepth 1 -name java-11-openjdk)/include ${extdir}/external/local_jdk/include +ln -sfn $(find /usr/lib/jvm -maxdepth 1 -name java-11-openjdk)/legal ${extdir}/external/local_jdk/legal +ln -sfn $(find /usr/lib/jvm -maxdepth 1 -name java-11-openjdk)/lib ${extdir}/external/local_jdk/lib +ln -sfn $(find /usr/lib/jvm -maxdepth 1 -name java-11-openjdk)/release ${extdir}/external/local_jdk/release +ln -sfn $(find /usr/lib/jvm -maxdepth 1 -name java-11-openjdk)/tapset ${extdir}/external/local_jdk/tapset +for f in $(find $extdir -lname "/root/rpmbuild/*"); do OLDLINK=$(readlink $f); echo $OLDLINK; NEWLINK=${HOME}/rpmbuild${OLDLINK#*rpmbuild}; LINKTP=$([ ! -d $NEWLINK ] && echo -n "-sf" || echo -n "-sfn"); ln $LINKTP $NEWLINK $f-newlink; mv -Tf $f-newlink $f; done +for f in $(find $extdir -lname "*/f1a05a074786842b07afcf52636c4445/external/*"); do OLDLINK=$(readlink $f); echo $OLDLINK; NEWLINK=${extdir}/external${OLDLINK#*external}; LINKTP=$([ ! -d $NEWLINK ] && echo -n "-sf" || echo -n "-sfn"); ln $LINKTP $NEWLINK $f-newlink; mv -Tf $f-newlink $f; done +for f in $(find $extdir -lname "*/f1a05a074786842b07afcf52636c4445/execroot/*"); do OLDLINK=$(readlink $f); echo $OLDLINK; NEWLINK=${extdir}/execroot${OLDLINK#*execroot}; LINKTP=$([ ! -d $NEWLINK ] && echo -n "-sf" || echo -n "-sfn"); ln $LINKTP $NEWLINK $f-newlink; mv -Tf $f-newlink $f; done +# replace local path to ci path for ebs&obs +oldext='/root/rpmbuild/BUILD/output_user_root/f1a05a074786842b07afcf52636c4445' +oldsrc='/root/rpmbuild/BUILD/tensorboard-2.12.1' +sed -i s#${oldext}#${extdir}#g `grep ${oldext} -rl ${extdir}/external` +sed -i s#${oldsrc}#${srcdir}#g `grep ${oldsrc} -rl ${extdir}/external` +grep ${extdir} -r ${extdir}/external +grep ${srcdir} -r ${extdir}/external +chmod -R 755 ${extdir}/external +sed -i '/ yarn_lock = \"\/\/\:yarn\.lock\",/i\ symlink_node_modules = False,' WORKSPACE +# sed -i '/ data = \[/,+3 d' WORKSPACE +sed -i 's/--frozen-lockfile --mutex/--frozen-lockfile --offline --mutex/g' ${extdir}/external/npm/_yarn.sh %build mkdir dist -cp %{SOURCE0} dist cp %{SOURCE1} dist +bazel --output_user_root=`pwd`/../output_user_root build //tensorboard/pip_package:build_pip_package --verbose_failures --experimental_local_memory_estimate --jobs=16 +bazel --output_user_root=`pwd`/../output_user_root run //tensorboard/pip_package:extract_pip_package -- `pwd`/dist %install %py3_install_wheel * -patch -d %{buildroot}/%{python3_sitelib} -p1 < %{SOURCE8} install -d -m755 %{buildroot}/%{_pkgdocdir} if [ -d doc ]; then cp -arf doc %{buildroot}/%{_pkgdocdir}; fi if [ -d docs ]; then cp -arf docs %{buildroot}/%{_pkgdocdir}; fi @@ -111,6 +145,9 @@ mv %{buildroot}/doclist.lst . %{_docdir}/* %changelog +* Thu Aug 17 2023 Dongxing Wang - 2.12.1-1 +- upgrade to version 2.12.1 + * Fri Jul 21 2023 zhuofeng - 2.12.0-1 - Update package to version 2.12.0