Cleanup RMS error computation function import (SMTorg#513)

* clean utils init file and fix RMS function import
Paul-Saves · Feb 20, 2024 · a647148 · a647148
1 parent d1018b8
commit a647148
Show file tree

Hide file tree

Showing 16 changed files with 14 additions and 16 deletions.
diff --git a/smt/applications/tests/test_mfk.py b/smt/applications/tests/test_mfk.py
@@ -22,7 +22,7 @@
 
 from smt.utils.sm_test_case import SMTestCase
 from smt.utils.silence import Silence
-from smt.utils import compute_rms_error
+from smt.utils.misc import compute_rms_error
 from smt.surrogate_models import LS, QP, KPLS, KRG, KPLSK, GEKPLS, GENN
 from smt.applications.mfk import MFK, NestedLHS
 from copy import deepcopy

diff --git a/smt/applications/tests/test_mfk_1fidelity.py b/smt/applications/tests/test_mfk_1fidelity.py
@@ -15,7 +15,7 @@
 
 from smt.utils.sm_test_case import SMTestCase
 from smt.utils.silence import Silence
-from smt.utils import compute_rms_error
+from smt.utils.misc import compute_rms_error
 from smt.applications.mfk import MFK
 
 print_output = False

diff --git a/smt/applications/tests/test_mfkpls.py b/smt/applications/tests/test_mfkpls.py
@@ -28,7 +28,7 @@
 
 from smt.utils.sm_test_case import SMTestCase
 from smt.utils.silence import Silence
-from smt.utils import compute_rms_error
+from smt.utils.misc import compute_rms_error
 from smt.surrogate_models import LS, QP, KPLS, KRG, KPLSK, GEKPLS, GENN
 from smt.applications.mfk import MFK, NestedLHS
 from smt.applications.mfkpls import MFKPLS

diff --git a/smt/applications/tests/test_mfkplsk.py b/smt/applications/tests/test_mfkplsk.py
@@ -23,7 +23,7 @@
 
 from smt.utils.sm_test_case import SMTestCase
 from smt.utils.silence import Silence
-from smt.utils import compute_rms_error
+from smt.utils.misc import compute_rms_error
 from smt.surrogate_models import LS, QP, KPLS, KRG, KPLSK, GEKPLS, GENN
 from smt.applications.mfk import MFK, NestedLHS
 from smt.applications.mfkplsk import MFKPLSK

diff --git a/smt/applications/tests/test_vfm.py b/smt/applications/tests/test_vfm.py
@@ -17,7 +17,6 @@
 import numpy as np
 from scipy import linalg
 from smt.utils.sm_test_case import SMTestCase
-from smt.utils import compute_rms_error
 from smt.utils.silence import Silence
 
 from smt.problems import WaterFlowLFidelity, WaterFlow

diff --git a/smt/examples/run_examples.py b/smt/examples/run_examples.py
@@ -7,7 +7,7 @@
 
 import numpy as np
 from scipy import linalg
-from smt.utils import compute_rms_error
+from smt.utils.misc import compute_rms_error
 
 from smt.problems import Sphere, NdimRobotArm
 from smt.sampling_methods import LHS

diff --git a/smt/surrogate_models/tests/test_krg_het_noise.py b/smt/surrogate_models/tests/test_krg_het_noise.py
@@ -9,7 +9,7 @@
 
 from smt.surrogate_models import KRG
 from smt.utils.sm_test_case import SMTestCase
-from smt.utils import compute_rms_error
+from smt.utils.misc import compute_rms_error
 
 
 class Test(SMTestCase):

diff --git a/smt/surrogate_models/tests/test_rmts.py b/smt/surrogate_models/tests/test_rmts.py
@@ -9,7 +9,7 @@
 
 from smt.utils.silence import Silence
 from smt.utils.sm_test_case import SMTestCase
-from smt.utils import compute_rms_error
+from smt.utils.misc import compute_rms_error
 from smt.surrogate_models import RMTB
 
 

diff --git a/smt/tests/test_all.py b/smt/tests/test_all.py
@@ -17,7 +17,7 @@
 
 from smt.utils.sm_test_case import SMTestCase
 from smt.utils.silence import Silence
-from smt.utils import compute_rms_error
+from smt.utils.misc import compute_rms_error
 from smt.surrogate_models import (
     LS,
     QP,

diff --git a/smt/tests/test_derivs.py b/smt/tests/test_derivs.py
@@ -15,7 +15,7 @@
 
 from smt.utils.sm_test_case import SMTestCase
 from smt.utils.silence import Silence
-from smt.utils import compute_rms_error
+from smt.utils.misc import compute_rms_error
 from smt.utils.design_space import DesignSpace
 
 from smt.applications import MFK

diff --git a/smt/tests/test_high_dim.py b/smt/tests/test_high_dim.py
@@ -16,7 +16,7 @@
 
 from smt.utils.sm_test_case import SMTestCase
 from smt.utils.silence import Silence
-from smt.utils import compute_rms_error
+from smt.utils.misc import compute_rms_error
 from smt.surrogate_models import LS, QP, KPLS, KRG
 
 try:

diff --git a/smt/tests/test_kpls_auto.py b/smt/tests/test_kpls_auto.py
@@ -16,7 +16,7 @@
 
 from smt.utils.sm_test_case import SMTestCase
 from smt.utils.silence import Silence
-from smt.utils import compute_rms_error
+from smt.utils.misc import compute_rms_error
 from smt.surrogate_models import KPLS
 
 

diff --git a/smt/tests/test_low_dim.py b/smt/tests/test_low_dim.py
@@ -16,7 +16,7 @@
 
 from smt.utils.sm_test_case import SMTestCase
 from smt.utils.silence import Silence
-from smt.utils import compute_rms_error
+from smt.utils.misc import compute_rms_error
 from smt.surrogate_models import LS, QP, KPLS, KRG
 
 try:

diff --git a/smt/tests/test_output_derivs.py b/smt/tests/test_output_derivs.py
@@ -15,7 +15,7 @@
 from smt.sampling_methods import FullFactorial
 from smt.utils.sm_test_case import SMTestCase
 from smt.utils.silence import Silence
-from smt.utils import compute_rms_error
+from smt.utils.misc import compute_rms_error
 
 try:
     from smt.surrogate_models import IDW, RBF, RMTC, RMTB

diff --git a/smt/tests/test_training_derivs.py b/smt/tests/test_training_derivs.py
@@ -16,7 +16,7 @@
 
 from smt.utils.sm_test_case import SMTestCase
 from smt.utils.silence import Silence
-from smt.utils import compute_rms_error
+from smt.utils.misc import compute_rms_error
 
 try:
     from smt.surrogate_models import IDW, RBF, RMTC, RMTB

diff --git a/smt/utils/__init__.py b/smt/utils/__init__.py
@@ -1 +0,0 @@
-from .misc import compute_rms_error