Skip to content

Use static link for windows #122

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

Closed
termoshtt wants to merge 3 commits into from
Closed

Use static link for windows #122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
738c0d0
Use static link for windows
termoshtt Apr 29, 2023
080e3c7
Add CI matrix for windows without nuget
termoshtt Apr 29, 2023
2b36442
Use static linking in fftw-sys
termoshtt Apr 29, 2023
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
21 changes: 17 additions & 4 deletions .github/workflows/rust.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@ on:
pull_request: {}

jobs:
windows:
windows-mkl:
runs-on: windows-latest
strategy:
fail-fast: false
matrix:
feature: ["intel-mkl", "source"]
download: ["nuget", "ocipkg"]
steps:
- uses: actions/checkout@v1
- name: Get MKL using NuGet
if: ${{ matrix.feature == 'intel-mkl' }}
if: ${{ matrix.download == 'nuget' }}
run: |
nuget install intelmkl.devel.cluster.win-x64 -Version 2022.0.3.171
nuget install intelmkl.static.cluster.win-x64 -Version 2022.0.3.171
Expand All @@ -28,7 +28,20 @@ jobs:
args: >
--all-targets
--manifest-path=fftw/Cargo.toml
--features=${{ matrix.feature }}
--features=intel-mkl
--no-default-features

windows-source:
runs-on: windows-latest
steps:
- uses: actions/checkout@v1
- uses: actions-rs/cargo@v1
with:
command: test
args: >
--all-targets
--manifest-path=fftw/Cargo.toml
--features=source
--no-default-features

macos:
Expand Down
4 changes: 2 additions & 2 deletions fftw-src/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,8 @@ fn main() {
if cfg!(target_os = "windows") {
download_archive_windows(&out_dir).unwrap();
println!("cargo:rustc-link-search={}", out_dir.display());
println!("cargo:rustc-link-lib=libfftw3-3");
println!("cargo:rustc-link-lib=libfftw3f-3");
println!("cargo:rustc-link-lib=static=libfftw3-3");
println!("cargo:rustc-link-lib=static=libfftw3f-3");
} else {
build_unix(&out_dir);
println!("cargo:rustc-link-search={}", out_dir.join("lib").display());
Expand Down
4 changes: 2 additions & 2 deletions fftw-sys/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ use libc::FILE;
pub use num_complex::Complex32 as fftwf_complex;
pub use num_complex::Complex64 as fftw_complex;

#[cfg_attr(feature = "system", link(name = "fftw3"))]
#[cfg_attr(feature = "system", link(name = "fftw3", kind = "static"))]
extern "C" {}
#[cfg_attr(feature = "system", link(name = "fftw3f"))]
#[cfg_attr(feature = "system", link(name = "fftw3f", kind = "static"))]
extern "C" {}

include!("fftw.rs");