Skip to content

GitLab

Unverified Commit 978ba613 authored by Eli Uriegas's avatar Eli Uriegas Committed by GitHub
Browse files

.circleci: Fix windows cmath issues (#3609) 


Signed-off-by: default avatarEli Uriegas <eliuriegas@fb.com>
parent 5fe1449d
Show whitespace changes
Inline Side-by-side
Showing with 33 additions and 0 deletions
.circleci/config.yml
View file @ 978ba613
...@@ -45,6 +45,14 @@ commands: ...@@ -45,6 +45,14 @@ commands:
our_upload_channel=test our_upload_channel=test
fi fi
echo "export UPLOAD_CHANNEL=${our_upload_channel}" >> ${BASH_ENV} echo "export UPLOAD_CHANNEL=${our_upload_channel}" >> ${BASH_ENV}
install_cuda_compatible_cmath:
description: "Install CUDA compatible cmath"
steps:
- run:
name: _HACK_ Install CUDA compatible cmath
no_output_timeout: 1m
command: |
powershell .circleci/scripts/vs_install_cmath.ps1
binary_common: &binary_common binary_common: &binary_common
parameters: parameters:
...@@ -212,6 +220,7 @@ jobs: ...@@ -212,6 +220,7 @@ jobs:
steps: steps:
- checkout_merge - checkout_merge
- designate_upload_channel - designate_upload_channel
- install_cuda_compatible_cmath
- run: - run:
name: Build conda packages name: Build conda packages
no_output_timeout: 20m no_output_timeout: 20m
...@@ -239,6 +248,7 @@ jobs: ...@@ -239,6 +248,7 @@ jobs:
steps: steps:
- checkout_merge - checkout_merge
- designate_upload_channel - designate_upload_channel
- install_cuda_compatible_cmath
- run: - run:
name: Build wheel packages name: Build wheel packages
command: | command: |
...@@ -546,6 +556,7 @@ jobs: ...@@ -546,6 +556,7 @@ jobs:
steps: steps:
- checkout - checkout
- designate_upload_channel - designate_upload_channel
- install_cuda_compatible_cmath
- run: - run:
name: Generate cache key name: Generate cache key
# This will refresh cache on Sundays, nightly build should generate new cache. # This will refresh cache on Sundays, nightly build should generate new cache.
...@@ -587,6 +598,7 @@ jobs: ...@@ -587,6 +598,7 @@ jobs:
steps: steps:
- checkout - checkout
- designate_upload_channel - designate_upload_channel
- install_cuda_compatible_cmath
- run: - run:
name: Generate cache key name: Generate cache key
# This will refresh cache on Sundays, nightly build should generate new cache. # This will refresh cache on Sundays, nightly build should generate new cache.
...@@ -716,6 +728,7 @@ jobs: ...@@ -716,6 +728,7 @@ jobs:
steps: steps:
- checkout_merge - checkout_merge
- designate_upload_channel - designate_upload_channel
- install_cuda_compatible_cmath
- run: - run:
command: | command: |
set -ex set -ex
...@@ -729,6 +742,7 @@ jobs: ...@@ -729,6 +742,7 @@ jobs:
steps: steps:
- checkout_merge - checkout_merge
- designate_upload_channel - designate_upload_channel
- install_cuda_compatible_cmath
- run: - run:
command: | command: |
set -ex set -ex
......
.circleci/config.yml.in
View file @ 978ba613
...@@ -45,6 +45,14 @@ commands: ...@@ -45,6 +45,14 @@ commands:
our_upload_channel=test our_upload_channel=test
fi fi
echo "export UPLOAD_CHANNEL=${our_upload_channel}" >> ${BASH_ENV} echo "export UPLOAD_CHANNEL=${our_upload_channel}" >> ${BASH_ENV}
install_cuda_compatible_cmath:
description: "Install CUDA compatible cmath"
steps:
- run:
name: _HACK_ Install CUDA compatible cmath
no_output_timeout: 1m
command: |
powershell .circleci/scripts/vs_install_cmath.ps1
binary_common: &binary_common binary_common: &binary_common
parameters: parameters:
...@@ -212,6 +220,7 @@ jobs: ...@@ -212,6 +220,7 @@ jobs:
steps: steps:
- checkout_merge - checkout_merge
- designate_upload_channel - designate_upload_channel
- install_cuda_compatible_cmath
- run: - run:
name: Build conda packages name: Build conda packages
no_output_timeout: 20m no_output_timeout: 20m
...@@ -239,6 +248,7 @@ jobs: ...@@ -239,6 +248,7 @@ jobs:
steps: steps:
- checkout_merge - checkout_merge
- designate_upload_channel - designate_upload_channel
- install_cuda_compatible_cmath
- run: - run:
name: Build wheel packages name: Build wheel packages
command: | command: |
...@@ -546,6 +556,7 @@ jobs: ...@@ -546,6 +556,7 @@ jobs:
steps: steps:
- checkout - checkout
- designate_upload_channel - designate_upload_channel
- install_cuda_compatible_cmath
- run: - run:
name: Generate cache key name: Generate cache key
# This will refresh cache on Sundays, nightly build should generate new cache. # This will refresh cache on Sundays, nightly build should generate new cache.
...@@ -587,6 +598,7 @@ jobs: ...@@ -587,6 +598,7 @@ jobs:
steps: steps:
- checkout - checkout
- designate_upload_channel - designate_upload_channel
- install_cuda_compatible_cmath
- run: - run:
name: Generate cache key name: Generate cache key
# This will refresh cache on Sundays, nightly build should generate new cache. # This will refresh cache on Sundays, nightly build should generate new cache.
...@@ -716,6 +728,7 @@ jobs: ...@@ -716,6 +728,7 @@ jobs:
steps: steps:
- checkout_merge - checkout_merge
- designate_upload_channel - designate_upload_channel
- install_cuda_compatible_cmath
- run: - run:
command: | command: |
set -ex set -ex
...@@ -729,6 +742,7 @@ jobs: ...@@ -729,6 +742,7 @@ jobs:
steps: steps:
- checkout_merge - checkout_merge
- designate_upload_channel - designate_upload_channel
- install_cuda_compatible_cmath
- run: - run:
command: | command: |
set -ex set -ex
......
.circleci/scripts/vs_install_cmath.ps1 0 → 100644
View file @ 978ba613
$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
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment