From 3de6e6c5216cd65b37abd3510223bd9c580b3ec0 Mon Sep 17 00:00:00 2001 From: antoinewehenkel Date: Tue, 14 Feb 2023 09:55:40 +0100 Subject: [PATCH 01/10] Test commit on personal fork. --- test.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 test.py diff --git a/test.py b/test.py new file mode 100644 index 000000000..e69de29bb From 97b8255a16c129301d894ffd75e291054557beb4 Mon Sep 17 00:00:00 2001 From: antoinewehenkel Date: Tue, 14 Feb 2023 09:57:32 +0100 Subject: [PATCH 02/10] Test commit on personal fork. --- test.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 test.py diff --git a/test.py b/test.py deleted file mode 100644 index e69de29bb..000000000 From daeeb248d382a47d4f3c989fc8a68f79f3bbd0ba Mon Sep 17 00:00:00 2001 From: antoinewehenkel Date: Tue, 14 Feb 2023 10:34:41 +0100 Subject: [PATCH 03/10] Add and update copyrights. --- docs/conf.py | 4 ++-- examples/fairness/config.py | 4 ++-- examples/fairness/data.py | 4 ++-- examples/fairness/losses.py | 4 ++-- examples/fairness/main.py | 4 ++-- examples/fairness/models.py | 4 ++-- examples/fairness/train.py | 4 ++-- examples/soft_error/config.py | 4 ++-- examples/soft_error/data.py | 4 ++-- examples/soft_error/losses.py | 4 ++-- examples/soft_error/main.py | 4 ++-- examples/soft_error/model.py | 4 ++-- examples/soft_error/train.py | 4 ++-- src/ott/__init__.py | 4 ++-- src/ott/geometry/__init__.py | 4 ++-- src/ott/geometry/costs.py | 4 ++-- src/ott/geometry/epsilon_scheduler.py | 4 ++-- src/ott/geometry/geometry.py | 4 ++-- src/ott/geometry/graph.py | 13 +++++++++++++ src/ott/geometry/grid.py | 4 ++-- src/ott/geometry/low_rank.py | 4 ++-- src/ott/geometry/pointcloud.py | 4 ++-- src/ott/geometry/segment.py | 4 +++- src/ott/initializers/__init__.py | 13 +++++++++++++ src/ott/initializers/linear/__init__.py | 13 +++++++++++++ src/ott/initializers/linear/initializers.py | 4 ++-- src/ott/initializers/linear/initializers_lr.py | 13 +++++++++++++ src/ott/initializers/nn/__init__.py | 13 +++++++++++++ src/ott/initializers/nn/initializers.py | 13 +++++++++++++ src/ott/initializers/quadratic/__init__.py | 13 +++++++++++++ src/ott/initializers/quadratic/initializers.py | 13 +++++++++++++ src/ott/math/__init__.py | 13 +++++++++++++ src/ott/math/decomposition.py | 13 +++++++++++++ src/ott/math/fixed_point_loop.py | 4 ++-- src/ott/math/matrix_square_root.py | 4 ++-- src/ott/math/unbalanced_functions.py | 4 ++-- src/ott/math/utils.py | 13 +++++++++++++ src/ott/problems/__init__.py | 13 +++++++++++++ src/ott/problems/linear/__init__.py | 13 +++++++++++++ src/ott/problems/linear/barycenter_problem.py | 4 ++-- src/ott/problems/linear/linear_problem.py | 4 ++-- src/ott/problems/linear/potentials.py | 13 +++++++++++++ src/ott/problems/nn/__init__.py | 13 +++++++++++++ src/ott/problems/nn/dataset.py | 2 ++ src/ott/problems/quadratic/quadratic_problem.py | 4 ++-- src/ott/solvers/__init__.py | 13 +++++++++++++ src/ott/solvers/linear/__init__.py | 13 +++++++++++++ src/ott/solvers/linear/acceleration.py | 13 +++++++++++++ src/ott/solvers/linear/continuous_barycenter.py | 4 ++-- src/ott/solvers/linear/discrete_barycenter.py | 4 ++-- src/ott/solvers/linear/implicit_differentiation.py | 4 ++-- src/ott/solvers/linear/sinkhorn.py | 4 ++-- src/ott/solvers/linear/sinkhorn_lr.py | 4 ++-- src/ott/solvers/nn/__init__.py | 13 +++++++++++++ src/ott/solvers/nn/conjugate_solvers.py | 2 ++ src/ott/solvers/nn/layers.py | 4 +++- src/ott/solvers/nn/models.py | 2 ++ src/ott/solvers/nn/neuraldual.py | 2 ++ src/ott/solvers/quadratic/__init__.py | 13 +++++++++++++ src/ott/solvers/quadratic/gromov_wasserstein.py | 4 ++-- src/ott/solvers/quadratic/gw_barycenter.py | 13 +++++++++++++ src/ott/solvers/was_solver.py | 4 ++-- src/ott/tools/__init__.py | 4 ++-- src/ott/tools/gaussian_mixture/__init__.py | 4 ++-- src/ott/tools/gaussian_mixture/fit_gmm.py | 4 ++-- src/ott/tools/gaussian_mixture/fit_gmm_pair.py | 4 ++-- src/ott/tools/gaussian_mixture/gaussian.py | 4 ++-- src/ott/tools/gaussian_mixture/gaussian_mixture.py | 4 ++-- .../tools/gaussian_mixture/gaussian_mixture_pair.py | 4 ++-- src/ott/tools/gaussian_mixture/linalg.py | 4 ++-- src/ott/tools/gaussian_mixture/probabilities.py | 4 ++-- src/ott/tools/gaussian_mixture/scale_tril.py | 4 ++-- src/ott/tools/k_means.py | 4 ++-- src/ott/tools/plot.py | 4 ++-- src/ott/tools/segment_sinkhorn.py | 4 ++-- src/ott/tools/sinkhorn_divergence.py | 4 ++-- src/ott/tools/soft_sort.py | 4 ++-- src/ott/types.py | 13 +++++++++++++ src/ott/utils.py | 4 ++-- tests/geometry/costs_test.py | 4 ++-- tests/geometry/low_rank_test.py | 4 ++-- tests/geometry/pointcloud_test.py | 4 ++-- tests/geometry/scaling_cost_test.py | 4 ++-- tests/initializers/linear/sinkhorn_init_test.py | 4 +++- tests/initializers/linear/sinkhorn_lr_init_test.py | 4 +++- tests/initializers/quadratic/gw_init_test.py | 4 +++- tests/math/lse_test.py | 4 ++-- tests/math/matrix_square_root_test.py | 4 ++-- tests/solvers/linear/continuous_barycenter_test.py | 5 +++-- tests/solvers/linear/discrete_barycenter_test.py | 4 ++-- tests/solvers/linear/sinkhorn_diff_test.py | 4 ++-- tests/solvers/linear/sinkhorn_grid_test.py | 4 ++-- tests/solvers/linear/sinkhorn_lr_test.py | 4 ++-- tests/solvers/linear/sinkhorn_misc_test.py | 4 ++-- tests/solvers/linear/sinkhorn_test.py | 4 ++-- tests/solvers/nn/icnn_test.py | 4 ++-- tests/solvers/nn/neuraldual_test.py | 2 ++ tests/solvers/quadratic/fgw_test.py | 4 ++-- tests/solvers/quadratic/gw_barycenter_test.py | 5 +++-- tests/solvers/quadratic/gw_test.py | 4 ++-- tests/tools/gaussian_mixture/fit_gmm_pair_test.py | 4 ++-- tests/tools/gaussian_mixture/fit_gmm_test.py | 4 ++-- .../gaussian_mixture/gaussian_mixture_pair_test.py | 4 ++-- .../tools/gaussian_mixture/gaussian_mixture_test.py | 4 ++-- tests/tools/gaussian_mixture/gaussian_test.py | 4 ++-- tests/tools/gaussian_mixture/linalg_test.py | 4 ++-- tests/tools/gaussian_mixture/probabilities_test.py | 4 ++-- tests/tools/gaussian_mixture/scale_tril_test.py | 4 ++-- tests/tools/segment_sinkhorn_test.py | 4 ++-- tests/tools/sinkhorn_divergence_test.py | 4 ++-- tests/tools/soft_sort_test.py | 4 ++-- 111 files changed, 471 insertions(+), 163 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index fa322570a..6b8be73ce 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -1,10 +1,10 @@ -# Copyright 2022 Google LLC. +# Copyright OTT-JAX # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/examples/fairness/config.py b/examples/fairness/config.py index 50354ed86..3618eeb9b 100644 --- a/examples/fairness/config.py +++ b/examples/fairness/config.py @@ -1,10 +1,10 @@ -# Copyright 2022 Google LLC. +# Copyright OTT-JAX # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/examples/fairness/data.py b/examples/fairness/data.py index 91547d421..72ca0e969 100644 --- a/examples/fairness/data.py +++ b/examples/fairness/data.py @@ -1,10 +1,10 @@ -# Copyright 2022 Google LLC. +# Copyright OTT-JAX # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/examples/fairness/losses.py b/examples/fairness/losses.py index b3d87cb9e..4f7331fbf 100644 --- a/examples/fairness/losses.py +++ b/examples/fairness/losses.py @@ -1,10 +1,10 @@ -# Copyright 2022 Google LLC. +# Copyright OTT-JAX # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/examples/fairness/main.py b/examples/fairness/main.py index 9d3c663f0..e7c7e0dc4 100644 --- a/examples/fairness/main.py +++ b/examples/fairness/main.py @@ -1,10 +1,10 @@ -# Copyright 2022 Google LLC. +# Copyright OTT-JAX # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/examples/fairness/models.py b/examples/fairness/models.py index dad3ab116..3a62098da 100644 --- a/examples/fairness/models.py +++ b/examples/fairness/models.py @@ -1,10 +1,10 @@ -# Copyright 2022 Google LLC. +# Copyright OTT-JAX # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/examples/fairness/train.py b/examples/fairness/train.py index 5cf959eb7..9fe79b4b9 100644 --- a/examples/fairness/train.py +++ b/examples/fairness/train.py @@ -1,10 +1,10 @@ -# Copyright 2022 Google LLC. +# Copyright OTT-JAX # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/examples/soft_error/config.py b/examples/soft_error/config.py index cab148be1..25700a8b8 100644 --- a/examples/soft_error/config.py +++ b/examples/soft_error/config.py @@ -1,10 +1,10 @@ -# Copyright 2022 Google LLC. +# Copyright OTT-JAX # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/examples/soft_error/data.py b/examples/soft_error/data.py index 009e550e0..ed86f80ac 100644 --- a/examples/soft_error/data.py +++ b/examples/soft_error/data.py @@ -1,10 +1,10 @@ -# Copyright 2022 Google LLC. +# Copyright OTT-JAX # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/examples/soft_error/losses.py b/examples/soft_error/losses.py index eb791115a..c016aa5a7 100644 --- a/examples/soft_error/losses.py +++ b/examples/soft_error/losses.py @@ -1,10 +1,10 @@ -# Copyright 2022 Google LLC. +# Copyright OTT-JAX # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/examples/soft_error/main.py b/examples/soft_error/main.py index 480a9286c..b38a7a680 100644 --- a/examples/soft_error/main.py +++ b/examples/soft_error/main.py @@ -1,10 +1,10 @@ -# Copyright 2022 Google LLC. +# Copyright OTT-JAX # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/examples/soft_error/model.py b/examples/soft_error/model.py index aa6ccb44a..97c685e72 100644 --- a/examples/soft_error/model.py +++ b/examples/soft_error/model.py @@ -1,10 +1,10 @@ -# Copyright 2022 Google LLC. +# Copyright OTT-JAX # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/examples/soft_error/train.py b/examples/soft_error/train.py index bcd28539f..084c03678 100644 --- a/examples/soft_error/train.py +++ b/examples/soft_error/train.py @@ -1,10 +1,10 @@ -# Copyright 2022 Google LLC. +# Copyright OTT-JAX # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/src/ott/__init__.py b/src/ott/__init__.py index 00c9d0a29..c97301283 100644 --- a/src/ott/__init__.py +++ b/src/ott/__init__.py @@ -1,10 +1,10 @@ -# Copyright 2022 Google LLC. +# Copyright OTT-JAX # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/src/ott/geometry/__init__.py b/src/ott/geometry/__init__.py index dc16005c2..7ede4a817 100644 --- a/src/ott/geometry/__init__.py +++ b/src/ott/geometry/__init__.py @@ -1,10 +1,10 @@ -# Copyright 2022 Google LLC. +# Copyright OTT-JAX # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/src/ott/geometry/costs.py b/src/ott/geometry/costs.py index 09838a4ef..c0aa7ff92 100644 --- a/src/ott/geometry/costs.py +++ b/src/ott/geometry/costs.py @@ -1,10 +1,10 @@ -# Copyright 2022 Google LLC. +# Copyright OTT-JAX # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/src/ott/geometry/epsilon_scheduler.py b/src/ott/geometry/epsilon_scheduler.py index e1dd3ad8f..0a3e2b686 100644 --- a/src/ott/geometry/epsilon_scheduler.py +++ b/src/ott/geometry/epsilon_scheduler.py @@ -1,10 +1,10 @@ -# Copyright 2022 Google LLC. +# Copyright OTT-JAX # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/src/ott/geometry/geometry.py b/src/ott/geometry/geometry.py index b588e3aba..1de4962e5 100644 --- a/src/ott/geometry/geometry.py +++ b/src/ott/geometry/geometry.py @@ -1,10 +1,10 @@ -# Copyright 2022 Google LLC. +# Copyright OTT-JAX # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/src/ott/geometry/graph.py b/src/ott/geometry/graph.py index 5fe7b144f..d79a6c7e4 100644 --- a/src/ott/geometry/graph.py +++ b/src/ott/geometry/graph.py @@ -1,3 +1,16 @@ +# Copyright OTT-JAX +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. from typing import Any, Dict, Literal, Optional, Sequence, Tuple, Union import jax diff --git a/src/ott/geometry/grid.py b/src/ott/geometry/grid.py index 3bb4a04fd..553949fe4 100644 --- a/src/ott/geometry/grid.py +++ b/src/ott/geometry/grid.py @@ -1,10 +1,10 @@ -# Copyright 2022 Google LLC. +# Copyright OTT-JAX # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/src/ott/geometry/low_rank.py b/src/ott/geometry/low_rank.py index 9da672fe3..453b1cdf8 100644 --- a/src/ott/geometry/low_rank.py +++ b/src/ott/geometry/low_rank.py @@ -1,10 +1,10 @@ -# Copyright 2022 Google LLC. +# Copyright OTT-JAX # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/src/ott/geometry/pointcloud.py b/src/ott/geometry/pointcloud.py index c2abe6bc9..b4e7e6d9d 100644 --- a/src/ott/geometry/pointcloud.py +++ b/src/ott/geometry/pointcloud.py @@ -1,10 +1,10 @@ -# Copyright 2022 Google LLC. +# Copyright OTT-JAX # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/src/ott/geometry/segment.py b/src/ott/geometry/segment.py index 1051f348a..15a45d514 100644 --- a/src/ott/geometry/segment.py +++ b/src/ott/geometry/segment.py @@ -1,9 +1,11 @@ # +# Copyright OTT-JAX +# # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/src/ott/initializers/__init__.py b/src/ott/initializers/__init__.py index 15cfac006..f72551448 100644 --- a/src/ott/initializers/__init__.py +++ b/src/ott/initializers/__init__.py @@ -1 +1,14 @@ +# Copyright OTT-JAX +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. from . import linear, nn, quadratic diff --git a/src/ott/initializers/linear/__init__.py b/src/ott/initializers/linear/__init__.py index 1ce1a00cd..c7a7dc4e3 100644 --- a/src/ott/initializers/linear/__init__.py +++ b/src/ott/initializers/linear/__init__.py @@ -1 +1,14 @@ +# Copyright OTT-JAX +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. from . import initializers, initializers_lr diff --git a/src/ott/initializers/linear/initializers.py b/src/ott/initializers/linear/initializers.py index 8e7124461..2a5479713 100644 --- a/src/ott/initializers/linear/initializers.py +++ b/src/ott/initializers/linear/initializers.py @@ -1,10 +1,10 @@ -# Copyright 2022 The OTT Authors +# Copyright OTT-JAX # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/src/ott/initializers/linear/initializers_lr.py b/src/ott/initializers/linear/initializers_lr.py index 3d1bdf885..f0ca847bd 100644 --- a/src/ott/initializers/linear/initializers_lr.py +++ b/src/ott/initializers/linear/initializers_lr.py @@ -1,3 +1,16 @@ +# Copyright OTT-JAX +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. import abc import functools from typing import ( diff --git a/src/ott/initializers/nn/__init__.py b/src/ott/initializers/nn/__init__.py index 7ccb321da..f188caec0 100644 --- a/src/ott/initializers/nn/__init__.py +++ b/src/ott/initializers/nn/__init__.py @@ -1 +1,14 @@ +# Copyright OTT-JAX +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. from . import initializers diff --git a/src/ott/initializers/nn/initializers.py b/src/ott/initializers/nn/initializers.py index f87dce7d0..95d7d3928 100644 --- a/src/ott/initializers/nn/initializers.py +++ b/src/ott/initializers/nn/initializers.py @@ -1,3 +1,16 @@ +# Copyright OTT-JAX +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. import functools from typing import TYPE_CHECKING, Any, Dict, Optional, Sequence, Tuple diff --git a/src/ott/initializers/quadratic/__init__.py b/src/ott/initializers/quadratic/__init__.py index 7ccb321da..f188caec0 100644 --- a/src/ott/initializers/quadratic/__init__.py +++ b/src/ott/initializers/quadratic/__init__.py @@ -1 +1,14 @@ +# Copyright OTT-JAX +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. from . import initializers diff --git a/src/ott/initializers/quadratic/initializers.py b/src/ott/initializers/quadratic/initializers.py index 70a50af4b..c14f1121b 100644 --- a/src/ott/initializers/quadratic/initializers.py +++ b/src/ott/initializers/quadratic/initializers.py @@ -1,3 +1,16 @@ +# Copyright OTT-JAX +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. import abc from typing import TYPE_CHECKING, Any, Dict, Sequence, Tuple diff --git a/src/ott/math/__init__.py b/src/ott/math/__init__.py index 67aca8931..08cab512d 100644 --- a/src/ott/math/__init__.py +++ b/src/ott/math/__init__.py @@ -1,3 +1,16 @@ +# Copyright OTT-JAX +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. from . import ( decomposition, fixed_point_loop, diff --git a/src/ott/math/decomposition.py b/src/ott/math/decomposition.py index e05888e81..b9e82595f 100644 --- a/src/ott/math/decomposition.py +++ b/src/ott/math/decomposition.py @@ -1,3 +1,16 @@ +# Copyright OTT-JAX +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. import abc from typing import ( Any, diff --git a/src/ott/math/fixed_point_loop.py b/src/ott/math/fixed_point_loop.py index 653c0bc62..b8de353b8 100644 --- a/src/ott/math/fixed_point_loop.py +++ b/src/ott/math/fixed_point_loop.py @@ -1,10 +1,10 @@ -# Copyright 2022 Google LLC. +# Copyright OTT-JAX # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/src/ott/math/matrix_square_root.py b/src/ott/math/matrix_square_root.py index 1db246d9f..0c49460c9 100644 --- a/src/ott/math/matrix_square_root.py +++ b/src/ott/math/matrix_square_root.py @@ -1,10 +1,10 @@ -# Copyright 2022 Google LLC. +# Copyright OTT-JAX # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/src/ott/math/unbalanced_functions.py b/src/ott/math/unbalanced_functions.py index 4a6aacff5..92694ff90 100644 --- a/src/ott/math/unbalanced_functions.py +++ b/src/ott/math/unbalanced_functions.py @@ -1,10 +1,10 @@ -# Copyright 2022 Google LLC. +# Copyright OTT-JAX # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/src/ott/math/utils.py b/src/ott/math/utils.py index fef5ae667..27e900a09 100644 --- a/src/ott/math/utils.py +++ b/src/ott/math/utils.py @@ -1,3 +1,16 @@ +# Copyright OTT-JAX +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. import functools from typing import TYPE_CHECKING, Optional, Union diff --git a/src/ott/problems/__init__.py b/src/ott/problems/__init__.py index 15cfac006..f72551448 100644 --- a/src/ott/problems/__init__.py +++ b/src/ott/problems/__init__.py @@ -1 +1,14 @@ +# Copyright OTT-JAX +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. from . import linear, nn, quadratic diff --git a/src/ott/problems/linear/__init__.py b/src/ott/problems/linear/__init__.py index 2088e5a3c..7d62b1391 100644 --- a/src/ott/problems/linear/__init__.py +++ b/src/ott/problems/linear/__init__.py @@ -1 +1,14 @@ +# Copyright OTT-JAX +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. from . import barycenter_problem, linear_problem, potentials diff --git a/src/ott/problems/linear/barycenter_problem.py b/src/ott/problems/linear/barycenter_problem.py index bcfbc30cd..c8f76c016 100644 --- a/src/ott/problems/linear/barycenter_problem.py +++ b/src/ott/problems/linear/barycenter_problem.py @@ -1,10 +1,10 @@ -# Copyright 2022 Apple Inc +# Copyright OTT-JAX # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/src/ott/problems/linear/linear_problem.py b/src/ott/problems/linear/linear_problem.py index 9ff72aa35..4b1bb9709 100644 --- a/src/ott/problems/linear/linear_problem.py +++ b/src/ott/problems/linear/linear_problem.py @@ -1,10 +1,10 @@ -# Copyright 2022 Google LLC. +# Copyright OTT-JAX # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/src/ott/problems/linear/potentials.py b/src/ott/problems/linear/potentials.py index b12a41a90..4eaf82769 100644 --- a/src/ott/problems/linear/potentials.py +++ b/src/ott/problems/linear/potentials.py @@ -1,3 +1,16 @@ +# Copyright OTT-JAX +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. from typing import ( TYPE_CHECKING, Any, diff --git a/src/ott/problems/nn/__init__.py b/src/ott/problems/nn/__init__.py index 61f97ede2..7be2b3186 100644 --- a/src/ott/problems/nn/__init__.py +++ b/src/ott/problems/nn/__init__.py @@ -1 +1,14 @@ +# Copyright OTT-JAX +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. from . import dataset diff --git a/src/ott/problems/nn/dataset.py b/src/ott/problems/nn/dataset.py index 8810ae701..7c17297f7 100644 --- a/src/ott/problems/nn/dataset.py +++ b/src/ott/problems/nn/dataset.py @@ -1,3 +1,5 @@ +# Copyright OTT-JAX +# # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at diff --git a/src/ott/problems/quadratic/quadratic_problem.py b/src/ott/problems/quadratic/quadratic_problem.py index face28f37..5369ce9fd 100644 --- a/src/ott/problems/quadratic/quadratic_problem.py +++ b/src/ott/problems/quadratic/quadratic_problem.py @@ -1,10 +1,10 @@ -# Copyright 2022 Google LLC. +# Copyright OTT-JAX # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/src/ott/solvers/__init__.py b/src/ott/solvers/__init__.py index 15cfac006..f72551448 100644 --- a/src/ott/solvers/__init__.py +++ b/src/ott/solvers/__init__.py @@ -1 +1,14 @@ +# Copyright OTT-JAX +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. from . import linear, nn, quadratic diff --git a/src/ott/solvers/linear/__init__.py b/src/ott/solvers/linear/__init__.py index 40034b929..3a67666b4 100644 --- a/src/ott/solvers/linear/__init__.py +++ b/src/ott/solvers/linear/__init__.py @@ -1,3 +1,16 @@ +# Copyright OTT-JAX +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. from . import ( acceleration, continuous_barycenter, diff --git a/src/ott/solvers/linear/acceleration.py b/src/ott/solvers/linear/acceleration.py index 802af6947..594c130ee 100644 --- a/src/ott/solvers/linear/acceleration.py +++ b/src/ott/solvers/linear/acceleration.py @@ -1,3 +1,16 @@ +# Copyright OTT-JAX +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. from typing import TYPE_CHECKING import jax diff --git a/src/ott/solvers/linear/continuous_barycenter.py b/src/ott/solvers/linear/continuous_barycenter.py index 556192ad5..4fa79b8d0 100644 --- a/src/ott/solvers/linear/continuous_barycenter.py +++ b/src/ott/solvers/linear/continuous_barycenter.py @@ -1,10 +1,10 @@ -# Copyright 2022 Apple. +# Copyright OTT-JAX # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/src/ott/solvers/linear/discrete_barycenter.py b/src/ott/solvers/linear/discrete_barycenter.py index a181d6d12..3304fd42d 100644 --- a/src/ott/solvers/linear/discrete_barycenter.py +++ b/src/ott/solvers/linear/discrete_barycenter.py @@ -1,10 +1,10 @@ -# Copyright 2022 Google LLC. +# Copyright OTT-JAX # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/src/ott/solvers/linear/implicit_differentiation.py b/src/ott/solvers/linear/implicit_differentiation.py index 8359791ad..e4da1d767 100644 --- a/src/ott/solvers/linear/implicit_differentiation.py +++ b/src/ott/solvers/linear/implicit_differentiation.py @@ -1,10 +1,10 @@ -# Copyright 2022 Google LLC. +# Copyright OTT-JAX # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/src/ott/solvers/linear/sinkhorn.py b/src/ott/solvers/linear/sinkhorn.py index f91e3cc4b..fcfe068a7 100644 --- a/src/ott/solvers/linear/sinkhorn.py +++ b/src/ott/solvers/linear/sinkhorn.py @@ -1,10 +1,10 @@ -# Copyright 2022 Google LLC. +# Copyright OTT-JAX # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/src/ott/solvers/linear/sinkhorn_lr.py b/src/ott/solvers/linear/sinkhorn_lr.py index 22e542b06..566f6f61a 100644 --- a/src/ott/solvers/linear/sinkhorn_lr.py +++ b/src/ott/solvers/linear/sinkhorn_lr.py @@ -1,10 +1,10 @@ -# Copyright 2022 Google LLC. +# Copyright OTT-JAX # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/src/ott/solvers/nn/__init__.py b/src/ott/solvers/nn/__init__.py index 4e7fa248b..a2b29803a 100644 --- a/src/ott/solvers/nn/__init__.py +++ b/src/ott/solvers/nn/__init__.py @@ -1 +1,14 @@ +# Copyright OTT-JAX +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. from . import conjugate_solvers, layers, models, neuraldual diff --git a/src/ott/solvers/nn/conjugate_solvers.py b/src/ott/solvers/nn/conjugate_solvers.py index 6eb4d5f57..e8dfde5f0 100644 --- a/src/ott/solvers/nn/conjugate_solvers.py +++ b/src/ott/solvers/nn/conjugate_solvers.py @@ -1,3 +1,5 @@ +# Copyright OTT-JAX +# # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at diff --git a/src/ott/solvers/nn/layers.py b/src/ott/solvers/nn/layers.py index f43d280b7..ea5883566 100644 --- a/src/ott/solvers/nn/layers.py +++ b/src/ott/solvers/nn/layers.py @@ -1,8 +1,10 @@ +# Copyright OTT-JAX +# # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/src/ott/solvers/nn/models.py b/src/ott/solvers/nn/models.py index e96c70163..35c45325d 100644 --- a/src/ott/solvers/nn/models.py +++ b/src/ott/solvers/nn/models.py @@ -1,3 +1,5 @@ +# Copyright OTT-JAX +# # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at diff --git a/src/ott/solvers/nn/neuraldual.py b/src/ott/solvers/nn/neuraldual.py index 1b8bc0058..a7ccb9058 100644 --- a/src/ott/solvers/nn/neuraldual.py +++ b/src/ott/solvers/nn/neuraldual.py @@ -1,3 +1,5 @@ +# Copyright OTT-JAX +# # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at diff --git a/src/ott/solvers/quadratic/__init__.py b/src/ott/solvers/quadratic/__init__.py index af9e5d01e..02a5f72cc 100644 --- a/src/ott/solvers/quadratic/__init__.py +++ b/src/ott/solvers/quadratic/__init__.py @@ -1 +1,14 @@ +# Copyright OTT-JAX +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. from . import gromov_wasserstein, gw_barycenter diff --git a/src/ott/solvers/quadratic/gromov_wasserstein.py b/src/ott/solvers/quadratic/gromov_wasserstein.py index b105c6c81..52da5a255 100644 --- a/src/ott/solvers/quadratic/gromov_wasserstein.py +++ b/src/ott/solvers/quadratic/gromov_wasserstein.py @@ -1,10 +1,10 @@ -# Copyright 2022 Google LLC. +# Copyright OTT-JAX # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/src/ott/solvers/quadratic/gw_barycenter.py b/src/ott/solvers/quadratic/gw_barycenter.py index d382d0ebc..0b8fc1866 100644 --- a/src/ott/solvers/quadratic/gw_barycenter.py +++ b/src/ott/solvers/quadratic/gw_barycenter.py @@ -1,3 +1,16 @@ +# Copyright OTT-JAX +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. from functools import partial from typing import Any, Dict, NamedTuple, Optional, Sequence, Tuple, Union diff --git a/src/ott/solvers/was_solver.py b/src/ott/solvers/was_solver.py index e392f7bd5..0771bb198 100644 --- a/src/ott/solvers/was_solver.py +++ b/src/ott/solvers/was_solver.py @@ -1,10 +1,10 @@ -# Copyright 2022 Apple Inc. +# Copyright OTT-JAX # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/src/ott/tools/__init__.py b/src/ott/tools/__init__.py index 3251eb9aa..a29369d3c 100644 --- a/src/ott/tools/__init__.py +++ b/src/ott/tools/__init__.py @@ -1,10 +1,10 @@ -# Copyright 2022 Google LLC. +# Copyright OTT-JAX # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/src/ott/tools/gaussian_mixture/__init__.py b/src/ott/tools/gaussian_mixture/__init__.py index 21ef8600d..3195d77c1 100644 --- a/src/ott/tools/gaussian_mixture/__init__.py +++ b/src/ott/tools/gaussian_mixture/__init__.py @@ -1,10 +1,10 @@ -# Copyright 2022 Google LLC. +# Copyright OTT-JAX # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/src/ott/tools/gaussian_mixture/fit_gmm.py b/src/ott/tools/gaussian_mixture/fit_gmm.py index 24759fac8..b425145a0 100644 --- a/src/ott/tools/gaussian_mixture/fit_gmm.py +++ b/src/ott/tools/gaussian_mixture/fit_gmm.py @@ -1,10 +1,10 @@ -# Copyright 2022 Google LLC. +# Copyright OTT-JAX # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/src/ott/tools/gaussian_mixture/fit_gmm_pair.py b/src/ott/tools/gaussian_mixture/fit_gmm_pair.py index 27dd093e9..ad248a9e7 100644 --- a/src/ott/tools/gaussian_mixture/fit_gmm_pair.py +++ b/src/ott/tools/gaussian_mixture/fit_gmm_pair.py @@ -1,10 +1,10 @@ -# Copyright 2022 Google LLC. +# Copyright OTT-JAX # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/src/ott/tools/gaussian_mixture/gaussian.py b/src/ott/tools/gaussian_mixture/gaussian.py index 10f74d423..07fd2ab75 100644 --- a/src/ott/tools/gaussian_mixture/gaussian.py +++ b/src/ott/tools/gaussian_mixture/gaussian.py @@ -1,10 +1,10 @@ -# Copyright 2022 Google LLC. +# Copyright OTT-JAX # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/src/ott/tools/gaussian_mixture/gaussian_mixture.py b/src/ott/tools/gaussian_mixture/gaussian_mixture.py index fc692f943..e038ed361 100644 --- a/src/ott/tools/gaussian_mixture/gaussian_mixture.py +++ b/src/ott/tools/gaussian_mixture/gaussian_mixture.py @@ -1,10 +1,10 @@ -# Copyright 2022 Google LLC. +# Copyright OTT-JAX # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/src/ott/tools/gaussian_mixture/gaussian_mixture_pair.py b/src/ott/tools/gaussian_mixture/gaussian_mixture_pair.py index e1ec650f4..fbaa0732c 100644 --- a/src/ott/tools/gaussian_mixture/gaussian_mixture_pair.py +++ b/src/ott/tools/gaussian_mixture/gaussian_mixture_pair.py @@ -1,10 +1,10 @@ -# Copyright 2022 Google LLC. +# Copyright OTT-JAX # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/src/ott/tools/gaussian_mixture/linalg.py b/src/ott/tools/gaussian_mixture/linalg.py index a3f55fcce..b7f866b68 100644 --- a/src/ott/tools/gaussian_mixture/linalg.py +++ b/src/ott/tools/gaussian_mixture/linalg.py @@ -1,10 +1,10 @@ -# Copyright 2022 Google LLC. +# Copyright OTT-JAX # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/src/ott/tools/gaussian_mixture/probabilities.py b/src/ott/tools/gaussian_mixture/probabilities.py index 13369024e..a35dddae1 100644 --- a/src/ott/tools/gaussian_mixture/probabilities.py +++ b/src/ott/tools/gaussian_mixture/probabilities.py @@ -1,10 +1,10 @@ -# Copyright 2022 Google LLC. +# Copyright OTT-JAX # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/src/ott/tools/gaussian_mixture/scale_tril.py b/src/ott/tools/gaussian_mixture/scale_tril.py index 52ed9a90b..6b2e98af2 100644 --- a/src/ott/tools/gaussian_mixture/scale_tril.py +++ b/src/ott/tools/gaussian_mixture/scale_tril.py @@ -1,10 +1,10 @@ -# Copyright 2022 Google LLC. +# Copyright OTT-JAX # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/src/ott/tools/k_means.py b/src/ott/tools/k_means.py index be16ba871..db675623a 100644 --- a/src/ott/tools/k_means.py +++ b/src/ott/tools/k_means.py @@ -1,10 +1,10 @@ -# Copyright 2022 The OTT Authors +# Copyright OTT-JAX # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/src/ott/tools/plot.py b/src/ott/tools/plot.py index 4e819589b..aefde1bae 100644 --- a/src/ott/tools/plot.py +++ b/src/ott/tools/plot.py @@ -1,10 +1,10 @@ -# Copyright 2022 Google LLC. +# Copyright OTT-JAX # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/src/ott/tools/segment_sinkhorn.py b/src/ott/tools/segment_sinkhorn.py index ae6052c60..d998850f9 100644 --- a/src/ott/tools/segment_sinkhorn.py +++ b/src/ott/tools/segment_sinkhorn.py @@ -1,10 +1,10 @@ -# Copyright 2022 The OTT Authors. +# Copyright OTT-JAX # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/src/ott/tools/sinkhorn_divergence.py b/src/ott/tools/sinkhorn_divergence.py index 9d4da7f93..45a1282eb 100644 --- a/src/ott/tools/sinkhorn_divergence.py +++ b/src/ott/tools/sinkhorn_divergence.py @@ -1,10 +1,10 @@ -# Copyright 2022 Google LLC. +# Copyright OTT-JAX # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/src/ott/tools/soft_sort.py b/src/ott/tools/soft_sort.py index 524c32238..6325634df 100644 --- a/src/ott/tools/soft_sort.py +++ b/src/ott/tools/soft_sort.py @@ -1,10 +1,10 @@ -# Copyright 2022 Google LLC. +# Copyright OTT-JAX # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/src/ott/types.py b/src/ott/types.py index 9128b80a0..10210690d 100644 --- a/src/ott/types.py +++ b/src/ott/types.py @@ -1,3 +1,16 @@ +# Copyright OTT-JAX +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. from typing import Protocol import jax.numpy as jnp diff --git a/src/ott/utils.py b/src/ott/utils.py index aac51b701..36e6d4379 100644 --- a/src/ott/utils.py +++ b/src/ott/utils.py @@ -1,10 +1,10 @@ -# Copyright 2022 Google LLC. +# Copyright OTT-JAX # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/tests/geometry/costs_test.py b/tests/geometry/costs_test.py index ec206476d..8d3064d7a 100644 --- a/tests/geometry/costs_test.py +++ b/tests/geometry/costs_test.py @@ -1,10 +1,10 @@ -# Copyright 2022 Google LLC. +# Copyright OTT-JAX # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/tests/geometry/low_rank_test.py b/tests/geometry/low_rank_test.py index 6dcb725f3..ed8ad4b84 100644 --- a/tests/geometry/low_rank_test.py +++ b/tests/geometry/low_rank_test.py @@ -1,10 +1,10 @@ -# Copyright 2022 Google LLC. +# Copyright OTT-JAX # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/tests/geometry/pointcloud_test.py b/tests/geometry/pointcloud_test.py index 447ef8bb2..97f1c0879 100644 --- a/tests/geometry/pointcloud_test.py +++ b/tests/geometry/pointcloud_test.py @@ -1,10 +1,10 @@ -# Copyright 2022 Google LLC. +# Copyright OTT-JAX # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/tests/geometry/scaling_cost_test.py b/tests/geometry/scaling_cost_test.py index 8978ff378..d07ef5ff3 100644 --- a/tests/geometry/scaling_cost_test.py +++ b/tests/geometry/scaling_cost_test.py @@ -1,10 +1,10 @@ -# Copyright 2022 Google LLC. +# Copyright OTT-JAX # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/tests/initializers/linear/sinkhorn_init_test.py b/tests/initializers/linear/sinkhorn_init_test.py index 4eb7e09d8..1a9c96631 100644 --- a/tests/initializers/linear/sinkhorn_init_test.py +++ b/tests/initializers/linear/sinkhorn_init_test.py @@ -1,8 +1,10 @@ +# Copyright OTT-JAX +# # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/tests/initializers/linear/sinkhorn_lr_init_test.py b/tests/initializers/linear/sinkhorn_lr_init_test.py index b0dbb4757..04a36aeb4 100644 --- a/tests/initializers/linear/sinkhorn_lr_init_test.py +++ b/tests/initializers/linear/sinkhorn_lr_init_test.py @@ -1,8 +1,10 @@ +# Copyright OTT-JAX +# # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/tests/initializers/quadratic/gw_init_test.py b/tests/initializers/quadratic/gw_init_test.py index a1d56dd52..f6c774e73 100644 --- a/tests/initializers/quadratic/gw_init_test.py +++ b/tests/initializers/quadratic/gw_init_test.py @@ -1,8 +1,10 @@ +# Copyright OTT-JAX +# # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/tests/math/lse_test.py b/tests/math/lse_test.py index fa14fd0de..8c42e99ae 100644 --- a/tests/math/lse_test.py +++ b/tests/math/lse_test.py @@ -1,10 +1,10 @@ -# Copyright 2022 Google LLC. +# Copyright OTT-JAX # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/tests/math/matrix_square_root_test.py b/tests/math/matrix_square_root_test.py index 9b67a37b4..505823852 100644 --- a/tests/math/matrix_square_root_test.py +++ b/tests/math/matrix_square_root_test.py @@ -1,10 +1,10 @@ -# Copyright 2022 Google LLC. +# Copyright OTT-JAX # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/tests/solvers/linear/continuous_barycenter_test.py b/tests/solvers/linear/continuous_barycenter_test.py index c326c0669..de189f6dc 100644 --- a/tests/solvers/linear/continuous_barycenter_test.py +++ b/tests/solvers/linear/continuous_barycenter_test.py @@ -1,9 +1,10 @@ -# Copyright 2022 Apple +# Copyright OTT-JAX +# # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/tests/solvers/linear/discrete_barycenter_test.py b/tests/solvers/linear/discrete_barycenter_test.py index 2e8a96230..062b91f08 100644 --- a/tests/solvers/linear/discrete_barycenter_test.py +++ b/tests/solvers/linear/discrete_barycenter_test.py @@ -1,10 +1,10 @@ -# Copyright 2022 Google LLC. +# Copyright OTT-JAX # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/tests/solvers/linear/sinkhorn_diff_test.py b/tests/solvers/linear/sinkhorn_diff_test.py index 91c9038b9..a929fe618 100644 --- a/tests/solvers/linear/sinkhorn_diff_test.py +++ b/tests/solvers/linear/sinkhorn_diff_test.py @@ -1,10 +1,10 @@ -# Copyright 2022 Google LLC. +# Copyright OTT-JAX # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/tests/solvers/linear/sinkhorn_grid_test.py b/tests/solvers/linear/sinkhorn_grid_test.py index 6e33c54f6..77fecad5d 100644 --- a/tests/solvers/linear/sinkhorn_grid_test.py +++ b/tests/solvers/linear/sinkhorn_grid_test.py @@ -1,10 +1,10 @@ -# Copyright 2022 Google LLC. +# Copyright OTT-JAX # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/tests/solvers/linear/sinkhorn_lr_test.py b/tests/solvers/linear/sinkhorn_lr_test.py index 48f799ef8..fd13c03cb 100644 --- a/tests/solvers/linear/sinkhorn_lr_test.py +++ b/tests/solvers/linear/sinkhorn_lr_test.py @@ -1,10 +1,10 @@ -# Copyright 2022 Google LLC. +# Copyright OTT-JAX # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/tests/solvers/linear/sinkhorn_misc_test.py b/tests/solvers/linear/sinkhorn_misc_test.py index 24f9aef48..0540353f9 100644 --- a/tests/solvers/linear/sinkhorn_misc_test.py +++ b/tests/solvers/linear/sinkhorn_misc_test.py @@ -1,10 +1,10 @@ -# Copyright 2022 Google LLC. +# Copyright OTT-JAX # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/tests/solvers/linear/sinkhorn_test.py b/tests/solvers/linear/sinkhorn_test.py index 8cda493f9..61145584e 100644 --- a/tests/solvers/linear/sinkhorn_test.py +++ b/tests/solvers/linear/sinkhorn_test.py @@ -1,10 +1,10 @@ -# Copyright 2022 Google LLC. +# Copyright OTT-JAX # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/tests/solvers/nn/icnn_test.py b/tests/solvers/nn/icnn_test.py index 9f6babf96..dfd87066d 100644 --- a/tests/solvers/nn/icnn_test.py +++ b/tests/solvers/nn/icnn_test.py @@ -1,10 +1,10 @@ -# Copyright 2022 Google LLC. +# Copyright OTT-JAX # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/tests/solvers/nn/neuraldual_test.py b/tests/solvers/nn/neuraldual_test.py index fe7f9ee34..8bdc2409c 100644 --- a/tests/solvers/nn/neuraldual_test.py +++ b/tests/solvers/nn/neuraldual_test.py @@ -1,4 +1,6 @@ # +# Copyright OTT-JAX +# # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at diff --git a/tests/solvers/quadratic/fgw_test.py b/tests/solvers/quadratic/fgw_test.py index e6019d4e9..f4d4fa9aa 100644 --- a/tests/solvers/quadratic/fgw_test.py +++ b/tests/solvers/quadratic/fgw_test.py @@ -1,10 +1,10 @@ -# Copyright 2022 Google LLC. +# Copyright OTT-JAX # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/tests/solvers/quadratic/gw_barycenter_test.py b/tests/solvers/quadratic/gw_barycenter_test.py index 5609bf41f..9a03f8c86 100644 --- a/tests/solvers/quadratic/gw_barycenter_test.py +++ b/tests/solvers/quadratic/gw_barycenter_test.py @@ -1,9 +1,10 @@ -# Copyright 2022 Apple +# Copyright OTT-JAX +# # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/tests/solvers/quadratic/gw_test.py b/tests/solvers/quadratic/gw_test.py index a461b1a0c..e45feeee3 100644 --- a/tests/solvers/quadratic/gw_test.py +++ b/tests/solvers/quadratic/gw_test.py @@ -1,10 +1,10 @@ -# Copyright 2022 Google LLC. +# Copyright OTT-JAX # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/tests/tools/gaussian_mixture/fit_gmm_pair_test.py b/tests/tools/gaussian_mixture/fit_gmm_pair_test.py index 7390f5866..c582d126f 100644 --- a/tests/tools/gaussian_mixture/fit_gmm_pair_test.py +++ b/tests/tools/gaussian_mixture/fit_gmm_pair_test.py @@ -1,10 +1,10 @@ -# Copyright 2022 Google LLC. +# Copyright OTT-JAX # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/tests/tools/gaussian_mixture/fit_gmm_test.py b/tests/tools/gaussian_mixture/fit_gmm_test.py index f9ff660fc..e208f9fe6 100644 --- a/tests/tools/gaussian_mixture/fit_gmm_test.py +++ b/tests/tools/gaussian_mixture/fit_gmm_test.py @@ -1,10 +1,10 @@ -# Copyright 2022 Google LLC. +# Copyright OTT-JAX # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/tests/tools/gaussian_mixture/gaussian_mixture_pair_test.py b/tests/tools/gaussian_mixture/gaussian_mixture_pair_test.py index 4846d06e0..30b2b9612 100644 --- a/tests/tools/gaussian_mixture/gaussian_mixture_pair_test.py +++ b/tests/tools/gaussian_mixture/gaussian_mixture_pair_test.py @@ -1,10 +1,10 @@ -# Copyright 2022 Google LLC. +# Copyright OTT-JAX # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/tests/tools/gaussian_mixture/gaussian_mixture_test.py b/tests/tools/gaussian_mixture/gaussian_mixture_test.py index 1d80b26f0..9e0c68e4f 100644 --- a/tests/tools/gaussian_mixture/gaussian_mixture_test.py +++ b/tests/tools/gaussian_mixture/gaussian_mixture_test.py @@ -1,10 +1,10 @@ -# Copyright 2022 Google LLC. +# Copyright OTT-JAX # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/tests/tools/gaussian_mixture/gaussian_test.py b/tests/tools/gaussian_mixture/gaussian_test.py index 18b47f903..6334f2d51 100644 --- a/tests/tools/gaussian_mixture/gaussian_test.py +++ b/tests/tools/gaussian_mixture/gaussian_test.py @@ -1,10 +1,10 @@ -# Copyright 2022 Google LLC. +# Copyright OTT-JAX # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/tests/tools/gaussian_mixture/linalg_test.py b/tests/tools/gaussian_mixture/linalg_test.py index e1e23b9e6..210eab8cb 100644 --- a/tests/tools/gaussian_mixture/linalg_test.py +++ b/tests/tools/gaussian_mixture/linalg_test.py @@ -1,10 +1,10 @@ -# Copyright 2022 Google LLC. +# Copyright OTT-JAX # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/tests/tools/gaussian_mixture/probabilities_test.py b/tests/tools/gaussian_mixture/probabilities_test.py index d15a92592..44220dde0 100644 --- a/tests/tools/gaussian_mixture/probabilities_test.py +++ b/tests/tools/gaussian_mixture/probabilities_test.py @@ -1,10 +1,10 @@ -# Copyright 2022 Google LLC. +# Copyright OTT-JAX # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/tests/tools/gaussian_mixture/scale_tril_test.py b/tests/tools/gaussian_mixture/scale_tril_test.py index 39d68042e..2e07b10de 100644 --- a/tests/tools/gaussian_mixture/scale_tril_test.py +++ b/tests/tools/gaussian_mixture/scale_tril_test.py @@ -1,10 +1,10 @@ -# Copyright 2022 Google LLC. +# Copyright OTT-JAX # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/tests/tools/segment_sinkhorn_test.py b/tests/tools/segment_sinkhorn_test.py index f6e43a4b7..960dc7f6c 100644 --- a/tests/tools/segment_sinkhorn_test.py +++ b/tests/tools/segment_sinkhorn_test.py @@ -1,10 +1,10 @@ -# Copyright 2022 The OTT Authors. +# Copyright OTT-JAX # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/tests/tools/sinkhorn_divergence_test.py b/tests/tools/sinkhorn_divergence_test.py index e0a0472b4..d35c89446 100644 --- a/tests/tools/sinkhorn_divergence_test.py +++ b/tests/tools/sinkhorn_divergence_test.py @@ -1,10 +1,10 @@ -# Copyright 2022 Google LLC. +# Copyright OTT-JAX # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, diff --git a/tests/tools/soft_sort_test.py b/tests/tools/soft_sort_test.py index 319c9fdd5..c54f6f295 100644 --- a/tests/tools/soft_sort_test.py +++ b/tests/tools/soft_sort_test.py @@ -1,10 +1,10 @@ -# Copyright 2022 Google LLC. +# Copyright OTT-JAX # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, From 7ec7fc1628682d48db0f704bb5ac6788ec07990b Mon Sep 17 00:00:00 2001 From: antoinewehenkel Date: Tue, 14 Feb 2023 11:19:38 +0100 Subject: [PATCH 04/10] Correct packages requirements for tests. --- pyproject.toml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 350a4a68d..23e837f1e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -72,10 +72,8 @@ test = [ "coverage[toml]", "chex", "networkx>=2.5", - "scikit-learn>=1.0" -] -experimental = [ - "scikit-sparse>=0.4.6", + "scikit-learn>=1.0", + "scikit-sparse>=0.4.6" ] docs = [ "sphinx>=4.0", From b7860e1a040b90bed2045c30dec75072500c0cb8 Mon Sep 17 00:00:00 2001 From: antoinewehenkel Date: Tue, 14 Feb 2023 11:30:12 +0100 Subject: [PATCH 05/10] Add apt-get install libsuitesparse-dev to get tests with scikit-sparse running on github. --- .github/workflows/tests.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index dcbccf36d..40d2528f4 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -23,6 +23,11 @@ jobs: with: python-version: '3.9' + - name: Install apt dependencies + if: ${{ matrix.os == 'ubuntu-latest' }} + run: | + sudo apt-get install libsuitesparse-dev + - name: Install dependencies run: | python -m pip install --upgrade pip From e79c1fcd7b708f624e409455dc69f87878761801 Mon Sep 17 00:00:00 2001 From: antoinewehenkel Date: Tue, 14 Feb 2023 11:38:53 +0100 Subject: [PATCH 06/10] Corect os runner check and also add it to "norma" tests. --- .github/workflows/tests.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 40d2528f4..bae919333 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -24,7 +24,7 @@ jobs: python-version: '3.9' - name: Install apt dependencies - if: ${{ matrix.os == 'ubuntu-latest' }} + if: ${{ runner.os == 'Linux' }} run: | sudo apt-get install libsuitesparse-dev @@ -85,6 +85,11 @@ jobs: with: python-version: ${{ matrix.python-version }} + - name: Install apt dependencies + if: ${{ runner.os == 'Linux' }} + run: | + sudo apt-get install libsuitesparse-dev + - name: Install dependencies run: | python -m pip install --upgrade pip From b9d8198bbf3a206b347c7d29d5490714018923de Mon Sep 17 00:00:00 2001 From: antoinewehenkel Date: Tue, 14 Feb 2023 11:44:28 +0100 Subject: [PATCH 07/10] Add brew install for scikit sparse. --- .github/workflows/tests.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index bae919333..aba3fea04 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -28,6 +28,11 @@ jobs: run: | sudo apt-get install libsuitesparse-dev + - name: Install brew dependencies + if: ${{ runner.os == 'macOS' }} + run: | + brew install suite-sparse + - name: Install dependencies run: | python -m pip install --upgrade pip @@ -90,6 +95,11 @@ jobs: run: | sudo apt-get install libsuitesparse-dev + - name: Install brew dependencies + if: ${{ runner.os == 'macOS' }} + run: | + brew install suite-sparse + - name: Install dependencies run: | python -m pip install --upgrade pip From 004bfa78482c6e83959d5aa6ed39b62f0f23055d Mon Sep 17 00:00:00 2001 From: antoinewehenkel Date: Tue, 14 Feb 2023 11:52:36 +0100 Subject: [PATCH 08/10] remove scikit-sparse from 3.11. --- pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 09c0bc3fb..584a30818 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -72,8 +72,7 @@ test = [ "coverage[toml]", "chex", "networkx>=2.5", - "scikit-learn>=1.0", - "scikit-sparse>=0.4.6" + "scikit-learn>=1.0" ] docs = [ "sphinx>=4.0", @@ -175,6 +174,7 @@ legacy_tox_ini = """ [testenv] extras = test pass_env = CUDA_*,PYTEST_*,CI + deps = py{38,39,310}: scikit-sparse>=0.4.6 commands = gpu: pip install "jax[cuda]" -f https://storage.googleapis.com/jax-releases/jax_cuda_releases.html python -m pytest {tty:--color=yes} {posargs: \ From 3c5c7f7d8adf4926e6bb3aa2621e434713db8ddf Mon Sep 17 00:00:00 2001 From: antoinewehenkel Date: Tue, 14 Feb 2023 11:54:41 +0100 Subject: [PATCH 09/10] Install libsuite sparse for gpu env tests. --- .github/workflows/tests.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index aba3fea04..ecf2fffbd 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -54,6 +54,11 @@ jobs: options: --gpus="device=12" steps: - uses: actions/checkout@v3 + + - name: Install apt dependencies + run: | + sudo apt-get install libsuitesparse-dev + - name: Install dependencies # `jax[cuda]<0.4` because of Docker issues: https://github.com/google/jax/issues/13758 # `flax<0.6.5` because it requires `jax>=0.4.2` From c7b14f264819c5576df6a2c8a277d5e3c2e4a311 Mon Sep 17 00:00:00 2001 From: antoinewehenkel Date: Tue, 14 Feb 2023 11:58:54 +0100 Subject: [PATCH 10/10] Remove libsuite sparse for gpu env tests (added in the docker). --- .github/workflows/tests.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index ecf2fffbd..885f5e719 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -55,10 +55,6 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Install apt dependencies - run: | - sudo apt-get install libsuitesparse-dev - - name: Install dependencies # `jax[cuda]<0.4` because of Docker issues: https://github.com/google/jax/issues/13758 # `flax<0.6.5` because it requires `jax>=0.4.2`