8000 Implement half dtype by mwiebe · Pull Request #16 · numpy/numpy · GitHub
[go: up one dir, main page]
Skip to content

Implement half dtype #16

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

Closed
wants to merge 10 commits into from
Closed

Implement half dtype #16

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
2234e1a
ENH: core: Create half/float16 data type
mwiebe Nov 10, 2010
3e06912
ENH: core: Implement half/float16 umath loops
mwiebe Dec 2, 2010
6eeeec7
ENH: core: Update the sorting module for half/float16
mwiebe Nov 10, 2010
57ce532
ENH: core: Fix up coercion rules for half/float16
mwiebe Nov 10, 2010
21c6094
ENH: core: Add half/float16 finfo support
mwiebe Nov 9, 2010
05e7f49
ENH: core: Add floating point exception support to the half/float16 type
mwiebe Nov 10, 2010
3d901cb
TST: Refactor the half test to use a fixture
mwiebe Nov 28, 2010
9cddfbc
ENH: core: Add half/float16 character code to numpy.typecodes
mwiebe Nov 11, 2010
dc4e197
DOC: core: Update docs for half/float16 type
mwiebe Nov 11, 2010
75cf9f0
ENH: Rename the half character code from 'j' to 'e'
mwiebe Nov 28, 2010
10000
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
Prev Previous commit
Next Next commit
ENH: core: Implement half/float16 umath loops
  • Loading branch information
@mwiebe
mwiebe committed Dec 2, 2010
commit 3e0691237cf475f1c4cdfdd6c1fb3040f0461580
107 changes: 62 additions & 45 deletions numpy/core/code_generators/generate_umath.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,16 @@ class TypeDescription(object):
The typecode(s) of the inputs.
out : str or None, optional
The typecode(s) of the outputs.
astype : dict or None, optional
If astype['x'] is 'y', uses PyUFunc_x_x_As_y_y/PyUFunc_xx_x_As_yy_y
instead of PyUFunc_x_x/PyUFunc_xx_x.
"""
def __init__(self, type, f=None, in_=None, out=None):
def __init__(self, type, f=None, in_=None, out=None, astype=None):
self.type = type
self.func_data = f
if astype is None:
astype = {}
self.astype_dict = astype
if in_ is not None:
in_ = in_.replace('P', type)
self.in_ = in_
Expand All @@ -49,8 +55,9 @@ def finish_signature(self, nin, nout):
if self.out is None:
self.out = self.type * nout
assert len(self.out) == nout
self.astype = self.astype_dict.get(self.type, None)

_fdata_map = dict(f='npy_%sf', d='npy_%s', g='npy_%sl',
_fdata_map = dict(j='npy_%sf', f='npy_%sf', d='npy_%s', g='npy_%sl',
F='nc_%sf', D='nc_%s', G='nc_%sl')
def build_func_data(types, f):
func_data = []
Expand All @@ -59,7 +66,7 @@ def build_func_data(types, f):
func_data.append(d)
return func_data

def TD(types, f=None, in_=None, out=None):
def TD(types, f=None, astype=None, in_=None, out=None):
if f is not None:
if isinstance(f, str):
func_data = build_func_data(types, f)
Expand All @@ -78,7 +85,7 @@ def TD(types, f=None, in_=None, out=None):
out = (None,) * len(types)
tds = []
for t, fd, i, o in zip(types, func_data, in_, out):
tds.append(TypeDescription(t, f=fd, in_=i, out=o))
tds.append(TypeDescription(t, f=fd, in_=i, out=o, astype=astype))
return tds

class Ufunc(object):
Expand Down Expand Up @@ -166,6 +173,7 @@ def english_upper(s):
'L': 'ulong',
'q': 'longlong',
'Q': 'ulonglong',
'j': 'half',
'f': 'float',
'd': 'double',
'g': 'longdouble',
Expand All @@ -180,15 +188,15 @@ def english_upper(s):
'P': 'OBJECT',
}

all = '?bBhHiIlLqQfdgFDGOMm'
all = '?bBhHiIlLqQjfdgFDGOMm'
O = 'O'
P = 'P'
ints = 'bBhHiIlLqQ'
times = 'Mm'
intsO = ints + O
bints = '?' + ints
bintsO = bints + O
flts = 'fdg'
flts = 'jfdg'
fltsO = flts + O
fltsP = flts + P
cmplx = 'FDG'
Expand Down Expand Up @@ -217,6 +225,10 @@ def english_upper(s):
uint64 = english_upper(code)
break

# This dictionary describes all the ufunc implementations, generating
# all the function names and their corresponding ufunc signatures. TD is
# an object which expands a list of character codes into an array of
# TypeDescriptions.
defdict = {
'add' :
Ufunc(2, 1, Zero,
Expand Down Expand Up @@ -274,7 +286,7 @@ def english_upper(s):
Ufunc(2, 1, Zero,
docstrings.get('numpy.core.umath.fmod'),
TD(ints),
TD(flts, f='fmod'),
TD(flts, f='fmod', astype={'j':'f'}),
TD(P, f='fmod'),
),
'square' :
Expand All @@ -299,7 +311,7 @@ def english_upper(s):
Ufunc(2, 1, One,
docstrings.get('numpy.core.umath.power'),
TD(ints),
TD(inexact, f='pow'),
TD(inexact, f='pow', astype={'j':'f'}),
TD(O, f='npy_ObjectPower'),
),
'absolute' :
Expand Down Expand Up @@ -407,12 +419,12 @@ def english_upper(s):
'logaddexp' :
Ufunc(2, 1, None,
docstrings.get('numpy.core.umath.logaddexp'),
TD(flts, f="logaddexp")
TD(flts, f="logaddexp", astype={'j':'f'})
),
'logaddexp2' :
Ufunc(2, 1, None,
docstrings.get('numpy.core.umath.logaddexp2'),
TD(flts, f="logaddexp2")
TD(flts, f="logaddexp2", astype={'j':'f'})
),
# FIXME: decide if the times should have the bitwise operations.
'bitwise_and' :
Expand Down Expand Up @@ -454,177 +466,177 @@ def english_upper(s):
'degrees' :
Ufunc(1, 1, None,
docstrings.get('numpy.core.umath.degrees'),
TD(fltsP, f='degrees'),
TD(fltsP, f='degrees', astype={'j':'f'}),
),
'rad2deg' :
Ufunc(1, 1, None,
docstrings.get('numpy.core.umath.rad2deg'),
TD(fltsP, f='rad2deg'),
TD(fltsP, f='rad2deg', astype={'j':'f'}),
),
'radians' :
Ufunc(1, 1, None,
docstrings.get('numpy.core.umath.radians'),
TD(fltsP, f='radians'),
TD(fltsP, f='radians', astype={'j':'f'}),
),
'deg2rad' :
Ufunc(1, 1, None,
docstrings.get('numpy.core.umath.deg2rad'),
TD(fltsP, f='deg2rad'),
TD(fltsP, f='deg2rad', astype={'j':'f'}),
),
'arccos' :
Ufunc(1, 1, None,
docstrings.get('numpy.core.umath.arccos'),
TD(inexact, f='acos'),
TD(inexact, f='acos', astype={'j':'f'}),
TD(P, f='arccos'),
),
'arccosh' :
Ufunc(1, 1, None,
docstrings.get('numpy.core.umath.arccosh'),
TD(inexact, f='acosh'),
TD(inexact, f='acosh', astype={'j':'f'}),
TD(P, f='arccosh'),
),
'arcsin' :
Ufunc(1, 1, None,
docstrings.get('numpy.core.umath.arcsin'),
TD(inexact, f='asin'),
TD(inexact, f='asin', astype={'j':'f'}),
TD(P, f='arcsin'),
),
'arcsinh' :
Ufunc(1, 1, None,
docstrings.get('numpy.core.umath.arcsinh'),
TD(inexact, f='asinh'),
TD(inexact, f='asinh', astype={'j':'f'}),
TD(P, f='arcsinh'),
),
'arctan' :
Ufunc(1, 1, None,
docstrings.get('numpy.core.umath.arctan'),
TD(inexact, f='atan'),
TD(inexact, f='atan', astype={'j':'f'}),
TD(P, f='arctan'),
),
'arctanh' :
Ufunc(1, 1, None,
docstrings.get('numpy.core.umath.arctanh'),
TD(inexact, f='atanh'),
TD(inexact, f='atanh', astype={'j':'f'}),
TD(P, f='arctanh'),
),
'cos' :
Ufunc(1, 1, None,
docstrings.get('numpy.core.umath.cos'),
TD(inexact, f='cos'),
TD(inexact, f='cos', astype={'j':'f'}),
TD(P, f='cos'),
),
'sin' :
Ufunc(1, 1, None,
docstrings.get('numpy.core.umath.sin'),
TD(inexact, f='sin'),
TD(inexact, f='sin', astype={'j':'f'}),
TD(P, f='sin'),
),
'tan' :
Ufunc(1, 1, None,
docstrings.get('numpy.core.umath.tan'),
TD(inexact, f='tan'),
TD(inexact, f='tan', astype={'j':'f'}),
TD(P, f='tan'),
),
'cosh' :
Ufunc(1, 1, None,
docstrings.get('numpy.core.umath.cosh'),
TD(inexact, f='cosh'),
TD(inexact, f='cosh', astype={'j':'f'}),
TD(P, f='cosh'),
),
'sinh' :
Ufunc(1, 1, None,
docstrings.get('numpy.core.umath.sinh'),
TD(inexact, f='sinh'),
TD(inexact, f='sinh', astype={'j':'f'}),
TD(P, f='sinh'),
),
'tanh' :
Ufunc(1, 1, None,
docstrings.get('numpy.core.umath.tanh'),
TD(inexact, f='tanh'),
TD(inexact, f='tanh', astype={'j':'f'}),
TD(P, f='tanh'),
),
'exp' :
Ufunc(1, 1, None,
docstrings.get('numpy.core.umath.exp'),
TD(inexact, f='exp'),
TD(inexact, f='exp', astype={'j':'f'}),
TD(P, f='exp'),
),
'exp2' :
Ufunc(1, 1, None,
docstrings.get('numpy.core.umath.exp2'),
TD(inexact, f='exp2'),
TD(inexact, f='exp2', astype={'j':'f'}),
TD(P, f='exp2'),
),
'expm1' :
Ufunc(1, 1, None,
docstrings.get('numpy.core.umath.expm1'),
TD(inexact, f='expm1'),
TD(inexact, f='expm1', astype={'j':'f'}),
TD(P, f='expm1'),
),
'log' :
Ufunc(1, 1, None,
docstrings.get('numpy.core.umath.log'),
TD(inexact, f='log'),
TD(inexact, f='log', astype={'j':'f'}),
TD(P, f='log'),
),
'log2' :
Ufunc(1, 1, None,
docstrings.get('numpy.core.umath.log2'),
TD(inexact, f='log2'),
TD(inexact, f='log2', astype={'j':'f'}),
TD(P, f='log2'),
),
'log10' :
Ufunc(1, 1, None,
docstrings.get('numpy.core.umath.log10'),
TD(inexact, f='log10'),
TD(inexact, f='log10', astype={'j':'f'}),
TD(P, f='log10'),
),
'log1p' :
Ufunc(1, 1, None,
docstrings.get('numpy.core.umath.log1p'),
TD(inexact, f='log1p'),
TD(inexact, f='log1p', astype={'j':'f'}),
TD(P, f='log1p'),
),
'sqrt' :
Ufunc(1, 1, None,
docstrings.get('numpy.core.umath.sqrt'),
TD(inexact, f='sqrt'),
TD(inexact, f='sqrt', astype={'j':'f'}),
TD(P, f='sqrt'),
),
'ceil' :
Ufunc(1, 1, None,
docstrings.get('numpy.core.umath.ceil'),
TD(flts, f='ceil'),
TD(flts, f='ceil', astype={'j':'f'}),
TD(P, f='ceil'),
),
'trunc' :
Ufunc(1, 1, None,
docstrings.get('numpy.core.umath.trunc'),
TD(flts, f='trunc'),
TD(flts, f='trunc', astype={'j':'f'}),
TD(P, f='trunc'),
),
'fabs' :
Ufunc(1, 1, None,
docstrings.get('numpy.core.umath.fabs'),
TD(flts, f='fabs'),
TD(flts, f='fabs', astype={'j':'f'}),
TD(P, f='fabs'),
),
'floor' :
Ufunc(1, 1, None,
docstrings.get('numpy.core.umath.floor'),
TD(flts, f='floor'),
TD(flts, f='floor', astype={'j':'f'}),
TD(P, f='floor'),
),
'rint' :
Ufunc(1, 1, None,
docstrings.get('numpy.core.umath.rint'),
TD(inexact, f='rint'),
TD(inexact, f='rint', astype={'j':'f'}),
TD(P, f='rint'),
),
'arctan2' :
Ufunc(2, 1, None,
docstrings.get('numpy.core.umath.arctan2'),
TD(flts, f='atan2'),
TD(flts, f='atan2', astype={'j':'f'}),
TD(P, f='arctan2'),
),
'remainder' :
Expand All @@ -636,7 +648,7 @@ def english_upper(s):
'hypot' :
Ufunc(2, 1, None,
docstrings.get('numpy.core.umath.hypot'),
TD(flts, f='hypot'),
TD(flts, f='hypot', astype={'j':'f'}),
TD(P, f='hypot'),
),
'isnan' :
Expand Down Expand Up @@ -692,7 +704,8 @@ def indent(st,spaces):
indented = re.sub(r' +$',r'',indented)
return indented

chartotype1 = {'f': 'f_f',
chartotype1 = {'j': 'j_j',
'f': 'f_f',
'd': 'd_d',
'g': 'g_g',
'F': 'F_F',
Expand All @@ -701,7 +714,8 @@ def indent(st,spaces):
'O': 'O_O',
'P': 'O_O_method'}

chartotype2 = {'f': 'ff_f',
chartotype2 = {'j': 'jj_j',
'f': 'ff_f',
'd': 'dd_d',
'g': 'gg_g',
'F': 'FF_F',
Expand Down Expand Up @@ -739,8 +753,11 @@ def make_arrays(funcdict):
for t in uf.type_descriptions:
if t.func_data not in (None, UsesArraysAsData):
funclist.append('NULL')
astr = '%s_functions[%d] = PyUFunc_%s;' % \
(name, k, thedict[t.type])
astype = ''
if not t.astype is None:
astype = '_As_%s' % thedict[t.astype]
astr = '%s_functions[%d] = PyUFunc_%s%s;' % \
(name, k, thedict[t.type], astype)
code2list.append(astr)
if t.type == 'O':
astr = '%s_data[%d] = (void *) %s;' % \
Expand Down
6 changes: 6 additions & 0 deletions numpy/core/code_generators/numpy_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,6 +291,12 @@
'PyUFunc_ReplaceLoopBySignature': 30,
'PyUFunc_FromFuncAndDataAndSignature': 31,
'PyUFunc_SetUsesArraysAsData': 32,
'PyUFunc_j_j': 33,
'PyUFunc_j_j_As_f_f': 34,
'PyUFunc_j_j_As_d_d': 35,
'PyUFunc_jj_j': 36,
'PyUFunc_jj_j_As_ff_f': 37,
'PyUFunc_jj_j_As_dd_d': 38,
}

# List of all the dicts which define the C API
Expand Down
Loading
0