Skip to content

Commit 9daf03a

Browse files
committed
Change to MIT OR Apache-2.0
1 parent 2359185 commit 9daf03a

File tree

6 files changed

+69
-24
lines changed

6 files changed

+69
-24
lines changed

LICENSE

Lines changed: 0 additions & 21 deletions
This file was deleted.

LICENSE.md

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
# License
2+
3+
The project is dual licensed under the terms of the Apache License, Version 2.0,
4+
and the MIT License. You may obtain copies of the two licenses at
5+
6+
* https://www.apache.org/licenses/LICENSE-2.0 and
7+
* https://opensource.org/licenses/MIT, respectively.
8+
9+
The following two notices apply to every file of the project.
10+
11+
## The Apache License
12+
13+
```
14+
Copyright 2016 The ndarray-linalg Developers
15+
16+
Licensed under the Apache License, Version 2.0 (the “License”); you may not use
17+
this file except in compliance with the License. You may obtain a copy of the
18+
License at
19+
20+
http://www.apache.org/licenses/LICENSE-2.0
21+
22+
Unless required by applicable law or agreed to in writing, software distributed
23+
under the License is distributed on an “AS IS” BASIS, WITHOUT WARRANTIES OR
24+
CONDITIONS OF ANY KIND, either express or implied. See the License for the
25+
specific language governing permissions and limitations under the License.
26+
```
27+
28+
## The MIT License
29+
30+
```
31+
Copyright 2016 The ndarray-linalg Developers
32+
33+
Permission is hereby granted, free of charge, to any person obtaining a copy of
34+
this software and associated documentation files (the “Software”), to deal in
35+
the Software without restriction, including without limitation the rights to
36+
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
37+
the Software, and to permit persons to whom the Software is furnished to do so,
38+
subject to the following conditions:
39+
40+
The above copyright notice and this permission notice shall be included in all
41+
copies or substantial portions of the Software.
42+
43+
THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
44+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
45+
FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
46+
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
47+
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
48+
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
49+
```

README.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,3 +103,13 @@ rustdocflags = ["--html-in-header", "katex-header.html"]
103103
```
104104

105105
But, be sure that this works only for `--no-deps`. `cargo doc` will fail with this `.cargo/config`.
106+
107+
License
108+
--------
109+
110+
**CAUTION** Be sure that if you use `intel-mkl-src` backend, you have to accept [Intel Simplified Software License](https://software.intel.com/content/www/us/en/develop/articles/end-user-license-agreement.html)
111+
in addition to the MIT-License or Apache-2.0 License.
112+
113+
Dual-licensed to be compatible with the Rust project.
114+
Licensed under the Apache License, Version 2.0 http://www.apache.org/licenses/LICENSE-2.0 or the MIT license http://opensource.org/licenses/MIT, at your option.
115+

lax/Cargo.toml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,14 @@ version = "0.1.0"
44
authors = ["Toshiki Teramura <toshiki.teramura@gmail.com>"]
55
edition = "2018"
66

7+
description = "LAPACK wrapper without ndarray"
8+
documentation = "https://docs.rs/lax/"
9+
repository = "https://github.com/rust-ndarray/ndarray-linalg"
10+
keywords = ["lapack", "matrix"]
11+
license = "MIT OR Apache-2.0"
12+
readme = "README.md"
13+
categories = ["algorithms", "science"]
14+
715
[features]
816
default = []
917

lax/README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,3 @@ This crate responsibles for
66

77
- Linking to LAPACK shared/static libraries
88
- Dispatching to LAPACK routines based on scalar types by using `Lapack` trait
9-

ndarray-linalg/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ description = "Linear algebra package for rust-ndarray using LAPACK"
88
documentation = "https://docs.rs/ndarray-linalg/"
99
repository = "https://github.com/rust-ndarray/ndarray-linalg"
1010
keywords = ["ndarray", "lapack", "matrix"]
11-
license = "MIT"
12-
readme = "README.md"
11+
license = "MIT OR Apache-2.0"
12+
readme = "../README.md"
1313
categories = ["algorithms", "science"]
1414

1515
[features]

0 commit comments

Comments
 (0)