Skip to content

[v0.9.1] Remove special versioning suffix rules for CUDA 10.2 #3603

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

Merged
merged 5 commits into from
Mar 25, 2021
Merged

[v0.9.1] Remove special versioning suffix rules for CUDA 10.2 #3603

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
623a48b
packaging: Remove special versioning priveleges
seemethere Mar 24, 2021
62d6bb0
also include windows cmath fix
seemethere Mar 24, 2021
cffa525
remove comment
seemethere Mar 24, 2021
eb9607e
fix indent
seemethere Mar 24, 2021
ed5dfa2
actually add the script
seemethere Mar 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 30 additions & 0 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,11 @@ jobs:
steps:
- checkout_merge
- designate_upload_channel
- run:
name: _HACK_ Install CUDA compatible cmath
no_output_timeout: 1m
command: |
powershell .circleci/scripts/vs_install_cmath.ps1
- run:
name: Build conda packages
no_output_timeout: 20m
Expand Down Expand Up @@ -241,6 +246,11 @@ jobs:
steps:
- checkout_merge
- designate_upload_channel
- run:
name: _HACK_ Install CUDA compatible cmath
no_output_timeout: 1m
command: |
powershell .circleci/scripts/vs_install_cmath.ps1
- run:
name: Build wheel packages
command: |
Expand Down Expand Up @@ -548,6 +558,11 @@ jobs:
steps:
- checkout
- designate_upload_channel
- run:
name: _HACK_ Install CUDA compatible cmath
no_output_timeout: 1m
command: |
powershell .circleci/scripts/vs_install_cmath.ps1
- run:
name: Generate cache key
# This will refresh cache on Sundays, nightly build should generate new cache.
Expand Down Expand Up @@ -589,6 +604,11 @@ jobs:
steps:
- checkout
- designate_upload_channel
- run:
name: _HACK_ Install CUDA compatible cmath
no_output_timeout: 1m
command: |
powershell .circleci/scripts/vs_install_cmath.ps1
- run:
name: Generate cache key
# This will refresh cache on Sundays, nightly build should generate new cache.
Expand Down Expand Up @@ -718,6 +738,11 @@ jobs:
steps:
- checkout_merge
- designate_upload_channel
- run:
name: _HACK_ Install CUDA compatible cmath
no_output_timeout: 1m
command: |
powershell .circleci/scripts/vs_install_cmath.ps1
- run:
command: |
set -ex
Expand All @@ -731,6 +756,11 @@ jobs:
steps:
- checkout_merge
- designate_upload_channel
- run:
name: _HACK_ Install CUDA compatible cmath
no_output_timeout: 1m
command: |
powershell .circleci/scripts/vs_install_cmath.ps1
- run:
command: |
set -ex
Expand Down
30 changes: 30 additions & 0 deletions .circleci/config.yml.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,11 @@ jobs:
steps:
- checkout_merge
- designate_upload_channel
- run:
name: _HACK_ Install CUDA compatible cmath
no_output_timeout: 1m
command: |
powershell .circleci/scripts/vs_install_cmath.ps1
- run:
name: Build conda packages
no_output_timeout: 20m
Expand Down Expand Up @@ -241,6 +246,11 @@ jobs:
steps:
- checkout_merge
- designate_upload_channel
- run:
name: _HACK_ Install CUDA compatible cmath
no_output_timeout: 1m
command: |
powershell .circleci/scripts/vs_install_cmath.ps1
- run:
name: Build wheel packages
command: |
Expand Down Expand Up @@ -548,6 +558,11 @@ jobs:
steps:
- checkout
- designate_upload_channel
- run:
name: _HACK_ Install CUDA compatible cmath
no_output_timeout: 1m
command: |
powershell .circleci/scripts/vs_install_cmath.ps1
- run:
name: Generate cache key
# This will refresh cache on Sundays, nightly build should generate new cache.
Expand Down Expand Up @@ -589,6 +604,11 @@ jobs:
steps:
- checkout
- designate_upload_channel
- run:
name: _HACK_ Install CUDA compatible cmath
no_output_timeout: 1m
command: |
powershell .circleci/scripts/vs_install_cmath.ps1
- run:
name: Generate cache key
# This will refresh cache on Sundays, nightly build should generate new cache.
Expand Down Expand Up @@ -718,6 +738,11 @@ jobs:
steps:
- checkout_merge
- designate_upload_channel
- run:
name: _HACK_ Install CUDA compatible cmath
no_output_timeout: 1m
command: |
powershell .circleci/scripts/vs_install_cmath.ps1
- run:
command: |
set -ex
Expand All @@ -731,6 +756,11 @@ jobs:
steps:
- checkout_merge
- designate_upload_channel
- run:
name: _HACK_ Install CUDA compatible cmath
no_output_timeout: 1m
command: |
powershell .circleci/scripts/vs_install_cmath.ps1
- run:
command: |
set -ex
Expand Down
5 changes: 5 additions & 0 deletions .circleci/scripts/vs_install_cmath.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
$CMATH_DOWNLOAD_LINK = "https://raw.githubusercontent.com/microsoft/STL/12c684bba78f9b032050526abdebf14f58ca26a3/stl/inc/cmath"
$VC14_28_INSTALL_PATH="C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.28.29910\include"

curl.exe --retry 3 -kL $CMATH_DOWNLOAD_LINK --output "$home\cmath"
Move-Item -Path "$home\cmath" -Destination "$VC14_28_INSTALL_PATH" -Force
5 changes: 1 addition & 4 deletions packaging/pkg_helpers.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,7 @@ setup_cuda() {
export WHEEL_DIR=""
# Wheel builds need suffixes (but not if they're on OS X, which never has suffix)
if [[ "$BUILD_TYPE" == "wheel" ]] && [[ "$(uname)" != Darwin ]]; then
# The default CUDA has no suffix
if [[ "$CU_VERSION" != "cu102" ]]; then
export PYTORCH_VERSION_SUFFIX="+$CU_VERSION"
fi
export PYTORCH_VERSION_SUFFIX="+$CU_VERSION"
Copy link
Member

Choose a reason for hiding this comment

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

Should we cherry-pick this change to the master branch?

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes, I'll make follow up PRs for both things here

# Match the suffix scheme of pytorch, unless this package does not have
# CUDA builds (in which case, use default)
if [[ -z "$NO_CUDA_PACKAGE" ]]; then
Expand Down