Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
曾经的那一瞬间
Tensorflow
提交
c715c310
T
Tensorflow
项目概览
曾经的那一瞬间
/
Tensorflow
9 个月 前同步成功
通知
10
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
Tensorflow
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
c715c310
编写于
9月 08, 2016
作者:
M
Martin Wicke
提交者:
GitHub
9月 08, 2016
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #4284 from caisq/r0.10-fixes
Cherry-picking r0.10 fixes
上级
23da860f
f5a9638e
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
34 addition
and
4 deletion
+34
-4
tensorflow/tools/docker/parameterized_docker_build.sh
tensorflow/tools/docker/parameterized_docker_build.sh
+15
-1
tensorflow/tools/pip_package/build_pip_package.sh
tensorflow/tools/pip_package/build_pip_package.sh
+19
-3
未找到文件。
tensorflow/tools/docker/parameterized_docker_build.sh
浏览文件 @
c715c310
...
...
@@ -323,7 +323,21 @@ fi
# Apply the final image name and tag
FINAL_IMG
=
"
${
FINAL_IMAGE_NAME
}
:
${
FINAL_TAG
}
"
docker tag
-f
"
${
IMG
}
"
"
${
FINAL_IMG
}
"
||
\
DOCKER_VER
=
$(
docker version |
grep
Version |
head
-1
|
awk
'{print $NF}'
)
if
[[
-z
"
${
DOCKER_VER
}
"
]]
;
then
die
"ERROR: Failed to determine docker version"
fi
DOCKER_MAJOR_VER
=
$(
echo
"
${
DOCKER_VER
}
"
|
cut
-d
.
-f
1
)
DOCKER_MINOR_VER
=
$(
echo
"
${
DOCKER_VER
}
"
|
cut
-d
.
-f
2
)
FORCE_TAG
=
""
if
[[
"
${
DOCKER_MAJOR_VER
}
"
-le
1
]]
&&
\
[[
"
${
DOCKER_MINOR_VER
}
"
-le
9
]]
;
then
FORCE_TAG
=
"--force"
fi
docker tag
${
FORCE_TAG
}
"
${
IMG
}
"
"
${
FINAL_IMG
}
"
||
\
die
"Failed to tag intermediate docker image
${
IMG
}
as
${
FINAL_IMG
}
"
echo
""
...
...
tensorflow/tools/pip_package/build_pip_package.sh
浏览文件 @
c715c310
...
...
@@ -17,6 +17,14 @@
set
-e
function
cp_external
()
{
local
src_dir
=
$1
local
dest_dir
=
$2
for
f
in
`
find
"
$src_dir
"
-maxdepth
1
-mindepth
1
!
-name
'*local_config_cuda*'
`
;
do
cp
-R
"
$f
"
"
$dest_dir
"
done
}
function
main
()
{
if
[
$#
-lt
1
]
;
then
echo
"No destination dir provided"
...
...
@@ -36,15 +44,23 @@ function main() {
if
[
!
-d
bazel-bin/tensorflow/tools/pip_package/build_pip_package.runfiles/org_tensorflow
]
;
then
# Really old (0.2.1-) runfiles, without workspace name.
cp
-R
\
bazel-bin/tensorflow/tools/pip_package/build_pip_package.runfiles/
{
tensorflow,external
}
\
bazel-bin/tensorflow/tools/pip_package/build_pip_package.runfiles/
tensorflow
\
"
${
TMPDIR
}
"
mkdir
"
${
TMPDIR
}
/external"
cp_external
\
bazel-bin/tensorflow/tools/pip_package/build_pip_package.runfiles/external
\
"
${
TMPDIR
}
/external"
RUNFILES
=
bazel-bin/tensorflow/tools/pip_package/build_pip_package.runfiles
else
if
[
-d
bazel-bin/tensorflow/tools/pip_package/build_pip_package.runfiles/org_tensorflow/external
]
;
then
# Old-style runfiles structure (--legacy_external_runfiles).
cp
-R
\
bazel-bin/tensorflow/tools/pip_package/build_pip_package.runfiles/org_tensorflow/
{
tensorflow,external
}
\
bazel-bin/tensorflow/tools/pip_package/build_pip_package.runfiles/org_tensorflow/
tensorflow
\
"
${
TMPDIR
}
"
mkdir
"
${
TMPDIR
}
/external"
cp_external
\
bazel-bin/tensorflow/tools/pip_package/build_pip_package.runfiles/org_tensorflow/external
\
"
${
TMPDIR
}
/external"
else
# New-style runfiles structure (--nolegacy_external_runfiles).
cp
-R
\
...
...
@@ -52,7 +68,7 @@ function main() {
"
${
TMPDIR
}
"
mkdir
"
${
TMPDIR
}
/external"
# Note: this makes an extra copy of org_tensorflow.
cp
-R
\
cp
_external
\
bazel-bin/tensorflow/tools/pip_package/build_pip_package.runfiles
\
"
${
TMPDIR
}
/external"
fi
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录