From c31cb1b52f5b38056cd8d1e56975a728f26f2f36 Mon Sep 17 00:00:00 2001 From: Toshiki Teramura Date: Fri, 29 Jul 2022 12:02:45 +0900 Subject: [PATCH 1/7] cargo upgrade intel-mkl-tool --- intel-mkl-tool/Cargo.toml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/intel-mkl-tool/Cargo.toml b/intel-mkl-tool/Cargo.toml index 2d621fbd..9bad7ab0 100644 --- a/intel-mkl-tool/Cargo.toml +++ b/intel-mkl-tool/Cargo.toml @@ -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" From e77525dccfa3bdf1d005c3726a5945780b12d074 Mon Sep 17 00:00:00 2001 From: Toshiki Teramura Date: Fri, 29 Jul 2022 12:03:43 +0900 Subject: [PATCH 2/7] Set MSRV to 1.56.0 in intel-mkl-src and intel-mkl-sys crate --- intel-mkl-src/Cargo.toml | 2 ++ intel-mkl-sys/Cargo.toml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/intel-mkl-src/Cargo.toml b/intel-mkl-src/Cargo.toml index a95a465a..f9208d39 100644 --- a/intel-mkl-src/Cargo.toml +++ b/intel-mkl-src/Cargo.toml @@ -4,6 +4,8 @@ version = "0.6.0+mkl2020.1" authors = ["Toshiki Teramura "] 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"] diff --git a/intel-mkl-sys/Cargo.toml b/intel-mkl-sys/Cargo.toml index 7248d41d..3a0f028f 100644 --- a/intel-mkl-sys/Cargo.toml +++ b/intel-mkl-sys/Cargo.toml @@ -4,6 +4,8 @@ version = "0.2.0+mkl2020.1" authors = ["Toshiki Teramura "] 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"] From e8bc0fac7eeb246b29db42e34d9996b4d17d24e0 Mon Sep 17 00:00:00 2001 From: Toshiki Teramura Date: Fri, 29 Jul 2022 12:04:09 +0900 Subject: [PATCH 3/7] cargo upgrade in intel-mkl-sys --- intel-mkl-sys/Cargo.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/intel-mkl-sys/Cargo.toml b/intel-mkl-sys/Cargo.toml index 3a0f028f..4e75e3d1 100644 --- a/intel-mkl-sys/Cargo.toml +++ b/intel-mkl-sys/Cargo.toml @@ -32,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" From 873c26f366e3203e46ca3ffc8b7b5bf28d4f8aea Mon Sep 17 00:00:00 2001 From: Toshiki Teramura Date: Fri, 29 Jul 2022 12:05:40 +0900 Subject: [PATCH 4/7] cargo upgrade intel-mkl-src --- intel-mkl-src/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/intel-mkl-src/Cargo.toml b/intel-mkl-src/Cargo.toml index f9208d39..06f6ffa4 100644 --- a/intel-mkl-src/Cargo.toml +++ b/intel-mkl-src/Cargo.toml @@ -35,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 } From 61efb5fb4133671371bcc721c05943742226f95f Mon Sep 17 00:00:00 2001 From: Toshiki Teramura Date: Fri, 29 Jul 2022 12:32:31 +0900 Subject: [PATCH 5/7] Use rust-toolchain file --- rust-toolchain | 1 + 1 file changed, 1 insertion(+) create mode 100644 rust-toolchain diff --git a/rust-toolchain b/rust-toolchain new file mode 100644 index 00000000..3ebf789f --- /dev/null +++ b/rust-toolchain @@ -0,0 +1 @@ +1.56.0 From 66c7b3757b960bb3ef3051d232a5abadac06a503 Mon Sep 17 00:00:00 2001 From: Toshiki Teramura Date: Fri, 29 Jul 2022 12:38:19 +0900 Subject: [PATCH 6/7] Use actions-rs/toolchain action to setup 1.56.0 in CI --- .github/workflows/intel-mkl-sys.yml | 18 ++++++++++++++++++ .github/workflows/intel-mkl-tool.yml | 6 ++++++ .github/workflows/rust.yml | 26 ++++++++++++++++++++++++-- 3 files changed, 48 insertions(+), 2 deletions(-) diff --git a/.github/workflows/intel-mkl-sys.yml b/.github/workflows/intel-mkl-sys.yml index 82a1d183..0d277902 100644 --- a/.github/workflows/intel-mkl-sys.yml +++ b/.github/workflows/intel-mkl-sys.yml @@ -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 @@ -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 @@ -63,6 +75,12 @@ jobs: runs-on: ubuntu-18.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 diff --git a/.github/workflows/intel-mkl-tool.yml b/.github/workflows/intel-mkl-tool.yml index 4af9f472..1594d4e1 100644 --- a/.github/workflows/intel-mkl-tool.yml +++ b/.github/workflows/intel-mkl-tool.yml @@ -18,6 +18,12 @@ jobs: 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 diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index eb1f7158..5543ac31 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -1,4 +1,4 @@ -name: Rust +name: rust on: push: @@ -8,10 +8,32 @@ on: jobs: check-format: - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.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-20.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 From b8f311d352e1196c4c59e1528cfa1d7bef8dc78a Mon Sep 17 00:00:00 2001 From: Toshiki Teramura Date: Fri, 29 Jul 2022 12:39:17 +0900 Subject: [PATCH 7/7] Use Ubuntu 22.04 --- .github/workflows/intel-mkl-sys.yml | 2 +- .github/workflows/intel-mkl-tool.yml | 4 ++-- .github/workflows/rust.yml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/intel-mkl-sys.yml b/.github/workflows/intel-mkl-sys.yml index 0d277902..7ca59efe 100644 --- a/.github/workflows/intel-mkl-sys.yml +++ b/.github/workflows/intel-mkl-sys.yml @@ -72,7 +72,7 @@ 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 diff --git a/.github/workflows/intel-mkl-tool.yml b/.github/workflows/intel-mkl-tool.yml index 1594d4e1..8cb2fee2 100644 --- a/.github/workflows/intel-mkl-tool.yml +++ b/.github/workflows/intel-mkl-tool.yml @@ -14,7 +14,7 @@ jobs: os: - windows-2019 - macos-10.15 - - ubuntu-18.04 + - ubuntu-22.04 runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v1 @@ -36,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: diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 5543ac31..00dfa704 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -8,7 +8,7 @@ on: jobs: check-format: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v1 - uses: actions-rs/toolchain@v1 @@ -24,7 +24,7 @@ jobs: args: -- --check clippy: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v1 - uses: actions-rs/toolchain@v1