!13 update version to 2.12..0
From: @zhuofeng6 Reviewed-by: @gaoruoshu Signed-off-by: @gaoruoshu
This commit is contained in:
commit
14391fc0dd
@ -1,25 +1,25 @@
|
|||||||
From a98b915f607ffa2ac5a3913dc91a1da2cccf4876 Mon Sep 17 00:00:00 2001
|
From c90d63595e513d424bbe281c1d4888ea12f7307e Mon Sep 17 00:00:00 2001
|
||||||
From: desert-sailor <dxwangk@isoftstone.com>
|
From: Super User <dxwangk@isoftstone.com>
|
||||||
Date: Sat, 6 May 2023 16:35:45 +0800
|
Date: Sat, 5 Aug 2023 20:30:07 +0800
|
||||||
Subject: [PATCH] Bumps google-auth-oauthlib dependency restriction
|
Subject: [PATCH] Bumps-google-auth-oauthlib-dependency-restriction
|
||||||
|
|
||||||
---
|
---
|
||||||
tensorboard/pip_package/requirements.txt | 2 +-
|
tensorboard-2.12.0.dist-info/METADATA | 2 +-
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
diff --git a/tensorboard/pip_package/requirements.txt b/tensorboard/pip_package/requirements.txt
|
diff --git a/tensorboard-2.12.0.dist-info/METADATA b/tensorboard-2.12.0.dist-info/METADATA
|
||||||
index e782cef..665da8a 100644
|
index 8c39dd9..ad49f7d 100644
|
||||||
--- a/tensorboard/pip_package/requirements.txt
|
--- a/tensorboard-2.12.0.dist-info/METADATA
|
||||||
+++ b/tensorboard/pip_package/requirements.txt
|
+++ b/tensorboard-2.12.0.dist-info/METADATA
|
||||||
@@ -21,7 +21,7 @@ grpcio >= 1.24.3
|
@@ -26,7 +26,7 @@ License-File: LICENSE
|
||||||
# Until this issue is closed
|
Requires-Dist: absl-py (>=0.4)
|
||||||
# https://github.com/googleapis/google-cloud-python/issues/10566
|
Requires-Dist: grpcio (>=1.48.2)
|
||||||
google-auth >= 1.6.3, < 3
|
Requires-Dist: google-auth (<3,>=1.6.3)
|
||||||
-google-auth-oauthlib >= 0.4.1, < 0.5
|
-Requires-Dist: google-auth-oauthlib (<0.5,>=0.4.1)
|
||||||
+google-auth-oauthlib >= 0.5, < 1.1
|
+Requires-Dist: google-auth-oauthlib (<1.1,>=0.5)
|
||||||
markdown >= 2.6.8
|
Requires-Dist: markdown (>=2.6.8)
|
||||||
numpy >= 1.12.0
|
Requires-Dist: numpy (>=1.12.0)
|
||||||
# Protobuf 4.0 is incompatible with TF. Force < 3.20 until they unblock upgrade.
|
Requires-Dist: protobuf (>=3.19.6)
|
||||||
--
|
--
|
||||||
2.33.0
|
2.41.0
|
||||||
|
|
||||||
|
|||||||
BIN
2.10.1.tar.gz
BIN
2.10.1.tar.gz
Binary file not shown.
@ -1,304 +0,0 @@
|
|||||||
From f4b841f228f65fb3a551dc17c650d24c12e5e4d0 Mon Sep 17 00:00:00 2001
|
|
||||||
From: desert-sailor <dxwangk@isoftstone.com>
|
|
||||||
Date: Thu, 11 May 2023 01:20:49 +0800
|
|
||||||
Subject: [PATCH] adapt external for aarch64
|
|
||||||
|
|
||||||
---
|
|
||||||
.../internal/node/_node_bin/node | 4 +--
|
|
||||||
.../_/sass/node_modules/.yarn-integrity | 4 +--
|
|
||||||
build_bazel_rules_sass_deps/_yarn.sh | 2 +-
|
|
||||||
esbuild_npm/_npm.sh | 2 +-
|
|
||||||
go_sdk/BUILD.bazel | 8 ++---
|
|
||||||
go_sdk/src/cmd/internal/objabi/zbootstrap.go | 2 +-
|
|
||||||
local_config_cc/BUILD | 12 +++----
|
|
||||||
.../builtin_include_directory_paths | 4 +--
|
|
||||||
local_config_cc_toolchains/BUILD | 4 +--
|
|
||||||
local_config_platform/constraints.bzl | 2 +-
|
|
||||||
local_jdk/BUILD.bazel | 2 +-
|
|
||||||
nodejs/BUILD.bazel | 30 +++++++++---------
|
|
||||||
nodejs/index.bzl | 2 +-
|
|
||||||
npm/_/node_modules/.yarn-integrity | 4 +--
|
|
||||||
npm/_yarn.sh | 2 +-
|
|
||||||
16 files changed, 42 insertions(+), 42 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/build_bazel_rules_nodejs/internal/node/_node_bin/node b/build_bazel_rules_nodejs/internal/node/_node_bin/node
|
|
||||||
index ae1ffe2a1..6520b1d29 100755
|
|
||||||
--- a/build_bazel_rules_nodejs/internal/node/_node_bin/node
|
|
||||||
+++ b/build_bazel_rules_nodejs/internal/node/_node_bin/node
|
|
||||||
@@ -2,7 +2,7 @@
|
|
||||||
export NP_SUBPROCESS_NODE_DIR="/root/.cache/bazel/_bazel_root/4351bb8fec5747e15a0a9b257c950736/external/build_bazel_rules_nodejs/internal/node/_node_bin"
|
|
||||||
export PATH="/root/.cache/bazel/_bazel_root/4351bb8fec5747e15a0a9b257c950736/external/build_bazel_rules_nodejs/internal/node/_node_bin":$PATH
|
|
||||||
if [[ ! "${@}" =~ "node_patches.js" ]]; then
|
|
||||||
- exec /root/.cache/bazel/_bazel_root/4351bb8fec5747e15a0a9b257c950736/external/nodejs_linux_amd64/bin/nodejs/bin/node --preserve-symlinks --require "/root/.cache/bazel/_bazel_root/4351bb8fec5747e15a0a9b257c950736/external/build_bazel_rules_nodejs/internal/node/node_patches.js" "$@"
|
|
||||||
+ exec /root/.cache/bazel/_bazel_root/4351bb8fec5747e15a0a9b257c950736/external/nodejs_linux_arm64/bin/nodejs/bin/node --preserve-symlinks --require "/root/.cache/bazel/_bazel_root/4351bb8fec5747e15a0a9b257c950736/external/build_bazel_rules_nodejs/internal/node/node_patches.js" "$@"
|
|
||||||
else
|
|
||||||
- exec /root/.cache/bazel/_bazel_root/4351bb8fec5747e15a0a9b257c950736/external/nodejs_linux_amd64/bin/nodejs/bin/node --preserve-symlinks "$@"
|
|
||||||
+ exec /root/.cache/bazel/_bazel_root/4351bb8fec5747e15a0a9b257c950736/external/nodejs_linux_arm64/bin/nodejs/bin/node --preserve-symlinks "$@"
|
|
||||||
fi
|
|
||||||
diff --git a/build_bazel_rules_sass_deps/_/sass/node_modules/.yarn-integrity b/build_bazel_rules_sass_deps/_/sass/node_modules/.yarn-integrity
|
|
||||||
index 911fdd087..10589144d 100644
|
|
||||||
--- a/build_bazel_rules_sass_deps/_/sass/node_modules/.yarn-integrity
|
|
||||||
+++ b/build_bazel_rules_sass_deps/_/sass/node_modules/.yarn-integrity
|
|
||||||
@@ -1,5 +1,5 @@
|
|
||||||
{
|
|
||||||
- "systemParams": "linux-x64-72",
|
|
||||||
+ "systemParams": "linux-arm64-72",
|
|
||||||
"modulesFolders": [
|
|
||||||
"node_modules"
|
|
||||||
],
|
|
||||||
@@ -36,4 +36,4 @@
|
|
||||||
},
|
|
||||||
"files": [],
|
|
||||||
"artifacts": {}
|
|
||||||
-}
|
|
||||||
\ No newline at end of file
|
|
||||||
+}
|
|
||||||
diff --git a/build_bazel_rules_sass_deps/_yarn.sh b/build_bazel_rules_sass_deps/_yarn.sh
|
|
||||||
index cf969c40a..f5fc9ca62 100755
|
|
||||||
--- a/build_bazel_rules_sass_deps/_yarn.sh
|
|
||||||
+++ b/build_bazel_rules_sass_deps/_yarn.sh
|
|
||||||
@@ -4,4 +4,4 @@ set -e
|
|
||||||
unset YARN_IGNORE_PATH
|
|
||||||
unset INIT_CWD
|
|
||||||
unset npm_config_registry
|
|
||||||
-(cd "/root/.cache/bazel/_bazel_root/4351bb8fec5747e15a0a9b257c950736/external/build_bazel_rules_sass_deps/_/sass"; "/root/.cache/bazel/_bazel_root/4351bb8fec5747e15a0a9b257c950736/external/nodejs_linux_amd64/bin/yarn" --frozen-lockfile --mutex network)
|
|
||||||
+(cd "/root/.cache/bazel/_bazel_root/4351bb8fec5747e15a0a9b257c950736/external/build_bazel_rules_sass_deps/_/sass"; "/root/.cache/bazel/_bazel_root/4351bb8fec5747e15a0a9b257c950736/external/nodejs_linux_arm64/bin/yarn" --frozen-lockfile --mutex network)
|
|
||||||
diff --git a/esbuild_npm/_npm.sh b/esbuild_npm/_npm.sh
|
|
||||||
index 79213289d..5c7744458 100755
|
|
||||||
--- a/esbuild_npm/_npm.sh
|
|
||||||
+++ b/esbuild_npm/_npm.sh
|
|
||||||
@@ -1,4 +1,4 @@
|
|
||||||
#!/usr/bin/env bash
|
|
||||||
# Immediately exit if any command fails.
|
|
||||||
set -e
|
|
||||||
-(cd "/root/.cache/bazel/_bazel_root/4351bb8fec5747e15a0a9b257c950736/external/esbuild_npm/_/toolchains/esbuild"; "/root/.cache/bazel/_bazel_root/4351bb8fec5747e15a0a9b257c950736/external/nodejs_linux_amd64/bin/npm" ci --no-optional --ignore-scripts)
|
|
||||||
+(cd "/root/.cache/bazel/_bazel_root/4351bb8fec5747e15a0a9b257c950736/external/esbuild_npm/_/toolchains/esbuild"; "/root/.cache/bazel/_bazel_root/4351bb8fec5747e15a0a9b257c950736/external/nodejs_linux_arm64/bin/npm" ci --no-optional --ignore-scripts)
|
|
||||||
diff --git a/go_sdk/BUILD.bazel b/go_sdk/BUILD.bazel
|
|
||||||
index 27ba422bd..94de2d1a0 100644
|
|
||||||
--- a/go_sdk/BUILD.bazel
|
|
||||||
+++ b/go_sdk/BUILD.bazel
|
|
||||||
@@ -8,8 +8,8 @@ package(default_visibility = ["//visibility:public"])
|
|
||||||
filegroup(
|
|
||||||
name = "libs",
|
|
||||||
srcs = glob(
|
|
||||||
- ["pkg/linux_amd64/**/*.a"],
|
|
||||||
- exclude = ["pkg/linux_amd64/**/cmd/**"],
|
|
||||||
+ ["pkg/linux_arm64/**/*.a"],
|
|
||||||
+ exclude = ["pkg/linux_arm64/**/cmd/**"],
|
|
||||||
),
|
|
||||||
)
|
|
||||||
|
|
||||||
@@ -31,7 +31,7 @@ filegroup(
|
|
||||||
go_sdk(
|
|
||||||
name = "go_sdk",
|
|
||||||
goos = "linux",
|
|
||||||
- goarch = "amd64",
|
|
||||||
+ goarch = "arm64",
|
|
||||||
root_file = "ROOT",
|
|
||||||
package_list = ":package_list",
|
|
||||||
libs = [":libs"],
|
|
||||||
@@ -57,7 +57,7 @@ package_list(
|
|
||||||
)
|
|
||||||
|
|
||||||
declare_toolchains(
|
|
||||||
- host = "linux_amd64",
|
|
||||||
+ host = "linux_arm64",
|
|
||||||
sdk = ":go_sdk",
|
|
||||||
builder = ":builder",
|
|
||||||
)
|
|
||||||
diff --git a/go_sdk/src/cmd/internal/objabi/zbootstrap.go b/go_sdk/src/cmd/internal/objabi/zbootstrap.go
|
|
||||||
index e694570bb..5bfe64668 100644
|
|
||||||
--- a/go_sdk/src/cmd/internal/objabi/zbootstrap.go
|
|
||||||
+++ b/go_sdk/src/cmd/internal/objabi/zbootstrap.go
|
|
||||||
@@ -4,7 +4,7 @@ package objabi
|
|
||||||
|
|
||||||
import "runtime"
|
|
||||||
|
|
||||||
-const defaultGO386 = `sse2`
|
|
||||||
+const defaultGO386 = `387`
|
|
||||||
const defaultGOARM = `5`
|
|
||||||
const defaultGOMIPS = `hardfloat`
|
|
||||||
const defaultGOMIPS64 = `hardfloat`
|
|
||||||
diff --git a/local_config_cc/BUILD b/local_config_cc/BUILD
|
|
||||||
index 426ca0cc0..03e329411 100755
|
|
||||||
--- a/local_config_cc/BUILD
|
|
||||||
+++ b/local_config_cc/BUILD
|
|
||||||
@@ -47,15 +47,15 @@ filegroup(
|
|
||||||
cc_toolchain_suite(
|
|
||||||
name = "toolchain",
|
|
||||||
toolchains = {
|
|
||||||
- "k8|compiler": ":cc-compiler-k8",
|
|
||||||
- "k8": ":cc-compiler-k8",
|
|
||||||
+ "aarch64|compiler": ":cc-compiler-aarch64",
|
|
||||||
+ "aarch64": ":cc-compiler-aarch64",
|
|
||||||
"armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a",
|
|
||||||
"armeabi-v7a": ":cc-compiler-armeabi-v7a",
|
|
||||||
},
|
|
||||||
)
|
|
||||||
|
|
||||||
cc_toolchain(
|
|
||||||
- name = "cc-compiler-k8",
|
|
||||||
+ name = "cc-compiler-aarch64",
|
|
||||||
toolchain_identifier = "local",
|
|
||||||
toolchain_config = ":local",
|
|
||||||
all_files = ":compiler_deps",
|
|
||||||
@@ -72,7 +72,7 @@ cc_toolchain(
|
|
||||||
|
|
||||||
cc_toolchain_config(
|
|
||||||
name = "local",
|
|
||||||
- cpu = "k8",
|
|
||||||
+ cpu = "aarch64",
|
|
||||||
compiler = "compiler",
|
|
||||||
toolchain_identifier = "local",
|
|
||||||
host_system_name = "local",
|
|
||||||
@@ -80,11 +80,11 @@ cc_toolchain_config(
|
|
||||||
target_libc = "local",
|
|
||||||
abi_version = "local",
|
|
||||||
abi_libc_version = "local",
|
|
||||||
- cxx_builtin_include_directories = ["/usr/lib/gcc/x86_64-linux-gnu/10.3.1/include",
|
|
||||||
+ cxx_builtin_include_directories = ["/usr/lib/gcc/aarch64-linux-gnu/10.3.1/include",
|
|
||||||
"/usr/local/include",
|
|
||||||
"/usr/include",
|
|
||||||
"/usr/include/c++/10.3.1",
|
|
||||||
- "/usr/include/c++/10.3.1/x86_64-linux-gnu",
|
|
||||||
+ "/usr/include/c++/10.3.1/aarch64-linux-gnu",
|
|
||||||
"/usr/include/c++/10.3.1/backward"],
|
|
||||||
tool_paths = {"ar": "/usr/bin/ar",
|
|
||||||
"ld": "/usr/bin/ld",
|
|
||||||
diff --git a/local_config_cc/builtin_include_directory_paths b/local_config_cc/builtin_include_directory_paths
|
|
||||||
index 50e25225d..548377077 100755
|
|
||||||
--- a/local_config_cc/builtin_include_directory_paths
|
|
||||||
+++ b/local_config_cc/builtin_include_directory_paths
|
|
||||||
@@ -4,9 +4,9 @@ changes to it will be reflected in the action cache key. When some of these
|
|
||||||
paths change, Bazel will make sure to rerun the action, even though none of
|
|
||||||
declared action inputs or the action commandline changes.
|
|
||||||
|
|
||||||
-/usr/lib/gcc/x86_64-linux-gnu/10.3.1/include
|
|
||||||
+/usr/lib/gcc/aarch64-linux-gnu/10.3.1/include
|
|
||||||
/usr/local/include
|
|
||||||
/usr/include
|
|
||||||
/usr/include/c++/10.3.1
|
|
||||||
-/usr/include/c++/10.3.1/x86_64-linux-gnu
|
|
||||||
+/usr/include/c++/10.3.1/aarch64-linux-gnu
|
|
||||||
/usr/include/c++/10.3.1/backward
|
|
||||||
diff --git a/local_config_cc_toolchains/BUILD b/local_config_cc_toolchains/BUILD
|
|
||||||
index f9c087553..db5234fb0 100755
|
|
||||||
--- a/local_config_cc_toolchains/BUILD
|
|
||||||
+++ b/local_config_cc_toolchains/BUILD
|
|
||||||
@@ -1,10 +1,10 @@
|
|
||||||
load("@local_config_platform//:constraints.bzl", "HOST_CONSTRAINTS")
|
|
||||||
|
|
||||||
toolchain(
|
|
||||||
- name = "cc-toolchain-k8",
|
|
||||||
+ name = "cc-toolchain-aarch64",
|
|
||||||
exec_compatible_with = HOST_CONSTRAINTS,
|
|
||||||
target_compatible_with = HOST_CONSTRAINTS,
|
|
||||||
- toolchain = "@local_config_cc//:cc-compiler-k8",
|
|
||||||
+ toolchain = "@local_config_cc//:cc-compiler-aarch64",
|
|
||||||
toolchain_type = "@bazel_tools//tools/cpp:toolchain_type",
|
|
||||||
)
|
|
||||||
|
|
||||||
diff --git a/local_config_platform/constraints.bzl b/local_config_platform/constraints.bzl
|
|
||||||
index 6a7d8c3e0..4b29ad72c 100644
|
|
||||||
--- a/local_config_platform/constraints.bzl
|
|
||||||
+++ b/local_config_platform/constraints.bzl
|
|
||||||
@@ -1,6 +1,6 @@
|
|
||||||
# DO NOT EDIT: automatically generated constraints list for local_config_platform
|
|
||||||
# Auto-detected host platform constraints.
|
|
||||||
HOST_CONSTRAINTS = [
|
|
||||||
- '@platforms//cpu:x86_64',
|
|
||||||
+ '@platforms//cpu:aarch64',
|
|
||||||
'@platforms//os:linux',
|
|
||||||
]
|
|
||||||
diff --git a/local_jdk/BUILD.bazel b/local_jdk/BUILD.bazel
|
|
||||||
index 67c59e9ea..40d17ace1 100755
|
|
||||||
--- a/local_jdk/BUILD.bazel
|
|
||||||
+++ b/local_jdk/BUILD.bazel
|
|
||||||
@@ -218,6 +218,6 @@ config_setting(
|
|
||||||
local_java_runtime(
|
|
||||||
name = "local_jdk",
|
|
||||||
runtime_name = "jdk",
|
|
||||||
- java_home = "/usr/lib/jvm/java-11-openjdk-11.0.18.10-1.oe2303.x86_64",
|
|
||||||
+ java_home = "/usr/lib/jvm/java-11-openjdk",
|
|
||||||
version = "11",
|
|
||||||
)
|
|
||||||
diff --git a/nodejs/BUILD.bazel b/nodejs/BUILD.bazel
|
|
||||||
index 3a59c491b..c632e0f44 100755
|
|
||||||
--- a/nodejs/BUILD.bazel
|
|
||||||
+++ b/nodejs/BUILD.bazel
|
|
||||||
@@ -1,21 +1,21 @@
|
|
||||||
# Generated by nodejs_repo_host_os_alias.bzl
|
|
||||||
package(default_visibility = ["//visibility:public"])
|
|
||||||
# aliases for exports_files
|
|
||||||
-alias(name = "run_npm.sh.template", actual = "@nodejs_linux_amd64//:run_npm.sh.template")
|
|
||||||
-alias(name = "run_npm.bat.template", actual = "@nodejs_linux_amd64//:run_npm.bat.template")
|
|
||||||
-alias(name = "bin/node_repo_args.sh", actual = "@nodejs_linux_amd64//:bin/node_repo_args.sh")
|
|
||||||
+alias(name = "run_npm.sh.template", actual = "@nodejs_linux_arm64//:run_npm.sh.template")
|
|
||||||
+alias(name = "run_npm.bat.template", actual = "@nodejs_linux_arm64//:run_npm.bat.template")
|
|
||||||
+alias(name = "bin/node_repo_args.sh", actual = "@nodejs_linux_arm64//:bin/node_repo_args.sh")
|
|
||||||
|
|
||||||
# aliases for other aliases
|
|
||||||
-alias(name = "node_bin", actual = "@nodejs_linux_amd64//:node_bin")
|
|
||||||
-alias(name = "npm_bin", actual = "@nodejs_linux_amd64//:npm_bin")
|
|
||||||
-alias(name = "npx_bin", actual = "@nodejs_linux_amd64//:npx_bin")
|
|
||||||
-alias(name = "yarn_bin", actual = "@nodejs_linux_amd64//:yarn_bin")
|
|
||||||
-alias(name = "node", actual = "@nodejs_linux_amd64//:node")
|
|
||||||
-alias(name = "npm", actual = "@nodejs_linux_amd64//:npm")
|
|
||||||
-alias(name = "yarn", actual = "@nodejs_linux_amd64//:yarn")
|
|
||||||
-alias(name = "npm_node_repositories", actual = "@nodejs_linux_amd64//:npm_node_repositories")
|
|
||||||
-alias(name = "yarn_node_repositories", actual = "@nodejs_linux_amd64//:yarn_node_repositories")
|
|
||||||
-alias(name = "node_files", actual = "@nodejs_linux_amd64//:node_files")
|
|
||||||
-alias(name = "yarn_files", actual = "@nodejs_linux_amd64//:yarn_files")
|
|
||||||
-alias(name = "npm_files", actual = "@nodejs_linux_amd64//:npm_files")
|
|
||||||
+alias(name = "node_bin", actual = "@nodejs_linux_arm64//:node_bin")
|
|
||||||
+alias(name = "npm_bin", actual = "@nodejs_linux_arm64//:npm_bin")
|
|
||||||
+alias(name = "npx_bin", actual = "@nodejs_linux_arm64//:npx_bin")
|
|
||||||
+alias(name = "yarn_bin", actual = "@nodejs_linux_arm64//:yarn_bin")
|
|
||||||
+alias(name = "node", actual = "@nodejs_linux_arm64//:node")
|
|
||||||
+alias(name = "npm", actual = "@nodejs_linux_arm64//:npm")
|
|
||||||
+alias(name = "yarn", actual = "@nodejs_linux_arm64//:yarn")
|
|
||||||
+alias(name = "npm_node_repositories", actual = "@nodejs_linux_arm64//:npm_node_repositories")
|
|
||||||
+alias(name = "yarn_node_repositories", actual = "@nodejs_linux_arm64//:yarn_node_repositories")
|
|
||||||
+alias(name = "node_files", actual = "@nodejs_linux_arm64//:node_files")
|
|
||||||
+alias(name = "yarn_files", actual = "@nodejs_linux_arm64//:yarn_files")
|
|
||||||
+alias(name = "npm_files", actual = "@nodejs_linux_arm64//:npm_files")
|
|
||||||
exports_files(["index.bzl"])
|
|
||||||
diff --git a/nodejs/index.bzl b/nodejs/index.bzl
|
|
||||||
index a89a803dc..91c3e1e15 100755
|
|
||||||
--- a/nodejs/index.bzl
|
|
||||||
+++ b/nodejs/index.bzl
|
|
||||||
@@ -1,2 +1,2 @@
|
|
||||||
# Generated by nodejs_repo_host_os_alias.bzl
|
|
||||||
-host_platform="linux_amd64"
|
|
||||||
+host_platform="linux_arm64"
|
|
||||||
diff --git a/npm/_/node_modules/.yarn-integrity b/npm/_/node_modules/.yarn-integrity
|
|
||||||
index 1756c0195..ebd8d9486 100644
|
|
||||||
--- a/npm/_/node_modules/.yarn-integrity
|
|
||||||
+++ b/npm/_/node_modules/.yarn-integrity
|
|
||||||
@@ -1,5 +1,5 @@
|
|
||||||
{
|
|
||||||
- "systemParams": "linux-x64-72",
|
|
||||||
+ "systemParams": "linux-arm64-72",
|
|
||||||
"modulesFolders": [
|
|
||||||
"node_modules"
|
|
||||||
],
|
|
||||||
@@ -887,4 +887,4 @@
|
|
||||||
},
|
|
||||||
"files": [],
|
|
||||||
"artifacts": {}
|
|
||||||
-}
|
|
||||||
\ No newline at end of file
|
|
||||||
+}
|
|
||||||
diff --git a/npm/_yarn.sh b/npm/_yarn.sh
|
|
||||||
index 01ad3ec00..39360e872 100755
|
|
||||||
--- a/npm/_yarn.sh
|
|
||||||
+++ b/npm/_yarn.sh
|
|
||||||
@@ -4,4 +4,4 @@ set -e
|
|
||||||
unset YARN_IGNORE_PATH
|
|
||||||
unset INIT_CWD
|
|
||||||
unset npm_config_registry
|
|
||||||
-(cd "/root/.cache/bazel/_bazel_root/4351bb8fec5747e15a0a9b257c950736/external/npm/_"; "/root/.cache/bazel/_bazel_root/4351bb8fec5747e15a0a9b257c950736/external/nodejs_linux_amd64/bin/yarn" --frozen-lockfile --mutex network)
|
|
||||||
+(cd "/root/.cache/bazel/_bazel_root/4351bb8fec5747e15a0a9b257c950736/external/npm/_"; "/root/.cache/bazel/_bazel_root/4351bb8fec5747e15a0a9b257c950736/external/nodejs_linux_arm64/bin/yarn" --frozen-lockfile --mutex network)
|
|
||||||
--
|
|
||||||
2.39.1
|
|
||||||
|
|
||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
tensorboard-2.12.0-py3-none-any.whl
Normal file
BIN
tensorboard-2.12.0-py3-none-any.whl
Normal file
Binary file not shown.
@ -1,19 +1,19 @@
|
|||||||
%global _empty_manifest_terminate_build 0
|
%global _empty_manifest_terminate_build 0
|
||||||
Name: python-tensorboard
|
Name: python-tensorboard
|
||||||
Version: 2.10.1
|
Version: 2.12.0
|
||||||
Release: 2
|
Release: 1
|
||||||
Summary: TensorBoard lets you watch Tensors Flow
|
Summary: TensorBoard lets you watch Tensors Flow
|
||||||
License: Apache 2.0
|
License: Apache 2.0
|
||||||
URL: https://github.com/tensorflow/tensorboard
|
URL: https://github.com/tensorflow/tensorboard
|
||||||
Source0: https://github.com/tensorflow/tensorboard/archive/refs/tags/%{version}.tar.gz
|
Source0: https://files.pythonhosted.org/packages/8d/71/75fcfab1ff98e3fad240f760d3a6b5ca6bdbcc5ed141fb7abd35cf63134c/tensorboard-2.12.0-py3-none-any.whl
|
||||||
Source1: https://files.pythonhosted.org/packages/74/69/5747a957f95e2e1d252ca41476ae40ce79d70d38151d2e494feb7722860c/tensorboard_data_server-0.6.1-py3-none-any.whl
|
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
|
#Source2: bazel-tensorboard-external.tar.gzaa
|
||||||
Source3: bazel-tensorboard-external.tar.gzab
|
#Source3: bazel-tensorboard-external.tar.gzab
|
||||||
Source4: bazel-tensorboard-external.tar.gzac
|
#Source4: bazel-tensorboard-external.tar.gzac
|
||||||
Source5: adapt-external-for-aarch64.patch
|
#Source5: adapt-external-for-aarch64.patch
|
||||||
Source6: adds-external-for-aarch64.tar.gzaa
|
#Source6: adds-external-for-aarch64.tar.gzaa
|
||||||
Source7: adds-external-for-aarch64.tar.gzab
|
#Source7: adds-external-for-aarch64.tar.gzab
|
||||||
Patch0: 0001-Bumps-google-auth-oauthlib-dependency-restriction.patch
|
Source8: 0001-Bumps-google-auth-oauthlib-dependency-restriction.patch
|
||||||
|
|
||||||
Requires: python3-absl-py
|
Requires: python3-absl-py
|
||||||
Requires: python3-grpcio
|
Requires: python3-grpcio
|
||||||
@ -76,52 +76,15 @@ 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.
|
and may be found at https://pypi.python.org/pypi/tensorflow-tensorboard.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -p1 -n tensorboard-%{version} -b 0
|
|
||||||
extdir=$(bazel --output_user_root=`pwd`/../output_user_root info output_base)
|
|
||||||
mkdir -p ${extdir}
|
|
||||||
cat %{SOURCE2} %{SOURCE3} %{SOURCE4} > bazel-local-cache.tar.gz
|
|
||||||
tar xzvf bazel-local-cache.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
|
|
||||||
ln -sfn $(find ${extdir}/../install -name embedded_tools) ${extdir}/external/bazel_tools
|
|
||||||
ln -sfn $(find ${extdir}/../install -maxdepth 2 -name platforms) ${extdir}/external/platforms
|
|
||||||
ln -sf ${extdir}/external/io_bazel_rules_go/go/private/compat/v25.bzl ${extdir}/external/io_bazel_rules_go_compat/compat.bzl
|
|
||||||
ln -sf ${extdir}/external/bazel_tools/tools/cpp/armeabi_cc_toolchain_config.bzl ${extdir}/external/local_config_cc/armeabi_cc_toolchain_config.bzl
|
|
||||||
ln -sf ${extdir}/external/bazel_tools/tools/cpp/unix_cc_toolchain_config.bzl ${extdir}/external/local_config_cc/cc_toolchain_config.bzl
|
|
||||||
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
|
|
||||||
ln -sf ${extdir}/external/nodejs_linux_amd64/node_info ${extdir}/external/build_bazel_rules_sass_deps/_node_info
|
|
||||||
ln -sf ${extdir}/external/nodejs_linux_amd64/node_info ${extdir}/external/esbuild_npm/_node_info
|
|
||||||
ln -sf ${extdir}/external/nodejs_linux_amd64/node_info ${extdir}/external/npm/_node_info
|
|
||||||
ln -sfn ${extdir}/external/build_bazel_rules_sass_deps/_/sass/node_modules ${extdir}/external/build_bazel_rules_sass_deps/node_modules
|
|
||||||
ln -sfn ${extdir}/external/esbuild_npm/_/toolchains/esbuild/node_modules ${extdir}/external/esbuild_npm/node_modules
|
|
||||||
ln -sfn ${extdir}/external/npm/_/node_modules ${extdir}/external/npm/node_modules
|
|
||||||
ln -sf ${extdir}/external/nodejs_linux_amd64/yarn_info ${extdir}/external/build_bazel_rules_sass_deps/_yarn_info
|
|
||||||
ln -sf ${extdir}/external/nodejs_linux_amd64/yarn_info ${extdir}/external/esbuild_npm/_yarn_info
|
|
||||||
ln -sf ${extdir}/external/nodejs_linux_amd64/yarn_info ${extdir}/external/npm/_yarn_info
|
|
||||||
ln -sf ${extdir}/external/io_bazel_rules_sass/sass/yarn.lock ${extdir}/external/build_bazel_rules_sass_deps/_/sass/yarn.lock
|
|
||||||
ln -sf ${_builddir}/tensorboard-2.10.1/yarn.lock ${extdir}/external/npm/_/yarn.lock
|
|
||||||
ln -sf ${extdir}/external/build_bazel_rules_nodejs/toolchains/esbuild/package-lock.json ${extdir}/external/esbuild_npm/_/toolchains/esbuild/package-lock.json
|
|
||||||
oldstr='/root/.cache/bazel/_bazel_root/4351bb8fec5747e15a0a9b257c950736/'
|
|
||||||
sed -i s#${oldstr}#${extdir}#g `grep ${oldstr} -rl ${extdir}`
|
|
||||||
grep ${extdir} -rl ${extdir}
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
mkdir dist
|
mkdir dist
|
||||||
|
cp %{SOURCE0} dist
|
||||||
cp %{SOURCE1} 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
|
%install
|
||||||
%py3_install_wheel *
|
%py3_install_wheel *
|
||||||
|
patch -d %{buildroot}/%{python3_sitelib} -p1 < %{SOURCE8}
|
||||||
install -d -m755 %{buildroot}/%{_pkgdocdir}
|
install -d -m755 %{buildroot}/%{_pkgdocdir}
|
||||||
if [ -d doc ]; then cp -arf doc %{buildroot}/%{_pkgdocdir}; fi
|
if [ -d doc ]; then cp -arf doc %{buildroot}/%{_pkgdocdir}; fi
|
||||||
if [ -d docs ]; then cp -arf docs %{buildroot}/%{_pkgdocdir}; fi
|
if [ -d docs ]; then cp -arf docs %{buildroot}/%{_pkgdocdir}; fi
|
||||||
@ -148,6 +111,9 @@ mv %{buildroot}/doclist.lst .
|
|||||||
%{_docdir}/*
|
%{_docdir}/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Jul 21 2023 zhuofeng <zhuofeng2@huawei.com> - 2.12.0-1
|
||||||
|
- Update package to version 2.12.0
|
||||||
|
|
||||||
* Sat May 06 2023 Dongxing Wang <dxwangk@isoftstone.com> - 2.10.1-2
|
* Sat May 06 2023 Dongxing Wang <dxwangk@isoftstone.com> - 2.10.1-2
|
||||||
- change depends google-auth
|
- change depends google-auth
|
||||||
|
|
||||||
|
|||||||
Binary file not shown.
BIN
tensorboard_data_server-0.7.1-py3-none-any.whl
Normal file
BIN
tensorboard_data_server-0.7.1-py3-none-any.whl
Normal file
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user