Cleanup C++ model example and cmake CI job #8411
Conversation
🔗 Helpful Links🧪 See artifacts and rendered test results at hud.pytorch.org/pr/pytorch/vision/8411
Note: Links to docs will display an error until the docs builds have been completed. ✅ No FailuresAs of commit 5041b90 with merge base d23a6e1 ( This comment was automatically generated by Dr. CI and updates every 15 minutes. |
…to cleanup_cpp_example
There was a problem hiding this comment.
This is executed by our Cmake CI job.
Originally this does the following:
- build
torchvisionlib - build and run the
example/cppstuff - build and run the
test/tracing/frcnnstuff.
In this PR I removed the test/tracing/frcnn stuff and merged it into the example/cpp stuff, so in this file we're just removing the things related to test/tracing/frcnn.
|
|
||
| cmake .. -DTorch_DIR="${Torch_DIR}" \ | ||
| -DCMAKE_PREFIX_PATH="${CONDA_PREFIX}" \ | ||
| -DCMAKE_FIND_FRAMEWORK=NEVER | ||
| -DCMAKE_FIND_FRAMEWORK=NEVER \ | ||
| -DUSE_TORCHVISION=ON # Needed for faster-rcnn since it's using torchvision ops like NMS. |
There was a problem hiding this comment.
Some scripted models like Faster-RCNN rely on torchvision ops, so for those we need to link to libtorchvision. But some other models like resnet do not need libtorchvision.
Prior to this PR, the example's CmakeLists.txt would always link to libtorchvision even if it was unnecessary. I added a USE_TORCHVISION option to let use decide whether they want to link against it or not. Here, we want to test the RCNN model, so we have to pass USE_TORCHVISION=ON.
There was a problem hiding this comment.
This file is a merge of the previous hello_world/CMakeLists.txt (now deleted) and test/tracing/frcnn/CMakelists.txt (now deleted).
The main changes are:
- only link to libtorchvision if
USE_TORCHVISIONis ON. - Do not link to libPython - this is actually not needed in this example regardless of the platform (it's only potentially required on
libtorchvisionon Windows).
There was a problem hiding this comment.
Much more detailed and more accurate build instructions for libtorchvision and for the example.
There was a problem hiding this comment.
This is a merge of the previous hello-world/main.cpp (deleted) and test/tracing/frcnn/test_frcnn_tracing.cpp (deleted).
This file is able to run both a resnet and faster-rcnn scripted model, and only include relevant headers if needed.
| #ifdef _WIN32 | ||
| #include <torchvision/vision.h> | ||
| #endif // _WIN32 |
There was a problem hiding this comment.
I don't fully understand yet why this is required on Windows, but this is for another PR
There was a problem hiding this comment.
like other files this is a merged of the previous stuff that was in hello-world and in tests/tracing.
|
Hey @NicolasHug! You merged this PR, but no labels were added. |
Reviewed By: vmoens Differential Revision: D57099456 fbshipit-source-id: 8c8ed51549c4abaa27644bef5aae8484b6d3a057
This PR cleans up some CMake stuff. I added comments to explain the changes made to the respective files.
This does not make any change to the
CMakeLists.txtat the root of the repo, and doesn't change the waylibtorchvisionis built either. Those are only changes related to docs on how to build it, and related to the examples / tests we have.The main changes are:
test/tracing/and integrate them withinexample/cpp