Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
b2f91f2
full coveragre utils
rflamary Jul 24, 2017
c6e648f
test parmap python 3.5
rflamary Jul 24, 2017
a31d3c2
map to list
rflamary Jul 24, 2017
f8e822c
test sinkhorn with empty marginals
rflamary Jul 24, 2017
7d9c5e7
add test optim
rflamary Jul 24, 2017
709d8cb
add dr tests
rflamary Jul 24, 2017
83ecc6d
bregman coverage
rflamary Jul 24, 2017
64cf2fc
tets barycenter
rflamary Jul 24, 2017
33f3d30
clean pep8
rflamary Jul 24, 2017
bd705ed
add test yunmlix and bary
rflamary Jul 24, 2017
f204e98
add test da 58% coverage
rflamary Jul 24, 2017
5aad08a
add test plot
rflamary Jul 24, 2017
a8d7301
add test plot and dataset
rflamary Jul 24, 2017
e11b1d1
test plot with no X
rflamary Jul 24, 2017
11f0652
matplotlib travis
rflamary Jul 24, 2017
46f297f
import nmpy before ot
rflamary Jul 26, 2017
68d7490
numpy assert + n_bins
rflamary Jul 26, 2017
67b011a
numpy assert test_da
rflamary Jul 26, 2017
347e628
n to n_samples
rflamary Jul 26, 2017
4a45135
dr +gpu numpy assert
rflamary Jul 26, 2017
2bc41ad
rng gpu
rflamary Jul 26, 2017
6a02db0
test_optim
rflamary Jul 26, 2017
86418eb
test_optim allclose
rflamary Jul 26, 2017
286de0a
clean test_ot
rflamary Jul 26, 2017
0e06129
Merge branch 'pytest' of github.com:rflamary/POT into pytest
rflamary Jul 26, 2017
81118f2
test_ot random state
rflamary Jul 26, 2017
109fc2a
flake8
rflamary Jul 26, 2017
e0fa14b
flake8
rflamary Jul 26, 2017
d101e08
nearly all review done
rflamary Jul 26, 2017
77037cc
gitignore
rflamary Jul 26, 2017
fac003d
author and license for tets files
rflamary Jul 26, 2017
0097017
add license and authors on all modules
rflamary Jul 26, 2017
251af8e
add author to all examples
rflamary Jul 26, 2017
84aa318
pep8
rflamary Jul 26, 2017
96f8b96
valid flake8
rflamary Jul 26, 2017
838550e
last stuff
rflamary Jul 26, 2017
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
add license and authors on all modules
  • Loading branch information
rflamary committed Jul 26, 2017
commit 00970175c0f8ba9a99b61a182b32e329f219d382
4 changes: 4 additions & 0 deletions ot/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@

"""

# Author: Remi Flamary <remi.flamary@unice.fr>
#
# License: MIT License


# All submodules and packages
from . import lp
Expand Down
5 changes: 5 additions & 0 deletions ot/bregman.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@
Bregman projections for regularized OT
"""

# Author: Remi Flamary <remi.flamary@unice.fr>
# Nicolas Courty <ncourty@irisa.fr>
#
# License: MIT License

import numpy as np


Expand Down
6 changes: 6 additions & 0 deletions ot/da.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@
Domain adaptation with optimal transport
"""

# Author: Remi Flamary <remi.flamary@unice.fr>
# Nicolas Courty <ncourty@irisa.fr>
# Michael Perrot <michael.perrot@univ-st-etienne.fr>
#
# License: MIT License

import numpy as np
from .bregman import sinkhorn
from .lp import emd
Expand Down
4 changes: 4 additions & 0 deletions ot/datasets.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
Simple example datasets for OT
"""

# Author: Remi Flamary <remi.flamary@unice.fr>
#
# License: MIT License


import numpy as np
import scipy as sp
Expand Down
4 changes: 4 additions & 0 deletions ot/dr.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
Dimension reduction with optimal transport
"""

# Author: Remi Flamary <remi.flamary@unice.fr>
#
# License: MIT License

from scipy import linalg
import autograd.numpy as np
from pymanopt.manifolds import Stiefel
Expand Down
5 changes: 5 additions & 0 deletions ot/gpu/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,9 @@
from . import da
from .bregman import sinkhorn

# Author: Remi Flamary <remi.flamary@unice.fr>
# Leo Gautheron <https://github.com/aje>
#
# License: MIT License

__all__ = ["bregman", "da", "sinkhorn"]
5 changes: 5 additions & 0 deletions ot/gpu/bregman.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@
Bregman projections for regularized OT with GPU
"""

# Author: Remi Flamary <remi.flamary@unice.fr>
# Leo Gautheron <https://github.com/aje>
#
# License: MIT License

import numpy as np
import cudamat

Expand Down
9 changes: 9 additions & 0 deletions ot/gpu/da.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,15 @@
Domain adaptation with optimal transport with GPU implementation
"""

# Author: Remi Flamary <remi.flamary@unice.fr>
# Nicolas Courty <ncourty@irisa.fr>
# Michael Perrot <michael.perrot@univ-st-etienne.fr>
# Leo Gautheron <https://github.com/aje>
#
# License: MIT License



import numpy as np
from ..utils import unif
from ..da import OTDA
Expand Down
4 changes: 4 additions & 0 deletions ot/lp/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
Solvers for the original linear program OT problem
"""

# Author: Remi Flamary <remi.flamary@unice.fr>
#
# License: MIT License

import numpy as np
# import compiled emd
from .emd_wrap import emd_c, emd2_c
Expand Down
9 changes: 6 additions & 3 deletions ot/lp/emd_wrap.pyx
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
# -*- coding: utf-8 -*-
"""
Created on Thu Sep 11 08:42:08 2014

@author: rflamary
Cython linker with C solver
"""

# Author: Remi Flamary <remi.flamary@unice.fr>
#
# License: MIT License

import numpy as np
cimport numpy as np

Expand Down
4 changes: 4 additions & 0 deletions ot/optim.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
Optimization algorithms for OT
"""

# Author: Remi Flamary <remi.flamary@unice.fr>
#
# License: MIT License

import numpy as np
from scipy.optimize.linesearch import scalar_search_armijo
from .lp import emd
Expand Down
3 changes: 3 additions & 0 deletions ot/plot.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
Functions for plotting OT matrices
"""

# Author: Remi Flamary <remi.flamary@unice.fr>
#
# License: MIT License

import numpy as np
import matplotlib.pylab as pl
Expand Down
5 changes: 5 additions & 0 deletions ot/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
"""
Various function that can be usefull
"""

# Author: Remi Flamary <remi.flamary@unice.fr>
#
# License: MIT License

import multiprocessing
from functools import reduce
import time
Expand Down