Skip to content

Commit

Permalink
Merge pull request #45 from termoshtt/workspace
Browse files Browse the repository at this point in the history
Setup cargo-workspace
  • Loading branch information
termoshtt committed Oct 31, 2020
2 parents f6b79e6 + 2b8f2d5 commit 3a2bc60
Show file tree
Hide file tree
Showing 8 changed files with 62 additions and 52 deletions.
12 changes: 9 additions & 3 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,9 @@ jobs:
- uses: actions-rs/cargo@v1
with:
command: test
args: --features=${{ matrix.feature }}
args: >
--features=${{ matrix.feature }}
--manifest-path=openblas-src/Cargo.toml
env:
VCPKG_ROOT: ${{ github.workspace }}/vcpkg

Expand All @@ -61,7 +63,9 @@ jobs:
- uses: actions-rs/cargo@v1
with:
command: test
args: --features=${{ matrix.feature }}
args: >
--features=${{ matrix.feature }}
--manifest-path=openblas-src/Cargo.toml
linux:
runs-on: ubuntu-18.04
Expand All @@ -86,4 +90,6 @@ jobs:
- uses: actions-rs/cargo@v1
with:
command: test
args: --features=${{ matrix.feature }}
args: >
--features=${{ matrix.feature }}
--manifest-path=openblas-src/Cargo.toml
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "source"]
path = source
path = openblas-src/source
url = https://github.com/xianyi/OpenBLAS.git
51 changes: 3 additions & 48 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,49 +1,4 @@
[package]
name = "openblas-src"
version = "0.10.1"
license = "Apache-2.0/MIT"
authors = [
"Corey Richardson <corey@octayn.net>",
"Ethan Smith <ethan@ethanhs.me>",
"Ivan Ukhov <ivan.ukhov@gmail.com>",
"Jim Turner <git@turner.link>",
"Ken Elkabany <ken@elkabany.com>",
"Steve Harris <steveOfAR@gmail.com>",
"Toshiki Teramura <toshiki.teramura@gmail.com>",
[workspace]
members = [
"openblas-src",
]
description = "The package provides a source of BLAS and LAPACK via OpenBLAS."
documentation = "https://docs.rs/openblas-src"
homepage = "https://github.com/blas-lapack-rs/openblas-src"
repository = "https://github.com/blas-lapack-rs/openblas-src"
readme = "README.md"
categories = ["science"]
keywords = ["linear-algebra"]
build = "build.rs"
links = "openblas"
exclude = [
"source/benchmark/*",
"source/ctest/*",
"source/lapack-netlib/BLAS/TESTING/*",
"source/lapack-netlib/CBLAS/testing/*",
"source/lapack-netlib/TESTING/*.in",
"source/lapack-netlib/TESTING/EIG/*",
"source/lapack-netlib/TESTING/LIN/*",
"source/reference/*",
"source/test/*",
"source/utest/*",
]

[features]
default = ["cblas", "lapacke"]

cache = []
cblas = []
lapacke = []
static = []
system = []

[dev-dependencies]
libc = "0.2"

[target.'cfg(target_os="windows")'.build-dependencies]
vcpkg = "0.2"
49 changes: 49 additions & 0 deletions openblas-src/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
[package]
name = "openblas-src"
version = "0.10.1"
license = "Apache-2.0/MIT"
authors = [
"Corey Richardson <corey@octayn.net>",
"Ethan Smith <ethan@ethanhs.me>",
"Ivan Ukhov <ivan.ukhov@gmail.com>",
"Jim Turner <git@turner.link>",
"Ken Elkabany <ken@elkabany.com>",
"Steve Harris <steveOfAR@gmail.com>",
"Toshiki Teramura <toshiki.teramura@gmail.com>",
]
description = "The package provides a source of BLAS and LAPACK via OpenBLAS."
documentation = "https://docs.rs/openblas-src"
homepage = "https://github.com/blas-lapack-rs/openblas-src"
repository = "https://github.com/blas-lapack-rs/openblas-src"
readme = "../README.md"
categories = ["science"]
keywords = ["linear-algebra"]
build = "build.rs"
links = "openblas"
exclude = [
"source/benchmark/*",
"source/ctest/*",
"source/lapack-netlib/BLAS/TESTING/*",
"source/lapack-netlib/CBLAS/testing/*",
"source/lapack-netlib/TESTING/*.in",
"source/lapack-netlib/TESTING/EIG/*",
"source/lapack-netlib/TESTING/LIN/*",
"source/reference/*",
"source/test/*",
"source/utest/*",
]

[features]
default = ["cblas", "lapacke"]

cache = []
cblas = []
lapacke = []
static = []
system = []

[dev-dependencies]
libc = "0.2"

[target.'cfg(target_os="windows")'.build-dependencies]
vcpkg = "0.2"
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 3a2bc60

Please sign in to comment.