3-Clause BSD licensing

naver · Apr 8, 2024 · c406cb5 · c406cb5
1 parent 69455d6
commit c406cb5
Show file tree

Hide file tree

Showing 23 changed files with 37 additions and 492 deletions.
diff --git a/LICENSE b/LICENSE
diff --git a/NOTICE b/NOTICE
@@ -1,5 +1,5 @@
 RoMa
-Copyright (c) 2021 NAVER Corp.
+Copyright (c) 2020 NAVER Corp.
 
 This project contains subcomponents with separate copyright notices and license terms. 
 Your use of the source code for these subcomponents is subject to the terms and conditions of the following licenses.

diff --git a/README.md b/README.md
@@ -55,7 +55,6 @@ identity = T @ T.inverse()
 M = identity.to_homogeneous()
 ```
 
-
 ## Installation
 The easiest way to install *RoMa* is to use pip:
 ```
@@ -74,7 +73,7 @@ You can check that this module is properly loaded using the function `roma.utils
 
 
 ## License
-*RoMa*, Copyright (c) 2021 NAVER Corp., is licensed under the Creative Commons Attribution-NonCommercial-ShareAlike 4.0 license (see [license](https://github.com/naver/roma/blob/master/LICENSE)).
+*RoMa*, Copyright (c) 2020 NAVER Corp., is licensed under the 3-Clause BSD License (see [license](https://github.com/naver/roma/blob/master/LICENSE)).
 
 Bits of code were adapted from SciPy. Documentation is generated, distributed and displayed with the support of Sphinx and other materials (see [notice](https://github.com/naver/roma/blob/master/NOTICE)).
 

diff --git a/__init__.py b/__init__.py
@@ -1,7 +1,6 @@
 # RoMa
 # Copyright (c) 2020 NAVER Corp.
-# CC BY-NC-SA 4.0
-# Available only for non-commercial use.
+# 3-Clause BSD License.
 
 # Dirty init so that one can just include this repository as a git submodule.
 from .roma.mappings import *

diff --git a/docsource/source/index.rst b/docsource/source/index.rst
@@ -231,6 +231,8 @@ Bits of code were adapted from SciPy. Documentation is generated, distributed an
 
 Changelog
 ==========
+Version 1.4.5:
+    - 3-Clause BSD Licensing.
 Version 1.4.4:
     - Added :func:`~roma.utils.identity_quat()`.
 Version 1.4.3: 

diff --git a/examples/example.py b/examples/example.py
@@ -1,7 +1,6 @@
 # RoMa
-# Copyright (c) 2021 NAVER Corp.
-# CC BY-NC-SA 4.0
-# Available only for non-commercial use.
+# Copyright (c) 2020 NAVER Corp.
+# 3-Clause BSD License.
 """
 Example showcasing some possibilities of the library.
 """

diff --git a/examples/geodesic_distance_comparison.py b/examples/geodesic_distance_comparison.py
@@ -1,7 +1,6 @@
 # RoMa
-# Copyright (c) 2021 NAVER Corp.
-# CC BY-NC-SA 4.0
-# Available only for non-commercial use.
+# Copyright (c) 2020 NAVER Corp.
+# 3-Clause BSD License.
 """
 Study of numerical stability of rotmat_geodesic_distance_naive and rotmat_geodesic_distance.
 Plot value and gradient of a function consisting given an angle theta in:

diff --git a/examples/linearity_deviations.py b/examples/linearity_deviations.py
@@ -1,7 +1,6 @@
 # RoMa
-# Copyright (c) 2021 NAVER Corp.
-# CC BY-NC-SA 4.0
-# Available only for non-commercial use.
+# Copyright (c) 2020 NAVER Corp.
+# 3-Clause BSD License.
 """
 Plot the deviation of various differentiable 3D rotation mappings with respect to their tangent plane, for different step sizes.
 """

diff --git a/examples/mapping_benchmark.py b/examples/mapping_benchmark.py
@@ -1,7 +1,6 @@
 # RoMa
-# Copyright (c) 2021 NAVER Corp.
-# CC BY-NC-SA 4.0
-# Available only for non-commercial use.
+# Copyright (c) 2020 NAVER Corp.
+# 3-Clause BSD License.
 """
 Execution speed benchmark for different mappings on the 3D rotation space.
 Requires a CUDA-enabled GPU.

diff --git a/examples/special_procrustes_benchmark.py b/examples/special_procrustes_benchmark.py
@@ -1,7 +1,6 @@
 # RoMa
-# Copyright (c) 2021 NAVER Corp.
-# CC BY-NC-SA 4.0
-# Available only for non-commercial use.
+# Copyright (c) 2020 NAVER Corp.
+# 3-Clause BSD License.
 """
 Plot computation time of special_procrustes using regular torch.svd decomposition versus batch SVD decomposition when available.
 Requires a CUDA-enabled GPU.

diff --git a/roma/__init__.py b/roma/__init__.py
@@ -1,8 +1,6 @@
 # RoMa
 # Copyright (c) 2020 NAVER Corp.
-# CC BY-NC-SA 4.0
-# Available only for non-commercial use.
-
+# 3-Clause BSD License.
 from .mappings import *
 from .utils import *
 from .transforms import *
diff --git a/roma/internal.py b/roma/internal.py
@@ -1,7 +1,6 @@
 # RoMa
 # Copyright (c) 2020 NAVER Corp.
-# CC BY-NC-SA 4.0
-# Available only for non-commercial use.
+# 3-Clause BSD License.
 """
 Set of functions for internal module use.
 """

diff --git a/roma/mappings.py b/roma/mappings.py
@@ -1,8 +1,6 @@
 # RoMa
 # Copyright (c) 2020 NAVER Corp.
-# CC BY-NC-SA 4.0
-# Available only for non-commercial use.
-
+# 3-Clause BSD License.
 """
 Various mappings between different rotation representations.
 """

diff --git a/roma/transforms.py b/roma/transforms.py
@@ -1,7 +1,6 @@
 # RoMa
 # Copyright (c) 2020 NAVER Corp.
-# CC BY-NC-SA 4.0
-# Available only for non-commercial use.
+# 3-Clause BSD License.
 """
 Spatial transformations parameterized by rotation matrices, unit quaternions and more.
 

diff --git a/roma/utils.py b/roma/utils.py
@@ -1,7 +1,6 @@
 # RoMa
 # Copyright (c) 2020 NAVER Corp.
-# CC BY-NC-SA 4.0
-# Available only for non-commercial use.
+# 3-Clause BSD License.
 """
 Various utility functions related to rotation representations.
 """

diff --git a/setup.py b/setup.py
@@ -5,7 +5,7 @@
 
 setuptools.setup(
     name="roma",
-    version="1.4.4",
+    version="1.4.5",
     author="Romain Brégier",
     author_email="[email protected]",
     description="A lightweight library to deal with 3D rotations in PyTorch.",
@@ -15,7 +15,7 @@
     packages=["roma"],
     classifiers=[
         "Programming Language :: Python :: 3",
-        "License :: Free for non-commercial use",
+        "License :: OSI Approved :: BSD License",
         "Operating System :: OS Independent",
     ],
     python_requires='>=3.6',

diff --git a/test/__init__.py b/test/__init__.py
@@ -1,8 +1,6 @@
 # RoMa
 # Copyright (c) 2020 NAVER Corp.
-# CC BY-NC-SA 4.0
-# Available only for non-commercial use.
-
+# 3-Clause BSD License.
 from os.path import dirname, basename, isfile, join
 import glob
 modules = glob.glob(join(dirname(__file__), "test_*.py"))

diff --git a/test/test_derivatives.py b/test/test_derivatives.py
@@ -1,8 +1,6 @@
 # RoMa
 # Copyright (c) 2020 NAVER Corp.
-# CC BY-NC-SA 4.0
-# Available only for non-commercial use.
-
+# 3-Clause BSD License.
 import torch
 import unittest
 from test.utils import *

diff --git a/test/test_mappings.py b/test/test_mappings.py
@@ -1,8 +1,6 @@
 # RoMa
 # Copyright (c) 2020 NAVER Corp.
-# CC BY-NC-SA 4.0
-# Available only for non-commercial use.
-
+# 3-Clause BSD License.
 import unittest
 import torch
 import roma

diff --git a/test/test_procrustes_derivatives.py b/test/test_procrustes_derivatives.py
@@ -1,8 +1,6 @@
 # RoMa
 # Copyright (c) 2020 NAVER Corp.
-# CC BY-NC-SA 4.0
-# Available only for non-commercial use.
-
+# 3-Clause BSD License.
 import torch
 import roma
 import unittest

diff --git a/test/test_transforms.py b/test/test_transforms.py
@@ -1,3 +1,6 @@
+# RoMa
+# Copyright (c) 2020 NAVER Corp.
+# 3-Clause BSD License.
 import torch
 import roma
 from roma.transforms import *

diff --git a/test/test_utils.py b/test/test_utils.py
@@ -1,8 +1,6 @@
 # RoMa
 # Copyright (c) 2020 NAVER Corp.
-# CC BY-NC-SA 4.0
-# Available only for non-commercial use.
-
+# 3-Clause BSD License.
 import unittest
 import torch
 import numpy as np

diff --git a/test/utils.py b/test/utils.py
@@ -1,8 +1,6 @@
 # RoMa
 # Copyright (c) 2020 NAVER Corp.
-# CC BY-NC-SA 4.0
-# Available only for non-commercial use.
-
+# 3-Clause BSD License.
 import torch
 import itertools
 import traceback