Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Try using scipp.elemwise_func #381

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

Try using scipp.elemwise_func #381

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8b5a43c
Try using scipp.elemwise_func
jl-wynen Nov 21, 2022
6af1be7
Make numba optional
SimonHeybrock Dec 8, 2022
ff33271
Comment on dtype check
SimonHeybrock Dec 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ set(CMAKE_CXX_EXTENSIONS OFF)
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")

find_package(Python 3.8 REQUIRED COMPONENTS Interpreter Development)
find_package(scipp 0.17 REQUIRED COMPONENTS conan-config)
find_package(scipp 22.11 REQUIRED COMPONENTS conan-config)
find_package(GTest CONFIG REQUIRED)
find_package(pybind11 CONFIG REQUIRED)
find_package(scipp 0.17 REQUIRED)
find_package(scipp 22.11 REQUIRED)

find_program(CCACHE ccache)
if(CCACHE)
Expand Down
28 changes: 28 additions & 0 deletions src/scippneutron/conversion/tof.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,25 @@ def _energy_transfer_t0(energy, tof, length):
return length.astype(dtype, copy=False) * sc.sqrt(c / energy)


try:
import numba
except ImportError:
energy_transfer_direct_from_tof_numba_float64 = None
else:
sig = numba.double(numba.double, numba.double, numba.double, numba.double)

@numba.cfunc(sig)
def dE(tof, t0, scale, incident_energy):
return incident_energy - scale / (tof - t0)**2

def dE_or_nan(tof, t0, scale, incident_energy):
delta_tof = tof - t0
return np.NAN if delta_tof <= 0.0 else dE(tof, t0, scale, incident_energy)

energy_transfer_direct_from_tof_numba_float64 = sc.elemwise_func(
dE_or_nan, unit_func=dE, auto_convert_dtypes=True)


def energy_transfer_direct_from_tof(*, tof: VariableLike, L1: VariableLike,
L2: VariableLike,
incident_energy: VariableLike) -> VariableLike:
Expand Down Expand Up @@ -179,6 +198,15 @@ def energy_transfer_direct_from_tof(*, tof: VariableLike, L1: VariableLike,
c = _energy_constant(elem_unit(incident_energy), tof, L2)
dtype = _common_dtype(incident_energy, tof)
scale = (c * L2**2).astype(dtype, copy=False)
jl-wynen marked this conversation as resolved.
Show resolved Hide resolved

if (energy_transfer_direct_from_tof_numba_float64 is not None) and (tof.dtype
== 'float64'):
# We could use this even of tof.dtype is not float64, but then there would be
# an allocation of significant size for the dtype conversion, so using the
# Numba branch is probably not with it.
return energy_transfer_direct_from_tof_numba_float64(tof, t0, scale,
incident_energy)

delta_tof = tof - t0
return sc.where(delta_tof <= sc.scalar(0, unit=elem_unit(delta_tof)),
sc.scalar(np.nan, dtype=dtype, unit=elem_unit(incident_energy)),
Expand Down