diff --git a/doc/conf.py b/doc/conf.py index 33ad35cfc2152c311cf845425e4643f3c134eb7d..62a9d725b3005b7a16cfa4f77c61c22d596cd7b9 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -280,4 +280,4 @@ intersphinx_mapping = { 'https://documen.tician.de/loopy/': None, 'https://documen.tician.de/sumpy/': None, } -autoclass_content = "both" +autoclass_content = "class" diff --git a/pytential/qbx/cost.py b/pytential/qbx/cost.py index 6071dea5c86afd04f3678718b7fef62deda95489..88cef8e437499081fab9e6f24d1cc46aeb95562e 100644 --- a/pytential/qbx/cost.py +++ b/pytential/qbx/cost.py @@ -40,7 +40,8 @@ from functools import partial import sys from boxtree.cost import ( - FMMTranslationCostModel, AbstractFMMCostModel, FMMCostModel, _PythonFMMCostModel + FMMTranslationCostModel, AbstractFMMCostModel as BaseAbstractFMMCostModel, + FMMCostModel, _PythonFMMCostModel ) from abc import abstractmethod @@ -193,7 +194,7 @@ def make_taylor_translation_cost_model(dim, nlevels): # {{{ abstract cost model -class AbstractQBXCostModel(AbstractFMMCostModel): +class AbstractQBXCostModel(BaseAbstractFMMCostModel): """An interface to obtain both QBX operation counts and calibrated (e.g. in seconds) cost estimates. @@ -503,7 +504,7 @@ class AbstractQBXCostModel(AbstractFMMCostModel): @staticmethod def get_unit_calibration_params(): - calibration_params = AbstractFMMCostModel.get_unit_calibration_params() + calibration_params = BaseAbstractFMMCostModel.get_unit_calibration_params() calibration_params.update(dict( c_p2qbxl=1.0, @@ -529,8 +530,8 @@ class AbstractQBXCostModel(AbstractFMMCostModel): stage_to_param_names = self._QBX_STAGE_TO_CALIBRATION_PARAMETER.copy() stage_to_param_names.update(additional_stage_to_param_names) - return AbstractFMMCostModel.estimate_calibration_params( - self, model_results, timing_results, time_field_name=time_field_name, + return super().estimate_calibration_params( + model_results, timing_results, time_field_name=time_field_name, additional_stage_to_param_names=stage_to_param_names )