Skip to content

Commit e8a5167

Browse files
author
Aaron Meyer
committed
More cleanup
1 parent 143db6c commit e8a5167

File tree

7 files changed

+8
-18
lines changed

7 files changed

+8
-18
lines changed

tensorly/decomposition/tests/test_cp.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
CP_NN_HALS,
1919
)
2020
from ...cp_tensor import cp_to_tensor
21-
from ...cp_tensor import cp_to_tensor
2221
from ...random import random_cp
2322
from ...tenalg import khatri_rao
2423
from ... import backend as T

tensorly/decomposition/tests/test_tr_svd.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
1-
import pytest
2-
import tensorly as tl
31

4-
from .._tr_svd import tensor_ring, TensorRing
2+
from .._tr_svd import tensor_ring
53
from ...random import random_tr
64
from ...testing import (
75
assert_,
86
assert_array_almost_equal,
97
assert_raises,
10-
assert_class_wrapper_correctly_passes_arguments,
118
)
129

1310

tensorly/random/base.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import numpy as np
21
from ..cp_tensor import cp_to_tensor, CPTensor, cp_normalize, validate_cp_rank
32
from ..tucker_tensor import tucker_to_tensor, TuckerTensor, validate_tucker_rank
43
from ..tt_tensor import tt_to_tensor, TTTensor, validate_tt_rank

tensorly/solvers/penalizations.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
import tensorly as tl
2-
import numpy as np
3-
import copy
41
import warnings
52

63

@@ -24,10 +21,10 @@ def process_regularization_weights(ridge_coefficients, sparsity_coefficients, n_
2421
list of floats
2522
sparsity coefficients, processed
2623
"""
27-
if ridge_coefficients is None or isinstance(ridge_coefficients, (int, float)):
24+
if ridge_coefficients is None or isinstance(ridge_coefficients, int | float):
2825
# Populate None or the input float in a list for all modes
2926
ridge_coefficients = [ridge_coefficients] * n_modes
30-
if sparsity_coefficients is None or isinstance(sparsity_coefficients, (int, float)):
27+
if sparsity_coefficients is None or isinstance(sparsity_coefficients, int | float):
3128
# Populate None or the input float in a list for all modes
3229
sparsity_coefficients = [sparsity_coefficients] * n_modes
3330
# Convert None to 0

tensorly/solvers/tests/test_admm.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,13 @@
22
import tensorly as tl
33

44
from tensorly.solvers.admm import admm
5-
from tensorly.testing import assert_, assert_array_equal, assert_array_almost_equal
6-
from tensorly import tensor_to_vec, truncated_svd
5+
from tensorly.testing import assert_array_almost_equal
76
import pytest
87

98
# Author: Jean Kossaifi
109
skip_tensorflow = pytest.mark.skipif(
1110
(tl.get_backend() == "tensorflow"),
12-
reason=f"Indexing with list not supported in TensorFlow",
11+
reason="Indexing with list not supported in TensorFlow",
1312
)
1413

1514

tensorly/solvers/tests/test_nnls.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
fista,
77
active_set_nnls,
88
)
9-
from tensorly.testing import assert_, assert_array_equal, assert_array_almost_equal
10-
from tensorly import tensor_to_vec, truncated_svd
9+
from tensorly.testing import assert_array_almost_equal
10+
from tensorly import tensor_to_vec
1111
import pytest
1212

1313
# Author: Jean Kossaifi
1414
skip_tensorflow = pytest.mark.skipif(
1515
(tl.get_backend() == "tensorflow"),
16-
reason=f"Indexing with list not supported in TensorFlow",
16+
reason="Indexing with list not supported in TensorFlow",
1717
)
1818

1919

tensorly/solvers/tests/test_penalizations.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import numpy as np
21
import tensorly as tl
32

43
from tensorly.solvers.penalizations import process_regularization_weights

0 commit comments

Comments
 (0)