From 23253345e110cbb8880e146bc3d415b2510aca88 Mon Sep 17 00:00:00 2001 From: Harald Klimach Date: Fri, 14 Nov 2025 12:23:14 +0100 Subject: [PATCH 1/2] Merge branch 'main' into openmp --- .gitmodules | 2 ++ atl | 2 +- polynomials | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 9d873a1b7..8a06782dd 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,12 +7,14 @@ [submodule "polynomials"] path = polynomials url = ../polynomials.git + branch = branch/feature/openmp [submodule "bin"] path = bin url = ../apes-bin.git [submodule "atl"] path = atl url = ../ateles-source.git + branch = openmp [submodule "pysys-extensions"] path = pysys-extensions url = ../apes-pysys-extensions.git diff --git a/atl b/atl index f833d91a3..b22d40e0e 160000 --- a/atl +++ b/atl @@ -1 +1 @@ -Subproject commit f833d91a3fcc331444d7fc1eb71f4fd6db84a3da +Subproject commit b22d40e0e0f441e765a2601628e814df8f7e0d33 diff --git a/polynomials b/polynomials index 845fe1fad..a9e57632b 160000 --- a/polynomials +++ b/polynomials @@ -1 +1 @@ -Subproject commit 845fe1fadacfa41071dceb0293bdd4e44fe9e5c6 +Subproject commit a9e57632bc585a957370b366c75bdbf7e4cc924b From 104db14695e7a3eb06e593a7ab891b24698e9e2a Mon Sep 17 00:00:00 2001 From: Harald Klimach Date: Fri, 14 Nov 2025 12:39:48 +0100 Subject: [PATCH 2/2] Fix for fpt performance unit test in polynomials --- polynomials | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/polynomials b/polynomials index a9e57632b..27dc67c25 160000 --- a/polynomials +++ b/polynomials @@ -1 +1 @@ -Subproject commit a9e57632bc585a957370b366c75bdbf7e4cc924b +Subproject commit 27dc67c25fcf3c0c0eaf2efad59c9bdc7f9702cf