Skip to content

Set minimal supported rustc version to 1.56.0, cargo upgrade #74

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.

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

Merged
merged 7 commits into from
Jul 29, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 19 additions & 1 deletion .github/workflows/intel-mkl-sys.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,12 @@ jobs:
runs-on: windows-2019
steps:
- uses: actions/checkout@v1
- uses: actions-rs/toolchain@v1
with:
toolchain: "1.56.0"
profile: minimal
default: true
override: true
- uses: actions-rs/cargo@v1
with:
command: test
Expand All @@ -39,6 +45,12 @@ jobs:
runs-on: macos-10.15
steps:
- uses: actions/checkout@v1
- uses: actions-rs/toolchain@v1
with:
toolchain: "1.56.0"
profile: minimal
default: true
override: true
- uses: actions-rs/cargo@v1
with:
command: test
Expand All @@ -60,9 +72,15 @@ jobs:
- mkl-dynamic-lp64-seq
- mkl-dynamic-ilp64-iomp
- mkl-dynamic-ilp64-seq
runs-on: ubuntu-18.04
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v1
- uses: actions-rs/toolchain@v1
with:
toolchain: "1.56.0"
profile: minimal
default: true
override: true
- uses: actions-rs/cargo@v1
with:
command: test
Expand Down
10 changes: 8 additions & 2 deletions .github/workflows/intel-mkl-tool.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,16 @@ jobs:
os:
- windows-2019
- macos-10.15
- ubuntu-18.04
- ubuntu-22.04
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v1
- uses: actions-rs/toolchain@v1
with:
toolchain: "1.56.0"
profile: minimal
default: true
override: true
- uses: actions-rs/cargo@v1
with:
command: test
Expand All @@ -30,7 +36,7 @@ jobs:
name: cargo-test no-default-features

docker:
runs-on: ubuntu-18.04
runs-on: ubuntu-22.04
strategy:
fail-fast: false
matrix:
Expand Down
26 changes: 24 additions & 2 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Rust
name: rust

on:
push:
Expand All @@ -8,10 +8,32 @@ on:

jobs:
check-format:
runs-on: ubuntu-18.04
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v1
- uses: actions-rs/toolchain@v1
with:
toolchain: "1.56.0"
profile: minimal
components: rustfmt
default: true
override: true
- uses: actions-rs/cargo@v1
with:
command: fmt
args: -- --check

clippy:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v1
- uses: actions-rs/toolchain@v1
with:
toolchain: "1.56.0"
profile: minimal
components: clippy
default: true
override: true
- uses: actions-rs/cargo@v1
with:
command: clippy
4 changes: 3 additions & 1 deletion intel-mkl-src/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ version = "0.6.0+mkl2020.1"
authors = ["Toshiki Teramura <[email protected]>"]
edition = "2018"

rust-version = "1.56.0" # MSRV is introduced

description = "Redistribution of Intel(R) MKL as a crate"
repository = "https://github.com/rust-math/intel-mkl-src"
keywords = ["fft", "blas", "lapack"]
Expand Down Expand Up @@ -33,5 +35,5 @@ download = ["intel-mkl-tool/archive"]
xdg-data-home = []

[build-dependencies]
anyhow = "1"
anyhow = "1.0.58"
intel-mkl-tool = { version = "0.2.0", path = "../intel-mkl-tool", default-features = false }
8 changes: 5 additions & 3 deletions intel-mkl-sys/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ version = "0.2.0+mkl2020.1"
authors = ["Toshiki Teramura <[email protected]>"]
edition = "2018"

rust-version = "1.56.0" # MSRV is introduced

description = "FFI for Intel(R) MKL"
repository = "https://github.com/rust-math/intel-mkl-src"
keywords = ["ffi"]
Expand All @@ -30,9 +32,9 @@ download = ["intel-mkl-src/download"]
intel-mkl-src = { path = "../intel-mkl-src", version = "0.6.0", default-features = false }

[dev-dependencies]
criterion = "0.3.0"
rand = "0.7.2"
approx = "0.3.2"
criterion = "0.3.6"
rand = "0.8.5"
approx = "0.5.1"

[[bench]]
name = "cos"
Expand Down
18 changes: 9 additions & 9 deletions intel-mkl-tool/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,22 +16,22 @@ archive = ["curl", "tar", "zstd"]
cli = ["structopt", "archive"]

[dependencies]
anyhow = "1.0.31"
derive_more = "0.99.8"
dirs = "2.0.2"
anyhow = "1.0.58"
derive_more = "0.99.17"
dirs = "4.0.0"
glob = "0.3.0"
pkg-config = "0.3.17"
pkg-config = "0.3.25"

# archive
curl = { version = "0.4.29", optional = true }
tar = { version = "0.4.29", optional = true }
zstd = { version = "<=0.11, >=0.6", optional = true }
curl = { version = "0.4.44", optional = true }
tar = { version = "0.4.38", optional = true }
zstd = { version = "0.11.2", optional = true }

# CLI
structopt = { version = "0.3.15", optional = true }
structopt = { version = "0.3.26", optional = true }

[dev-dependencies]
paste = "0.1.17"
paste = "1.0.7"

[[bin]]
name = "intel-mkl-tool"
Expand Down
1 change: 1 addition & 0 deletions rust-toolchain
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1.56.0