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

feat: yet another attempt to add windows builds #231

Merged
merged 126 commits into from
Jan 14, 2025
Merged

feat: yet another attempt to add windows builds #231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
126 commits
Select commit Hold shift + click to select a range
2753e85
wip: windows
baszalmstra Apr 4, 2024
6a64e35
feat: disable other builds for now
baszalmstra Apr 5, 2024
1e34a9b
fix: used wrong source
baszalmstra Apr 5, 2024
b666871
remove almost all builds
baszalmstra Apr 5, 2024
08f2bb1
use new style py selector syntax
baszalmstra Apr 5, 2024
a100368
select only py311
baszalmstra Apr 5, 2024
f0b935f
chore: try moving to c disk
baszalmstra Apr 6, 2024
2b60dfb
MNT: Re-rendered with conda-build 24.3.0, conda-smithy 3.34.1, and co…
Apr 6, 2024
8b2cf0f
fix: working cuda builds
baszalmstra May 12, 2024
e8d9e35
merged main
baszalmstra May 12, 2024
6ae7452
fix: working cuda builds
baszalmstra May 13, 2024
7d9fd51
'fix: blas_impl generic'
baszalmstra May 14, 2024
349fd41
merged main
baszalmstra May 14, 2024
24f972d
fix: reenable all targets again
baszalmstra May 14, 2024
97d2f03
lets give it a try
baszalmstra May 15, 2024
1070c36
fix: replace openblas sed command with patch
baszalmstra May 16, 2024
77dd099
update config
wolfv Jun 21, 2024
ad68585
MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.36.2, and co…
wolfv Jun 21, 2024
900b84b
MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.36.2, and co…
wolfv Jun 21, 2024
cd933a6
trigger
wolfv Jun 21, 2024
381d3ec
add missing file
wolfv Jun 21, 2024
d68d573
fix: generic cpu
baszalmstra Jul 10, 2024
4052c81
Merge remote-tracking branch 'upstream/main' into feat/windows
baszalmstra Jul 10, 2024
ccd5e80
fix: disable sccache
baszalmstra Jul 10, 2024
6a20e20
fix: sha merge issue
baszalmstra Jul 10, 2024
d7dc857
fix: recipe lint error
baszalmstra Jul 10, 2024
8a59f3b
fix: add cuda-crt for missing header
baszalmstra Jul 11, 2024
6993ce0
rename bld_pytorch.bat to build_pytorch.bat
baszalmstra Jul 12, 2024
46efcb7
use baseline c_stdlib
baszalmstra Jul 12, 2024
149810c
remove obsolute cuda_compiler_versions
baszalmstra Jul 12, 2024
9033a5f
use libblas
baszalmstra Jul 12, 2024
eb8705c
bring back dev url
baszalmstra Jul 12, 2024
e997aae
add back tests
baszalmstra Jul 12, 2024
6017ca6
fix: host_config.h not found
baszalmstra Jul 23, 2024
959849b
bump ci
baszalmstra Jul 24, 2024
6aab6d5
sccache to avoid recompilation issues
baszalmstra Aug 7, 2024
cf94821
add sccache to all outputs
baszalmstra Aug 8, 2024
18d3a16
Merge main 2.5.1 changes
Tobias-Fischer Dec 16, 2024
46d7b46
protobuf on windows; put bound on setuptools version
Tobias-Fischer Dec 16, 2024
017e086
Merge branch 'main' into feat/windows
Tobias-Fischer Dec 17, 2024
bf8dd3d
MNT: Re-rendered with conda-build 24.11.2, conda-smithy 3.45.0, and c…
Tobias-Fischer Dec 17, 2024
f12a799
Fixup
Tobias-Fischer Dec 17, 2024
73aad72
Cleanup
Tobias-Fischer Dec 17, 2024
ef40fb7
Fix Mark's review comment
Tobias-Fischer Dec 17, 2024
2e058d9
re-enable megabuild
Tobias-Fischer Dec 17, 2024
163963b
MNT: Re-rendered with conda-build 24.11.2, conda-smithy 3.45.0, and c…
Dec 17, 2024
9b4e1f6
Pull in fixes from https://github.com/conda-forge/pytorch-cpu-feedsto…
Tobias-Fischer Dec 17, 2024
bc9fc16
Pull in fixes from https://github.com/conda-forge/pytorch-cpu-feedsto…
Tobias-Fischer Dec 17, 2024
d77aecb
Remove skip condition for megabuild
Tobias-Fischer Dec 17, 2024
a009e3b
patch/git not needed anymore
Tobias-Fischer Dec 17, 2024
8fe9571
Always test for torch import when not using cuda
Tobias-Fischer Dec 17, 2024
3a7fa53
MNT: Re-rendered with conda-build 24.11.2, conda-smithy 3.45.0, and c…
Dec 17, 2024
3dff9a1
Trigger
Tobias-Fischer Dec 17, 2024
54182b3
Tighter sed commands to avoid timestamp mingling
Tobias-Fischer Dec 20, 2024
53338b9
Merge remote-tracking branch 'upstream/main' into feat/windows
h-vetinari Dec 27, 2024
c068b5b
Do not pull in pytest-shard to avoid conflicts with pytorch upstream …
Tobias-Fischer Dec 28, 2024
6d2090c
MNT: Re-rendered with conda-build 24.11.2, conda-smithy 3.45.1, and c…
Dec 28, 2024
5d75a51
Trigger
Tobias-Fischer Dec 28, 2024
fe05d64
Fix copy+paste error
Tobias-Fischer Dec 28, 2024
e683402
Debug pytest failure
Tobias-Fischer Dec 29, 2024
1cf622d
Merge branch 'main' into feat/windows
Tobias-Fischer Dec 29, 2024
1a05f46
MNT: Re-rendered with conda-build 24.11.2, conda-smithy 3.45.1, and c…
Dec 29, 2024
9636987
Trigger
Tobias-Fischer Dec 29, 2024
7c36649
DEBUG: reduce testing to one module
h-vetinari Dec 30, 2024
b59b696
DEBUG: Use double quotes
Tobias-Fischer Dec 30, 2024
7007908
We finally have some test output, let's try all tests again
Tobias-Fischer Dec 31, 2024
7e3b630
Create 0015-fix-cuda-test-win.patch
Tobias-Fischer Dec 31, 2024
127ecda
Use 0015-fix-cuda-test-win.patch
Tobias-Fischer Dec 31, 2024
12225de
Update 0015-fix-cuda-test-win.patch
Tobias-Fischer Dec 31, 2024
f29632a
Delete recipe/patches/0015-fix-cuda-test-win.patch
Tobias-Fischer Dec 31, 2024
7445264
unset cuda_compiler_version
Tobias-Fischer Dec 31, 2024
160221a
Disable parallel tests on Windows for now, remove unneeded patch
Tobias-Fischer Dec 31, 2024
facc448
try with `-s`
h-vetinari Dec 31, 2024
8baaf3b
Try non-mkl build
Tobias-Fischer Dec 31, 2024
d7937dd
MNT: Re-rendered with conda-build 24.11.2, conda-smithy 3.45.1, and c…
Dec 31, 2024
0f03fc4
Trigger
Tobias-Fischer Dec 31, 2024
3a38400
unset CUDA_VERSION too
isuruf Jan 1, 2025
ac1b365
Build DEBUG mode, enable /fsanitize=address
Tobias-Fischer Jan 2, 2025
b4d4719
pytest -v
Tobias-Fischer Jan 2, 2025
a6b0d1b
set ASAN_WIN_CONTINUE_ON_INTERCEPTION_FAILURE=1
Tobias-Fischer Jan 2, 2025
9ecb789
Fixup
Tobias-Fischer Jan 2, 2025
53c4a25
/fsanitize=address in too hard basket
Tobias-Fischer Jan 2, 2025
8c32a69
Use llvm-openmp also on Windows
Tobias-Fischer Jan 3, 2025
37be107
Try mkl build again
Tobias-Fischer Jan 3, 2025
b63c977
MNT: Re-rendered with conda-build 24.11.2, conda-smithy 3.45.1, and c…
Jan 3, 2025
83a7447
Trigger
Tobias-Fischer Jan 3, 2025
d0b00f7
Release build
Tobias-Fischer Jan 3, 2025
161287c
- intel-openmp <0a0 # [win]
Tobias-Fischer Jan 4, 2025
9dc87a1
Only run_constrained I think
Tobias-Fischer Jan 4, 2025
a7a8ebf
Disallow intel-openmp
Tobias-Fischer Jan 4, 2025
8ca918f
Not supported
Tobias-Fischer Jan 4, 2025
e0f562c
Try mkl=2025 as it's the only mkl not depending on intel-openmp
Tobias-Fischer Jan 4, 2025
fc30284
mkl 2025?
Tobias-Fischer Jan 4, 2025
64356c4
mkl 2025 doesn't work
Tobias-Fischer Jan 4, 2025
1792331
Try opposite approach: use intel-openmp for everything
Tobias-Fischer Jan 4, 2025
6c95e35
Enforce consistent version
Tobias-Fischer Jan 4, 2025
84eca4f
Try llvm-openmp again, but with KMP_DUPLICATE_LIB_OK=TRUE
Tobias-Fischer Jan 4, 2025
69498e7
Bugfix
Tobias-Fischer Jan 4, 2025
75b1649
Use intel-openmp
Tobias-Fischer Jan 5, 2025
0ae71aa
Merge remote-tracking branch 'upstream/main' into feat/windows
h-vetinari Jan 5, 2025
1132ca4
MNT: Re-rendered with conda-build 24.11.2, conda-smithy 3.45.1, and c…
Jan 5, 2025
1acc4fa
Disable mkldnn tests
Tobias-Fischer Jan 5, 2025
b6ea5e2
Debug: USE_MKLDNN=0
Tobias-Fischer Jan 5, 2025
3fc6530
Hack: Only py312
Tobias-Fischer Jan 6, 2025
675ca87
the sed commands find the wrong python in BUILD_PREFIX, do the wrong …
Tobias-Fischer Jan 6, 2025
71cda89
Debug sed issues
Tobias-Fischer Jan 6, 2025
716140b
Does CmakeCache.txt get deleted? Copy it.
Tobias-Fischer Jan 6, 2025
9265549
Debug: do not clean
Tobias-Fischer Jan 6, 2025
60969d1
Fixes issues where CMakeCache.txt does not contain CMAKE_BUILD_TYPE
Tobias-Fischer Jan 8, 2025
f422b0b
use 0016-use-environment-build-type.patch
Tobias-Fischer Jan 8, 2025
b965280
Go back to last working bld.bat
Tobias-Fischer Jan 8, 2025
25ad164
No triton on Win
Tobias-Fischer Jan 8, 2025
78f64d0
Try fix Could NOT find Python (missing: Python_LIBRARIES Python_INCLU…
Tobias-Fischer Jan 8, 2025
d959705
Make future life easier; go back to last known somewhat working versi…
Tobias-Fischer Jan 8, 2025
fd1a076
add some best practices
Tobias-Fischer Jan 8, 2025
2d6c054
Fix
Tobias-Fischer Jan 8, 2025
1528137
Bugfix
Tobias-Fischer Jan 8, 2025
7dd9e64
Run tests with compilers installed
Tobias-Fischer Jan 8, 2025
60cd3da
Delete recipe/patches/0016-use-environment-build-type.patch
Tobias-Fischer Jan 8, 2025
8fac9a5
Check if multiple lib initialization is still a problem; skip tests f…
Tobias-Fischer Jan 9, 2025
dde9d4d
Add intel-openmp run req; currently linker warnings
Tobias-Fischer Jan 9, 2025
1f52327
Run mkldnn tests to get full test output
Tobias-Fischer Jan 9, 2025
fbccb20
Do not use sccache on Unix
Tobias-Fischer Jan 9, 2025
0c21e06
General cleanup
Tobias-Fischer Jan 9, 2025
93e950d
Rerender + enable generic blas build + re-add migrations that were lo…
Tobias-Fischer Jan 9, 2025
44c6035
Do not test non-mkl builds
Tobias-Fischer Jan 9, 2025
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
79 changes: 0 additions & 79 deletions .azure-pipelines/azure-pipelines-osx.yml
View file
Open in desktop

This file was deleted.

74 changes: 0 additions & 74 deletions ...c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13.yaml
View file
Open in desktop

This file was deleted.

74 changes: 0 additions & 74 deletions ...piler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13.yaml
View file
Open in desktop

This file was deleted.

74 changes: 0 additions & 74 deletions ...c_compiler_version13cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13.yaml
View file
Open in desktop

This file was deleted.

74 changes: 0 additions & 74 deletions ...piler_version13cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13.yaml
View file
Open in desktop

This file was deleted.

Loading