started removing dtypes from frontends (WIP)

Author: pancetta

pySDC/core/Level.py

@@ -44,16 +44,13 @@ class level(FrozenClass):
         tau (list of dtype_u): FAS correction, allocated via step class if necessary
     """
 
-    def __init__(self, problem_class, problem_params, dtype_u, dtype_f, sweeper_class, sweeper_params,
-                 level_params, level_index):
+    def __init__(self, problem_class, problem_params, sweeper_class, sweeper_params, level_params, level_index):
         """
         Initialization routine
 
         Args:
             problem_class: problem class
             problem_params (dict): parameters for the problem to be initialized
-            dtype_u: data type of the dofs
-            dtype_f: data type of the RHS
             sweeper_class: sweeper class
             sweeper_params (dict): parameters for the sweeper (contains collocation)
             level_params (dict): parameters given by the user, will be added as attributes
@@ -62,7 +59,7 @@ def __init__(self, problem_class, problem_params, dtype_u, dtype_f, sweeper_clas
 
         # instantiate sweeper, problem and hooks
         self.__sweep = sweeper_class(sweeper_params)
-        self.__prob = problem_class(problem_params, dtype_u, dtype_f)
+        self.__prob = problem_class(problem_params)
 
         # set level parameters and status
         self.params = _Pars(level_params)

pySDC/core/Step.py

@@ -85,8 +85,11 @@ def __generate_hierarchy(self, descr):
             descr (dict): dictionary containing the description of the levels as list per key
         """
 
+        assert 'dtype_u' not in descr
+        assert 'dtype_f' not in descr
+
         # assert the existence of all the keys we need to set up at least on level
-        essential_keys = ['problem_class', 'dtype_u', 'dtype_f', 'sweeper_class', 'sweeper_params', 'level_params']
+        essential_keys = ['problem_class', 'sweeper_class', 'sweeper_params', 'level_params']
         for key in essential_keys:
             if key not in descr:
                 msg = 'need %s to instantiate step, only got %s' % (key, str(descr.keys()))
@@ -131,8 +134,6 @@ def __generate_hierarchy(self, descr):
 
             L = levclass.level(problem_class=descr_list[l]['problem_class'],
                                problem_params=descr_list[l]['problem_params'],
-                               dtype_u=descr_list[l]['dtype_u'],
-                               dtype_f=descr_list[l]['dtype_f'],
                                sweeper_class=descr_list[l]['sweeper_class'],
                                sweeper_params=descr_list[l]['sweeper_params'],
                                level_params=descr_list[l]['level_params'],

pySDC/implementations/problem_classes/GeneralizedFisher_1D_PETSc.py

@@ -1,6 +1,8 @@
 import numpy as np
 from petsc4py import PETSc
 
+from pySDC.implementations.datatype_classes.petsc_dmda_grid import petsc_data, rhs_2comp_petsc_data, rhs_imex_petsc_data
+
 from pySDC.core.Problem import ptype
 from pySDC.core.Errors import ParameterError
 
@@ -181,14 +183,14 @@ class petsc_fisher_multiimplicit(ptype):
     """
     Problem class implementing the multi-implicit 1D generalized Fisher equation with periodic BC and PETSc
     """
-    def __init__(self, problem_params, dtype_u, dtype_f):
+    def __init__(self, problem_params, dtype_u=petsc_data, dtype_f=rhs_2comp_petsc_data):
         """
         Initialization routine
 
         Args:
             problem_params: custom parameters for the example
-            dtype_u: particle data type (will be passed parent class)
-            dtype_f: acceleration data type (will be passed parent class)
+            dtype_u: PETSc data type (will be passed to parent class)
+            dtype_f: PETSc data type with 2 components (will be passed to parent class)
         """
 
         # define optional parameters
@@ -440,6 +442,20 @@ class petsc_fisher_fullyimplicit(petsc_fisher_multiimplicit):
     Problem class implementing the fully-implicit 2D Gray-Scott reaction-diffusion equation with periodic BC and PETSc
     """
 
+    def __init__(self, problem_params, dtype_u=petsc_data, dtype_f=petsc_data):
+        """
+        Initialization routine
+
+        Args:
+            problem_params: custom parameters for the example
+            dtype_u: PETSc data type (will be passed to parent class)
+            dtype_f: PETSc data type (will be passed to parent class)
+        """
+
+        # invoke super init, passing number of dofs, dtype_u and dtype_f
+        super(petsc_fisher_fullyimplicit, self).__init__(problem_params=problem_params, dtype_u=dtype_u,
+                                                         dtype_f=dtype_f)
+
     def eval_f(self, u, t):
         """
         Routine to evaluate the RHS
@@ -499,6 +515,20 @@ class petsc_fisher_semiimplicit(petsc_fisher_multiimplicit):
     Problem class implementing the semi-implicit 2D Gray-Scott reaction-diffusion equation with periodic BC and PETSc
     """
 
+    def __init__(self, problem_params, dtype_u=petsc_data, dtype_f=rhs_imex_petsc_data):
+        """
+        Initialization routine
+
+        Args:
+            problem_params: custom parameters for the example
+            dtype_u: PETSc data type (will be passed to parent class)
+            dtype_f: PETSc data type with implicit and explicit parts (will be passed to parent class)
+        """
+
+        # invoke super init, passing number of dofs, dtype_u and dtype_f
+        super(petsc_fisher_semiimplicit, self).__init__(problem_params=problem_params, dtype_u=dtype_u,
+                                                        dtype_f=dtype_f)
+
     def eval_f(self, u, t):
         """
         Routine to evaluate the RHS

pySDC/projects/SDC_showdown/SDC_timing_Fisher.py

@@ -4,7 +4,6 @@
 
 from pySDC.implementations.problem_classes.GeneralizedFisher_1D_PETSc import petsc_fisher_multiimplicit, \
     petsc_fisher_fullyimplicit, petsc_fisher_semiimplicit
-from pySDC.implementations.datatype_classes.petsc_dmda_grid import petsc_data, rhs_2comp_petsc_data, rhs_imex_petsc_data
 from pySDC.implementations.collocation_classes.gauss_radau_right import CollGaussRadau_Right
 from pySDC.implementations.sweeper_classes.multi_implicit import multi_implicit
 from pySDC.implementations.sweeper_classes.imex_1st_order import imex_1st_order
@@ -69,8 +68,6 @@ def setup_parameters():
     description = dict()
     description['problem_class'] = None  # pass problem class
     description['problem_params'] = problem_params  # pass problem parameters
-    description['dtype_u'] = petsc_data  # pass data type for u
-    description['dtype_f'] = None  # pass data type for f
     description['sweeper_class'] = None  # pass sweeper (see part B)
     description['sweeper_params'] = sweeper_params  # pass sweeper parameters
     description['level_params'] = level_params  # pass level parameters
@@ -100,15 +97,12 @@ def run_SDC_variant(variant=None, inexact=False):
     # add stuff based on variant
     if variant == 'fully-implicit':
         description['problem_class'] = petsc_fisher_fullyimplicit
-        description['dtype_f'] = petsc_data
         description['sweeper_class'] = generic_implicit
     elif variant == 'semi-implicit':
         description['problem_class'] = petsc_fisher_semiimplicit
-        description['dtype_f'] = rhs_imex_petsc_data
         description['sweeper_class'] = imex_1st_order
     elif variant == 'multi-implicit':
         description['problem_class'] = petsc_fisher_multiimplicit
-        description['dtype_f'] = rhs_2comp_petsc_data
         description['sweeper_class'] = multi_implicit
     else:
         raise NotImplemented('Wrong variant specified, got %s' % variant)
@@ -209,7 +203,7 @@ def show_results(fname):
     return None
 
 
-def main():
+def main(cwd=''):
     """
     Main driver
 
@@ -225,7 +219,7 @@ def main():
         results[(variant, 'inexact')] = run_SDC_variant(variant=variant, inexact=True)
 
     # dump result
-    fname = 'data/timings_SDC_variants_Fisher'
+    fname = cwd + 'data/timings_SDC_variants_Fisher'
     file = open(fname + '.pkl', 'wb')
     pickle.dump(results, file)
     file.close()

requirements.txt

@@ -5,4 +5,5 @@ matplotlib>=1.5.3
 pep8
 dill>=0.2.6
 numba>=0.35
+petsc4py>=3.10.0
 pyfftw