jan/opencl_fdtd
2
2
Fork 1
Code Issues Pull Requests Releases Wiki Activity

type modernization

Browse Source
This commit is contained in:
Jan Petykiewicz 2024-01-10 20:54:12 -08:00
parent 654f9c165b
commit d0011cb1f9
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
opencl_fdtd/simulation.py
View File

@ -2,7 +2,7 @@
Class for constructing and holding the basic FDTD operations and fields Class for constructing and holding the basic FDTD operations and fields
""" """
from typing import List, Dict, Callable, Type, Union, Optional, Sequence from typing import Callable, Type, Sequence
from collections import OrderedDict from collections import OrderedDict
import numpy import numpy
from numpy.typing import NDArray from numpy.typing import NDArray
@ -62,29 +62,29 @@ class Simulation(object):
S: pyopencl.array.Array S: pyopencl.array.Array
eps: pyopencl.array.Array eps: pyopencl.array.Array
dt: float dt: float
inv_dxes: List[pyopencl.array.Array] inv_dxes: list[pyopencl.array.Array]
arg_type: Type arg_type: Type
context: pyopencl.Context context: pyopencl.Context
queue: pyopencl.CommandQueue queue: pyopencl.CommandQueue
update_E: Callable[[List[pyopencl.Event]], pyopencl.Event] update_E: Callable[[list[pyopencl.Event]], pyopencl.Event]
update_H: Callable[[List[pyopencl.Event]], pyopencl.Event] update_H: Callable[[list[pyopencl.Event]], pyopencl.Event]
update_S: Callable[[List[pyopencl.Event]], pyopencl.Event] update_S: Callable[[list[pyopencl.Event]], pyopencl.Event]
update_J: Callable[[List[pyopencl.Event]], pyopencl.Event] update_J: Callable[[list[pyopencl.Event]], pyopencl.Event]
sources: Dict[str, str] sources: dict[str, str]
def __init__( def __init__(
self, self,
epsilon: NDArray, epsilon: NDArray,
pmls: Sequence[Dict[str, float]], pmls: Sequence[dict[str, float]],
bloch_boundaries: Sequence[Dict[str, float]] = (), bloch_boundaries: Sequence[dict[str, float]] = (),
dxes: Union[List[List[NDArray]], float, None] = None, dxes: list[list[NDArray]] | float | None = None,
dt: Optional[float] = None, dt: float | None = None,
initial_fields: Optional[Dict[str, NDArray]] = None, initial_fields: dict[str, NDArray] | None = None,
context: Optional[pyopencl.Context] = None, context: pyopencl.Context | None = None,
queue: Optional[pyopencl.CommandQueue] = None, queue: pyopencl.CommandQueue | None = None,
float_type: Type = numpy.float32, float_type: Type = numpy.float32,
do_poynting: bool = True, do_poynting: bool = True,
do_fieldsrc: bool = False, do_fieldsrc: bool = False,
@ -331,8 +331,8 @@ class Simulation(object):
def _create_context( def _create_context(
self, self,
context: Optional[pyopencl.Context] = None, context: pyopencl.Context | None = None,
queue: Optional[pyopencl.CommandQueue] = None, queue: pyopencl.CommandQueue | None = None,
) -> None: ) -> None:
if context is None: if context is None:
self.context = pyopencl.create_some_context() self.context = pyopencl.create_some_context()
@ -353,7 +353,7 @@ class Simulation(object):
raise Exception(f'Epsilon shape mismatch. Expected {self.shape}, got {epsilon[0].shape}') raise Exception(f'Epsilon shape mismatch. Expected {self.shape}, got {epsilon[0].shape}')
self.eps = pyopencl.array.to_device(self.queue, vec(epsilon).astype(self.arg_type)) self.eps = pyopencl.array.to_device(self.queue, vec(epsilon).astype(self.arg_type))
def _create_field(self, initial_value: Optional[NDArray] = None) -> pyopencl.array.Array: def _create_field(self, initial_value: NDArray | None = None) -> pyopencl.array.Array:
if initial_value is None: if initial_value is None:
return pyopencl.array.zeros_like(self.eps) return pyopencl.array.zeros_like(self.eps)
else: else: