summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorRémi Flamary <remi.flamary@gmail.com>2017-07-26 11:26:08 +0200
committerRémi Flamary <remi.flamary@gmail.com>2017-07-26 11:26:08 +0200
commit46f297f678de0051dc6d5067291d1e1046b4705e (patch)
tree1c362d2353af5db2cb8ea22d1164ae7f9a43866b /test
parente11b1d1a77f201896fd3f70bc5b910e99610e951 (diff)
import nmpy before ot
Diffstat (limited to 'test')
-rw-r--r--test/test_bregman.py4
-rw-r--r--test/test_da.py4
-rw-r--r--test/test_dr.py5
-rw-r--r--test/test_gpu.py3
-rw-r--r--test/test_optim.py4
-rw-r--r--test/test_ot.py4
6 files changed, 13 insertions, 11 deletions
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