Uppercase COMPILED_AVAILABLE

SMTorg · Feb 21, 2024 · 45a75c7 · 45a75c7
1 parent 30f4732
commit 45a75c7
Show file tree

Hide file tree

Showing 8 changed files with 69 additions and 70 deletions.
diff --git a/smt/applications/application.py b/smt/applications/application.py
@@ -10,13 +10,13 @@
 try:
     from smt.surrogate_models import IDW, RBF, RMTC, RMTB
 
-    compiled_available = True
+    COMPILED_AVAILABLE = True
 except ImportError:
-    compiled_available = False
+    COMPILED_AVAILABLE = False
 
 
 class SurrogateBasedApplication:
-    if compiled_available:
+    if COMPILED_AVAILABLE:
         _surrogate_type = {
             "KRG": KRG,
             "LS": LS,

diff --git a/smt/examples/run_examples.py b/smt/examples/run_examples.py
@@ -16,9 +16,9 @@
 try:
     from smt.surrogate_models import IDW, RBF, RMTC, RMTB
 
-    compiled_available = True
+    COMPILED_AVAILABLE = True
 except ImportError:
-    compiled_available = False
+    COMPILED_AVAILABLE = False
 
 try:
     import matplotlib.pyplot as plt
@@ -466,7 +466,7 @@
 
 if plot_status:
     plt.show()
-if compiled_available:
+if COMPILED_AVAILABLE:
     ########### The IDW model
 
     t = IDW(print_prediction=False)

diff --git a/smt/tests/test_all.py b/smt/tests/test_all.py
@@ -33,9 +33,9 @@
 try:
     from smt.surrogate_models import IDW, RBF, RMTC, RMTB
 
-    compiled_available = True
+    COMPILED_AVAILABLE = True
 except ImportError:
-    compiled_available = False
+    COMPILED_AVAILABLE = False
 
 
 print_output = False
@@ -86,7 +86,7 @@ def setUp(self):
         sms["MGP"] = KPLSK(theta0=[1e-2] * ncomp, n_comp=ncomp)
         sms["GEKPLS"] = GEKPLS(theta0=[1e-2] * 2, n_comp=2, delta_x=1e-1)
         sms["GENN"] = genn()
-        if compiled_available:
+        if COMPILED_AVAILABLE:
             sms["IDW"] = IDW()
             sms["RBF"] = RBF()
             sms["RMTC"] = RMTC()
@@ -102,7 +102,7 @@ def setUp(self):
         t_errors["MGP"] = 1e0
         t_errors["GEKPLS"] = 1.4
         t_errors["GENN"] = 1.2
-        if compiled_available:
+        if COMPILED_AVAILABLE:
             t_errors["IDW"] = 1e0
             t_errors["RBF"] = 1e-2
             t_errors["RMTC"] = 1e-1
@@ -118,7 +118,7 @@ def setUp(self):
         e_errors["MGP"] = 2e-2
         e_errors["GEKPLS"] = 2e-2
         e_errors["GENN"] = 2e-2
-        if compiled_available:
+        if COMPILED_AVAILABLE:
             e_errors["IDW"] = 1e0
             e_errors["RBF"] = 1e0
             e_errors["RMTC"] = 2e-1
@@ -228,19 +228,19 @@ def test_exp_GEKPLS_TNC(self):
     def test_exp_GENN(self):
         self.run_test()
 
-    @unittest.skipIf(not compiled_available, "Compiled Fortran libraries not available")
+    @unittest.skipIf(not COMPILED_AVAILABLE, "Compiled Fortran libraries not available")
     def test_exp_IDW(self):
         self.run_test()
 
-    @unittest.skipIf(not compiled_available, "Compiled Fortran libraries not available")
+    @unittest.skipIf(not COMPILED_AVAILABLE, "Compiled Fortran libraries not available")
     def test_exp_RBF(self):
         self.run_test()
 
-    @unittest.skipIf(not compiled_available, "Compiled Fortran libraries not available")
+    @unittest.skipIf(not COMPILED_AVAILABLE, "Compiled Fortran libraries not available")
     def test_exp_RMTC(self):
         self.run_test()
 
-    @unittest.skipIf(not compiled_available, "Compiled Fortran libraries not available")
+    @unittest.skipIf(not COMPILED_AVAILABLE, "Compiled Fortran libraries not available")
     def test_exp_RMTB(self):
         self.run_test()
 
@@ -284,19 +284,19 @@ def test_tanh_GEKPLS_TNC(self):
     def test_tanh_GENN(self):
         self.run_test()
 
-    @unittest.skipIf(not compiled_available, "Compiled Fortran libraries not available")
+    @unittest.skipIf(not COMPILED_AVAILABLE, "Compiled Fortran libraries not available")
     def test_tanh_IDW(self):
         self.run_test()
 
-    @unittest.skipIf(not compiled_available, "Compiled Fortran libraries not available")
+    @unittest.skipIf(not COMPILED_AVAILABLE, "Compiled Fortran libraries not available")
     def test_tanh_RBF(self):
         self.run_test()
 
-    @unittest.skipIf(not compiled_available, "Compiled Fortran libraries not available")
+    @unittest.skipIf(not COMPILED_AVAILABLE, "Compiled Fortran libraries not available")
     def test_tanh_RMTC(self):
         self.run_test()
 
-    @unittest.skipIf(not compiled_available, "Compiled Fortran libraries not available")
+    @unittest.skipIf(not COMPILED_AVAILABLE, "Compiled Fortran libraries not available")
     def test_tanh_RMTB(self):
         self.run_test()
 
@@ -340,19 +340,19 @@ def test_cos_GEKPLS_TNC(self):
     def test_cos_GENN(self):
         self.run_test()
 
-    @unittest.skipIf(not compiled_available, "Compiled Fortran libraries not available")
+    @unittest.skipIf(not COMPILED_AVAILABLE, "Compiled Fortran libraries not available")
     def test_cos_IDW(self):
         self.run_test()
 
-    @unittest.skipIf(not compiled_available, "Compiled Fortran libraries not available")
+    @unittest.skipIf(not COMPILED_AVAILABLE, "Compiled Fortran libraries not available")
     def test_cos_RBF(self):
         self.run_test()
 
-    @unittest.skipIf(not compiled_available, "Compiled Fortran libraries not available")
+    @unittest.skipIf(not COMPILED_AVAILABLE, "Compiled Fortran libraries not available")
     def test_cos_RMTC(self):
         self.run_test()
 
-    @unittest.skipIf(not compiled_available, "Compiled Fortran libraries not available")
+    @unittest.skipIf(not COMPILED_AVAILABLE, "Compiled Fortran libraries not available")
     def test_cos_RMTB(self):
         self.run_test()
 

diff --git a/smt/tests/test_derivs.py b/smt/tests/test_derivs.py
@@ -23,9 +23,9 @@
 try:
     from smt.surrogate_models import IDW, RBF, RMTC, RMTB
 
-    compiled_available = True
+    COMPILED_AVAILABLE = True
 except ImportError:
-    compiled_available = False
+    COMPILED_AVAILABLE = False
 
 
 print_output = False
@@ -41,7 +41,7 @@ def setUp(self):
         problems["sphere"] = Sphere(ndim=ndim)
 
         sms = OrderedDict()
-        if compiled_available:
+        if COMPILED_AVAILABLE:
             sms["RBF"] = RBF()
             sms["RMTC"] = RMTC()
             sms["RMTB"] = RMTB()
@@ -106,15 +106,15 @@ def run_test(self):
     # --------------------------------------------------------------------
     # Function: sphere
 
-    @unittest.skipIf(not compiled_available, "Compiled Fortran libraries not available")
+    @unittest.skipIf(not COMPILED_AVAILABLE, "Compiled Fortran libraries not available")
     def test_sphere_RBF(self):
         self.run_test()
 
-    @unittest.skipIf(not compiled_available, "Compiled Fortran libraries not available")
+    @unittest.skipIf(not COMPILED_AVAILABLE, "Compiled Fortran libraries not available")
     def test_sphere_RMTC(self):
         self.run_test()
 
-    @unittest.skipIf(not compiled_available, "Compiled Fortran libraries not available")
+    @unittest.skipIf(not COMPILED_AVAILABLE, "Compiled Fortran libraries not available")
     def test_sphere_RMTB(self):
         self.run_test()
 

diff --git a/smt/tests/test_extrap.py b/smt/tests/test_extrap.py
@@ -20,9 +20,9 @@
 try:
     from smt.surrogate_models import IDW, RBF, RMTC, RMTB
 
-    compiled_available = True
+    COMPILED_AVAILABLE = True
 except ImportError:
-    compiled_available = False
+    COMPILED_AVAILABLE = False
 
 
 print_output = False
@@ -38,7 +38,7 @@ def setUp(self):
         problems["sphere"] = Sphere(ndim=ndim)
 
         sms = OrderedDict()
-        if compiled_available:
+        if COMPILED_AVAILABLE:
             sms["RMTC"] = RMTC(num_elements=6, extrapolate=True)
             sms["RMTB"] = RMTB(order=4, num_ctrl_pts=10, extrapolate=True)
 
@@ -79,31 +79,31 @@ def run_test(self, sname, extrap_train=False, extrap_predict=False):
         if extrap_predict:
             sm.predict_values(x)
 
-    @unittest.skipIf(not compiled_available, "Compiled Fortran libraries not available")
+    @unittest.skipIf(not COMPILED_AVAILABLE, "Compiled Fortran libraries not available")
     def test_RMTC(self):
         self.run_test("RMTC", False, False)
 
-    @unittest.skipIf(not compiled_available, "Compiled Fortran libraries not available")
+    @unittest.skipIf(not COMPILED_AVAILABLE, "Compiled Fortran libraries not available")
     def test_RMTC_train(self):
         with self.assertRaises(Exception) as context:
             self.run_test("RMTC", True, False)
         self.assertEqual(str(context.exception), "Training points above max for 0")
 
-    @unittest.skipIf(not compiled_available, "Compiled Fortran libraries not available")
+    @unittest.skipIf(not COMPILED_AVAILABLE, "Compiled Fortran libraries not available")
     def test_RMTC_predict(self):
         self.run_test("RMTC", False, True)
 
-    @unittest.skipIf(not compiled_available, "Compiled Fortran libraries not available")
+    @unittest.skipIf(not COMPILED_AVAILABLE, "Compiled Fortran libraries not available")
     def test_RMTB(self):
         self.run_test("RMTB", False, False)
 
-    @unittest.skipIf(not compiled_available, "Compiled Fortran libraries not available")
+    @unittest.skipIf(not COMPILED_AVAILABLE, "Compiled Fortran libraries not available")
     def test_RMTB_train(self):
         with self.assertRaises(Exception) as context:
             self.run_test("RMTB", True, False)
         self.assertEqual(str(context.exception), "Training points above max for 0")
 
-    @unittest.skipIf(not compiled_available, "Compiled Fortran libraries not available")
+    @unittest.skipIf(not COMPILED_AVAILABLE, "Compiled Fortran libraries not available")
     def test_RMTB_predict(self):
         self.run_test("RMTB", False, True)
 

diff --git a/smt/tests/test_high_dim.py b/smt/tests/test_high_dim.py
@@ -22,9 +22,9 @@
 try:
     from smt.surrogate_models import IDW, RBF, RMTC, RMTB
 
-    compiled_available = True
+    COMPILED_AVAILABLE = True
 except ImportError:
-    compiled_available = False
+    COMPILED_AVAILABLE = False
 
 
 print_output = False
@@ -48,7 +48,7 @@ def setUp(self):
         sms["KRG"] = KRG(theta0=[4e-1] * ndim)
         sms["KPLS"] = KPLS()
 
-        if compiled_available:
+        if COMPILED_AVAILABLE:
             sms["IDW"] = IDW()
             sms["RBF"] = RBF()
 
@@ -129,11 +129,11 @@ def test_sphere_KRG(self):
     def test_sphere_KPLS(self):
         self.run_test()
 
-    @unittest.skipIf(not compiled_available, "Compiled Fortran libraries not available")
+    @unittest.skipIf(not COMPILED_AVAILABLE, "Compiled Fortran libraries not available")
     def test_sphere_IDW(self):
         self.run_test()
 
-    @unittest.skipIf(not compiled_available, "Compiled Fortran libraries not available")
+    @unittest.skipIf(not COMPILED_AVAILABLE, "Compiled Fortran libraries not available")
     def test_sphere_RBF(self):
         self.run_test()
 
@@ -153,11 +153,11 @@ def test_exp_KRG(self):
     def test_exp_KPLS(self):
         self.run_test()
 
-    @unittest.skipIf(not compiled_available, "Compiled Fortran libraries not available")
+    @unittest.skipIf(not COMPILED_AVAILABLE, "Compiled Fortran libraries not available")
     def test_exp_IDW(self):
         self.run_test()
 
-    @unittest.skipIf(not compiled_available, "Compiled Fortran libraries not available")
+    @unittest.skipIf(not COMPILED_AVAILABLE, "Compiled Fortran libraries not available")
     def test_exp_RBF(self):
         self.run_test()
 
@@ -177,11 +177,11 @@ def test_tanh_KRG(self):
     def test_tanh_KPLS(self):
         self.run_test()
 
-    @unittest.skipIf(not compiled_available, "Compiled Fortran libraries not available")
+    @unittest.skipIf(not COMPILED_AVAILABLE, "Compiled Fortran libraries not available")
     def test_tanh_IDW(self):
         self.run_test()
 
-    @unittest.skipIf(not compiled_available, "Compiled Fortran libraries not available")
+    @unittest.skipIf(not COMPILED_AVAILABLE, "Compiled Fortran libraries not available")
     def test_tanh_RBF(self):
         self.run_test()
 
@@ -201,11 +201,11 @@ def test_cos_KRG(self):
     def test_cos_KPLS(self):
         self.run_test()
 
-    @unittest.skipIf(not compiled_available, "Compiled Fortran libraries not available")
+    @unittest.skipIf(not COMPILED_AVAILABLE, "Compiled Fortran libraries not available")
     def test_cos_IDW(self):
         self.run_test()
 
-    @unittest.skipIf(not compiled_available, "Compiled Fortran libraries not available")
+    @unittest.skipIf(not COMPILED_AVAILABLE, "Compiled Fortran libraries not available")
     def test_cos_RBF(self):
         self.run_test()
 

diff --git a/smt/tests/test_output_derivs.py b/smt/tests/test_output_derivs.py
@@ -15,14 +15,13 @@
 from smt.sampling_methods import FullFactorial
 from smt.utils.sm_test_case import SMTestCase
 from smt.utils.silence import Silence
-from smt.utils.misc import compute_rms_error
 
 try:
     from smt.surrogate_models import IDW, RBF, RMTC, RMTB
 
-    compiled_available = True
+    COMPILED_AVAILABLE = True
 except ImportError:
-    compiled_available = False
+    COMPILED_AVAILABLE = False
 
 
 print_output = False
@@ -37,7 +36,7 @@ def setUp(self):
         self.problem = Sphere(ndim=ndim)
 
         self.sms = sms = OrderedDict()
-        if compiled_available:
+        if COMPILED_AVAILABLE:
             sms["IDW"] = IDW()
             sms["RBF"] = RBF()
             sms["RMTB"] = RMTB(
@@ -104,19 +103,19 @@ def run_test(self):
 
         self.assert_error(jac_fd, jac_an, rtol=5e-2)
 
-    @unittest.skipIf(not compiled_available, "Compiled Fortran libraries not available")
+    @unittest.skipIf(not COMPILED_AVAILABLE, "Compiled Fortran libraries not available")
     def test_IDW(self):
         self.run_test()
 
-    @unittest.skipIf(not compiled_available, "Compiled Fortran libraries not available")
+    @unittest.skipIf(not COMPILED_AVAILABLE, "Compiled Fortran libraries not available")
     def test_RBF(self):
         self.run_test()
 
-    @unittest.skipIf(not compiled_available, "Compiled Fortran libraries not available")
+    @unittest.skipIf(not COMPILED_AVAILABLE, "Compiled Fortran libraries not available")
     def test_RMTB(self):
         self.run_test()
 
-    @unittest.skipIf(not compiled_available, "Compiled Fortran libraries not available")
+    @unittest.skipIf(not COMPILED_AVAILABLE, "Compiled Fortran libraries not available")
     def test_RMTC(self):
         self.run_test()