use logging module for progress reports

This commit is contained in:
Jan Petykiewicz 2017-05-20 21:23:18 -07:00
parent 9d33744427
commit 6748181f8f

View File

@ -3,6 +3,7 @@ Solvers for FDFD problems.
""" """
from typing import List, Callable, Dict, Any from typing import List, Callable, Dict, Any
import logging
import numpy import numpy
from numpy.linalg import norm from numpy.linalg import norm
@ -11,6 +12,9 @@ import scipy.sparse.linalg
from . import operators from . import operators
logger = logging.getLogger(__name__)
def _scipy_qmr(A: scipy.sparse.csr_matrix, def _scipy_qmr(A: scipy.sparse.csr_matrix,
b: numpy.ndarray, b: numpy.ndarray,
**kwargs **kwargs
@ -29,20 +33,20 @@ def _scipy_qmr(A: scipy.sparse.csr_matrix,
''' '''
iter = 0 iter = 0
def print_residual(xk): def log_residual(xk):
nonlocal iter nonlocal iter
iter += 1 iter += 1
if iter % 100 == 0: if iter % 100 == 0:
print('Solver residual at iteration', iter, ':', norm(A @ xk - b)) logger.info('Solver residual at iteration {} : {}'.format(iter, norm(A @ xk - b)))
if 'callback' in kwargs: if 'callback' in kwargs:
def augmented_callback(xk): def augmented_callback(xk):
print_residual(xk) log_residual(xk)
kwargs['callback'](xk) kwargs['callback'](xk)
kwargs['callback'] = augmented_callback kwargs['callback'] = augmented_callback
else: else:
kwargs['callback'] = print_residual kwargs['callback'] = log_residual
''' '''
Run the actual solve Run the actual solve
@ -83,7 +87,7 @@ def generic(omega: complex,
b: numpy.ndarray b: numpy.ndarray
x: numpy.ndarray x: numpy.ndarray
Default is a wrapped version of scipy.sparse.linalg.qmr() Default is a wrapped version of scipy.sparse.linalg.qmr()
which doesn't return convergence info and prints the residual which doesn't return convergence info and logs the residual
every 100 iterations. every 100 iterations.
:param matrix_solver_opts: Passed as kwargs to matrix_solver(...) :param matrix_solver_opts: Passed as kwargs to matrix_solver(...)
:return: E-field which solves the system. :return: E-field which solves the system.