clean up the build a bit. We no longer need the separate build_libtorch entrypoint#9836
clean up the build a bit. We no longer need the separate build_libtorch entrypoint#9836anderspapitto wants to merge 1 commit intopytorch:masterfrom
Conversation
9b44bbd to
9edf4aa
Compare
|
@pytorchbot retest this please |
8e72247 to
bab364c
Compare
4b81b7c to
07e5294
Compare
a07b8f6 to
c6f4ca3
Compare
c6f4ca3 to
3e8b76d
Compare
goldsborough
left a comment
There was a problem hiding this comment.
Mostly LGTM, just a lot of questions of how my old config will translate to the brave new world
| popd | ||
| fi | ||
|
|
||
| # Test no-Python build |
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
| # this is a bit hacky, but not too bad. Bundle the test binaries into | ||
| # the installation directory, so they can catch a free ride on the 7z | ||
| # train. | ||
| mkdir -p ${PYTORCH_ENV_DIR}/miniconda3/lib/python3.6/site-packages/torch/test_binaries/build |
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
|
|
||
| cmake -DUSE_CUDA:BOOL=$USE_CUDA \ | ||
| -DBUILD_TORCH=ON \ | ||
| -DUSE_OPENMP:BOOL=${USE_OPENMP:ON} \ |
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
| fi | ||
|
|
||
| # Code is developed a lot more than released, so default to Debug. | ||
| BUILD_TYPE=${BUILD_TYPE:-Debug} |
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
| # Build with Ninja if available. It has much cleaner output. | ||
| GENERATE="Unix Makefiles" | ||
| MAKE=make | ||
| if [ -x "$(command -v ninja)" ]; then |
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
| # Try to build with as many threads as we have cores, default to 4 if the | ||
| # command fails. | ||
| set +e | ||
| if [ -n "$MAX_JOBS" ]; then # Use MAX_JOBS if it is set |
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
|
|
||
| # Add the test binaries so that they won't be git clean'ed away | ||
| git add -f build/bin | ||
| git add -f build/bin build/lib |
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
|
What is the status here? Can we make this happen soon? |
|
@goldsborough if you want to accept I'm ready to push now. But in the meantime i'm looking at some of the cleanup comments |
goldsborough
left a comment
There was a problem hiding this comment.
@ezyang still had some questions, then he can give you codeowner approval
facebook-github-bot
left a comment
There was a problem hiding this comment.
anderspapitto is landing this pull request. If you are a Facebook employee, you can view this diff on Phabricator.
|
I kind of expected you to wait for @ezyang's approval |
…d_libtorch entrypoint (pytorch#9836)" This reverts commit 62e23a1.
…ch entrypoint (pytorch#9836) Summary: the new entrypoint is `./tools/build_pytorch_libs.sh caffe2` this will also speed up CI builds a bit, since we will no longer be compiling all of libtorch twice Pull Request resolved: pytorch#9836 Differential Revision: D9182634 Pulled By: anderspapitto fbshipit-source-id: 0b9a20ab04f5df2d5c4e7777e4dc468ab25b9ce2
pytorch#10285) Summary: …d_libtorch entrypoint (pytorch#9836)" This reverts commit 62e23a1. Pull Request resolved: pytorch#10285 Differential Revision: D9193107 Pulled By: ezyang fbshipit-source-id: de96dce12fdf74410413ae18feee5caf0bed0025
the new entrypoint is
./tools/build_pytorch_libs.sh caffe2this will also speed up CI builds a bit, since we will no longer be compiling all of libtorch twice