Skip to content

Commit

Permalink
Merge pull request #34 from igr-ml/prepare-v0.1.0
Browse files Browse the repository at this point in the history
Prepare v0.1.0
  • Loading branch information
mj-will authored Sep 23, 2022
2 parents 285c68c + 6e9bb73 commit 7aa477e
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 3 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [0.1.0]

### Added

- Add `RealNVP`
Expand All @@ -15,3 +17,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Add option for user-defined masks in coupling-based flows

[Unreleased]: https://github.com/igr-ml/glasflow/compare/v0.1.0...HEAD
[0.1.0]: https://github.com/igr-ml/glasflow/releases/tag/v0.1.0
31 changes: 30 additions & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,35 @@
# glasflow

MIT License

Copyright (c) 2021-2022 Jordan McGinn, Federico Stachurski, Michael J. Williams

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

# nflows

This software includes a fork of [nflows](https://github.com/igr-ml/nflows)
which is licensed under an MIT License:

MIT License

Copyright (c) 2021 Jordan McGinn, Federico Stachurski, Michael J. Williams
Copyright (c) 2020 Conor Durkan, Artur Bekasov, Iain Murray, George Papamakarios

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
4 changes: 2 additions & 2 deletions src/glasflow/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ def _import_submodules(module):
"1",
]
if USE_NFLOWS:
print("glasflow is using `nflows` instead of the included submodule")
print("glasflow is using an externally installed version of nflows")
if not NFLOWS_INSTALLED:
raise RuntimeError(
"nflows is not installed. Set the environment variable "
Expand All @@ -55,7 +55,7 @@ def _import_submodules(module):
# the nflows installation
_import_submodules(nflows)
else:
print("glasflow is using the included fork of `nflows`")
print("glasflow is using its own internal version of nflows")

from .flows import ( # noqa
CouplingNSF,
Expand Down

0 comments on commit 7aa477e

Please sign in to comment.