Skip to content

Commit 3f41879

Browse files
mondusptheywood
andauthored
Licence update to AGPL + Commercial and CLA (#10)
* Add licence page with explanaiton of the change from MIT to AGPL3 + Commercial * Added CLA text Co-authored-by: Peter Heywood <[email protected]>
1 parent 74648d5 commit 3f41879

File tree

4 files changed

+161
-12
lines changed

4 files changed

+161
-12
lines changed

Gemfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ gem "github-pages", group: :jekyll_plugins
1414
# To upgrade, run `bundle update`.
1515

1616
gem "minimal-mistakes-jekyll"
17+
# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
18+
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
1719

1820
# The following plugins are automatically loaded by the theme-gem:
1921
# gem "jekyll-paginate"

download/cla-individual.md

Lines changed: 102 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
1+
---
2+
title: "Contributor Licence Agreement"
3+
permalink: "cla"
4+
---
5+
6+
# Contributor Licence Agreement
7+
8+
## Individual Contributor Exclusive License Agreement
9+
10+
Thank you for your interest in contributing to University of Sheffield's FLAME GPU Software ("We" or "Us").
11+
12+
The purpose of this contributor agreement ("Agreement") is to clarify and document the rights granted by contributors to Us. To make this document effective, please follow the instructions via our CLA Bot when submitting a pull request via [https://github.com/FLAMEGPU/FLAMEGPU2/compare](https://github.com/FLAMEGPU/FLAMEGPU2/compare).
13+
14+
### How to use this Contributor Agreement
15+
16+
If You are an employee and have created the Contribution as part of your employment, You need to have Your employer approve this Agreement or sign the Entity version of this document by contacting [[email protected]](mailto:[email protected]). Entity contributions can not be processed via the CLA bot. If You do not own the Copyright in the entire work of authorship, any other author of the Contribution should also sign this – in any event, please contact Us at [[email protected]](mailto:[email protected]).
17+
18+
### 1\. Definitions
19+
20+
**"You"** means the individual Copyright owner who Submits a Contribution to Us.
21+
22+
**"Legal Entity"** means an entity that is not a natural person.
23+
24+
**"Affiliate"** means any other Legal Entity that controls, is controlled by, or under common control with that Legal Entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such Legal Entity, whether by contract or otherwise, (ii) ownership of fifty percent (50%) or more of the outstanding shares or securities that vote to elect the management or other persons who direct such Legal Entity or (iii) beneficial ownership of such entity.
25+
26+
**"Contribution"** means any original work of authorship, including any original modifications or additions to an existing work of authorship, Submitted by You to Us, in which You own the Copyright.
27+
28+
**"Copyright"** means all rights protecting works of authorship, including copyright, moral and neighboring rights, as appropriate, for the full term of their existence.
29+
30+
**"Material"** means the software or documentation made available by Us to third parties. When this Agreement covers more than one software project, the Material means the software or documentation to which the Contribution was Submitted. After You Submit the Contribution, it may be included in the Material.
31+
32+
**"Submit"** means any act by which a Contribution is transferred to Us by You by means of tangible or intangible media, including but not limited to electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, Us, but excluding any transfer that is conspicuously marked or otherwise designated in writing by You as "Not a Contribution."
33+
34+
**"Documentation"** means any non-software portion of a Contribution.
35+
36+
### 2\. License grant
37+
38+
#### 2.1 Copyright license to Us
39+
40+
Subject to the terms and conditions of this Agreement, You hereby grant to Us a worldwide, royalty-free, Exclusive, perpetual and irrevocable (except as stated in Section 8.2) license, with the right to transfer an unlimited number of non-exclusive licenses or to grant sublicenses to third parties, under the Copyright covering the Contribution to use the Contribution by all means, including, but not limited to:
41+
42+
* publish the Contribution,
43+
* modify the Contribution,
44+
* prepare derivative works based upon or containing the Contribution and/or to combine the Contribution with other Materials,
45+
* reproduce the Contribution in original or modified form,
46+
* distribute, to make the Contribution available to the public, display and publicly perform the Contribution in original or modified form.
47+
48+
#### 2.2 Moral rights
49+
50+
Moral Rights remain unaffected to the extent they are recognized and not waivable by applicable law. Notwithstanding, You may add your name to the attribution mechanism customary used in the Materials you Contribute to, such as the header of the source code files of Your Contribution, and We will respect this attribution when using Your Contribution.
51+
52+
#### 2.3 Copyright license back to You
53+
54+
Upon such grant of rights to Us, We immediately grant to You a worldwide, royalty-free, non-exclusive, perpetual and irrevocable license, with the right to transfer an unlimited number of non-exclusive licenses or to grant sublicenses to third parties, under the Copyright covering the Contribution to use the Contribution by all means, including, but not limited to:
55+
56+
* publish the Contribution,
57+
* modify the Contribution,
58+
* prepare derivative works based upon or containing the Contribution and/or to combine the Contribution with other Materials,
59+
* reproduce the Contribution in original or modified form,
60+
* distribute, to make the Contribution available to the public, display and publicly perform the Contribution in original or modified form.
61+
62+
This license back is limited to the Contribution and does not provide any rights to the Material.
63+
64+
### 3\. Patents
65+
66+
#### 3.1 Patent license
67+
68+
Subject to the terms and conditions of this Agreement You hereby grant to Us and to recipients of Materials distributed by Us a worldwide, royalty-free, non-exclusive, perpetual and irrevocable (except as stated in Section 3.2) patent license, with the right to transfer an unlimited number of non-exclusive licenses or to grant sublicenses to third parties, to make, have made, use, sell, offer for sale, import and otherwise transfer the Contribution and the Contribution in combination with any Material (and portions of such combination). This license applies to all patents owned or controlled by You, whether already acquired or hereafter acquired, that would be infringed by making, having made, using, selling, offering for sale, importing or otherwise transferring of Your Contribution(s) alone or by combination of Your Contribution(s) with any Material.
69+
70+
#### 3.2 Revocation of patent license
71+
72+
You reserve the right to revoke the patent license stated in section 3.1 if We make any infringement claim that is targeted at your Contribution and not asserted for a Defensive Purpose. An assertion of claims of the Patents shall be considered for a "Defensive Purpose" if the claims are asserted against an entity that has filed, maintained, threatened, or voluntarily participated in a patent infringement lawsuit against Us or any of Our licensees.
73+
74+
### 4. Disclaimer
75+
76+
THE CONTRIBUTION IS PROVIDED "AS IS". MORE PARTICULARLY, ALL EXPRESS OR IMPLIED WARRANTIES INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTY OF SATISFACTORY QUALITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE EXPRESSLY DISCLAIMED BY YOU TO US AND BY US TO YOU. TO THE EXTENT THAT ANY SUCH WARRANTIES CANNOT BE DISCLAIMED, SUCH WARRANTY IS LIMITED IN DURATION AND EXTENT TO THE MINIMUM PERIOD AND EXTENT PERMITTED BY LAW.
77+
78+
### 5. Consequential damage waiver
79+
80+
TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT WILL YOU OR WE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF ANTICIPATED SAVINGS, LOSS OF DATA, INDIRECT, SPECIAL, INCIDENTAL, CONSEQUENTIAL AND EXEMPLARY DAMAGES ARISING OUT OF THIS AGREEMENT REGARDLESS OF THE LEGAL OR EQUITABLE THEORY (CONTRACT, TORT OR OTHERWISE) UPON WHICH THE CLAIM IS BASED.
81+
82+
### 6. Approximation of disclaimer and damage waiver
83+
84+
IF THE DISCLAIMER AND DAMAGE WAIVER MENTIONED IN SECTION 4. AND SECTION 5. CANNOT BE GIVEN LEGAL EFFECT UNDER APPLICABLE LOCAL LAW, REVIEWING COURTS SHALL APPLY LOCAL LAW THAT MOST CLOSELY APPROXIMATES AN ABSOLUTE WAIVER OF ALL CIVIL OR CONTRACTUAL LIABILITY IN CONNECTION WITH THE CONTRIBUTION.
85+
86+
### 7. Term
87+
88+
7.1 This Agreement shall come into effect upon Your acceptance of the terms and conditions.
89+
90+
7.3 In the event of a termination of this Agreement Sections 4, 5, 6, 7 and 8 shall survive such termination and shall remain in full force thereafter. For the avoidance of doubt, Free and Open Source Software (sub)licenses that have already been granted for Contributions at the date of the termination shall remain in full force after the termination of this Agreement.
91+
92+
### 8 Miscellaneous
93+
94+
8.1 This Agreement and all disputes, claims, actions, suits or other proceedings arising out of this agreement or relating in any way to it shall be governed by the laws of the United Kingdom of Great Britain and Northern Ireland excluding its private international law provisions.
95+
96+
8.2 This Agreement sets out the entire agreement between You and Us for Your Contributions to Us and overrides all other agreements or understandings.
97+
98+
8.3 In case of Your death, this agreement shall continue with Your heirs. In case of more than one heir, all heirs must exercise their rights through a commonly authorized person.
99+
100+
8.4 If any provision of this Agreement is found void and unenforceable, such provision will be replaced to the extent possible with a provision that comes closest to the meaning of the original provision and that is enforceable. The terms and conditions set forth in this Agreement shall apply notwithstanding any failure of essential purpose of this Agreement or any limited remedy to the maximum extent possible under law.
101+
102+
8.5 You agree to notify Us of any facts or circumstances of which you become aware that would make this Agreement inaccurate in any respect.

download/index.md

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,27 @@
22
title: "Download FLAME GPU"
33
---
44

5-
## FLAME GPU 2.x
5+
## FLAME GPU 2+
66

7-
[![FLAME GPU 2 logo]({{ "/assets/images/fgpu2_icon_256.png" | relative_url }})](https://github.com/FLAMEGPU/FLAMEGPU2){: .align-right .no-shadow}
8-
FLAME GPU 2 is currently in an pre-release (alpha) state, and although we hope there will not be significant changes to the API prior to a stable release there may be breaking changes as we fix issues, adjust the API and improve performance.
7+
The simplest and recommend way to install FLAME GPU 2+ is to install our pre-built python binary wheels using our [wheelhouse](https://whl.flamegpu.com/). E.g. to install the latest pyflamegpu build for CUDA 12.0+ with visualiastion:
98

10-
It is mostly feature complete with FLAME GPU 1 but may not meet the same levels of performance for all use cases.
11-
This is a result of the vastly more flexible interface used to template generated code.
12-
Performance is generally still very close to or better than FLAME GPU 1 and optimisations are always being added.
9+
```
10+
python3 -m pip install --extra-index-url https://whl.flamegpu.com/whl/cuda120-vis/ pyflamegpu
11+
```
1312

14-
FLAME GPU 2 uses [CMake](https://cmake.org) as a cross-platform build system, with support for Windows via Visual Studio and for linux systems via make, with support for CUDA 11.0+.
15-
Please see the [readme](https://github.com/FLAMEGPU/FLAMEGPU2) for further information on the dependencies of FLAME GPU 2 and the model development process.
13+
Please see the [Release Notes](https://github.com/FLAMEGPU/FLAMEGPU2/releases/latest) for more information.
1614

17-
To use FLAME GPU 2, you can either start by consider starting with one of the standalone [models](../models), or create a new standalone model based on the [template repository](https://github.com/FLAMEGPU/FLAMEGPU2-example-template) or by downloading and building the main [FLAME GPU 2](https://github.com/FLAMEGPU/FLAMEGPU2) project and follow the instructions in the readme.
15+
To build FLAME GPU 2+ or develop using C++, you can either start by consider starting with one of the standalone [models](../models), or create a new standalone model based on the [template repository](https://github.com/FLAMEGPU/FLAMEGPU2-example-template) or by downloading and building the main [FLAME GPU 2](https://github.com/FLAMEGPU/FLAMEGPU2) project and follow the instructions in the readme. FLAME GPU 2 uses [CMake](https://cmake.org) as a cross-platform build system, with support for Windows via Visual Studio and for Linux systems via make, with support for CUDA 12.0+. Please see the [readme](https://github.com/FLAMEGPU/FLAMEGPU2) for further information on the dependencies of FLAME GPU 2 and the model development process.
1816

19-
Pre-built python 3.6+ binary wheels are now available on some platforms. Please see the [Release Notes](https://github.com/FLAMEGPU/FLAMEGPU2/releases/latest) for more information.
17+
*Note: FLAME GPU 2 is released under a [dual licence of AGPL v3.0 and a commercial licence](./licence). Pre-release versions were previously distributed under MIT. Contributions require a digital signature (via a GitHub CLA bot) of our [Contributor Licence Agreement](../cla).*
2018

21-
## FLAME GPU 1.x
19+
20+
21+
## FLAME GPU 1.x (Legacy Versions)
2222

2323
[![FLAME GPU 1 logo]({{ "/assets/images/flame_gpu_v1.jpg" | relative_url }})](https://github.com/FLAMEGPU/FLAMEGPU){: .align-right .no-shadow}
24-
FLAME GPU 1.x releases are still available to download and use, although there are no plans for further development of FLAME GPU 1.
24+
FLAME GPU 2 refers to Versions 2+ as opposed to the legacy 1.x version of FLAME GPU/ FLAME GPU 2 is designed on the same concepts and ideas of FLAME GPU 1 with a similar but vastly improved interface and wider variety of features. FLAME GPU 1.x releases are still available to download and use, although it should be considered legacy software and there are no plans for further development or maintenance of FLAME GPU 1.
25+
2526
The latest release, FLAME GPU 1.5 supports CUDA 10.2 with Visual Studio 2015/2019 on windows and Make on Linux).
2627
CUDA 11.0+ is unsupported.
2728

download/license.md

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
---
2+
title: "FLAME GPU 2 License"
3+
---
4+
5+
The most recent (and future) versions of FLAME GPU 2 are available under a dual license (AGPL v3.0 and commercial). Previous versions of FLAME GPU were distributed under MIT.
6+
7+
## Why a dual license model for FLAME GPU 2
8+
9+
Developing and maintaining research software is hard, especially software like FLAME GPU which requires highly skilled GPU developers. Very little funding exists for development or maintenance. FLAME GPU 2 was extremely fortunate to receive a large chunk of funding for its initial development via a Research Software Engineering Fellowship. Funding to support new features is often sought through collaborative research projects with partners wishing to apply FLAME GPU to a new domain. As the software has become mature and stable it is becoming harder to seek research grants which look to add novel new features (constituting software engineering research). Instead funding is required to maintain what we already have.
10+
11+
## Commitment to Open Source
12+
13+
First and foremost FLAME GPU is committed to open source, in particular in ensuring that the results of FLAME GPU simulations are FAIR and that the software itself remains open and accessible, preventing it from becoming proprietary. If you use FLAME GPU as part of your research and want to publish the resulting model and outputs you can do so under the AGPL v3.0 terms.
14+
15+
## A Commercial License
16+
17+
The move towards a dual license allows us to pursue commercial routes for FLAME GPU to generate revenue to support the software and to help understand its industrial impact. As a FLAME GPU user, this means that if you do not want to comply with the AGPL terms then a commercial license would be required. I.e. If you want to build a model or product using FLAME GPU and distribute this without releasing the source code then a commercial would eb needed. There is not a fixed license fee, instead this is negotiable depending on your use case and may require terms to help us understand and demonstrate the impact of the software. If you would like to find out more then please [contact us](../../contact).
18+
19+
## FAQ
20+
21+
**Q: Why are you changing it now?**
22+
A: The software is reaching a mature and stable point where alternative sources of income are required to support its maintenance.
23+
24+
**Q: Can I use the old MIT version?**
25+
A: Of course but updates to the software will only be issued under the new license terms.
26+
27+
**Q: Can I have a commercial license?**
28+
A: Yes. Speak to us.
29+
30+
**Q: Can I have a free commercial license?**
31+
A: Possibly. Speak to us.
32+
33+
**Q: Can I fund FLAME GPUs development without a commercial license?**
34+
A: Yes of course. Speak to us.
35+
36+
**Q: MIT was much better. Don't you agree?**
37+
A: MIT is great but we need to find ways to fund FLAME GPUs development or it will lose support.
38+
39+
**Q: Can I contribute to the software?**
40+
A: Yes. See our [contribution guidelines](https://github.com/FLAMEGPU/FLAMEGPU2/blob/master/CONTRIBUTING.md). We will require a contributor license agreement which allows us permission to distribute any contribution under the dual license terms.
41+
42+
**Q: Can you tell me if my software is compliant with AGPL?**
43+
We can not. You should seek specialist advice.
44+

0 commit comments

Comments
 (0)