added option to turn off parallelization

Author: passscoed

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "pyGroupedTransforms"
-version = "0.1.0"
+version = "0.2.0"
 authors = [
   { name="Felix Wirth", email="fwi012001@gmail.com" },
 ]

src/pyGroupedTransforms/GroupedTransform.py

@@ -184,6 +184,7 @@ def __init__(
         X,
         settings=[],
         fastmult=True,
+        parallel=True,
         basis_vect=[],
         N=[],
         U=None,
@@ -232,6 +233,7 @@ def __init__(
         self.basis_vect = basis_vect
         self.system = system
         self.X = X
+        self.parallel = parallel
 
         if len(settings) == 0:
             self.settings = get_setting(system=system, N=N, U=U, d=d, ds=ds)
@@ -322,20 +324,25 @@ def __mul__(self, other):
 
         if isinstance(other, np.ndarray):  # `f = F*f`    (f = other)
             if self.fastmult:
-                threads = []
                 fhat = GroupedCoefficients(self.settings)
 
                 def adjoint_worker(i):
                     adjoint_result = self.transforms[i].H @ other
                     fhat[self.settings[i].u] = adjoint_result
-
-                for i in range(len(self.transforms)):
-                    t = threading.Thread(target=adjoint_worker, args=(i,))
-                    t.start()
-                    threads.append(t)
-
-                for t in threads:
-                    t.join()
+                    
+                if self.parallel:
+                    threads = []
+                    for i in range(len(self.transforms)):
+                        t = threading.Thread(target=adjoint_worker, args=(i,))
+                        t.start()
+                        threads.append(t)
+
+                    for t in threads:
+                        t.join()
+                        
+                else:
+                    for i in range(len(self.transforms)):
+                        adjoint_worker(i)
 
                 return fhat
             else:
@@ -349,20 +356,24 @@ def adjoint_worker(i):
                 )
 
             if self.fastmult:
-                threads = []
                 results = []
 
                 def worker(i):
                     u = self.settings[i].u
                     result = self.transforms[i] @ other[u]
                     results.append(result)
 
-                for i in range(len(self.transforms)):
-                    t = threading.Thread(target=worker, args=(i,))
-                    t.start()
-                    threads.append(t)
-                for t in threads:
-                    t.join()
+                if self.parallel:
+                    threads = []
+                    for i in range(len(self.transforms)):
+                        t = threading.Thread(target=worker, args=(i,))
+                        t.start()
+                        threads.append(t)
+                    for t in threads:
+                        t.join()
+                else:
+                    for i in range(len(self.transforms)):
+                        worker(i)
 
                 return sum(results)
             else:

src/pyGroupedTransforms/__init__.py

@@ -35,4 +35,7 @@
     "Setting",
     "GroupedCoefficientsComplex",
     "GroupedCoefficientsReal",
+    "get_superposition_set", #TODO: Exports ab hier testen
+    "GroupedTransform",
+    "GroupedCoefficients",
 ]