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

Add windows build (try IV) #16

Closed
wants to merge 48 commits into from
Closed

Add windows build (try IV) #16

Show file tree
Hide file tree
Changes from 47 commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
b24d6fb
Test old PR implementation of windows build
brynpickering Dec 8, 2023
573bf0b
MNT: Re-rendered with conda-build 3.28.1, conda-smithy 3.30.1, and co…
Dec 8, 2023
2a5bd96
MNT: Re-rendered with conda-build 24.3.0, conda-smithy 3.34.0, and co…
Mar 28, 2024
0386e02
Update build.sh
jpfeuffer Mar 28, 2024
e187caf
Update build.sh
jpfeuffer Mar 28, 2024
90d6c3a
Update meta.yaml
jpfeuffer Mar 28, 2024
5d713a0
Use M2 make
jpfeuffer Mar 28, 2024
9cf3964
try without Flang on win
jpfeuffer Mar 29, 2024
621b6f1
no Fortran variables also
jpfeuffer Mar 29, 2024
6564439
try cblas. no idea if the lib is called like this
jpfeuffer Mar 29, 2024
4d45abc
do not install non-C blas on windows
jpfeuffer Mar 30, 2024
0b0d86f
add some guessed include dir. hoping it works without quotes
jpfeuffer Mar 30, 2024
7630df2
try cat config.log
jpfeuffer Mar 30, 2024
703367c
cat the config.log in the subdirectory
tkralphs Mar 30, 2024
92d2a14
Use slash
jpfeuffer Mar 30, 2024
3956879
Try just letting configure find the BLAS library on its own
tkralphs Mar 31, 2024
8825078
Fix to previous commit
tkralphs Mar 31, 2024
b7b9905
Add Blas metapackage?
jpfeuffer Mar 31, 2024
1a5746f
Flags are not getting picked up for some reason
tkralphs Mar 31, 2024
14a82f9
try some stuff for preserving paths in msys2 (from dotnet recipe)
jpfeuffer Mar 31, 2024
7881b6e
Update bld.bat to add library prefix too
jpfeuffer Mar 31, 2024
33ba139
try fix tests on win
jpfeuffer Mar 31, 2024
8e25b7c
always add c++11 flag, not only replace
jpfeuffer Mar 31, 2024
d88b709
just try to force the correct host specs
jpfeuffer Apr 1, 2024
4411871
try arm-apple
jpfeuffer Apr 1, 2024
36a1727
cleanup
jpfeuffer Apr 1, 2024
2bb3edf
noop
jpfeuffer Apr 1, 2024
e2cca4a
try if we really need m2-base since it's huge
jpfeuffer Apr 1, 2024
be89c10
yes we need m2-base
jpfeuffer Apr 1, 2024
5cff18b
more cleanup
jpfeuffer Apr 1, 2024
8f14e6c
add back updated config.sub/guess
jpfeuffer Apr 1, 2024
97d6a3f
Update build.sh
wolfv Apr 1, 2024
c6d77e1
Update build.sh
tkralphs Apr 2, 2024
ddbaa58
Cleanup
jpfeuffer Apr 2, 2024
1b094a4
copy error
jpfeuffer Apr 2, 2024
fc59bcd
Update Version, maintainers, url
jpfeuffer Apr 3, 2024
222a5f5
Update meta.yaml
jpfeuffer Apr 3, 2024
8f02b24
Update meta.yaml
jpfeuffer Apr 3, 2024
1cd3f63
forgot hash
jpfeuffer Apr 3, 2024
b5aaae3
oops
jpfeuffer Apr 3, 2024
5be10aa
try without cxx11 and O3 flags
jpfeuffer Apr 3, 2024
9653d17
add back std=c++11
jpfeuffer Apr 3, 2024
2cf36e0
Update CODEOWNERS
jpfeuffer Apr 3, 2024
b469f83
add make test
jpfeuffer Apr 6, 2024
ca04f50
Bump version
tkralphs Apr 6, 2024
219db87
Update SHA
tkralphs Apr 6, 2024
4a19149
do not make test when cross compiling
jpfeuffer Apr 7, 2024
520a6d5
remove all mentions of fortran, blas, lapack; address review; try mac…
jpfeuffer Apr 10, 2024
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
9 changes: 4 additions & 5 deletions .azure-pipelines/azure-pipelines-linux.yml
View file
Open in desktop

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

4 changes: 4 additions & 0 deletions .azure-pipelines/azure-pipelines-osx.yml
View file
Open in desktop

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

52 changes: 52 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: 6 additions & 0 deletions .ci_support/linux_64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ c_compiler:
- gcc
c_compiler_version:
- '12'
c_stdlib:
- sysroot
c_stdlib_version:
- '2.12'
cdt_name:
- cos6
channel_sources:
Expand Down Expand Up @@ -34,5 +38,7 @@ zip_keys:
- - c_compiler_version
- cxx_compiler_version
- fortran_compiler_version
- - c_stdlib_version
- cdt_name
zlib:
- '1.2'
6 changes: 6 additions & 0 deletions .ci_support/linux_aarch64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ c_compiler:
- gcc
c_compiler_version:
- '12'
c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cdt_arch:
- aarch64
cdt_name:
Expand Down Expand Up @@ -38,5 +42,7 @@ zip_keys:
- - c_compiler_version
- cxx_compiler_version
- fortran_compiler_version
- - c_stdlib_version
- cdt_name
zlib:
- '1.2'
6 changes: 6 additions & 0 deletions .ci_support/linux_ppc64le_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ c_compiler:
- gcc
c_compiler_version:
- '12'
c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cdt_name:
- cos7
channel_sources:
Expand Down Expand Up @@ -34,5 +38,7 @@ zip_keys:
- - c_compiler_version
- cxx_compiler_version
- fortran_compiler_version
- - c_stdlib_version
- cdt_name
zlib:
- '1.2'
8 changes: 6 additions & 2 deletions .ci_support/osx_64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,19 @@ bzip2:
c_compiler:
- clang
c_compiler_version:
- '15'
- '16'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '10.9'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- clangxx
cxx_compiler_version:
- '15'
- '16'
fortran_compiler:
- gfortran
fortran_compiler_version:
Expand Down
8 changes: 6 additions & 2 deletions .ci_support/osx_arm64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,19 @@ bzip2:
c_compiler:
- clang
c_compiler_version:
- '15'
- '16'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '11.0'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- clangxx
cxx_compiler_version:
- '15'
- '16'
fortran_compiler:
- gfortran
fortran_compiler_version:
Expand Down
28 changes: 28 additions & 0 deletions .ci_support/win_64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
bzip2:
- '1'
c_compiler:
- vs2019
c_stdlib:
- vs
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- vs2019
fortran_compiler:
- flang
fortran_compiler_version:
- '5'
Comment on lines +13 to +16
Copy link
Member

Choose a reason for hiding this comment

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

Note that you're still adding fortran compilers here (seems to be based on an old rerender before adding the selector to the fortran compiler). However, since the dependency is missing in meta.yaml, this isn't actually pulled into the build environment for now.

Copy link
Contributor

Choose a reason for hiding this comment

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

I would think we should remove this now.

libblas:
- 3.9 *netlib
libcblas:
- 3.9 *netlib
liblapack:
- 3.9 *netlib
liblapacke:
- 3.9 *netlib
target_platform:
- win-64
zlib:
- '1.2'
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
View file
Open in desktop

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

25 changes: 23 additions & 2 deletions .gitignore
View file
Open in desktop

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

16 changes: 9 additions & 7 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.

4 changes: 2 additions & 2 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.

9 changes: 9 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.

29 changes: 18 additions & 11 deletions .scripts/run_osx_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