Skip to content

fix: Update Docker build to automatically adapt Torch version#1732

Merged
gs-olive merged 2 commits intopytorch:mainfrom
gs-olive:dockerfile_version_fix
Mar 28, 2023
Merged

fix: Update Docker build to automatically adapt Torch version#1732
gs-olive merged 2 commits intopytorch:mainfrom
gs-olive:dockerfile_version_fix

Conversation

@gs-olive
Copy link
Copy Markdown
Contributor

@gs-olive gs-olive commented Mar 10, 2023 •
edited
Loading

Description

  • Build issue encountered in Docker arising from mismatched versions in WORKSPACE and Docker folder
  • Update Dockerfile build process to adapt Torch version from requirements.txt
  • Remove references to Torch version in Docker WORKSPACE file; instead use local Torch version

Type of change

  • Bug fix (non-breaking change which fixes an issue)

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 requested a review from peri044 March 10, 2023 18:24
@gs-olive gs-olive self-assigned this Mar 10, 2023
@gs-olive gs-olive changed the title chore/fix: Ensure Docker Torch version agrees with WORKSPACE chore/fix: Update Docker Torch version to agree with WORKSPACE Mar 10, 2023
narendasan
narendasan approved these changes Mar 10, 2023
View reviewed changes
@gs-olive gs-olive force-pushed the dockerfile_version_fix branch from 7647c6c to 9dc646d Compare March 10, 2023 22:33
@gs-olive gs-olive requested a review from narendasan March 10, 2023 22:34
@gs-olive gs-olive changed the title chore/fix: Update Docker Torch version to agree with WORKSPACE chore/fix: Update Docker Torch version to auomatically adapt Torch version Mar 10, 2023
@gs-olive gs-olive changed the title chore/fix: Update Docker Torch version to auomatically adapt Torch version chore/fix: Update Docker build to automatically adapt Torch version Mar 10, 2023
narendasan
narendasan reviewed Mar 17, 2023
View reviewed changes
Copy link
Copy Markdown
Collaborator

@narendasan narendasan left a comment

Choose a reason for hiding this comment

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

Add note about the abi

@gs-olive
fix: Refactor Docker Torch version to auto-sync
ea6bdf4 
- Build issue encountered in Docker arising from mismatched versions in
WORKSPACE and Docker folder
- Update Dockerfile build process to adapt Torch version from
`requirements.txt`
- Remove references to Torch version in Docker `WORKSPACE` file; instead
use local Torch version
- Update documentation to provide clear instructions about inclusion of
the C++11 ABI build (disabled by default)
@gs-olive gs-olive force-pushed the dockerfile_version_fix branch from 9dc646d to ea6bdf4 Compare March 17, 2023 19:24
@gs-olive gs-olive requested a review from narendasan March 17, 2023 19:24
narendasan
narendasan reviewed Mar 22, 2023
View reviewed changes
narendasan
narendasan reviewed Mar 22, 2023
View reviewed changes
docker/Dockerfile
Copy link
Copy Markdown
Collaborator

@narendasan narendasan Mar 22, 2023

Choose a reason for hiding this comment

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

Add build args for tensorrt and cudnn versions

gs-olive
gs-olive commented Mar 22, 2023
View reviewed changes
narendasan
narendasan reviewed Mar 22, 2023
View reviewed changes
docker/Dockerfile
Copy link
Copy Markdown
Collaborator

@narendasan narendasan Mar 22, 2023

Choose a reason for hiding this comment

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

use 22.04 base

@gs-olive gs-olive changed the title chore/fix: Update Docker build to automatically adapt Torch version fix: Update Docker build to automatically adapt Torch version Mar 22, 2023
narendasan
narendasan reviewed Mar 22, 2023
View reviewed changes
@peri044 peri044 mentioned this pull request Mar 24, 2023
Closed
@gs-olive gs-olive added the WIP Work is in progress, pull request should not be merged yet label Mar 24, 2023
@gs-olive
feat: Add build arg for CXX11 ABI
11cf193 
- Update requirements to include `packaging` for FX compatibility checks
- Add optional build argument for compilation with CXX11 ABI
- Improve documentation regarding build-args
@github-actions github-actions bot added the component: api [Python] Issues re: Python API label Mar 28, 2023
@gs-olive gs-olive added component: build system Issues re: Build system and removed WIP Work is in progress, pull request should not be merged yet component: api [Python] Issues re: Python API labels Mar 28, 2023
@github-actions github-actions bot requested a review from narendasan March 28, 2023 03:17
@gs-olive gs-olive mentioned this pull request Mar 28, 2023
Closed
@gs-olive
Copy link
Copy Markdown
Contributor Author

gs-olive commented Mar 28, 2023

22.04 base upgrade and tensorrt/cuddn build args to be addressed in Issue #1782

@gs-olive gs-olive merged commit c2126b1 into pytorch:main Mar 28, 2023
@gs-olive gs-olive deleted the dockerfile_version_fix branch March 28, 2023 18:24
bowang007 pushed a commit that referenced this pull request Apr 28, 2023
@gs-olive @bowang007
fix: Update Docker build to automatically adapt Torch version (#1732)
63608b1
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@peri044 peri044 Awaiting requested review from peri044

@narendasan narendasan Awaiting requested review from narendasan

Assignees

@gs-olive gs-olive

Labels

cla signed component: build system Issues re: Build system

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

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