Skip to content

Fix scipy.linalg import. #122

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 24, 2019
Merged

Fix scipy.linalg import. #122

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions tensorflow_graphics/geometry/convolution/tests/utils_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

from absl.testing import parameterized
import numpy as np
import scipy as sp
from scipy import linalg
import tensorflow as tf

from tensorflow_graphics.geometry.convolution import utils
Expand Down Expand Up @@ -516,7 +516,7 @@ class UtilsConvertToBlockDiag2dTests(test_case.TestCase):
def _validate_sizes(self, block_diag_tensor, sizes):
"""Assert all elements outside the blocks are zero."""
data = [np.ones(shape=s) for s in sizes]
mask = 1.0 - sp.linalg.block_diag(*data)
mask = 1.0 - linalg.block_diag(*data)

self.assertAllEqual(
tf.sparse.to_dense(block_diag_tensor) * mask, np.zeros_like(mask))
Expand Down Expand Up @@ -570,7 +570,7 @@ def test_convert_to_block_diag_2d_random(self):
batch_data_padded[i, :s[0], :s[1]] = data[i]

batch_data_padded_sparse = _dense_to_sparse(batch_data_padded)
block_diag_data = sp.linalg.block_diag(*data)
block_diag_data = linalg.block_diag(*data)
block_diag_sparse = utils.convert_to_block_diag_2d(
batch_data_padded_sparse, sizes=sizes)

Expand All @@ -579,7 +579,7 @@ def test_convert_to_block_diag_2d_random(self):
def test_convert_to_block_diag_2d_no_padding(self):
"""Test block diagonalization without any padding."""
batch_data = np.random.uniform(size=(3, 4, 5, 4))
block_diag_data = sp.linalg.block_diag(
block_diag_data = linalg.block_diag(
*[x for x in np.reshape(batch_data, (-1, 5, 4))])

batch_data_sparse = _dense_to_sparse(batch_data)
Expand Down