OrgLion-ML
/
dlib
mirror of https://github.com/davisking/dlib.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed test to really work if numpy isn't installed.

This commit is contained in:
Davis King 2018-01-16 21:00:54 -05:00
parent a9ca83d228
commit 99b0f687b4
1 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
tools/python/test/test_matrix.py
View File

@ -7,9 +7,9 @@ from pytest import raises
try: try:
import numpy import numpy
have_numpy = True
except ImportError: except ImportError:
# Just skip these tests if numpy isn't installed have_numpy = False
exit(0)
def test_matrix_empty_init(): def test_matrix_empty_init():
@ -57,23 +57,24 @@ def test_matrix_from_list_as_column_vector():
assert str(m) == "0 \n1 \n2" assert str(m) == "0 \n1 \n2"
def test_matrix_from_object_with_2d_shape(): if have_numpy:
m1 = numpy.array([[0, 1, 2], def test_matrix_from_object_with_2d_shape():
[3, 4, 5], m1 = numpy.array([[0, 1, 2],
[6, 7, 8]]) [3, 4, 5],
m = matrix(m1) [6, 7, 8]])
assert m.nr() == 3 m = matrix(m1)
assert m.nc() == 3 assert m.nr() == 3
assert m.shape == (3, 3) assert m.nc() == 3
assert len(m) == 3 assert m.shape == (3, 3)
assert repr(m) == "< dlib.matrix containing: \n0 1 2 \n3 4 5 \n6 7 8 >" assert len(m) == 3
assert str(m) == "0 1 2 \n3 4 5 \n6 7 8" assert repr(m) == "< dlib.matrix containing: \n0 1 2 \n3 4 5 \n6 7 8 >"
assert str(m) == "0 1 2 \n3 4 5 \n6 7 8"
def test_matrix_from_object_without_2d_shape(): def test_matrix_from_object_without_2d_shape():
with raises(IndexError): with raises(IndexError):
m1 = numpy.array([0, 1, 2]) m1 = numpy.array([0, 1, 2])
matrix(m1) matrix(m1)
def test_matrix_from_object_without_shape(): def test_matrix_from_object_without_shape():