Skip to content
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

Windows + CUDA (redux) #32

Merged
merged 12 commits into from
Apr 7, 2021
Merged

Windows + CUDA (redux) #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
7c698ff
Revert "disable win + cuda until debugged fully"
h-vetinari Feb 20, 2021
d6aa7bc
stay on C++11 for win + cuda 10.2
h-vetinari Feb 24, 2021
2e4e4f8
add rebased win_cuda patches
h-vetinari Mar 4, 2021
c11a475
add patch for long vs. windows in swigfaiss.swig
h-vetinari Mar 4, 2021
90867d1
add exploratory patch for replacing non-portable methods
h-vetinari Mar 5, 2021
4d7caf4
fix oversight in build-pkg.bat
h-vetinari Mar 5, 2021
7ff43bb
update patches with some upstream work
h-vetinari Mar 8, 2021
d7111ec
Revert "CMAKE_GENERATOR workaround for vs2019 from conda-forge"
h-vetinari Mar 9, 2021
2a5af95
reflect changes from #37
h-vetinari Mar 15, 2021
6212efb
bump build number
h-vetinari Mar 15, 2021
21f4617
use upstreamed patch
h-vetinari Apr 6, 2021
ec4bbee
MNT: Re-rendered with conda-build 3.21.4, conda-smithy 3.9.0, and con…
h-vetinari Apr 6, 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
12 changes: 12 additions & 0 deletions .azure-pipelines/azure-pipelines-win.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions .ci_support/linux_64_cuda_compiler_version10.2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ libblas:
liblapack:
- 3.8 *netlib
numpy:
- '1.16'
- '1.16'
- '1.16'
- '1.17'
- '1.17'
- '1.17'
- '1.19'
pin_run_as_build:
python:
Expand Down
6 changes: 3 additions & 3 deletions .ci_support/linux_64_cuda_compiler_version11.0.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ libblas:
liblapack:
- 3.8 *netlib
numpy:
- '1.16'
- '1.16'
- '1.16'
- '1.17'
- '1.17'
- '1.17'
- '1.19'
pin_run_as_build:
python:
Expand Down
6 changes: 3 additions & 3 deletions .ci_support/linux_64_cuda_compiler_version11.1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ libblas:
liblapack:
- 3.8 *netlib
numpy:
- '1.16'
- '1.16'
- '1.16'
- '1.17'
- '1.17'
- '1.17'
- '1.19'
pin_run_as_build:
python:
Expand Down
6 changes: 3 additions & 3 deletions .ci_support/linux_64_cuda_compiler_version11.2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ libblas:
liblapack:
- 3.8 *netlib
numpy:
- '1.16'
- '1.16'
- '1.16'
- '1.17'
- '1.17'
- '1.17'
- '1.19'
pin_run_as_build:
python:
Expand Down
6 changes: 3 additions & 3 deletions .ci_support/linux_64_cuda_compiler_versionNone.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ libblas:
liblapack:
- 3.8 *netlib
numpy:
- '1.16'
- '1.16'
- '1.16'
- '1.17'
- '1.17'
- '1.17'
- '1.19'
pin_run_as_build:
python:
Expand Down
6 changes: 3 additions & 3 deletions .ci_support/osx_64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ liblapack:
macos_machine:
- x86_64-apple-darwin13.4.0
numpy:
- '1.16'
- '1.16'
- '1.16'
- '1.17'
- '1.17'
- '1.17'
- '1.19'
pin_run_as_build:
python:
Expand Down
33 changes: 33 additions & 0 deletions .ci_support/win_64_cuda_compiler_version10.2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
channel_sources:
- conda-forge,defaults
channel_targets:
- conda-forge main
cuda_compiler:
- nvcc
cuda_compiler_version:
- '10.2'
cxx_compiler:
- vs2019
libblas:
- 3.8 *netlib
liblapack:
- 3.8 *netlib
numpy:
- '1.17'
- '1.17'
- '1.17'
- '1.19'
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- 3.6.* *_cpython
- 3.7.* *_cpython
- 3.8.* *_cpython
- 3.9.* *_cpython
target_platform:
- win-64
zip_keys:
- - numpy
- python
33 changes: 33 additions & 0 deletions .ci_support/win_64_cuda_compiler_version11.0.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
channel_sources:
- conda-forge,defaults
channel_targets:
- conda-forge main
cuda_compiler:
- nvcc
cuda_compiler_version:
- '11.0'
cxx_compiler:
- vs2019
libblas:
- 3.8 *netlib
liblapack:
- 3.8 *netlib
numpy:
- '1.17'
- '1.17'
- '1.17'
- '1.19'
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- 3.6.* *_cpython
- 3.7.* *_cpython
- 3.8.* *_cpython
- 3.9.* *_cpython
target_platform:
- win-64
zip_keys:
- - numpy
- python
33 changes: 33 additions & 0 deletions .ci_support/win_64_cuda_compiler_version11.1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
channel_sources:
- conda-forge,defaults
channel_targets:
- conda-forge main
cuda_compiler:
- nvcc
cuda_compiler_version:
- '11.1'
cxx_compiler:
- vs2019
libblas:
- 3.8 *netlib
liblapack:
- 3.8 *netlib
numpy:
- '1.17'
- '1.17'
- '1.17'
- '1.19'
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- 3.6.* *_cpython
- 3.7.* *_cpython
- 3.8.* *_cpython
- 3.9.* *_cpython
target_platform:
- win-64
zip_keys:
- - numpy
- python
33 changes: 33 additions & 0 deletions .ci_support/win_64_cuda_compiler_version11.2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
channel_sources:
- conda-forge,defaults
channel_targets:
- conda-forge main
cuda_compiler:
- nvcc
cuda_compiler_version:
- '11.2'
cxx_compiler:
- vs2019
libblas:
- 3.8 *netlib
liblapack:
- 3.8 *netlib
numpy:
- '1.17'
- '1.17'
- '1.17'
- '1.19'
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- 3.6.* *_cpython
- 3.7.* *_cpython
- 3.8.* *_cpython
- 3.9.* *_cpython
target_platform:
- win-64
zip_keys:
- - numpy
- python
8 changes: 5 additions & 3 deletions .ci_support/win_64_cuda_compiler_versionNone.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ channel_sources:
- conda-forge,defaults
channel_targets:
- conda-forge main
cuda_compiler:
- nvcc
cuda_compiler_version:
- None
cxx_compiler:
Expand All @@ -11,9 +13,9 @@ libblas:
liblapack:
- 3.8 *netlib
numpy:
- '1.16'
- '1.16'
- '1.16'
- '1.17'
- '1.17'
- '1.17'
- '1.19'
pin_run_as_build:
python:
Expand Down
22 changes: 19 additions & 3 deletions .scripts/build_steps.sh
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 30 additions & 0 deletions .scripts/logging_utils.sh
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .scripts/run_docker_build.sh
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading