Merge pull request #45 from termoshtt/workspace

Setup cargo-workspace
blas-lapack-rs · Oct 31, 2020 · 3a2bc60 · 3a2bc60
2 parents f6b79e6 + 2b8f2d5
commit 3a2bc60
Show file tree

Hide file tree

Showing 8 changed files with 62 additions and 52 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -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
 
@@ -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
@@ -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
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "source"]
-	path = source
+	path = openblas-src/source
 	url = https://github.com/xianyi/OpenBLAS.git
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,49 +1,4 @@
-[package]
-name = "openblas-src"
-version = "0.10.1"
-license = "Apache-2.0/MIT"
-authors = [
-    "Corey Richardson <[email protected]>",
-    "Ethan Smith <[email protected]>",
-    "Ivan Ukhov <[email protected]>",
-    "Jim Turner <[email protected]>",
-    "Ken Elkabany <[email protected]>",
-    "Steve Harris <[email protected]>",
-    "Toshiki Teramura <[email protected]>",
+[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"
diff --git a/openblas-src/Cargo.toml b/openblas-src/Cargo.toml
@@ -0,0 +1,49 @@
+[package]
+name = "openblas-src"
+version = "0.10.1"
+license = "Apache-2.0/MIT"
+authors = [
+    "Corey Richardson <[email protected]>",
+    "Ethan Smith <[email protected]>",
+    "Ivan Ukhov <[email protected]>",
+    "Jim Turner <[email protected]>",
+    "Ken Elkabany <[email protected]>",
+    "Steve Harris <[email protected]>",
+    "Toshiki Teramura <[email protected]>",
+]
+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"
diff --git a/build.rs → openblas-src/build.rs b/build.rs → openblas-src/build.rs
diff --git a/source → openblas-src/source b/source → openblas-src/source
diff --git a/src/lib.rs → openblas-src/src/lib.rs b/src/lib.rs → openblas-src/src/lib.rs
diff --git a/tests/lib.rs → openblas-src/tests/lib.rs b/tests/lib.rs → openblas-src/tests/lib.rs