Skip to content

feat: Win/Linux Dual Compatible WORKSPACE + Upgrade CUDA + Upgrade PyT#2907

Merged
gs-olive merged 14 commits intopytorch:mainfrom
gs-olive:windows_cpp_runtime_bazel
Jun 14, 2024
Merged

feat: Win/Linux Dual Compatible WORKSPACE + Upgrade CUDA + Upgrade PyT#2907
gs-olive merged 14 commits intopytorch:mainfrom
gs-olive:windows_cpp_runtime_bazel

Conversation

@gs-olive
Copy link
Contributor

@gs-olive gs-olive commented Jun 12, 2024 •
edited
Loading

Description

  • Add support for OS compatibility in the WORKSPACE file and BUILD files across the repository
  • Upgrade bazel version to enable Windows builds in MSVC command prompt
  • Validate multiple builds on CI, including with new Bazel version
  • Upgrade default to CUDA 12.4
  • Upgrade PyTorch versions

Steps to Build on Windows Using the New WORKSPACE

Portions adapted from discussion with @HolyWu in #2806

  • Clone Torch-TRT (this repo)
  • Open x64 Native Tools Command Prompt for VS 2022
  • Install latest version of Torch (i.e. with pip install --pre torch --index-url https://download.pytorch.org/whl/nightly/cu121)
  • Run set DISTUTILS_USE_SDK=1
  • This is analogous to setting LD_LIBRARY_PATH on Linux
  • Run python setup.py bdist_wheel
  • Run python -m pip install dist/*.whl

Type of change

  • New feature (non-breaking change which adds functionality)

Checklist:

  • [ x ] My code follows the style guidelines of this project (You can use the linters)
  • [ x ] I have performed a self-review of my own code
  • [ x ] I have commented my code, particularly in hard-to-understand areas and hacks
  • [ x ] I have made corresponding changes to the documentation
  • [ x ] I have added tests to verify my fix or my feature
  • [ x ] New and existing unit tests pass locally with my changes
  • [ x ] I have added the relevant labels to my PR in so that relevant reviewers are notified

@gs-olive gs-olive added the WIP Work is in progress, pull request should not be merged yet label Jun 12, 2024
@gs-olive gs-olive requested a review from narendasan June 12, 2024 02:59
@gs-olive gs-olive self-assigned this Jun 12, 2024
@github-actions github-actions bot added component: tests Issues re: Tests component: lowering Issues re: The lowering / preprocessing passes component: conversion Issues re: Conversion stage component: core Issues re: The core compiler component: converters Issues re: Specific op converters component: build system Issues re: Build system component: api [Python] Issues re: Python API component: api [C++] Issues re: C++ API component: evaluators Issues re: Specific op evaluators component: runtime component: partitioning labels Jun 12, 2024
@gs-olive gs-olive force-pushed the windows_cpp_runtime_bazel branch from 9be7ea1 to 14e079b Compare June 12, 2024 03:08
@gs-olive
Copy link
Contributor Author

gs-olive commented Jun 12, 2024

Installation instruction update

@gs-olive gs-olive force-pushed the windows_cpp_runtime_bazel branch from 14e079b to 2202e3c Compare June 13, 2024 21:18
@github-actions github-actions bot removed the component: api [Python] Issues re: Python API label Jun 13, 2024
narendasan
narendasan reviewed Jun 13, 2024
View reviewed changes
@github-actions github-actions bot added documentation Improvements or additions to documentation component: api [Python] Issues re: Python API labels Jun 13, 2024
@gs-olive gs-olive changed the title feat: Win/Linux Dual Compatible WORKSPACE feat: Win/Linux Dual Compatible WORKSPACE + Upgrade CUDA + Upgrade PyT Jun 14, 2024
@gs-olive gs-olive removed the WIP Work is in progress, pull request should not be merged yet label Jun 14, 2024
@gs-olive gs-olive requested a review from narendasan June 14, 2024 01:57
gs-olive
gs-olive commented Jun 14, 2024
View reviewed changes
docsrc/getting_started/getting_started_with_windows.rst
Comment on lines -19 to -24
* Open Microsoft Visual Studio
* Open Torch-TensorRT source code folder
* Open Manage configurations -> Edit JSON to open CMakeSettings.json file.
* Configure the CMake build configurations. Following is an example configuration:

.. code-block:: none
Copy link
Contributor Author

@gs-olive gs-olive Jun 14, 2024

Choose a reason for hiding this comment

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

Is it useful to leave the old Visual Studio instructions in this tutorial?

Copy link
Collaborator

@peri044 peri044 Jun 14, 2024

Choose a reason for hiding this comment

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

The existing windows support was using cmake right ?

peri044
peri044 approved these changes Jun 14, 2024
View reviewed changes
Copy link
Collaborator

@peri044 peri044 left a comment

Choose a reason for hiding this comment

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

LGTM

HolyWu
HolyWu reviewed Jun 14, 2024
View reviewed changes
HolyWu
HolyWu reviewed Jun 14, 2024
View reviewed changes
HolyWu
HolyWu reviewed Jun 14, 2024
View reviewed changes
HolyWu
HolyWu reviewed Jun 14, 2024
View reviewed changes
HolyWu
HolyWu reviewed Jun 14, 2024
View reviewed changes
HolyWu
HolyWu reviewed Jun 14, 2024
View reviewed changes
gs-olive
gs-olive commented Jun 14, 2024
View reviewed changes
gs-olive added 13 commits June 14, 2024 13:02
@gs-olive
feat: Win/Linux Dual Compatible WORKSPACE
6d88b01 
- Add support for OS compatibility in the `WORKSPACE` file and `BUILD`
  files across the repository
- Upgrade bazel version to enable Windows builds in MSVC command prompt
- Validate multiple builds on CI, including with new Bazel version
@gs-olive
fix: Address review comments; upgrade to cu124
8f8ad7a
@gs-olive
fix: Upgrade CI Workspace
f364c98
@gs-olive
Downgrade to bazel 6.2.1
0b4681e
@gs-olive
Update target lang in bazelrc to match
ede8be4
@gs-olive
Update target lang in bazelrc to match 2
c92a172
@gs-olive
fix: Update include dirs for Windows
ff09577
@gs-olive
fix: Upgrade bazel version again
7518218
@gs-olive
fix: Remove unnecessary args in Windows build
3657f4e
@gs-olive
Update instructions for Windows builds
9129d4a
@gs-olive
Update docs
cfccdf6
@gs-olive
Fix indentation and documentation of imports
b9d2cb7
@gs-olive
Upgrade version in txt
e94ce68
@gs-olive gs-olive force-pushed the windows_cpp_runtime_bazel branch from 5426b59 to e94ce68 Compare June 14, 2024 20:03
@github-actions github-actions bot added the component: dynamo Issues relating to the `torch.compile` or `torch._dynamo.export` paths label Jun 14, 2024
@gs-olive gs-olive force-pushed the windows_cpp_runtime_bazel branch from cf04d92 to 4113b95 Compare June 14, 2024 21:07
@gs-olive gs-olive merged commit 7dc08c5 into pytorch:main Jun 14, 2024
@gs-olive gs-olive deleted the windows_cpp_runtime_bazel branch June 14, 2024 22:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@peri044 peri044 peri044 approved these changes

@narendasan narendasan Awaiting requested review from narendasan

+1 more reviewer

@HolyWu HolyWu HolyWu left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@gs-olive gs-olive

Labels

cla signed component: api [C++] Issues re: C++ API component: api [Python] Issues re: Python API component: build system Issues re: Build system component: conversion Issues re: Conversion stage component: converters Issues re: Specific op converters component: core Issues re: The core compiler component: dynamo Issues relating to the `torch.compile` or `torch._dynamo.export` paths component: evaluators Issues re: Specific op evaluators component: lowering Issues re: The lowering / preprocessing passes component: partitioning component: runtime component: tests Issues re: Tests documentation Improvements or additions to documentation

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@gs-olive @narendasan @HolyWu @peri044 @facebook-github-bot