From 46f297f678de0051dc6d5067291d1e1046b4705e Mon Sep 17 00:00:00 2001 From: Rémi Flamary Date: Wed, 26 Jul 2017 11:26:08 +0200 Subject: import nmpy before ot --- test/test_bregman.py | 4 ++-- test/test_da.py | 4 ++-- test/test_dr.py | 5 +++-- test/test_gpu.py | 3 ++- test/test_optim.py | 4 ++-- test/test_ot.py | 4 ++-- 6 files changed, 13 insertions(+), 11 deletions(-) (limited to 'test') diff --git a/test/test_bregman.py b/test/test_bregman.py index 025568c..aaa2efc 100644 --- a/test/test_bregman.py +++ b/test/test_bregman.py @@ -1,7 +1,7 @@ - -import ot import numpy as np +import ot + # import pytest diff --git a/test/test_da.py b/test/test_da.py index 50d3aba..0d92b95 100644 --- a/test/test_da.py +++ b/test/test_da.py @@ -1,7 +1,7 @@ - -import ot import numpy as np +import ot + # import pytest diff --git a/test/test_dr.py b/test/test_dr.py index 3da7705..3faba48 100644 --- a/test/test_dr.py +++ b/test/test_dr.py @@ -1,8 +1,9 @@ -import ot + import numpy as np +import ot import pytest -try: # test if cudamat installed +try: # test if autograd and pymanopt are installed import ot.dr nogo = False except ImportError: diff --git a/test/test_gpu.py b/test/test_gpu.py index 24797f2..5184a6c 100644 --- a/test/test_gpu.py +++ b/test/test_gpu.py @@ -1,5 +1,6 @@ -import ot + import numpy as np +import ot import time import pytest diff --git a/test/test_optim.py b/test/test_optim.py index a77a37c..d5c4ad0 100644 --- a/test/test_optim.py +++ b/test/test_optim.py @@ -1,7 +1,7 @@ - -import ot import numpy as np +import ot + # import pytest diff --git a/test/test_ot.py b/test/test_ot.py index 5bf65c6..a30491d 100644 --- a/test/test_ot.py +++ b/test/test_ot.py @@ -1,7 +1,7 @@ - -import ot import numpy as np +import ot + # import pytest -- cgit v1.2.3