[tensorflow-common] fix regex pattern of static link script (#27847)

This commit is contained in:
7FrogTW 2022-11-18 15:28:00 +08:00 коммит произвёл GitHub
Родитель 4dbc2e3403
Коммит 42db6e908b
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
5 изменённых файлов: 10 добавлений и 7 удалений

Просмотреть файл

@ -10,7 +10,7 @@ with open(sys.argv[1], "r") as f_in:
with open("static_link.sh", "w") as f_out:
if os.path.isfile(f"{params_path}/libtensorflow_framework.{version}.dylib-2.params"):
p_cd = re.compile(r"^\((cd .*) && \\$")
p_linker = re.compile(fr"^\s*.+cc_wrapper.sh.+(@bazel-out\S+libtensorflow{lib_suffix}\.\d\.\d\.\d\.dylib-2\.params).*")
p_linker = re.compile(fr"^\s*.+cc_wrapper.sh.+(@bazel-out\S+libtensorflow{lib_suffix}\.\d+\.\d+\.\d+\.dylib-2\.params).*")
f_out.write("#!/bin/bash\n# note: ar/binutils version 2.27 required to support output files > 4GB\n")
env = []
for line in f_in:
@ -29,8 +29,8 @@ with open(sys.argv[1], "r") as f_in:
else:
# old behaviour (still on some platforms): inline all parameters instead of using -2.params file
p_cd = re.compile(r"^\((cd .*) && \\$")
p_linker1 = re.compile(fr"^.*cc_wrapper.sh.+-shared.+-o (bazel-out\S+libtensorflow{lib_suffix}\.\d\.\d\.\d\.dylib)")
p_linker2 = re.compile("^.*cc_wrapper.sh.+-shared.+-o (bazel-out\\S+libtensorflow_framework\\.\\d\\.\\d\\.\\d\\.dylib)")
p_linker1 = re.compile(fr"^.*cc_wrapper.sh.+-shared.+-o (bazel-out\S+libtensorflow{lib_suffix}\.\d+\.\d+\.\d+\.dylib)")
p_linker2 = re.compile("^.*cc_wrapper.sh.+-shared.+-o (bazel-out\\S+libtensorflow_framework\\.\\d+\\.\\d+\\.\\d+\\.dylib)")
f_out.write("#!/bin/bash\n# note: ar/binutils version 2.27 required to support output files > 4GB\n")
env = []
parts = None

Просмотреть файл

@ -1,6 +1,7 @@
{
"name": "tensorflow-common",
"version-semver": "2.10.0",
"port-version": 1,
"description": "This meta package holds common files for the C [tensorflow] and the C++ [tensorflow-cc] API version of TensorFlow but is not installable on its own.",
"homepage": "https://github.com/tensorflow/tensorflow",
"license": "Apache-2.0"

Просмотреть файл

@ -1058,9 +1058,6 @@ tensorflow-cc:x64-windows=fail
tensorflow-cc:x64-windows-static=fail
tensorflow-cc:x64-windows-static-md=fail
tensorflow:x64-osx=fail
tensorflow-cc:x64-osx=fail
theia:arm64-windows = skip
theia:arm-uwp = skip
theia:x64-uwp = skip

Просмотреть файл

@ -7334,7 +7334,7 @@
},
"tensorflow-common": {
"baseline": "2.10.0",
"port-version": 0
"port-version": 1
},
"tensorpipe": {
"baseline": "2022-03-16",

Просмотреть файл

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "0c6c288cabee4b8f5b260c2af84c534ece1285d8",
"version-semver": "2.10.0",
"port-version": 1
},
{
"git-tree": "958295999ce648940c11c6671f0897f38944841a",
"version-semver": "2.10.0",