diff --git a/README.md b/README.md index 72d7cdae..773b6453 100644 --- a/README.md +++ b/README.md @@ -26,14 +26,14 @@ PHYSBO was developed based on [COMBO](https://github.com/tsudalab/combo) for aca - From PyPI (recommended) ```bash -pip3 install physbo +python3 -m pip install physbo ``` - From source (for developers) 1. Update pip (>= 19.0) ```bash - pip3 install -U pip + python3 -m pip install -U pip ``` 1. Download or clone the github repository @@ -48,7 +48,7 @@ pip3 install physbo # ./PHYSBO is the root directory of PHYSBO # pip install options such as --user are avaiable - pip3 install ./PHYSBO + python3 -m pip install ./PHYSBO ``` 1. Note: Do not `import physbo` at the root directory of the repository because `import physbo` does not try to import the installed PHYSBO but one in the repository, which includes Cython codes not compiled. @@ -56,7 +56,7 @@ pip3 install physbo ## Uninstall ```bash -pip3 uninstall physbo +python3 -m pip uninstall physbo ``` ## Usage @@ -70,7 +70,7 @@ A tutorial and a dataset of a paper about PHYSBO can be found in [PHYSBO Gallery ## License PHYSBO was developed based on [COMBO](https://github.com/tsudalab/COMBO) for academic use. -This package is distributed under GNU General Public License version 3 (GPL v3) or later. +PHYSBO v2 is distributed under Mozilla Public License version 2.0 (MPL v2). We hope that you cite the following reference when you publish the results using PHYSBO: [“Bayesian optimization package: PHYSBO”, Yuichi Motoyama, Ryo Tamura, Kazuyoshi Yoshimi, Kei Terayama, Tsuyoshi Ueno, Koji Tsuda, Computer Physics Communications Volume 278, September 2022, 108405.](https://doi.org/10.1016/j.cpc.2022.108405) diff --git a/docs/sphinx/manual/en/source/introduction.rst b/docs/sphinx/manual/en/source/introduction.rst index 7430769e..66c72512 100644 --- a/docs/sphinx/manual/en/source/introduction.rst +++ b/docs/sphinx/manual/en/source/introduction.rst @@ -52,8 +52,8 @@ Main Developers License ---------------------- -GNU General Public License version 3 +PHYSBO v2 is distributed under `the Mozilla Public License version 2.0 (MPL v2) `_. Copyright (c) <2020-> The University of Tokyo. All rights reserved. -Part of this software is developed under the support of “Project for advancement of software usability in materials science” by The Institute for Solid State Physics, The University of Tokyo. +Part of this software is developed under the support of "Project for advancement of software usability in materials science" by The Institute for Solid State Physics, The University of Tokyo. diff --git a/docs/sphinx/manual/ja/source/introduction.rst b/docs/sphinx/manual/ja/source/introduction.rst index 51571dd1..ee35a7d2 100644 --- a/docs/sphinx/manual/ja/source/introduction.rst +++ b/docs/sphinx/manual/ja/source/introduction.rst @@ -68,8 +68,7 @@ Bibtexは以下の通りです。 :: ライセンス ---------------------- -| 本ソフトウェアのプログラムパッケージおよびソースコード一式はGNU - General Public License version 3（GPL v3）に準じて配布されています。 +| PHYSBO v2 のソースコードは Mozilla Public License version 2.0（MPL v2）のもとで公開・頒布されています。 Copyright (c) <2020-> The University of Tokyo. All rights reserved. diff --git a/examples/multiple.py b/examples/multiple.py index 1a84c479..dd628849 100644 --- a/examples/multiple.py +++ b/examples/multiple.py @@ -1,3 +1,10 @@ +# SPDX-License-Identifier: MPL-2.0 +# Copyright (C) 2020- The University of Tokyo +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at https://mozilla.org/MPL/2.0/. + import itertools import numpy as np diff --git a/examples/multiple_score.py b/examples/multiple_score.py index 541d8811..67e123ad 100644 --- a/examples/multiple_score.py +++ b/examples/multiple_score.py @@ -1,3 +1,10 @@ +# SPDX-License-Identifier: MPL-2.0 +# Copyright (C) 2020- The University of Tokyo +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at https://mozilla.org/MPL/2.0/. + import itertools import numpy as np diff --git a/examples/simple.py b/examples/simple.py index 3e764d86..5d0cfca4 100644 --- a/examples/simple.py +++ b/examples/simple.py @@ -1,3 +1,10 @@ +# SPDX-License-Identifier: MPL-2.0 +# Copyright (C) 2020- The University of Tokyo +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at https://mozilla.org/MPL/2.0/. + import numpy as np import physbo diff --git a/examples/simple_score.py b/examples/simple_score.py index 874a5229..bdb7e112 100644 --- a/examples/simple_score.py +++ b/examples/simple_score.py @@ -1,3 +1,10 @@ +# SPDX-License-Identifier: MPL-2.0 +# Copyright (C) 2020- The University of Tokyo +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at https://mozilla.org/MPL/2.0/. + import numpy as np import physbo diff --git a/examples/simple_time.py b/examples/simple_time.py index 8442d6b3..5e5d0d31 100644 --- a/examples/simple_time.py +++ b/examples/simple_time.py @@ -1,3 +1,10 @@ +# SPDX-License-Identifier: MPL-2.0 +# Copyright (C) 2020- The University of Tokyo +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at https://mozilla.org/MPL/2.0/. + ### This example describes how to save elapsed time diff --git a/physbo/__init__.py b/physbo/__init__.py index 29ca50d5..39457b79 100644 --- a/physbo/__init__.py +++ b/physbo/__init__.py @@ -1,3 +1,10 @@ +# SPDX-License-Identifier: MPL-2.0 +# Copyright (C) 2020- The University of Tokyo +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at https://mozilla.org/MPL/2.0/. + from . import gp from . import opt from . import blm diff --git a/physbo/blm/__init__.py b/physbo/blm/__init__.py index 7eca6fbb..d007bd80 100644 --- a/physbo/blm/__init__.py +++ b/physbo/blm/__init__.py @@ -1,3 +1,10 @@ +# SPDX-License-Identifier: MPL-2.0 +# Copyright (C) 2020- The University of Tokyo +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at https://mozilla.org/MPL/2.0/. + """ Bayesian Linear Model """ diff --git a/physbo/blm/basis/__init__.py b/physbo/blm/basis/__init__.py index eac276b7..15824bb7 100644 --- a/physbo/blm/basis/__init__.py +++ b/physbo/blm/basis/__init__.py @@ -1 +1,8 @@ +# SPDX-License-Identifier: MPL-2.0 +# Copyright (C) 2020- The University of Tokyo +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at https://mozilla.org/MPL/2.0/. + from .fourier import fourier diff --git a/physbo/blm/basis/fourier.py b/physbo/blm/basis/fourier.py index d1ec43f7..1589ddf9 100644 --- a/physbo/blm/basis/fourier.py +++ b/physbo/blm/basis/fourier.py @@ -1,3 +1,10 @@ +# SPDX-License-Identifier: MPL-2.0 +# Copyright (C) 2020- The University of Tokyo +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at https://mozilla.org/MPL/2.0/. + # -*- coding:utf-8 -*- import numpy as np diff --git a/physbo/blm/core/__init__.py b/physbo/blm/core/__init__.py index 2460c221..cb717be4 100644 --- a/physbo/blm/core/__init__.py +++ b/physbo/blm/core/__init__.py @@ -1 +1,8 @@ +# SPDX-License-Identifier: MPL-2.0 +# Copyright (C) 2020- The University of Tokyo +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at https://mozilla.org/MPL/2.0/. + from .model import model diff --git a/physbo/blm/core/model.py b/physbo/blm/core/model.py index ba3bdf7b..66b87d42 100644 --- a/physbo/blm/core/model.py +++ b/physbo/blm/core/model.py @@ -1,3 +1,10 @@ +# SPDX-License-Identifier: MPL-2.0 +# Copyright (C) 2020- The University of Tokyo +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at https://mozilla.org/MPL/2.0/. + import numpy as np from .. import inf diff --git a/physbo/blm/inf/__init__.py b/physbo/blm/inf/__init__.py index da8cfdf7..6aaae33f 100644 --- a/physbo/blm/inf/__init__.py +++ b/physbo/blm/inf/__init__.py @@ -1 +1,8 @@ +# SPDX-License-Identifier: MPL-2.0 +# Copyright (C) 2020- The University of Tokyo +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at https://mozilla.org/MPL/2.0/. + from . import exact diff --git a/physbo/blm/inf/exact.py b/physbo/blm/inf/exact.py index 95c090fe..3d4eda00 100644 --- a/physbo/blm/inf/exact.py +++ b/physbo/blm/inf/exact.py @@ -1,3 +1,10 @@ +# SPDX-License-Identifier: MPL-2.0 +# Copyright (C) 2020- The University of Tokyo +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at https://mozilla.org/MPL/2.0/. + import numpy as np import scipy diff --git a/physbo/blm/lik/__init__.py b/physbo/blm/lik/__init__.py index 497b57f0..e89304fb 100644 --- a/physbo/blm/lik/__init__.py +++ b/physbo/blm/lik/__init__.py @@ -1,3 +1,10 @@ +# SPDX-License-Identifier: MPL-2.0 +# Copyright (C) 2020- The University of Tokyo +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at https://mozilla.org/MPL/2.0/. + from ._src import cov from .linear import linear from .gauss import gauss diff --git a/physbo/blm/lik/_src/__init__.py b/physbo/blm/lik/_src/__init__.py index ab05c2f0..9c296db3 100644 --- a/physbo/blm/lik/_src/__init__.py +++ b/physbo/blm/lik/_src/__init__.py @@ -1 +1,8 @@ +# SPDX-License-Identifier: MPL-2.0 +# Copyright (C) 2020- The University of Tokyo +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at https://mozilla.org/MPL/2.0/. + from .cov import cov diff --git a/physbo/blm/lik/_src/cov.py b/physbo/blm/lik/_src/cov.py index 6ffef15e..202f360b 100644 --- a/physbo/blm/lik/_src/cov.py +++ b/physbo/blm/lik/_src/cov.py @@ -1,3 +1,10 @@ +# SPDX-License-Identifier: MPL-2.0 +# Copyright (C) 2020- The University of Tokyo +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at https://mozilla.org/MPL/2.0/. + import numpy as np diff --git a/physbo/blm/lik/gauss.py b/physbo/blm/lik/gauss.py index c06de5e0..9bef8da7 100644 --- a/physbo/blm/lik/gauss.py +++ b/physbo/blm/lik/gauss.py @@ -1,3 +1,10 @@ +# SPDX-License-Identifier: MPL-2.0 +# Copyright (C) 2020- The University of Tokyo +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at https://mozilla.org/MPL/2.0/. + import numpy as np diff --git a/physbo/blm/lik/linear.py b/physbo/blm/lik/linear.py index be016cf3..287d72b2 100644 --- a/physbo/blm/lik/linear.py +++ b/physbo/blm/lik/linear.py @@ -1,3 +1,10 @@ +# SPDX-License-Identifier: MPL-2.0 +# Copyright (C) 2020- The University of Tokyo +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at https://mozilla.org/MPL/2.0/. + import numpy as np diff --git a/physbo/blm/predictor.py b/physbo/blm/predictor.py index 422eafcf..ff3b35d1 100644 --- a/physbo/blm/predictor.py +++ b/physbo/blm/predictor.py @@ -1,3 +1,10 @@ +# SPDX-License-Identifier: MPL-2.0 +# Copyright (C) 2020- The University of Tokyo +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at https://mozilla.org/MPL/2.0/. + import physbo.predictor diff --git a/physbo/blm/prior/__init__.py b/physbo/blm/prior/__init__.py index 4ec4c2bc..dd76a297 100644 --- a/physbo/blm/prior/__init__.py +++ b/physbo/blm/prior/__init__.py @@ -1 +1,8 @@ +# SPDX-License-Identifier: MPL-2.0 +# Copyright (C) 2020- The University of Tokyo +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at https://mozilla.org/MPL/2.0/. + from .gauss import gauss diff --git a/physbo/blm/prior/gauss.py b/physbo/blm/prior/gauss.py index dcfd46d3..569aca77 100644 --- a/physbo/blm/prior/gauss.py +++ b/physbo/blm/prior/gauss.py @@ -1,3 +1,10 @@ +# SPDX-License-Identifier: MPL-2.0 +# Copyright (C) 2020- The University of Tokyo +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at https://mozilla.org/MPL/2.0/. + import numpy as np diff --git a/physbo/gp/__init__.py b/physbo/gp/__init__.py index ee1bd702..450fb294 100644 --- a/physbo/gp/__init__.py +++ b/physbo/gp/__init__.py @@ -1,3 +1,10 @@ +# SPDX-License-Identifier: MPL-2.0 +# Copyright (C) 2020- The University of Tokyo +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at https://mozilla.org/MPL/2.0/. + from . import cov from . import mean from . import lik diff --git a/physbo/gp/core/__init__.py b/physbo/gp/core/__init__.py index d2e597be..ff0a2230 100644 --- a/physbo/gp/core/__init__.py +++ b/physbo/gp/core/__init__.py @@ -1,3 +1,10 @@ +# SPDX-License-Identifier: MPL-2.0 +# Copyright (C) 2020- The University of Tokyo +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at https://mozilla.org/MPL/2.0/. + from .prior import prior from .model import model diff --git a/physbo/gp/core/learning.py b/physbo/gp/core/learning.py index 178697e7..ba76da9f 100644 --- a/physbo/gp/core/learning.py +++ b/physbo/gp/core/learning.py @@ -1,3 +1,10 @@ +# SPDX-License-Identifier: MPL-2.0 +# Copyright (C) 2020- The University of Tokyo +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at https://mozilla.org/MPL/2.0/. + # coding=utf-8 import numpy as np import scipy.optimize diff --git a/physbo/gp/core/model.py b/physbo/gp/core/model.py index 0bdd51a7..4fc7dd9c 100644 --- a/physbo/gp/core/model.py +++ b/physbo/gp/core/model.py @@ -1,3 +1,10 @@ +# SPDX-License-Identifier: MPL-2.0 +# Copyright (C) 2020- The University of Tokyo +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at https://mozilla.org/MPL/2.0/. + import numpy as np from physbo import blm diff --git a/physbo/gp/core/prior.py b/physbo/gp/core/prior.py index 8767d2f0..3463cb7a 100644 --- a/physbo/gp/core/prior.py +++ b/physbo/gp/core/prior.py @@ -1,3 +1,10 @@ +# SPDX-License-Identifier: MPL-2.0 +# Copyright (C) 2020- The University of Tokyo +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at https://mozilla.org/MPL/2.0/. + import numpy as np import scipy diff --git a/physbo/gp/cov/__init__.py b/physbo/gp/cov/__init__.py index 4ec4c2bc..dd76a297 100644 --- a/physbo/gp/cov/__init__.py +++ b/physbo/gp/cov/__init__.py @@ -1 +1,8 @@ +# SPDX-License-Identifier: MPL-2.0 +# Copyright (C) 2020- The University of Tokyo +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at https://mozilla.org/MPL/2.0/. + from .gauss import gauss diff --git a/physbo/gp/cov/_src/__init__.py b/physbo/gp/cov/_src/__init__.py index e69de29b..8b137891 100644 --- a/physbo/gp/cov/_src/__init__.py +++ b/physbo/gp/cov/_src/__init__.py @@ -0,0 +1 @@ + diff --git a/physbo/gp/cov/_src/enhance_gauss.pyx b/physbo/gp/cov/_src/enhance_gauss.pyx index 00a07074..ff3c64ac 100644 --- a/physbo/gp/cov/_src/enhance_gauss.pyx +++ b/physbo/gp/cov/_src/enhance_gauss.pyx @@ -1,3 +1,10 @@ +# SPDX-License-Identifier: MPL-2.0 +# Copyright (C) 2020- The University of Tokyo +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at https://mozilla.org/MPL/2.0/. + import numpy as np cimport numpy as np import cython diff --git a/physbo/gp/cov/gauss.py b/physbo/gp/cov/gauss.py index c6d02eee..d55657bf 100644 --- a/physbo/gp/cov/gauss.py +++ b/physbo/gp/cov/gauss.py @@ -1,3 +1,10 @@ +# SPDX-License-Identifier: MPL-2.0 +# Copyright (C) 2020- The University of Tokyo +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at https://mozilla.org/MPL/2.0/. + # -*- coding:utf-8 -*- import numpy as np from scipy import spatial diff --git a/physbo/gp/inf/__init__.py b/physbo/gp/inf/__init__.py index da8cfdf7..6aaae33f 100644 --- a/physbo/gp/inf/__init__.py +++ b/physbo/gp/inf/__init__.py @@ -1 +1,8 @@ +# SPDX-License-Identifier: MPL-2.0 +# Copyright (C) 2020- The University of Tokyo +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at https://mozilla.org/MPL/2.0/. + from . import exact diff --git a/physbo/gp/inf/exact.py b/physbo/gp/inf/exact.py index 5bc38e37..0054ec52 100644 --- a/physbo/gp/inf/exact.py +++ b/physbo/gp/inf/exact.py @@ -1,3 +1,10 @@ +# SPDX-License-Identifier: MPL-2.0 +# Copyright (C) 2020- The University of Tokyo +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at https://mozilla.org/MPL/2.0/. + import numpy as np import scipy from ... import misc diff --git a/physbo/gp/lik/__init__.py b/physbo/gp/lik/__init__.py index 4ec4c2bc..dd76a297 100644 --- a/physbo/gp/lik/__init__.py +++ b/physbo/gp/lik/__init__.py @@ -1 +1,8 @@ +# SPDX-License-Identifier: MPL-2.0 +# Copyright (C) 2020- The University of Tokyo +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at https://mozilla.org/MPL/2.0/. + from .gauss import gauss diff --git a/physbo/gp/lik/gauss.py b/physbo/gp/lik/gauss.py index ab96d0b3..96ce6a93 100644 --- a/physbo/gp/lik/gauss.py +++ b/physbo/gp/lik/gauss.py @@ -1,4 +1,10 @@ -# -*- coding:utf-8 -*- +# SPDX-License-Identifier: MPL-2.0 +# Copyright (C) 2020- The University of Tokyo +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at https://mozilla.org/MPL/2.0/. + import numpy as np diff --git a/physbo/gp/mean/__init__.py b/physbo/gp/mean/__init__.py index 193963bb..5a644295 100644 --- a/physbo/gp/mean/__init__.py +++ b/physbo/gp/mean/__init__.py @@ -1,2 +1,9 @@ +# SPDX-License-Identifier: MPL-2.0 +# Copyright (C) 2020- The University of Tokyo +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at https://mozilla.org/MPL/2.0/. + from .zero import zero from .const import const diff --git a/physbo/gp/mean/const.py b/physbo/gp/mean/const.py index b845657d..02e0fcf8 100644 --- a/physbo/gp/mean/const.py +++ b/physbo/gp/mean/const.py @@ -1,3 +1,10 @@ +# SPDX-License-Identifier: MPL-2.0 +# Copyright (C) 2020- The University of Tokyo +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at https://mozilla.org/MPL/2.0/. + import numpy as np diff --git a/physbo/gp/mean/zero.py b/physbo/gp/mean/zero.py index 52e4a8bf..0f50812d 100644 --- a/physbo/gp/mean/zero.py +++ b/physbo/gp/mean/zero.py @@ -1,3 +1,10 @@ +# SPDX-License-Identifier: MPL-2.0 +# Copyright (C) 2020- The University of Tokyo +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at https://mozilla.org/MPL/2.0/. + import numpy as np diff --git a/physbo/gp/predictor.py b/physbo/gp/predictor.py index a01c99a3..f8206e36 100644 --- a/physbo/gp/predictor.py +++ b/physbo/gp/predictor.py @@ -1,3 +1,10 @@ +# SPDX-License-Identifier: MPL-2.0 +# Copyright (C) 2020- The University of Tokyo +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at https://mozilla.org/MPL/2.0/. + import physbo.predictor diff --git a/physbo/misc/__init__.py b/physbo/misc/__init__.py index 81057bca..1255fc7f 100644 --- a/physbo/misc/__init__.py +++ b/physbo/misc/__init__.py @@ -1,3 +1,10 @@ +# SPDX-License-Identifier: MPL-2.0 +# Copyright (C) 2020- The University of Tokyo +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at https://mozilla.org/MPL/2.0/. + from .centering import centering from .gauss_elim import gauss_elim from .set_config import set_config diff --git a/physbo/misc/_src/__init__.py b/physbo/misc/_src/__init__.py index e69de29b..8b137891 100644 --- a/physbo/misc/_src/__init__.py +++ b/physbo/misc/_src/__init__.py @@ -0,0 +1 @@ + diff --git a/physbo/misc/_src/cholupdate.pyx b/physbo/misc/_src/cholupdate.pyx index 60fad134..bbb51f8d 100644 --- a/physbo/misc/_src/cholupdate.pyx +++ b/physbo/misc/_src/cholupdate.pyx @@ -1,3 +1,10 @@ +# SPDX-License-Identifier: MPL-2.0 +# Copyright (C) 2020- The University of Tokyo +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at https://mozilla.org/MPL/2.0/. + from libc.math cimport sqrt from libc.math cimport abs as cabs import numpy as np diff --git a/physbo/misc/_src/diagAB.pyx b/physbo/misc/_src/diagAB.pyx index de24b8fe..6fcca91e 100644 --- a/physbo/misc/_src/diagAB.pyx +++ b/physbo/misc/_src/diagAB.pyx @@ -1,3 +1,10 @@ +# SPDX-License-Identifier: MPL-2.0 +# Copyright (C) 2020- The University of Tokyo +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at https://mozilla.org/MPL/2.0/. + import numpy as np cimport numpy as np import cython diff --git a/physbo/misc/_src/logsumexp.pyx b/physbo/misc/_src/logsumexp.pyx index a9367c05..1ea03500 100644 --- a/physbo/misc/_src/logsumexp.pyx +++ b/physbo/misc/_src/logsumexp.pyx @@ -1,3 +1,10 @@ +# SPDX-License-Identifier: MPL-2.0 +# Copyright (C) 2020- The University of Tokyo +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at https://mozilla.org/MPL/2.0/. + from libc.math cimport exp, log import numpy as np cimport numpy as np diff --git a/physbo/misc/_src/traceAB.pyx b/physbo/misc/_src/traceAB.pyx index 321f4a19..ef413cde 100644 --- a/physbo/misc/_src/traceAB.pyx +++ b/physbo/misc/_src/traceAB.pyx @@ -1,3 +1,10 @@ +# SPDX-License-Identifier: MPL-2.0 +# Copyright (C) 2020- The University of Tokyo +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at https://mozilla.org/MPL/2.0/. + import numpy as np cimport numpy as np import cython diff --git a/physbo/misc/centering.py b/physbo/misc/centering.py index 14ab702d..8db59506 100644 --- a/physbo/misc/centering.py +++ b/physbo/misc/centering.py @@ -1,3 +1,10 @@ +# SPDX-License-Identifier: MPL-2.0 +# Copyright (C) 2020- The University of Tokyo +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at https://mozilla.org/MPL/2.0/. + import numpy as np diff --git a/physbo/misc/gauss_elim.py b/physbo/misc/gauss_elim.py index ff732ea6..21a56b73 100644 --- a/physbo/misc/gauss_elim.py +++ b/physbo/misc/gauss_elim.py @@ -1,3 +1,10 @@ +# SPDX-License-Identifier: MPL-2.0 +# Copyright (C) 2020- The University of Tokyo +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at https://mozilla.org/MPL/2.0/. + import numpy as np import scipy diff --git a/physbo/misc/set_config.py b/physbo/misc/set_config.py index 1afdeffc..4543a40d 100644 --- a/physbo/misc/set_config.py +++ b/physbo/misc/set_config.py @@ -1,3 +1,10 @@ +# SPDX-License-Identifier: MPL-2.0 +# Copyright (C) 2020- The University of Tokyo +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at https://mozilla.org/MPL/2.0/. + import numpy as np import configparser diff --git a/physbo/opt/__init__.py b/physbo/opt/__init__.py index 88043ffe..53d80ab4 100644 --- a/physbo/opt/__init__.py +++ b/physbo/opt/__init__.py @@ -1 +1,8 @@ +# SPDX-License-Identifier: MPL-2.0 +# Copyright (C) 2020- The University of Tokyo +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at https://mozilla.org/MPL/2.0/. + from .adam import adam diff --git a/physbo/opt/adam.py b/physbo/opt/adam.py index f742964e..cddfca3f 100644 --- a/physbo/opt/adam.py +++ b/physbo/opt/adam.py @@ -1,3 +1,10 @@ +# SPDX-License-Identifier: MPL-2.0 +# Copyright (C) 2020- The University of Tokyo +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at https://mozilla.org/MPL/2.0/. + import numpy as np diff --git a/physbo/predictor.py b/physbo/predictor.py index 6e7760ce..46207071 100644 --- a/physbo/predictor.py +++ b/physbo/predictor.py @@ -1,3 +1,10 @@ +# SPDX-License-Identifier: MPL-2.0 +# Copyright (C) 2020- The University of Tokyo +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at https://mozilla.org/MPL/2.0/. + import pickle as pickle import numpy as np from physbo import gp diff --git a/physbo/search/__init__.py b/physbo/search/__init__.py index ce11d7f4..21d26899 100644 --- a/physbo/search/__init__.py +++ b/physbo/search/__init__.py @@ -1,3 +1,10 @@ +# SPDX-License-Identifier: MPL-2.0 +# Copyright (C) 2020- The University of Tokyo +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at https://mozilla.org/MPL/2.0/. + from . import score from . import discrete from . import score_multi diff --git a/physbo/search/discrete/__init__.py b/physbo/search/discrete/__init__.py index eb472b27..2a27e893 100644 --- a/physbo/search/discrete/__init__.py +++ b/physbo/search/discrete/__init__.py @@ -1,3 +1,10 @@ +# SPDX-License-Identifier: MPL-2.0 +# Copyright (C) 2020- The University of Tokyo +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at https://mozilla.org/MPL/2.0/. + from .policy import policy from .results import history diff --git a/physbo/search/discrete/policy.py b/physbo/search/discrete/policy.py index 5930d563..b09485bb 100644 --- a/physbo/search/discrete/policy.py +++ b/physbo/search/discrete/policy.py @@ -1,3 +1,10 @@ +# SPDX-License-Identifier: MPL-2.0 +# Copyright (C) 2020- The University of Tokyo +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at https://mozilla.org/MPL/2.0/. + import numpy as np import copy import pickle as pickle diff --git a/physbo/search/discrete/results.py b/physbo/search/discrete/results.py index ca9feafa..f925830b 100644 --- a/physbo/search/discrete/results.py +++ b/physbo/search/discrete/results.py @@ -1,3 +1,10 @@ +# SPDX-License-Identifier: MPL-2.0 +# Copyright (C) 2020- The University of Tokyo +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at https://mozilla.org/MPL/2.0/. + import numpy as np import copy import pickle diff --git a/physbo/search/discrete_multi/__init__.py b/physbo/search/discrete_multi/__init__.py index eb472b27..2a27e893 100644 --- a/physbo/search/discrete_multi/__init__.py +++ b/physbo/search/discrete_multi/__init__.py @@ -1,3 +1,10 @@ +# SPDX-License-Identifier: MPL-2.0 +# Copyright (C) 2020- The University of Tokyo +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at https://mozilla.org/MPL/2.0/. + from .policy import policy from .results import history diff --git a/physbo/search/discrete_multi/policy.py b/physbo/search/discrete_multi/policy.py index 9b54d1ca..78f14582 100644 --- a/physbo/search/discrete_multi/policy.py +++ b/physbo/search/discrete_multi/policy.py @@ -1,3 +1,10 @@ +# SPDX-License-Identifier: MPL-2.0 +# Copyright (C) 2020- The University of Tokyo +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at https://mozilla.org/MPL/2.0/. + import numpy as np import copy import pickle as pickle diff --git a/physbo/search/discrete_multi/results.py b/physbo/search/discrete_multi/results.py index bde6e98a..96288a86 100644 --- a/physbo/search/discrete_multi/results.py +++ b/physbo/search/discrete_multi/results.py @@ -1,3 +1,10 @@ +# SPDX-License-Identifier: MPL-2.0 +# Copyright (C) 2020- The University of Tokyo +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at https://mozilla.org/MPL/2.0/. + import numpy as np import pickle import copy diff --git a/physbo/search/pareto.py b/physbo/search/pareto.py index 95c5fc79..84706721 100644 --- a/physbo/search/pareto.py +++ b/physbo/search/pareto.py @@ -1,3 +1,10 @@ +# SPDX-License-Identifier: MPL-2.0 +# Copyright (C) 2020- The University of Tokyo +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at https://mozilla.org/MPL/2.0/. + import numpy as np diff --git a/physbo/search/score.py b/physbo/search/score.py index 4bf190a4..20d1a5e5 100644 --- a/physbo/search/score.py +++ b/physbo/search/score.py @@ -1,3 +1,10 @@ +# SPDX-License-Identifier: MPL-2.0 +# Copyright (C) 2020- The University of Tokyo +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at https://mozilla.org/MPL/2.0/. + import numpy as np import scipy.stats diff --git a/physbo/search/score_multi.py b/physbo/search/score_multi.py index 599f49fb..4573caa7 100644 --- a/physbo/search/score_multi.py +++ b/physbo/search/score_multi.py @@ -1,3 +1,10 @@ +# SPDX-License-Identifier: MPL-2.0 +# Copyright (C) 2020- The University of Tokyo +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at https://mozilla.org/MPL/2.0/. + import numpy as np import scipy.stats diff --git a/physbo/search/utility.py b/physbo/search/utility.py index babd4344..703804b9 100644 --- a/physbo/search/utility.py +++ b/physbo/search/utility.py @@ -1,3 +1,10 @@ +# SPDX-License-Identifier: MPL-2.0 +# Copyright (C) 2020- The University of Tokyo +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at https://mozilla.org/MPL/2.0/. + import numpy as np diff --git a/physbo/variable.py b/physbo/variable.py index ec98d2aa..1144b3e6 100644 --- a/physbo/variable.py +++ b/physbo/variable.py @@ -1,3 +1,10 @@ +# SPDX-License-Identifier: MPL-2.0 +# Copyright (C) 2020- The University of Tokyo +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at https://mozilla.org/MPL/2.0/. + import numpy as np diff --git a/setup.cfg b/setup.cfg index 201f8cad..483327d7 100644 --- a/setup.cfg +++ b/setup.cfg @@ -5,7 +5,7 @@ description = optimization tool for PHYSics based on Bayesian Optimization long_description = file: README.md long_description_content_type = text/markdown url = https://github.com/issp-center-dev/PHYSBO -license = GPLv3 +license = MPLv2 author = PHYSBO developers author_email = physbo-dev@issp.u-tokyo.ac.jp diff --git a/setup.py b/setup.py index d64f50a9..5ec33769 100644 --- a/setup.py +++ b/setup.py @@ -1,3 +1,10 @@ +# SPDX-License-Identifier: MPL-2.0 +# Copyright (C) 2020- The University of Tokyo +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at https://mozilla.org/MPL/2.0/. + from Cython.Build import cythonize from Cython.Distutils import build_ext from setuptools import setup, Extension diff --git a/tests/integrated/__init__.py b/tests/integrated/__init__.py index e69de29b..8b137891 100644 --- a/tests/integrated/__init__.py +++ b/tests/integrated/__init__.py @@ -0,0 +1 @@ + diff --git a/tests/integrated/test_gp.py b/tests/integrated/test_gp.py index 849fdd60..8a4aa1d7 100644 --- a/tests/integrated/test_gp.py +++ b/tests/integrated/test_gp.py @@ -1,3 +1,10 @@ +# SPDX-License-Identifier: MPL-2.0 +# Copyright (C) 2020- The University of Tokyo +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at https://mozilla.org/MPL/2.0/. + from __future__ import print_function from itertools import product diff --git a/tests/integrated/test_interactive_example.py b/tests/integrated/test_interactive_example.py index f55c5fab..9e3dded1 100644 --- a/tests/integrated/test_interactive_example.py +++ b/tests/integrated/test_interactive_example.py @@ -1,3 +1,10 @@ +# SPDX-License-Identifier: MPL-2.0 +# Copyright (C) 2020- The University of Tokyo +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at https://mozilla.org/MPL/2.0/. + from __future__ import print_function from itertools import product diff --git a/tests/integrated/test_multi_objective.py b/tests/integrated/test_multi_objective.py index 61f5074a..4d579aa0 100644 --- a/tests/integrated/test_multi_objective.py +++ b/tests/integrated/test_multi_objective.py @@ -1,3 +1,10 @@ +# SPDX-License-Identifier: MPL-2.0 +# Copyright (C) 2020- The University of Tokyo +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at https://mozilla.org/MPL/2.0/. + from __future__ import print_function from itertools import product diff --git a/tests/integrated/test_simple_example.py b/tests/integrated/test_simple_example.py index 73b26432..4b349bdb 100644 --- a/tests/integrated/test_simple_example.py +++ b/tests/integrated/test_simple_example.py @@ -1,3 +1,10 @@ +# SPDX-License-Identifier: MPL-2.0 +# Copyright (C) 2020- The University of Tokyo +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at https://mozilla.org/MPL/2.0/. + from __future__ import print_function from itertools import product diff --git a/tests/unit/__init__.py b/tests/unit/__init__.py index e69de29b..8b137891 100644 --- a/tests/unit/__init__.py +++ b/tests/unit/__init__.py @@ -0,0 +1 @@ + diff --git a/tests/unit/test_gp.py b/tests/unit/test_gp.py index d3c65a3a..f5ac0a49 100644 --- a/tests/unit/test_gp.py +++ b/tests/unit/test_gp.py @@ -1,3 +1,10 @@ +# SPDX-License-Identifier: MPL-2.0 +# Copyright (C) 2020- The University of Tokyo +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at https://mozilla.org/MPL/2.0/. + from __future__ import print_function import pytest diff --git a/tests/unit/test_misc.py b/tests/unit/test_misc.py index 3d660070..1040400d 100644 --- a/tests/unit/test_misc.py +++ b/tests/unit/test_misc.py @@ -1,3 +1,10 @@ +# SPDX-License-Identifier: MPL-2.0 +# Copyright (C) 2020- The University of Tokyo +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at https://mozilla.org/MPL/2.0/. + import sys import pytest diff --git a/tests/unit/test_policy.py b/tests/unit/test_policy.py index ea1e15a2..c04a6ec5 100644 --- a/tests/unit/test_policy.py +++ b/tests/unit/test_policy.py @@ -1,3 +1,10 @@ +# SPDX-License-Identifier: MPL-2.0 +# Copyright (C) 2020- The University of Tokyo +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at https://mozilla.org/MPL/2.0/. + from __future__ import print_function import os diff --git a/tests/unit/test_search.py b/tests/unit/test_search.py index ddb29772..5cbb3b33 100644 --- a/tests/unit/test_search.py +++ b/tests/unit/test_search.py @@ -1,3 +1,10 @@ +# SPDX-License-Identifier: MPL-2.0 +# Copyright (C) 2020- The University of Tokyo +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at https://mozilla.org/MPL/2.0/. + from __future__ import print_function import pytest diff --git a/tests/unit/test_variable.py b/tests/unit/test_variable.py index 663f75fe..9a8e5fcf 100644 --- a/tests/unit/test_variable.py +++ b/tests/unit/test_variable.py @@ -1,3 +1,10 @@ +# SPDX-License-Identifier: MPL-2.0 +# Copyright (C) 2020- The University of Tokyo +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at https://mozilla.org/MPL/2.0/. + import sys import pytest