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.

Sign up for GitHub

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

Jump to bottom

Move Fluid C++ code from /paddle to /paddle/fluid #8344

Merged
merged 8 commits into from
Feb 10, 2018
Merged

Move Fluid C++ code from /paddle to /paddle/fluid #8344

merged 8 commits into from
Feb 10, 2018

Conversation

wangkuiyi
Copy link
Collaborator

@wangkuiyi wangkuiyi commented Feb 10, 2018 •
edited
Loading

Fixes #8345

@wangkuiyi wangkuiyi changed the title Move to fluid Move Fluid C++ code from /paddle to /paddle/fluid Feb 10, 2018
@wangkuiyi
Copy link
Collaborator Author

The CI failed at the stage of building the wheel package:

[01:41:10][Step 1/1] error: package directory '/paddle/build/paddle/framework' does not exist
[01:41:10][Step 1/1] make[2]: *** [python/build/.timestamp] Error 1

I have no clue with the process that builds the wheel package. Could @Yancey1989 @typhoonzero please help me with this? Thanks!

@typhoonzero
Copy link
Contributor

@wangkuiyi should change this line: https://github.com/wangkuiyi/Paddle/blob/154368b1a0f81dda8393a9aa8687d7da44b3bead/python/setup.py.in#L112

@wangkuiyi wangkuiyi mentioned this pull request Feb 10, 2018
Closed
@luotao1
Copy link
Contributor

luotao1 commented Feb 10, 2018

In order to make paddle_docs sucussfully, should change:
https://github.com/wangkuiyi/Paddle/blob/a6c1bffa471798fa36829c8cb24c9bd993bd2baf/paddle/fluid/operators/CMakeLists.txt#L4
from set(pybind_file ${PADDLE_SOURCE_DIR}/paddle/pybind/pybind.h)
to set(pybind_file ${PADDLE_SOURCE_DIR}/paddle/fluid/pybind/pybind.h)

And change the file in .gitignore: https://github.com/PaddlePaddle/Paddle/blob/develop/.gitignore#L36
from paddle/pybind/pybind.h
to paddle/fluid/pybind/pybind.h

@luotao1
Copy link
Contributor

luotao1 commented Feb 10, 2018 •
edited
Loading

paddle/string should be moved to paddle/fluid/string as well (TODO in next PR)

@luotao1 luotao1 merged commit 8370fa8 into PaddlePaddle:develop Feb 10, 2018
@luotao1 luotao1 mentioned this pull request Feb 11, 2018
Merged
@wangkuiyi wangkuiyi mentioned this pull request Feb 11, 2018
Closed
@luotao1 luotao1 mentioned this pull request Feb 11, 2018
Closed
@wangkuiyi wangkuiyi deleted the move_to_fluid branch February 12, 2018 18:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@luotao1 luotao1 luotao1 approved these changes

@hedaoyuan hedaoyuan Awaiting requested review from hedaoyuan

@reyoung reyoung Awaiting requested review from reyoung

@dzhwinter dzhwinter Awaiting requested review from dzhwinter

@QiJune QiJune Awaiting requested review from QiJune

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@wangkuiyi @typhoonzero @luotao1