[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes include path broken by virtual pip packaging #29561

Merged
merged 1 commit into from
Jun 9, 2019

Conversation

byronyi
Copy link
Contributor
@byronyi byronyi commented Jun 8, 2019

Ping @mihaimaruseac for review. Ping @lark as this is a work-related contribution.

This fixes horovod/horovod#1129 in our in-house nightly build.

Signed-off-by: Bairen Yi <yibairen.byron@bytedance.com>
@tensorflow-bot tensorflow-bot bot added the size:S CL Change Size: Small label Jun 8, 2019
unzip $WHEEL -d $WHEEL_TMPDIR > /dev/null
rm $WHEEL
pushd $WHEEL_TMPDIR > /dev/null
mv tensorflow_core/include/tensorflow{_core,}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we only need this line but immediately after line 172 above:

mv tensorflow tensorflow_core   # this is line 172
mv tensorflow_core/include/tensorflow{_core,}   # this is the line

This way we don't unzip and rezip the wheel and potentially breaking the contract in manifest.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm going to approve as is for now and fix that tomorrow after we have new pips

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That’s weird, why do we have them under tensorflow_core in the first place, before bdist_wheel? I’ll take a closer look at your suggested fix.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This way we don't unzip and rezip the wheel and potentially breaking the contract in manifest.

The MANIFEST.in file seems long broken anyway. Do we need to fix them as well?

@tensorflow-bot tensorflow-bot bot added kokoro:force-run Tests on submitted change ready to pull PR ready for merge process labels Jun 8, 2019
@kokoro-team kokoro-team removed the kokoro:force-run Tests on submitted change label Jun 8, 2019
pull bot pushed a commit to Pandinosaurus/tensorflow that referenced this pull request Jun 9, 2019
@tensorflow-copybara tensorflow-copybara merged commit 3cc7bab into tensorflow:master Jun 9, 2019
@byronyi
Copy link
Contributor Author
byronyi commented Jun 9, 2019

Oh this should not be merged...ping @perfinion to help sort out this patch in a proper way.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cla: yes ready to pull PR ready for merge process size:S CL Change Size: Small
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Nightly TF 1.14.1.dev20190607 breaks v0.16.3
5 participants