提交 9a124cac authored 作者: Ricardo Vieira's avatar Ricardo Vieira 提交者: Ricardo Vieira

Scipy is not optional

上级 27d79707
...@@ -6,9 +6,9 @@ from unittest import mock ...@@ -6,9 +6,9 @@ from unittest import mock
import numpy as np import numpy as np
import pytest import pytest
import scipy
from pytensor.compile import SymbolicInput from pytensor.compile import SymbolicInput
from tests.tensor.test_math_scipy import scipy
numba = pytest.importorskip("numba") numba = pytest.importorskip("numba")
......
import warnings import warnings
from functools import partial
import numpy as np import numpy as np
import pytest import pytest
import scipy
from pytensor.gradient import NullTypeGradError, verify_grad
from pytensor.scalar import ScalarLoop
from pytensor.tensor.elemwise import Elemwise
scipy = pytest.importorskip("scipy")
from functools import partial
from scipy import special, stats from scipy import special, stats
from pytensor import function, grad from pytensor import function, grad
from pytensor import tensor as pt from pytensor import tensor as pt
from pytensor.compile.mode import get_default_mode from pytensor.compile.mode import get_default_mode
from pytensor.configdefaults import config from pytensor.configdefaults import config
from pytensor.gradient import NullTypeGradError, verify_grad
from pytensor.scalar import ScalarLoop
from pytensor.tensor import gammaincc, inplace, kn, kv, kve, vector from pytensor.tensor import gammaincc, inplace, kn, kv, kve, vector
from pytensor.tensor.elemwise import Elemwise
from tests import unittest_tools as utt from tests import unittest_tools as utt
from tests.tensor.utils import ( from tests.tensor.utils import (
_good_broadcast_unary_chi2sf, _good_broadcast_unary_chi2sf,
......
import numpy as np import numpy as np
import pytest import pytest
import scipy
import pytensor import pytensor
import pytensor.typed_list import pytensor.typed_list
...@@ -37,8 +38,7 @@ def rand_ranged_matrix(minimum, maximum, shape): ...@@ -37,8 +38,7 @@ def rand_ranged_matrix(minimum, maximum, shape):
def random_lil(shape, dtype, nnz): def random_lil(shape, dtype, nnz):
sp = pytest.importorskip("scipy") rval = scipy.sparse.lil_matrix(shape, dtype=dtype)
rval = sp.sparse.lil_matrix(shape, dtype=dtype)
huge = 2**30 huge = 2**30
for k in range(nnz): for k in range(nnz):
# set non-zeros in random locations (row x, col y) # set non-zeros in random locations (row x, col y)
...@@ -451,7 +451,6 @@ class TestIndex: ...@@ -451,7 +451,6 @@ class TestIndex:
assert f([[x, y], [x, y, y]], [x, y]) == 0 assert f([[x, y], [x, y, y]], [x, y]) == 0
def test_sparse(self): def test_sparse(self):
sp = pytest.importorskip("scipy")
mySymbolicSparseList = TypedListType( mySymbolicSparseList = TypedListType(
sparse.SparseTensorType("csr", pytensor.config.floatX) sparse.SparseTensorType("csr", pytensor.config.floatX)
)() )()
...@@ -461,8 +460,8 @@ class TestIndex: ...@@ -461,8 +460,8 @@ class TestIndex:
f = pytensor.function([mySymbolicSparseList, mySymbolicSparse], z) f = pytensor.function([mySymbolicSparseList, mySymbolicSparse], z)
x = sp.sparse.csr_matrix(random_lil((10, 40), pytensor.config.floatX, 3)) x = scipy.sparse.csr_matrix(random_lil((10, 40), pytensor.config.floatX, 3))
y = sp.sparse.csr_matrix(random_lil((10, 40), pytensor.config.floatX, 3)) y = scipy.sparse.csr_matrix(random_lil((10, 40), pytensor.config.floatX, 3))
assert f([x, y], y) == 1 assert f([x, y], y) == 1
...@@ -519,7 +518,6 @@ class TestCount: ...@@ -519,7 +518,6 @@ class TestCount:
assert f([[x, y], [x, y, y]], [x, y]) == 1 assert f([[x, y], [x, y, y]], [x, y]) == 1
def test_sparse(self): def test_sparse(self):
sp = pytest.importorskip("scipy")
mySymbolicSparseList = TypedListType( mySymbolicSparseList = TypedListType(
sparse.SparseTensorType("csr", pytensor.config.floatX) sparse.SparseTensorType("csr", pytensor.config.floatX)
)() )()
...@@ -529,8 +527,8 @@ class TestCount: ...@@ -529,8 +527,8 @@ class TestCount:
f = pytensor.function([mySymbolicSparseList, mySymbolicSparse], z) f = pytensor.function([mySymbolicSparseList, mySymbolicSparse], z)
x = sp.sparse.csr_matrix(random_lil((10, 40), pytensor.config.floatX, 3)) x = scipy.sparse.csr_matrix(random_lil((10, 40), pytensor.config.floatX, 3))
y = sp.sparse.csr_matrix(random_lil((10, 40), pytensor.config.floatX, 3)) y = scipy.sparse.csr_matrix(random_lil((10, 40), pytensor.config.floatX, 3))
assert f([x, y, y], y) == 2 assert f([x, y, y], y) == 2
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论