fixes change from Space to Mat

tfjgeorge · Jul 29, 2020 · 280ba08 · 280ba08
1 parent 47a802b
commit 280ba08
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/nngeometry/object/__init__.py b/nngeometry/object/__init__.py
@@ -1,7 +1,7 @@
-from .PMat import (PMatDense, PMatBlockDiag, PMatDiag,
+from .pspace import (PMatDense, PMatBlockDiag, PMatDiag,
                      PMatLowRank, PMatImplicit,
                      PMatKFAC, PMatEKFAC)
 from .vector import (PVector, FVector)
-from .FMat import (FMatDense,)
+from .fspace import (FMatDense,)
 from .map import (PushForwardDense, PushForwardImplicit,
                   PullBackDense)
diff --git a/tests/test_jacobian.py b/tests/test_jacobian.py
@@ -8,8 +8,8 @@
                    get_conv_task, get_conv_bn_task)
 from nngeometry.object.map import (PushForwardDense, PushForwardImplicit,
                                    PullBackDense)
-from nngeometry.object.FMat import FMatDense
-from nngeometry.object.PMat import (PMatDense, PMatDiag, PMatBlockDiag,
+from nngeometry.object.fspace import FMatDense
+from nngeometry.object.pspace import (PMatDense, PMatDiag, PMatBlockDiag,
                                       PMatImplicit, PMatLowRank)
 from nngeometry.generator import Jacobian
 from nngeometry.object.vector import random_pvector, random_fvector, PVector

diff --git a/tests/test_jacobian_ekfac.py b/tests/test_jacobian_ekfac.py
@@ -1,12 +1,12 @@
 from nngeometry.generator.jacobian import Jacobian
-from nngeometry.object.PMat import PMatBlockDiag, PMatKFAC, PMatEKFAC
+from nngeometry.object.pspace import PMatBlockDiag, PMatKFAC, PMatEKFAC
 import torch
 from tasks import get_fullyconnect_task, get_conv_task
 from nngeometry.object.vector import random_pvector
 from utils import check_ratio, check_tensors
 
 
-def test_PMat_ekfac_vs_kfac():
+def test_pspace_ekfac_vs_kfac():
     """
     Check that EKFAC matrix is closer to block diag one in the
     sense of the Frobenius norm
@@ -39,7 +39,7 @@ def test_PMat_ekfac_vs_kfac():
                        - M_blockdiag.get_dense_tensor())
 
 
-def test_PMat_ekfac_vs_direct():
+def test_pspace_ekfac_vs_direct():
     """
     Check EKFAC basis operations against direct computation using
     get_dense_tensor

diff --git a/tests/test_jacobian_kfac.py b/tests/test_jacobian_kfac.py
@@ -1,5 +1,5 @@
 from nngeometry.generator.jacobian import Jacobian
-from nngeometry.object.PMat import PMatBlockDiag, PMatKFAC
+from nngeometry.object.pspace import PMatBlockDiag, PMatKFAC
 from nngeometry.object.vector import random_pvector, PVector
 from nngeometry.maths import kronecker
 from nngeometry.layercollection import LayerCollection