Rework some tests for shorter CI runs

.gitignore

@@ -4,7 +4,7 @@
 *.so
 *.lock
 __psydac__/
-__*pyccel__/
+__*pyccel__*/
 docs/source/modules/STUBDIR/*
 
 build
@@ -13,6 +13,7 @@ build
 *dist*
 usr
 *cache*
+prof
 
 *.swp
 *.log

psydac/api/settings.py

@@ -20,11 +20,19 @@
 
 PSYDAC_BACKEND_GPYCCEL  = {'name': 'pyccel',
                        'compiler_family': 'GNU',
-                       'flags'   : '-O3 -ffast-math',
+                       'flags'   : '-O3 -ffast-math -march=native',
                        'folder'  : '__gpyccel__',
                        'tag'     : 'gpyccel',
                        'openmp'  : False}
 
+# [MCP 10.02.2026] this flag was used previously for intel mac, should we add it ?
+# if not platform.system() == "Darwin":
+#     PSYDAC_BACKEND_GPYCCEL['flags'] += ' -mtune=native'
+
+# [MCP 10.02.2026] YG's suggestion:
+if platform.machine() == 'x86_64':
+    PSYDAC_BACKEND_GPYCCEL['flags'] += ' -mavx'
+
 PSYDAC_BACKEND_IPYCCEL  = {'name': 'pyccel',
                        'compiler_family': 'intel',
                        'flags'   : '-O3',
@@ -53,26 +61,31 @@
 gfortran_version = Version(gfortran_version_string)
 
 # Platform-dependent flags
-if platform.system() == "Darwin" and platform.machine() == 'arm64' and gfortran_version >= Version("14"):
-
-    # Apple silicon requires architecture-specific flags (see https://github.com/pyccel/psydac/pull/411)
-    # which are only available on GCC version >= 14
-    cpu_brand = subprocess.check_output(['sysctl','-n','machdep.cpu.brand_string']).decode('utf-8').strip() # nosec B603, B607
-    if cpu_brand.startswith("Apple M"):
-        # Example: "Apple M3 Pro (virtual)" --> " -mcpu=apple-m3"
-        cpu_flag = '-'.join(cpu_brand.lower().split()[:2])
-        PSYDAC_BACKEND_GPYCCEL['flags'] += f' -mcpu={cpu_flag}'
-    else:
-        # TODO: Support later Apple CPU models. Perhaps the CPU naming scheme could be easily guessed
-        # based on the output of 'sysctl -n machdep.cpu.brand_string', but I wouldn't rely on this
-        # guess unless it has been manually verified. Loud errors are better than silent failures!
-        raise SystemError(f"Unsupported Apple CPU '{cpu_brand}'.")
-
-else:
-    # Default architecture flags
-    PSYDAC_BACKEND_GPYCCEL['flags'] += ' -march=native -mtune=native'
-    if platform.machine() == 'x86_64':
-        PSYDAC_BACKEND_GPYCCEL['flags'] += ' -mavx'
+# if platform.system() == "Darwin" and platform.machine() == 'arm64':
+#     PSYDAC_BACKEND_GPYCCEL['flags'] += ' -march=native'
+
+# [MCP] version before PR #569, delete if OK:
+# if platform.system() == "Darwin" and platform.machine() == 'arm64' and gfortran_version >= Version("14"):
+#
+#     # Apple silicon requires architecture-specific flags (see https://github.com/pyccel/psydac/pull/411)
+#     # which are only available on GCC version >= 14
+#     cpu_brand = subprocess.check_output(['sysctl','-n','machdep.cpu.brand_string']).decode('utf-8').strip() # nosec B603, B607
+#     if cpu_brand.startswith("Apple M"):
+#         # Example: "Apple M3 Pro (virtual)" --> " -mcpu=apple-m3"
+#         cpu_flag = '-'.join(cpu_brand.lower().split()[:2])
+#         cpu_flag = cpu_flag.replace('4', '3')
+#         PSYDAC_BACKEND_GPYCCEL['flags'] += f' -mcpu={cpu_flag}'
+#     else:
+#         # TODO: Support later Apple CPU models. Perhaps the CPU naming scheme could be easily guessed
+#         # based on the output of 'sysctl -n machdep.cpu.brand_string', but I wouldn't rely on this
+#         # guess unless it has been manually verified. Loud errors are better than silent failures!
+#         raise SystemError(f"Unsupported Apple CPU '{cpu_brand}'.")
+
+# else:
+#     # Default architecture flags
+#     PSYDAC_BACKEND_GPYCCEL['flags'] += ' -march=native -mtune=native'
+#     if platform.machine() == 'x86_64':
+#         PSYDAC_BACKEND_GPYCCEL['flags'] += ' -mavx'
 
 #==============================================================================
 
@@ -83,4 +96,4 @@
     'pyccel-intel' : PSYDAC_BACKEND_IPYCCEL,
     'pyccel-pgi'   : PSYDAC_BACKEND_PGPYCCEL,
     'pyccel-nvidia': PSYDAC_BACKEND_NVPYCCEL,
-}
+}

psydac/api/tests/test_2d_multipatch_mapping_maxwell.py

@@ -147,7 +147,25 @@ def test_maxwell_2d_2_patch_dirichlet_0():
 #------------------------------------------------------------------------------
 def test_maxwell_2d_2_patch_dirichlet_1():
 
-    domain = build_pretzel()
+    # domain = build_pretzel()    # a lot of patches, takes a long time
+
+    bounds1   = (0.5, 1.)
+    bounds2_A = (0, np.pi/2)
+    bounds2_B = (np.pi/2, np.pi)
+
+    A = Square('A',bounds1=bounds1, bounds2=bounds2_A)
+    B = Square('B',bounds1=bounds1, bounds2=bounds2_B)
+
+    mapping_1 = PolarMapping('M1',2, c1= 0., c2= 0., rmin = 0., rmax=1.)
+    mapping_2 = PolarMapping('M2',2, c1= 0., c2= 0., rmin = 0., rmax=1.)
+
+    D1     = mapping_1(A)
+    D2     = mapping_2(B)
+
+    connectivity = [((0,1,1),(1,1,-1))]
+    patches = [D1,D2]
+    domain = Domain.join(patches, connectivity, 'domain')
+
     x,y    = domain.coordinates
 
     omega = 1.5
@@ -158,8 +176,9 @@ def test_maxwell_2d_2_patch_dirichlet_1():
 
     l2_error, Eh      = run_maxwell_2d(Eex, f, alpha, domain, ncells=[2**2, 2**2], degree=[2,2])
 
-    expected_l2_error = 1.5941322657006822
-
+
+    expected_l2_error = 0.06335070876243 # 1.5941322657006822
+    print(l2_error, abs(l2_error - expected_l2_error))
     assert abs(l2_error - expected_l2_error) < 1e-7
 
 #------------------------------------------------------------------------------

psydac/feec/tests/test_commuting_projections.py

@@ -29,7 +29,7 @@
 @pytest.mark.parametrize('bc', [True, False])
 @pytest.mark.parametrize('p', [2, 3])
 @pytest.mark.parametrize('Nq', [5])
-@pytest.mark.parametrize('Nel', [5, 6])
+@pytest.mark.parametrize('Nel', [5]) #, 6])
 def test_3d_commuting_pro_1(Nel, Nq, p, bc, m):
 
     fun1    = lambda xi1, xi2, xi3 : np.sin(xi1)*np.sin(xi2)*np.sin(xi3)
@@ -103,7 +103,7 @@ def test_3d_commuting_pro_1(Nel, Nq, p, bc, m):
 @pytest.mark.parametrize('bc', [True, False])
 @pytest.mark.parametrize('p', [2, 3])
 @pytest.mark.parametrize('Nq', [7])
-@pytest.mark.parametrize('Nel', [5, 6])
+@pytest.mark.parametrize('Nel', [5]) #, 6])
 def test_3d_commuting_pro_2(Nel, Nq, p, bc, m):
 
     fun1    = lambda xi1, xi2, xi3 : np.sin(xi1)*np.sin(xi2)*np.sin(xi3)
@@ -195,7 +195,7 @@ def test_3d_commuting_pro_2(Nel, Nq, p, bc, m):
 @pytest.mark.parametrize('bc', [True, False])
 @pytest.mark.parametrize('p', [2, 3])
 @pytest.mark.parametrize('Nq', [7])
-@pytest.mark.parametrize('Nel', [5, 6])
+@pytest.mark.parametrize('Nel', [5]) #, 6])
 def test_3d_commuting_pro_3(Nel, Nq, p, bc, m):
 
     fun1    = lambda xi1, xi2, xi3 : np.sin(xi1)*np.sin(xi2)*np.sin(xi3)
@@ -278,7 +278,7 @@ def test_3d_commuting_pro_3(Nel, Nq, p, bc, m):
 # 2D tests
 #==============================================================================
 @pytest.mark.mpi
-@pytest.mark.parametrize('Nel', [8, 12])
+@pytest.mark.parametrize('Nel', [8]) #, 12])
 @pytest.mark.parametrize('Nq', [5])
 @pytest.mark.parametrize('p', [2,3])
 @pytest.mark.parametrize('bc', [True, False])
@@ -351,7 +351,7 @@ def test_2d_commuting_pro_1(Nel, Nq, p, bc, m):
     assert norm2_e1 < 1e-12
 
 @pytest.mark.mpi
-@pytest.mark.parametrize('Nel', [8, 12])
+@pytest.mark.parametrize('Nel', [8]) #, 12])
 @pytest.mark.parametrize('Nq', [5])
 @pytest.mark.parametrize('p', [2,3])
 @pytest.mark.parametrize('bc', [True, False])
@@ -424,7 +424,7 @@ def test_2d_commuting_pro_2(Nel, Nq, p, bc, m):
     assert norm2_e0 < 1e-12
 
 @pytest.mark.mpi
-@pytest.mark.parametrize('Nel', [8, 12])
+@pytest.mark.parametrize('Nel', [8]) #, 12])
 @pytest.mark.parametrize('Nq', [8])
 @pytest.mark.parametrize('p', [2,3])
 @pytest.mark.parametrize('bc', [True, False])
@@ -504,7 +504,7 @@ def test_2d_commuting_pro_3(Nel, Nq, p, bc, m):
     assert norm2_e3 < 1e-12
 
 @pytest.mark.mpi
-@pytest.mark.parametrize('Nel', [8, 12])
+@pytest.mark.parametrize('Nel', [8]) #, 12])
 @pytest.mark.parametrize('Nq', [8])
 @pytest.mark.parametrize('p', [2,3])
 @pytest.mark.parametrize('bc', [True, False])

psydac/feec/tests/test_commuting_projections_dual.py

@@ -15,7 +15,7 @@
 import pytest
 
 
-@pytest.mark.parametrize('Nel', [8, 12])
+@pytest.mark.parametrize('Nel', [8]) #, 12])
 @pytest.mark.parametrize('Nq', [5])
 @pytest.mark.parametrize('p', [2, 3])
 @pytest.mark.parametrize('bc', [True, False])
@@ -58,7 +58,7 @@ def test_transpose_div_3d(Nel, Nq, p, bc, m):
     assert error < 2e-10
 
 
-@pytest.mark.parametrize('Nel', [8, 12])
+@pytest.mark.parametrize('Nel', [8]) #, 12])
 @pytest.mark.parametrize('Nq', [6])
 @pytest.mark.parametrize('p', [2, 3])
 @pytest.mark.parametrize('bc', [True, False])
@@ -116,7 +116,7 @@ def test_transpose_curl_3d(Nel, Nq, p, bc, m):
     assert error < 2e-9
 
 
-@pytest.mark.parametrize('Nel', [8, 12])
+@pytest.mark.parametrize('Nel', [8]) #, 12])
 @pytest.mark.parametrize('Nq', [6])
 @pytest.mark.parametrize('p', [2, 3])
 @pytest.mark.parametrize('bc', [True, False])

psydac/feec/tests/test_feec_conf_projectors_cart_2d.py

@@ -54,7 +54,7 @@ def get_polynomial_function(degree, hom_bc_axes, domain):
 @pytest.mark.parametrize('nc', [5])
 @pytest.mark.parametrize('reg', [0])
 @pytest.mark.parametrize('hom_bc', [False, True])
-@pytest.mark.parametrize('domain_name', ["1patch", "4patch_nc", "2patch_nc"])
+@pytest.mark.parametrize('domain_name', ["1patch", "4patch_nc"]) #, "2patch_nc"])
 @pytest.mark.parametrize("nonconforming, full_mom_pres",
                          [(True, True), (False, True)])