@jax-js/jax 0.0.2 → 0.0.4

package/dist/index.js

@@ -1,11 +1,12 @@
 import { __export } from "./chunk-Cl8Af3a2.js";
-import { AluExp, AluGroup, AluOp, AluVar, DEBUG, DType, FpHash, Kernel, PPrint, Reduction, ShapeTracker, accessorAluExp, accessorGlobal, byteWidth, checkAxis, deepEqual, devices, dtypedArray, getBackend, init, invertPermutation, isFloatDtype, isNumberPair, isPermutation, partitionList, prod, range, recursiveFlatten, rep, runWithCache, setDevice, toposort, unravelAlu, unzip2, zip } from "./backend-1eVbAoaV.js";
+import { AluExp, AluGroup, AluOp, AluVar, DEBUG, DType, FpHash, Kernel, PPrint, Reduction, ShapeTracker, accessorAluExp, accessorGlobal, byteWidth, checkAxis, deepEqual, defaultDevice, devices, dtypedArray, dtypedJsArray, getBackend, init, invertPermutation, isFloatDtype, isNumberPair, isPermutation, normalizeAxis, partitionList, prod, promoteTypes, range, recursiveFlatten, rep, runWithCache, setDebug, toposort, unravelAlu, unzip2, zip, zipn } from "./backend-EBRGmEYw.js";
 
 //#region src/tree.ts
 var tree_exports = {};
 __export(tree_exports, {
 	JsTreeDef: () => JsTreeDef,
 	NodeType: () => NodeType,
+	dispose: () => dispose,
 	flatten: () => flatten,
 	leaves: () => leaves,
 	map: () => map,
@@ -20,7 +21,7 @@ let NodeType = /* @__PURE__ */ function(NodeType$1) {
 	NodeType$1["Leaf"] = "Leaf";
 	return NodeType$1;
 }({});
-/** Analog to the JAX "pytree" object, but for JavaScript. */
+/** Represents the structure of a JsTree. */
 var JsTreeDef = class JsTreeDef {
 	static leaf = new JsTreeDef(NodeType.Leaf, null, []);
 	constructor(nodeType, nodeMetadata, childTreedefs) {
@@ -108,6 +109,194 @@ function map(fn, tree, ...rest) {
 function ref(tree) {
 	return map((x) => x.ref, tree);
 }
+/** Dispose every array in a tree. */
+function dispose(tree) {
+	if (tree) map((x) => x.dispose(), tree);
+}
+
+//#endregion
+//#region src/frontend/convolution.ts
+/**
+* Check that the shapes and parameters passed to convolution are valid.
+*
+* If the check succeeds, returns the output shape.
+*/
+function checkConvShape(lhsShape, rhsShape, { strides, padding, lhsDilation, rhsDilation }) {
+	if (lhsShape.length !== rhsShape.length) throw new Error(`conv() requires inputs with the same number of dimensions, got ${lhsShape.length} and ${rhsShape.length}`);
+	const n = lhsShape.length - 2;
+	if (n < 0) throw new Error("conv() requires at least 2D inputs");
+	if (strides.length !== n) throw new Error("conv() strides != spatial dims");
+	if (padding.length !== n) throw new Error("conv() padding != spatial dims");
+	if (lhsDilation.length !== n) throw new Error("conv() lhsDilation != spatial dimensions");
+	if (rhsDilation.length !== n) throw new Error("conv() rhsDilation != spatial dimensions");
+	if (lhsShape[1] !== rhsShape[1]) throw new Error(`conv() input channels: ${lhsShape[1]} != ${rhsShape[1]}`);
+	const outShape = [lhsShape[0], rhsShape[0]];
+	for (let i = 0; i < n; i++) {
+		if (strides[i] <= 0 || !Number.isInteger(strides[i])) throw new Error(`conv() strides[${i}] must be a positive integer`);
+		if (padding[i].length !== 2 || !padding[i].every(Number.isInteger)) throw new Error(`conv() padding[${i}] must be a 2-tuple of integers`);
+		if (lhsDilation[i] <= 0 || !Number.isInteger(lhsDilation[i])) throw new Error(`conv() lhsDilation[${i}] must be a positive integer`);
+		if (rhsDilation[i] <= 0 || !Number.isInteger(rhsDilation[i])) throw new Error(`conv() rhsDilation[${i}] must be a positive integer`);
+		const [x, k] = [lhsShape[i + 2], rhsShape[i + 2]];
+		if (k <= 0) throw new Error("conv() kernel size must be positive");
+		const [pl, pr] = padding[i];
+		if (pl < -x || pr < -x || pl + pr < -x) throw new Error(`conv() padding[${i}]=(${pl},${pr}) is too negative for input size ${x}`);
+		const kernelSize = (k - 1) * rhsDilation[i] + 1;
+		const inSize = Math.max((x - 1) * lhsDilation[i] + 1, 0) + pl + pr;
+		if (kernelSize > inSize) throw new Error(`conv() kernel size ${kernelSize} > input size ${inSize} in dimension ${i}`);
+		outShape.push(Math.ceil((inSize - kernelSize + 1) / strides[i]));
+	}
+	return outShape;
+}
+function checkPoolShape(inShape, window, strides) {
+	if (strides.length !== window.length) throw new Error("pool() strides != window dims");
+	if (window.length > inShape.length) throw new Error("pool() window has more dimensions than input");
+	const outShape = inShape.slice(0, inShape.length - window.length);
+	for (let i = 0; i < window.length; i++) {
+		const k = window[i];
+		const s = strides[i];
+		const size$1 = inShape[inShape.length - window.length + i];
+		if (k <= 0 || !Number.isInteger(k)) throw new Error(`pool() window[${i}] must be a positive integer`);
+		if (k > size$1) throw new Error(`pool() window[${i}]=${k} > input size ${size$1}`);
+		if (s <= 0 || !Number.isInteger(s)) throw new Error(`pool() strides[${i}] must be a positive integer`);
+		outShape.push(Math.ceil((size$1 - k + 1) / s));
+	}
+	return outShape.concat(window);
+}
+/**
+* Takes a shape tracker and a kernel size `ks`, then reshapes it so the last
+* `ks.length` dimensions become `2 * ks.length` dimensions by treating them as
+* spatial dimensions convolved with a kernel.
+*
+* The resulting array can be multiplied with a kernel of shape `ks`, then
+* reduced along the last `ks.length` dimensions for a convolution.
+*
+* Reference: https://github.com/tinygrad/tinygrad/blob/v0.10.3/tinygrad/tensor.py#L2097
+*/
+function pool(st, ks, strides = 1, dilation = 1) {
+	if (ks.length === 0) return st;
+	if (st.shape.length < ks.length) throw new Error("pool() called with too many dimensions");
+	if (typeof strides === "number") strides = rep(ks.length, strides);
+	if (typeof dilation === "number") dilation = rep(ks.length, dilation);
+	if (strides.some((s) => s <= 0 || !Number.isInteger(s))) throw new Error("pool() strides must be positive integers");
+	if (dilation.some((d) => d <= 0 || !Number.isInteger(d))) throw new Error("pool() dilation must be positive integers");
+	const noop = st.shape.slice(0, -ks.length);
+	const i_ = st.shape.slice(-ks.length);
+	const s_ = strides;
+	const d_ = dilation;
+	const o_ = zipn(i_, d_, ks, s_).map(([i, d, k, s]) => Math.ceil((i - d * (k - 1)) / s));
+	const f_ = zipn(o_, s_, i_, d_, ks).map(([o, s, i, d, k]) => 1 + Number(o * s > i - d * (k - 1)));
+	const kidf = zipn(ks, i_, d_, f_);
+	st = st.repeat([...rep(noop.length, 1), ...kidf.map(([k, i, d, f]) => Math.ceil(k * (i * f + d) / i))]);
+	st = st.shrink([...noop.map((x) => [0, x]), ...kidf.map(([k, i, d, f]) => [0, k * (i * f + d)])]).reshape([...noop, ...kidf.flatMap(([k, i, d, f]) => [k, i * f + d])]);
+	const kos = zipn(ks, o_, s_);
+	st = st.shrink([...noop.map((x) => [0, x]), ...kos.flatMap(([k, o, s]) => [[0, k], [0, o * s]])]).reshape([...noop, ...kos.flat(1)]);
+	st = st.shrink([...noop.map((x) => [0, x]), ...kos.flatMap(([k, o]) => [
+		[0, k],
+		[0, o],
+		[0, 1]
+	])]).reshape([...noop, ...kos.flatMap(([k, o]) => [k, o])]);
+	st = st.permute([
+		...range(noop.length),
+		...ks.map((_, j) => noop.length + 2 * j + 1),
+		...ks.map((_, j) => noop.length + 2 * j)
+	]);
+	return st;
+}
+/**
+* Perform the transpose of pool, directly undo-ing a pool() operation.
+*
+* Note that since pool repeats the input, the transpose operation technically
+* should include a sum reduction. This function doesn't perform the reduction,
+* which should be done on the last `k` axes of the returned shape.
+*/
+function poolTranspose(st, inShape, ks, strides = 1, dilation = 1) {
+	if (ks.length === 0) return st;
+	if (typeof strides === "number") strides = rep(ks.length, strides);
+	if (typeof dilation === "number") dilation = rep(ks.length, dilation);
+	const noop = inShape.slice(0, -ks.length);
+	const i_ = inShape.slice(-ks.length);
+	const s_ = strides;
+	const d_ = dilation;
+	const o_ = zipn(i_, d_, ks, s_).map(([i, d, k, s]) => Math.ceil((i - d * (k - 1)) / s));
+	if (!deepEqual(o_, st.shape.slice(noop.length, noop.length + ks.length))) throw new Error("poolTranspose() called with mismatched output shape");
+	const f_ = zipn(o_, s_, i_, d_, ks).map(([o, s, i, d, k]) => 1 + Number(o * s > i - d * (k - 1)));
+	const kidf = zipn(ks, i_, d_, f_);
+	const kos = zipn(ks, o_, s_);
+	st = st.permute([...range(noop.length), ...ks.flatMap((_, j) => [noop.length + ks.length + j, noop.length + j])]);
+	st = st.reshape([...noop, ...kos.flatMap(([k, o]) => [
+		k,
+		o,
+		1
+	])]).pad([...noop.map(() => [0, 0]), ...s_.flatMap((s) => [
+		[0, 0],
+		[0, 0],
+		[0, s - 1]
+	])]);
+	st = st.reshape([...noop, ...kos.flatMap(([k, o, s]) => [k, o * s])]).pad([...noop.map(() => [0, 0]), ...kidf.flatMap(([_k, i, d, f], j) => [[0, 0], [0, i * f + d - o_[j] * s_[j]]])]);
+	st = st.reshape([...noop, ...kidf.map(([k, i, d, f]) => k * (i * f + d))]).pad([...noop.map(() => [0, 0]), ...kidf.map(([k, i, d, f]) => [0, Math.ceil(k * (i * f + d) / i) * i - k * (i * f + d)])]);
+	st = st.reshape([...noop, ...kidf.flatMap(([k, i, d, f]) => [Math.ceil(k * (i * f + d) / i), i])]).permute([
+		...range(noop.length),
+		...ks.map((_, j) => noop.length + 2 * j + 1),
+		...ks.map((_, j) => noop.length + 2 * j)
+	]);
+	return st;
+}
+/** Applies dilation to an array directly, for transposed convolution. */
+function applyDilation(st, dilation) {
+	if (dilation.every((s) => s === 1)) return st;
+	const s_ = dilation;
+	const [a, b, ...k_] = st.shape;
+	st = st.reshape([
+		a,
+		b,
+		...k_.flatMap((k) => [k, 1])
+	]);
+	st = st.pad([
+		[0, 0],
+		[0, 0],
+		...s_.flatMap((s) => [[0, 0], [0, s - 1]])
+	]);
+	st = st.reshape([
+		a,
+		b,
+		...k_.map((k, i) => k * s_[i])
+	]);
+	st = st.shrink([
+		[0, a],
+		[0, b],
+		...k_.map((k, i) => [0, (k - 1) * s_[i] + 1])
+	]);
+	return st;
+}
+/**
+* Prepare for a convolution between two arrays.
+*
+* This does not check the validity of the shapes, which should be checked
+* beforehand using `checkConvShape()`.
+*/
+function prepareConv(stX, stY, params) {
+	const n = stX.shape.length - 2;
+	stX = applyDilation(stX, params.lhsDilation);
+	const ks = stY.shape.slice(2);
+	stX = stX.padOrShrink([
+		[0, 0],
+		[0, 0],
+		...params.padding
+	]);
+	stX = pool(stX, ks, params.strides, params.rhsDilation);
+	stX = stX.moveaxis(1, n + 1).reshape([
+		stX.shape[0],
+		1,
+		...stX.shape.slice(2, n + 2),
+		stX.shape[1] * prod(ks)
+	]);
+	stY = stY.reshape([
+		stY.shape[0],
+		...rep(n, 1),
+		stY.shape[1] * prod(ks)
+	]);
+	return [stX, stY];
+}
 
 //#endregion
 //#region src/frontend/core.ts
@@ -134,12 +323,18 @@ let Primitive = /* @__PURE__ */ function(Primitive$1) {
 	Primitive$1["RandomBits"] = "random_bits";
 	Primitive$1["Sin"] = "sin";
 	Primitive$1["Cos"] = "cos";
+	Primitive$1["Asin"] = "asin";
+	Primitive$1["Atan"] = "atan";
 	Primitive$1["Exp"] = "exp";
 	Primitive$1["Log"] = "log";
+	Primitive$1["Sqrt"] = "sqrt";
 	Primitive$1["Min"] = "min";
 	Primitive$1["Max"] = "max";
 	Primitive$1["Reduce"] = "reduce";
 	Primitive$1["Dot"] = "dot";
+	Primitive$1["Conv"] = "conv";
+	Primitive$1["Pool"] = "pool";
+	Primitive$1["PoolTranspose"] = "pool_transpose";
 	Primitive$1["Compare"] = "compare";
 	Primitive$1["Where"] = "where";
 	Primitive$1["Transpose"] = "transpose";
@@ -197,34 +392,52 @@ function sin$1(x) {
 function cos$1(x) {
 	return bind1(Primitive.Cos, [x]);
 }
+function asin$1(x) {
+	return bind1(Primitive.Asin, [x]);
+}
+function atan$1(x) {
+	return bind1(Primitive.Atan, [x]);
+}
 function exp$1(x) {
 	return bind1(Primitive.Exp, [x]);
 }
 function log$1(x) {
 	return bind1(Primitive.Log, [x]);
 }
+function sqrt$1(x) {
+	return bind1(Primitive.Sqrt, [x]);
+}
 function min$1(x, y) {
 	return bind1(Primitive.Min, [x, y]);
 }
 function max$1(x, y) {
 	return bind1(Primitive.Max, [x, y]);
 }
-function reduce(x, op, axis, opts) {
+function reduce(x, op, axis = null, opts) {
 	if (!AluGroup.Reduce.has(op)) throw new TypeError(`Invalid reduce operation: ${op}`);
-	if (axis === void 0) if (x instanceof Tracer) axis = range(x.shape.length);
-	else axis = [];
-	else if (typeof axis === "number") axis = [checkAxis(axis, ndim$1(x))];
-	else axis = axis.map((a) => checkAxis(a, ndim$1(x)));
+	axis = normalizeAxis(axis, ndim$1(x));
 	const originalShape = getShape(x);
-	const result = bind1(Primitive.Reduce, [x], {
+	let result = bind1(Primitive.Reduce, [x], {
 		op,
 		axis
 	});
-	return opts?.keepDims ? broadcast(result, originalShape, axis) : result;
+	if (opts?.keepdims) result = result.reshape(originalShape.map((dim, i) => axis.includes(i) ? 1 : dim));
+	return result;
 }
 function dot$1(x, y) {
 	return bind1(Primitive.Dot, [x, y]);
 }
+function conv(x, y, params = {}) {
+	if (x.ndim !== y.ndim) throw new Error(`conv() requires inputs with the same number of dimensions, got ${x.ndim} and ${y.ndim}`);
+	const n = x.ndim - 2;
+	if (n < 0) throw new Error("conv() requires at least 2D inputs");
+	return bind1(Primitive.Conv, [x, y], {
+		strides: params.strides ?? rep(n, 1),
+		padding: params.padding ?? rep(n, [0, 0]),
+		lhsDilation: params.lhsDilation ?? rep(n, 1),
+		rhsDilation: params.rhsDilation ?? rep(n, 1)
+	});
+}
 function compare(x, y, op) {
 	return bind1(Primitive.Compare, [x, y], { op });
 }
@@ -255,10 +468,11 @@ function where$1(cond, x, y) {
 }
 function transpose$1(x, perm) {
 	perm = perm ? perm.map((a) => checkAxis(a, ndim$1(x))) : range(ndim$1(x)).reverse();
+	if (!isPermutation(perm, ndim$1(x))) throw new Error(`Invalid transpose permutation for ${ndim$1(x)} axes: ${JSON.stringify(perm)}`);
 	return bind1(Primitive.Transpose, [x], { perm });
 }
 function broadcast(x, shape$1, axis) {
-	axis = axis.map((a) => checkAxis(a, shape$1.length));
+	axis = normalizeAxis(axis, shape$1.length);
 	return bind1(Primitive.Broadcast, [x], {
 		shape: shape$1,
 		axis
@@ -277,7 +491,7 @@ function reshape$1(x, shape$1) {
 	return bind1(Primitive.Reshape, [x], { shape: shape$1 });
 }
 function flip$1(x, axis) {
-	axis = axis.map((a) => checkAxis(a, ndim$1(x)));
+	axis = normalizeAxis(axis, ndim$1(x));
 	return bind1(Primitive.Flip, [x], { axis });
 }
 function shrink(x, slice) {
@@ -357,12 +571,19 @@ var Tracer = class Tracer {
 	constructor(trace) {
 		this._trace = trace;
 	}
+	/** The shape of the array. */
 	get shape() {
 		return this.aval.shape;
 	}
+	/** The total number of elements in the array. */
+	get size() {
+		return prod(this.shape);
+	}
+	/** The dtype of the array. */
 	get dtype() {
 		return this.aval.dtype;
 	}
+	/** The number of dimensions of the array. */
 	get ndim() {
 		return this.shape.length;
 	}
@@ -398,22 +619,20 @@ var Tracer = class Tracer {
 		return lessEqual$1(this, other);
 	}
 	/** Sum of the elements of the array over a given axis, or axes. */
-	sum(axis, opts) {
+	sum(axis = null, opts) {
 		return reduce(this, AluOp.Add, axis, opts);
 	}
 	/** Product of the array elements over a given axis. */
-	prod(axis, opts) {
+	prod(axis = null, opts) {
 		return reduce(this, AluOp.Mul, axis, opts);
 	}
 	/** Compute the average of the array elements along the specified axis. */
-	mean(axis, opts) {
-		if (axis === void 0) axis = range(this.ndim);
-		else if (typeof axis === "number") axis = [checkAxis(axis, this.ndim)];
-		else axis = axis.map((a) => checkAxis(a, this.ndim));
-		let result = reduce(this, AluOp.Add, axis);
-		result = result.mul(prod(result.shape) / prod(this.shape));
-		if (opts?.keepDims) result = broadcast(result, this.shape, axis);
-		return result;
+	mean(axis = null, opts) {
+		axis = normalizeAxis(axis, this.ndim);
+		const n = axis.reduce((acc, a) => acc * this.shape[a], 1);
+		if (n === 0) throw new Error("mean: cannot compute mean over zero-length axis");
+		const result = reduce(this, AluOp.Add, axis, opts);
+		return result.mul(1 / n);
 	}
 	/** Permute the dimensions of an array. Defaults to reversing the axis order. */
 	transpose(perm) {
@@ -445,8 +664,29 @@ var Tracer = class Tracer {
 	/** Return specified diagonals. See `numpy.diagonal` for full docs. */
 	diagonal(offset = 0, axis1 = 0, axis2 = 1) {
 		if (!Number.isInteger(offset)) throw new TypeError(`offset must be an integer, got ${offset}`);
+		if (offset < 0) return this.diagonal(-offset, axis2, axis1);
+		axis1 = checkAxis(axis1, this.ndim);
+		axis2 = checkAxis(axis2, this.ndim);
 		if (axis1 === axis2) throw new Error("axis1 and axis2 must not be equal");
-		throw new Error("diagonal not implemented");
+		if (offset >= this.shape[axis2]) throw new Error("offset exceeds axis size");
+		let ar = this;
+		if (axis1 !== ar.ndim - 2 || axis2 !== ar.ndim - 1) {
+			const perm = range(ar.ndim).filter((i) => i !== axis1 && i !== axis2).concat(axis1, axis2);
+			ar = ar.transpose(perm);
+		}
+		const [n, m] = ar.shape.slice(-2);
+		const diagSize = Math.min(n, m - offset);
+		ar = ar.reshape([...ar.shape.slice(0, -2), n * m]);
+		const npad = diagSize * (m + 1) - n * m;
+		if (npad > 0) ar = pad$1(ar, [...rep(ar.ndim - 1, [0, 0]), [0, npad]]);
+		else if (npad < 0) ar = shrink(ar, [...ar.shape.slice(0, -1), n * m + npad].map((x) => [0, x]));
+		ar = ar.reshape([
+			...ar.shape.slice(0, -1),
+			diagSize,
+			m + 1
+		]);
+		ar = shrink(ar, [...ar.shape.slice(0, -1).map((x) => [0, x]), [offset, offset + 1]]).reshape(ar.shape.slice(0, -1));
+		return ar;
 	}
 	/** Flatten the array without changing its data. */
 	flatten() {
@@ -589,7 +829,7 @@ var ShapedArray = class ShapedArray {
 	get ndim() {
 		return this.shape.length;
 	}
-	strShort() {
+	toString() {
 		return `${this.dtype}[${this.shape.join(",")}]`;
 	}
 	equals(other) {
@@ -620,7 +860,7 @@ function fullRaise(trace, val) {
 	if (Object.is(val._trace.main, trace.main)) return val;
 	else if (val._trace.main.level < level) return trace.lift(val);
 	else if (val._trace.main.level > level) throw new Error(`Can't lift Tracer level ${val._trace.main.level} to level ${level}`);
-	else throw new Error(`Different traces at same level: ${val._trace}, ${trace}.`);
+	else throw new Error(`Different traces at same level: ${val._trace.constructor}, ${trace.constructor}.`);
 }
 var TreeMismatchError = class extends TypeError {
 	constructor(where$2, left, right) {
@@ -869,16 +1109,16 @@ function jitCompile(backend, jaxpr, consts) {
 	jitCompileCache.set(cacheKey, jp);
 	return jp;
 }
-function reshapeViews(exp$2, mapping) {
+function reshapeViews(exp$2, mapping, reduceAxis = false) {
 	return exp$2.rewrite((exp$3) => {
 		if (exp$3.op === AluOp.GlobalView) {
 			const [gid, st] = exp$3.arg;
 			const newSt = mapping(st);
 			if (newSt) {
-				const indices = unravelAlu(newSt.shape, AluVar.gidx);
+				const indices = reduceAxis ? unravelAlu(newSt.shape.slice(0, -1), AluVar.gidx).concat(AluVar.ridx) : unravelAlu(newSt.shape, AluVar.gidx);
 				return AluExp.globalView(exp$3.dtype, gid, newSt, indices);
 			}
-		}
+		} else if (exp$3.op === AluOp.GlobalIndex) throw new Error("internal: reshapeViews() called with GlobalIndex op");
 	});
 }
 function broadcastedJit(fn) {
@@ -925,8 +1165,11 @@ const jitRules = {
 	},
 	[Primitive.Sin]: unopJit(AluExp.sin),
 	[Primitive.Cos]: unopJit(AluExp.cos),
+	[Primitive.Asin]: unopJit(AluExp.asin),
+	[Primitive.Atan]: unopJit(AluExp.atan),
 	[Primitive.Exp]: unopJit(AluExp.exp),
 	[Primitive.Log]: unopJit(AluExp.log),
+	[Primitive.Sqrt]: unopJit(AluExp.sqrt),
 	[Primitive.Min]: broadcastedJit(([a, b]) => AluExp.min(a, b)),
 	[Primitive.Max]: broadcastedJit(([a, b]) => AluExp.max(a, b)),
 	[Primitive.Reduce](nargs, [a], [as], { op, axis }) {
@@ -941,18 +1184,20 @@ const jitRules = {
 		const size$1 = prod(newShape);
 		const reductionSize = prod(shiftedAxes.map((ax) => as.shape[ax]));
 		newShape.push(reductionSize);
-		a = a.rewrite((exp$2) => {
-			if (exp$2.op === AluOp.GlobalView) {
-				const [gid, st] = exp$2.arg;
-				const newSt = st.permute(keptAxes.concat(shiftedAxes)).reshape(newShape);
-				const indices = unravelAlu(newShape.slice(0, -1), AluVar.gidx);
-				indices.push(AluVar.ridx);
-				return AluExp.globalView(exp$2.dtype, gid, newSt, indices);
-			}
-		});
+		const perm = keptAxes.concat(shiftedAxes);
+		a = reshapeViews(a, (st) => st.permute(perm).reshape(newShape), true);
 		const reduction = new Reduction(a.dtype, op, reductionSize);
 		return new Kernel(nargs, size$1, a, reduction);
 	},
+	[Primitive.Pool]: reshapeJit((st, { window, strides }) => pool(st, window, strides)),
+	[Primitive.PoolTranspose](nargs, [a], [as], { inShape, window, strides }) {
+		let stX = poolTranspose(ShapeTracker.fromShape(as.shape), inShape, window, strides);
+		const size$1 = prod(inShape);
+		stX = stX.reshape([...inShape, prod(stX.shape.slice(inShape.length))]);
+		a = reshapeViews(a, (st) => st.compose(stX), true);
+		const reduction = new Reduction(a.dtype, AluOp.Add, stX.shape[stX.shape.length - 1]);
+		return new Kernel(nargs, size$1, a, reduction);
+	},
 	[Primitive.Dot](nargs, [a, b], [as, bs]) {
 		const k1 = jitRules[Primitive.Mul](nargs, [a, b], [as, bs], {});
 		const c = k1.exp;
@@ -962,6 +1207,14 @@ const jitRules = {
 			axis: [cs.ndim - 1]
 		});
 	},
+	[Primitive.Conv](nargs, [a, b], [as, bs], params) {
+		const [stX, stY] = prepareConv(ShapeTracker.fromShape(as.shape), ShapeTracker.fromShape(bs.shape), params);
+		a = reshapeViews(a, (st) => st.compose(stX));
+		b = reshapeViews(b, (st) => st.compose(stY));
+		as = new ShapedArray(stX.shape, as.dtype);
+		bs = new ShapedArray(stY.shape, bs.dtype);
+		return jitRules[Primitive.Dot](nargs, [a, b], [as, bs], {});
+	},
 	[Primitive.Compare]: broadcastedJit(([a, b], { op }) => aluCompare(a, b, op)),
 	[Primitive.Where]: broadcastedJit(([cond, a, b]) => AluExp.where(cond, a, b)),
 	[Primitive.Transpose]: reshapeJit((st, { perm }) => st.permute(perm)),
@@ -974,8 +1227,20 @@ const jitRules = {
 	}),
 	[Primitive.Shrink]: reshapeJit((st, { slice }) => st.shrink(slice)),
 	[Primitive.Pad]: reshapeJit((st, { width }) => st.pad(width)),
-	[Primitive.Gather]() {
-		throw new Error("Gather is not implemented in JIT yet");
+	[Primitive.Gather](nargs, [x, ...indices], [xs, ...indicesShapes], { axis, outDim }) {
+		const axisSet = new Set(axis);
+		const indexShape = indicesShapes.map((c) => c.shape).reduce(generalBroadcast);
+		const finalShape = xs.shape.filter((_, i) => !axisSet.has(i));
+		finalShape.splice(outDim, 0, ...indexShape);
+		const idxAll = unravelAlu(finalShape, AluVar.gidx);
+		const idxNonaxis = [...idxAll];
+		idxNonaxis.splice(outDim, indexShape.length);
+		const src = [...idxNonaxis];
+		for (let i = 0; i < xs.shape.length; i++) if (axisSet.has(i)) src.splice(i, 0, null);
+		for (const [i, iexp] of indices.entries()) src[axis[i]] = AluExp.cast(DType.Int32, reshapeViews(iexp, (st) => st.broadcast(finalShape, [...range(outDim + indexShape.length - st.shape.length), ...range(outDim + indexShape.length, finalShape.length)])));
+		const [index, valid] = ShapeTracker.fromShape(xs.shape).toAluExp(src);
+		if (!valid.resolve()) throw new Error("internal: expected full validity mask in Gather");
+		return new Kernel(nargs, prod(finalShape), x.substitute({ gidx: index }));
 	},
 	[Primitive.JitCall]() {
 		throw new Error("internal: JitCall should have been flattened before JIT compilation");
@@ -994,9 +1259,15 @@ function splitGraphDataflow(backend, jaxpr) {
 		blackNodes.add(v);
 		p1NextBlack.set(v, v);
 	}
+	const reducePrimitives = [
+		Primitive.Reduce,
+		Primitive.Dot,
+		Primitive.Conv,
+		Primitive.PoolTranspose
+	];
 	for (let i = jaxpr.eqns.length - 1; i >= 0; i--) {
 		const eqn = jaxpr.eqns[i];
-		if (eqn.primitive === Primitive.Reduce || eqn.outBinders.some((v) => blackNodes.has(v))) {
+		if (reducePrimitives.includes(eqn.primitive) || eqn.primitive === Primitive.Gather || eqn.outBinders.some((v) => blackNodes.has(v))) {
 			for (const v of eqn.outBinders) {
 				blackNodes.add(v);
 				p1NextBlack.set(v, v);
@@ -1137,7 +1408,7 @@ var Array$1 = class Array$1 extends Tracer {
 	* is a backend `Slot`, this constructor _takes ownership_ of the slot. It
 	* will be freed when the array is disposed.
 	*/
-	constructor(source, st, dtype, backend, pending = null) {
+	constructor(source, st, dtype, backend, { pending = null } = {}) {
 		super(baseArrayTrace);
 		this.id = Array$1.#nextId++;
 		this.#dtype = dtype;
@@ -1146,6 +1417,8 @@ var Array$1 = class Array$1 extends Tracer {
 		this.#backend = backend;
 		this.#rc = 1;
 		this.#pendingSet = new Set(pending);
+		if (this.#pendingSet.size === 0) this.#pendingSet = null;
+		else if (source instanceof AluExp) throw new Error("internal: AluExp source cannot have pending executes");
 	}
 	/** @ignore */
 	get aval() {
@@ -1200,7 +1473,7 @@ var Array$1 = class Array$1 extends Tracer {
 		const pending = this.#pending;
 		for (const exe of pending) exe.updateRc(1);
 		if (typeof this.#source === "number") this.#backend.incRef(this.#source);
-		const ar = new Array$1(this.#source, st, this.#dtype, this.#backend, pending);
+		const ar = new Array$1(this.#source, st, this.#dtype, this.#backend, { pending });
 		this.dispose();
 		return ar;
 	}
@@ -1223,7 +1496,7 @@ var Array$1 = class Array$1 extends Tracer {
 		const inputs = [];
 		const src = [...idxNonaxis];
 		for (let i = 0; i < this.shape.length; i++) if (axisSet.has(i)) src.splice(i, 0, null);
-		for (const [i, ar] of indices.entries()) if (ar.#source instanceof AluExp) src[axis[i]] = AluExp.cast(DType.Int32, accessorAluExp(ar.#dtype, ar.#source, ar.#st, idxAxis));
+		for (const [i, ar] of indices.entries()) if (ar.#source instanceof AluExp) src[axis[i]] = AluExp.cast(DType.Int32, accessorAluExp(ar.#source, ar.#st, idxAxis));
 		else {
 			let gid = inputs.indexOf(ar.#source);
 			if (gid === -1) {
@@ -1233,7 +1506,7 @@ var Array$1 = class Array$1 extends Tracer {
 			src[axis[i]] = AluExp.cast(DType.Int32, AluExp.globalView(ar.#dtype, gid, ar.#st, idxAxis));
 		}
 		let exp$2;
-		if (this.#source instanceof AluExp) exp$2 = accessorAluExp(this.#dtype, this.#source, this.#st, src);
+		if (this.#source instanceof AluExp) exp$2 = accessorAluExp(this.#source, this.#st, src);
 		else {
 			let gid = inputs.indexOf(this.#source);
 			if (gid === -1) {
@@ -1249,7 +1522,7 @@ var Array$1 = class Array$1 extends Tracer {
 		pending.push(new PendingExecute(this.#backend, kernel, inputs, [output]));
 		this.dispose();
 		for (const ar of indices) ar.dispose();
-		return new Array$1(output, ShapeTracker.fromShape(finalShape), this.#dtype, this.#backend, pending);
+		return new Array$1(output, ShapeTracker.fromShape(finalShape), this.#dtype, this.#backend, { pending });
 	}
 	/** Move axes to the rightmost dimension of the shape. */
 	#moveAxesDown(axis) {
@@ -1276,7 +1549,7 @@ var Array$1 = class Array$1 extends Tracer {
 		this.#check();
 		if (this.#source instanceof AluExp) {
 			const exp$3 = new AluExp(op, dtypeOutput, [this.#source]);
-			return new Array$1(exp$3, this.#st, dtypeOutput, this.#backend);
+			return new Array$1(exp$3.simplify(), this.#st, dtypeOutput, this.#backend);
 		}
 		const indices = unravelAlu(this.#st.shape, AluVar.gidx);
 		const exp$2 = new AluExp(op, dtypeOutput, [AluExp.globalView(this.#dtype, 0, this.#st, indices)]);
@@ -1286,7 +1559,7 @@ var Array$1 = class Array$1 extends Tracer {
 		for (const exe of pending) exe.updateRc(1);
 		pending.push(new PendingExecute(this.#backend, kernel, [this.#source], [output]));
 		this.dispose();
-		return new Array$1(output, ShapeTracker.fromShape(this.shape), dtypeOutput, this.#backend, pending);
+		return new Array$1(output, ShapeTracker.fromShape(this.shape), dtypeOutput, this.#backend, { pending });
 	}
 	#binary(op, other) {
 		const custom = (src) => new AluExp(op, this.#dtype, src);
@@ -1309,18 +1582,18 @@ var Array$1 = class Array$1 extends Tracer {
 		if (!dtypeOutput) throw new TypeError("nary operation with no dtype");
 		arrays = Array$1.#broadcastArrays(arrays);
 		const newShape = [...arrays[0].shape];
-		if (arrays.every((ar) => ar.#source instanceof AluExp) && reduceAxis === void 0) {
+		if (arrays.every((ar) => ar.#source instanceof AluExp) && !reduceAxis) {
 			if (arrays.every((ar) => deepEqual(ar.#st, arrays[0].#st))) {
 				const exp$4 = custom(arrays.map((ar) => ar.#source));
-				return new Array$1(exp$4, arrays[0].#st, exp$4.dtype, backend);
+				return new Array$1(exp$4.simplify(), arrays[0].#st, exp$4.dtype, backend);
 			}
 			const exp$3 = custom(arrays.map((ar) => {
 				const src$1 = ar.#source;
 				if (ar.#st.contiguous) return src$1;
-				return accessorAluExp(ar.#dtype, src$1, ar.#st, unravelAlu(newShape, AluVar.idx));
+				return accessorAluExp(src$1, ar.#st, unravelAlu(newShape, AluVar.idx));
 			}));
 			const st = ShapeTracker.fromShape(newShape);
-			return new Array$1(exp$3, st, exp$3.dtype, backend);
+			return new Array$1(exp$3.simplify(), st, exp$3.dtype, backend);
 		}
 		let indices;
 		if (!reduceAxis) indices = unravelAlu(newShape, AluVar.gidx);
@@ -1330,7 +1603,7 @@ var Array$1 = class Array$1 extends Tracer {
 		}
 		const inputs = [];
 		const src = [];
-		for (const ar of arrays) if (ar.#source instanceof AluExp) src.push(accessorAluExp(ar.#dtype, ar.#source, ar.#st, indices));
+		for (const ar of arrays) if (ar.#source instanceof AluExp) src.push(accessorAluExp(ar.#source, ar.#st, indices));
 		else {
 			let gid = inputs.indexOf(ar.#source);
 			if (gid === -1) {
@@ -1351,7 +1624,7 @@ var Array$1 = class Array$1 extends Tracer {
 		for (const exe of pending) exe.updateRc(1);
 		pending.add(new PendingExecute(backend, kernel, inputs, [output]));
 		for (const ar of arrays) ar.dispose();
-		return new Array$1(output, ShapeTracker.fromShape(newShape), dtypeOutput, backend, pending);
+		return new Array$1(output, ShapeTracker.fromShape(newShape), dtypeOutput, backend, { pending });
 	}
 	/** Reduce the last dimension of the array by an operation. */
 	#reduce(op) {
@@ -1364,7 +1637,7 @@ var Array$1 = class Array$1 extends Tracer {
 		const indices = [...unravelAlu(newShape, AluVar.gidx), AluVar.ridx];
 		let exp$2;
 		const inputs = [];
-		if (this.#source instanceof AluExp) exp$2 = accessorAluExp(this.#dtype, this.#source, this.#st, indices);
+		if (this.#source instanceof AluExp) exp$2 = accessorAluExp(this.#source, this.#st, indices);
 		else {
 			inputs.push(this.#source);
 			exp$2 = accessorGlobal(this.#dtype, 0, this.#st, indices);
@@ -1375,7 +1648,7 @@ var Array$1 = class Array$1 extends Tracer {
 		for (const exe of pending) exe.updateRc(1);
 		pending.push(new PendingExecute(this.#backend, kernel, inputs, [output]));
 		this.dispose();
-		return new Array$1(output, ShapeTracker.fromShape(newShape), this.#dtype, this.#backend, pending);
+		return new Array$1(output, ShapeTracker.fromShape(newShape), this.#dtype, this.#backend, { pending });
 	}
 	/**
 	* Normalizes this array into one backed by a `Slot`.
@@ -1389,7 +1662,7 @@ var Array$1 = class Array$1 extends Tracer {
 		this.#check();
 		const indices = unravelAlu(this.#st.shape, AluVar.gidx);
 		if (this.#source instanceof AluExp) {
-			const exp$2 = accessorAluExp(this.#dtype, this.#source, this.#st, indices);
+			const exp$2 = accessorAluExp(this.#source, this.#st, indices);
 			const kernel = new Kernel(0, this.#st.size, exp$2);
 			const output = this.#backend.malloc(kernel.bytes);
 			const pendingItem = new PendingExecute(this.#backend, kernel, [], [output]);
@@ -1427,42 +1700,54 @@ var Array$1 = class Array$1 extends Tracer {
 	}
 	/** Realize the array and return it as data. */
 	async data() {
-		if (this.#source instanceof AluExp && prod(this.shape) < inlineArrayLimit && this.device !== "cpu") return this.#dataInline();
+		if (this.#source instanceof AluExp && this.size < inlineArrayLimit && this.device !== "cpu") return this.#dataInline();
 		this.#realize();
 		const pending = this.#pending;
 		if (pending) {
 			await Promise.all(pending.map((p) => p.prepare()));
 			for (const p of pending) p.submit();
 		}
-		const byteCount = byteWidth(this.#dtype) * prod(this.shape);
+		const byteCount = byteWidth(this.#dtype) * this.size;
 		const buf = await this.#backend.read(this.#source, 0, byteCount);
 		this.dispose();
 		return dtypedArray(this.dtype, buf);
 	}
-	/** Wait for this array to be placed on the backend, if needed. */
-	async wait() {
+	/**
+	* Wait for this array to finish evaluation.
+	*
+	* Operations and data loading in jax-js are lazy, so this function ensures
+	* that pending operations are dispatched and fully executed before it
+	* returns.
+	*
+	* If you are mapping from `data()` or `dataSync()`, it will also trigger
+	* dispatch of operations as well.
+	*
+	* **Note:** `jax.blockUntilReady()` is a higher-level API, it calls this
+	* asynchronously for multiple arrays.
+	*/
+	async blockUntilReady() {
 		this.#check();
-		if (this.#source instanceof AluExp) return;
+		if (this.#source instanceof AluExp) return this;
 		const pending = this.#pending;
 		if (pending) {
 			await Promise.all(pending.map((p) => p.prepare()));
 			for (const p of pending) p.submit();
 		}
 		await this.#backend.read(this.#source, 0, 0);
-		this.dispose();
+		return this;
 	}
 	/**
 	* Realize the array and return it as data. This is a sync variant and not
 	* recommended for performance reasons, as it will block rendering.
 	*/
 	dataSync() {
-		if (this.#source instanceof AluExp && prod(this.shape) < inlineArrayLimit && this.device !== "cpu") return this.#dataInline();
+		if (this.#source instanceof AluExp && this.size < inlineArrayLimit && this.device !== "cpu") return this.#dataInline();
 		this.#realize();
 		for (const p of this.#pending) {
 			p.prepareSync();
 			p.submit();
 		}
-		const byteCount = byteWidth(this.#dtype) * prod(this.shape);
+		const byteCount = byteWidth(this.#dtype) * this.size;
 		const buf = this.#backend.readSync(this.#source, 0, byteCount);
 		this.dispose();
 		return dtypedArray(this.dtype, buf);
@@ -1483,6 +1768,16 @@ var Array$1 = class Array$1 extends Tracer {
 	async jsAsync() {
 		return dataToJs(this.dtype, await this.data(), this.shape);
 	}
+	/**
+	* Copy an element of an array to a numeric scalar and return it.
+	*
+	* Throws an error if the array does not have a single element. The array must
+	* either be rank-0, or all dimensions of the shape are 1.
+	*/
+	item() {
+		if (this.size !== 1) throw new Error(`item() can only be called on arrays of size 1`);
+		return this.dataSync()[0];
+	}
 	/** @private Internal plumbing method for Array / Tracer ops. */
 	static _implRules() {
 		return {
@@ -1496,7 +1791,7 @@ var Array$1 = class Array$1 extends Tracer {
 				return [x.#binary(AluOp.Idiv, y)];
 			},
 			[Primitive.Neg]([x]) {
-				return [zerosLike(x).#binary(AluOp.Sub, x)];
+				return [zerosLike$1(x.ref).#binary(AluOp.Sub, x)];
 			},
 			[Primitive.Reciprocal]([x]) {
 				return [x.#unary(AluOp.Reciprocal)];
@@ -1516,7 +1811,7 @@ var Array$1 = class Array$1 extends Tracer {
 					x.#backend.incRef(x.#source);
 					const pending = x.#pending;
 					for (const exe of pending) exe.updateRc(1);
-					const y = new Array$1(x.#source, x.#st, dtype, x.#backend, pending);
+					const y = new Array$1(x.#source, x.#st, dtype, x.#backend, { pending });
 					x.dispose();
 					return [y];
 				}
@@ -1546,12 +1841,21 @@ var Array$1 = class Array$1 extends Tracer {
 			[Primitive.Cos]([x]) {
 				return [x.#unary(AluOp.Cos)];
 			},
+			[Primitive.Asin]([x]) {
+				return [x.#unary(AluOp.Asin)];
+			},
+			[Primitive.Atan]([x]) {
+				return [x.#unary(AluOp.Atan)];
+			},
 			[Primitive.Exp]([x]) {
 				return [x.#unary(AluOp.Exp)];
 			},
 			[Primitive.Log]([x]) {
 				return [x.#unary(AluOp.Log)];
 			},
+			[Primitive.Sqrt]([x]) {
+				return [x.#unary(AluOp.Sqrt)];
+			},
 			[Primitive.Min]([x, y]) {
 				return [x.#binary(AluOp.Min, y)];
 			},
@@ -1562,9 +1866,24 @@ var Array$1 = class Array$1 extends Tracer {
 				if (axis.length === 0) return [x];
 				return [x.#moveAxesDown(axis).#reduce(op)];
 			},
+			[Primitive.Pool]([x], { window, strides }) {
+				const st = pool(x.#st, window, strides);
+				return [x.#reshape(st)];
+			},
+			[Primitive.PoolTranspose]([x], { inShape, window, strides }) {
+				const n = inShape.length;
+				let st = poolTranspose(x.#st, inShape, window, strides);
+				st = st.reshape([...st.shape.slice(0, n), prod(st.shape.slice(n))]);
+				return [x.#reshape(st).#reduce(AluOp.Add)];
+			},
 			[Primitive.Dot]([x, y]) {
 				return [Array$1.#naryCustom("dot", ([x$1, y$1]) => AluExp.mul(x$1, y$1), [x, y], { reduceAxis: true })];
 			},
+			[Primitive.Conv]([x, y], params) {
+				checkConvShape(x.shape, y.shape, params);
+				const [stX, stY] = prepareConv(x.#st, y.#st, params);
+				return [Array$1.#naryCustom("conv", ([x$1, y$1]) => AluExp.mul(x$1, y$1), [x.#reshape(stX), y.#reshape(stY)], { reduceAxis: true })];
+			},
 			[Primitive.Compare]([x, y], { op }) {
 				const custom = ([x$1, y$1]) => aluCompare(x$1, y$1, op);
 				return [Array$1.#naryCustom("compare", custom, [x, y], { dtypeOutput: DType.Bool })];
@@ -1613,7 +1932,7 @@ var Array$1 = class Array$1 extends Tracer {
 				pending.splice(0, 0, ...prevPending);
 				args.forEach((x) => x.dispose());
 				return outputs.map((source, i) => {
-					return new Array$1(source, ShapeTracker.fromShape(jaxpr.outs[i].aval.shape), jaxpr.outs[i].aval.dtype, backend, pending);
+					return new Array$1(source, ShapeTracker.fromShape(jaxpr.outs[i].aval.shape), jaxpr.outs[i].aval.dtype, backend, { pending });
 				});
 			}
 		};
@@ -1629,6 +1948,7 @@ function scalar(value, { dtype, device } = {}) {
 		dtype ??= DType.Float32;
 		if (![
 			DType.Float32,
+			DType.Float16,
 			DType.Int32,
 			DType.Uint32
 		].includes(dtype)) throw new TypeError(`Mismatched dtype for scalar ${value}`);
@@ -1636,6 +1956,7 @@ function scalar(value, { dtype, device } = {}) {
 		dtype ??= DType.Bool;
 		if (![
 			DType.Float32,
+			DType.Float16,
 			DType.Int32,
 			DType.Uint32,
 			DType.Bool
@@ -1649,7 +1970,7 @@ function array(values, { shape: shape$1, dtype, device } = {}) {
 		if (shape$1 && !deepEqual(values.shape, shape$1)) values = values.reshape(shape$1);
 		if (dtype && values.dtype !== dtype) throw new Error("array astype not implemented yet");
 		return values;
-	} else if (values instanceof Float32Array || values instanceof Int32Array) return arrayFromData(values, shape$1 ?? [values.length], {
+	} else if (ArrayBuffer.isView(values)) return arrayFromData(values, shape$1 ?? [values.length], {
 		dtype,
 		device
 	});
@@ -1678,7 +1999,7 @@ function array(values, { shape: shape$1, dtype, device } = {}) {
 			});
 		} else {
 			dtype = dtype ?? DType.Float32;
-			const data = dtypedArray(dtype, flat);
+			const data = dtypedJsArray(dtype, flat);
 			return arrayFromData(data, shape$1, {
 				dtype,
 				device
@@ -1699,19 +2020,24 @@ function arrayFromData(data, shape$1, { dtype, device } = {}) {
 		});
 	}
 	const backend = getBackend(device);
-	if (data instanceof Float32Array) {
-		if (dtype && dtype !== DType.Float32) throw new Error("Float32Array must have float32 type");
-		const slot = backend.malloc(data.byteLength, data.buffer);
-		return new Array$1(slot, ShapeTracker.fromShape(shape$1), DType.Float32, backend);
-	} else if (data instanceof Int32Array) {
-		if (dtype && dtype !== DType.Int32 && dtype !== DType.Bool) throw new Error("Int32Array must have int32 or bool type");
-		const slot = backend.malloc(data.byteLength, data.buffer);
-		return new Array$1(slot, ShapeTracker.fromShape(shape$1), dtype ?? DType.Int32, backend);
-	} else if (data instanceof Uint32Array) {
-		if (dtype && dtype !== DType.Uint32) throw new Error("Uint32Array must have uint32 type");
-		const slot = backend.malloc(data.byteLength, data.buffer);
-		return new Array$1(slot, ShapeTracker.fromShape(shape$1), DType.Uint32, backend);
-	} else throw new Error("Unsupported data type");
+	if (ArrayBuffer.isView(data)) {
+		const buf = new Uint8Array(data.buffer, data.byteOffset, data.byteLength);
+		if (data instanceof Float32Array) {
+			if (dtype && dtype !== DType.Float32) throw new Error("Float32Array must have float32 type");
+			dtype ??= DType.Float32;
+		} else if (data instanceof Int32Array) {
+			if (dtype && dtype !== DType.Int32 && dtype !== DType.Bool) throw new Error("Int32Array must have int32 or bool type");
+			dtype ??= DType.Int32;
+		} else if (data instanceof Uint32Array) {
+			if (dtype && dtype !== DType.Uint32) throw new Error("Uint32Array must have uint32 type");
+			dtype ??= DType.Uint32;
+		} else if (data instanceof Float16Array) {
+			if (dtype && dtype !== DType.Float16) throw new Error("Float16Array must have float16 type");
+			dtype ??= DType.Float16;
+		} else throw new Error("Unsupported data array type: " + data.constructor.name);
+		const slot = backend.malloc(data.byteLength, buf);
+		return new Array$1(slot, ShapeTracker.fromShape(shape$1), dtype, backend);
+	} else throw new Error("Unsupported data type: " + data.constructor.name);
 }
 function dataToJs(dtype, data, shape$1) {
 	if (shape$1.length === 0) return dtype === DType.Bool ? Boolean(data[0]) : data[0];
@@ -1738,9 +2064,20 @@ var EvalTrace = class extends Trace {
 };
 const baseArrayTrace = new EvalTrace(newMain(EvalTrace, null));
 const implRules = Array$1._implRules();
-function zerosLike(val) {
+function zerosLike$1(val, dtype) {
+	const aval = getAval(val);
+	if (val instanceof Tracer) val.dispose();
+	return zeros(aval.shape, { dtype: dtype ?? aval.dtype });
+}
+function onesLike$1(val, dtype) {
+	const aval = getAval(val);
+	if (val instanceof Tracer) val.dispose();
+	return ones(aval.shape, { dtype: dtype ?? aval.dtype });
+}
+function fullLike(val, fillValue, dtype) {
 	const aval = getAval(val);
-	return zeros(aval.shape, { dtype: aval.dtype });
+	if (val instanceof Tracer) val.dispose();
+	return full(aval.shape, fillValue, { dtype: dtype ?? aval.dtype });
 }
 /** Return a new array of given shape and type, filled with zeros. */
 function zeros(shape$1, { dtype, device } = {}) {
@@ -1762,6 +2099,9 @@ function full(shape$1, fillValue, { dtype, device } = {}) {
 	if (typeof fillValue === "number") {
 		dtype = dtype ?? DType.Float32;
 		source = AluExp.const(dtype, fillValue);
+	} else if (typeof fillValue === "bigint") {
+		dtype = dtype ?? DType.Int32;
+		source = AluExp.const(dtype, Number(fillValue));
 	} else if (typeof fillValue === "boolean") {
 		dtype = dtype ?? DType.Bool;
 		source = AluExp.const(dtype, fillValue ? 1 : 0);
@@ -1792,7 +2132,7 @@ function eye(numRows, numCols, { dtype, device } = {}) {
 	const exp$2 = AluExp.cmplt(AluExp.mod(AluVar.idx, AluExp.i32(numCols + 1)), AluExp.i32(1));
 	return new Array$1(AluExp.cast(dtype, exp$2), ShapeTracker.fromShape([numRows, numCols]), dtype, getBackend(device));
 }
-/** Return the identity array, with ones on the main diagonal. */
+/** Return the identity matrix, with ones on the main diagonal. */
 function identity$1(n, { dtype, device } = {}) {
 	return eye(n, n, {
 		dtype,
@@ -1859,7 +2199,6 @@ function linspace(start, stop, num = 50, endpoint = true, { dtype, device } = {}
 	const st = ShapeTracker.fromShape([num]);
 	return new Array$1(exp$2, st, dtype, getBackend(device));
 }
-/** Translate a `CompareOp` into an `AluExp` on two sub-expressions. */
 function aluCompare(a, b, op) {
 	switch (op) {
 		case CompareOp.Greater: return AluExp.mul(AluExp.cmpne(a, b), AluExp.cmplt(a, b).not());
@@ -1901,7 +2240,7 @@ function generalBroadcast(a, b) {
 }
 
 //#endregion
-//#region node_modules/.pnpm/@oxc-project+runtime@0.77.3/node_modules/@oxc-project/runtime/src/helpers/esm/usingCtx.js
+//#region node_modules/.pnpm/@oxc-project+runtime@0.78.0/node_modules/@oxc-project/runtime/src/helpers/esm/usingCtx.js
 function _usingCtx() {
 	var r = "function" == typeof SuppressedError ? SuppressedError : function(r$1, e$2) {
 		var n$1 = Error();
@@ -1969,7 +2308,7 @@ var Var = class Var {
 		this.aval = aval;
 	}
 	toString() {
-		return `Var(${this.id}):${this.aval.strShort()}`;
+		return `Var(${this.id}):${this.aval.toString()}`;
 	}
 };
 /** Literal in a Jaxpr expression. Currently, only scalars are supported. */
@@ -2009,7 +2348,7 @@ var VarPrinter = class {
 		return name;
 	}
 	nameType(v) {
-		return `${this.name(v)}:${v.aval.strShort()}`;
+		return `${this.name(v)}:${v.aval.toString()}`;
 	}
 };
 /** A single statement / binding in a Jaxpr, in ANF form. */
@@ -2069,16 +2408,19 @@ var Jaxpr = class Jaxpr {
 			varIds.set(v, FpHash.hash(id, v.aval.dtype, ...v.aval.shape));
 			return id;
 		};
-		hasher.update(this.inBinders.length, ...this.inBinders.map(vi));
-		hasher.update(this.eqns.length, ...this.eqns.flatMap((eqn) => [
-			eqn.primitive,
-			eqn.inputs.length,
-			...eqn.inputs.map((x) => x instanceof Var ? vi(x) : x.value),
-			JSON.stringify(eqn.params),
-			eqn.outBinders.length,
-			...eqn.outBinders.map(vi)
-		]));
-		hasher.update(this.outs.length, ...this.outs.map((x) => x instanceof Var ? vi(x) : x.value));
+		hasher.update(this.inBinders.length);
+		for (const x of this.inBinders) hasher.update(vi(x));
+		hasher.update(this.eqns.length);
+		for (const eqn of this.eqns) {
+			hasher.update(eqn.primitive);
+			hasher.update(eqn.inputs.length);
+			for (const x of eqn.inputs) hasher.update(x instanceof Var ? vi(x) : x.value);
+			hasher.update(JSON.stringify(eqn.params));
+			hasher.update(eqn.outBinders.length);
+			for (const x of eqn.outBinders) hasher.update(vi(x));
+		}
+		hasher.update(this.outs.length);
+		for (const x of this.outs) hasher.update(x instanceof Var ? vi(x) : x.value);
 		return this.#hash = hasher.value;
 	}
 	hash(state) {
@@ -2115,7 +2457,7 @@ var Jaxpr = class Jaxpr {
 				const c = eqn.outBinders[0];
 				if (atomIsLit(b, 1)) context.set(c, a);
 				else newEqns.push(eqn);
-			} else if ((eqn.primitive === Primitive.Broadcast || eqn.primitive === Primitive.Reshape) && deepEqual(eqn.params.shape, eqn.inputs[0].aval.shape)) context.set(eqn.outBinders[0], eqn.inputs[0]);
+			} else if ((eqn.primitive === Primitive.Broadcast || eqn.primitive === Primitive.Reshape) && deepEqual(eqn.params.shape, eqn.inputs[0].aval.shape) || eqn.primitive === Primitive.Transpose && eqn.params.perm.every((p, i) => p === i) || eqn.primitive === Primitive.Flip && eqn.params.axis.length === 0 || eqn.primitive === Primitive.Shrink && eqn.params.slice.every(([s, e$2], i) => s === 0 && e$2 === eqn.inputs[0].aval.shape[i]) || eqn.primitive === Primitive.Pad && eqn.params.width.every(([w0, w1]) => w0 === 0 && w1 === 0)) context.set(eqn.outBinders[0], eqn.inputs[0]);
 			else newEqns.push(eqn);
 		}
 		const outs = this.outs.map((x) => x instanceof Var ? context.get(x) ?? x : x);
@@ -2164,8 +2506,8 @@ var JaxprType = class {
 		this.outTypes = outTypes;
 	}
 	toString() {
-		const inTypes = this.inTypes.map((aval) => aval.strShort()).join(", ");
-		const outTypes = this.outTypes.map((aval) => aval.strShort()).join(", ");
+		const inTypes = this.inTypes.map((aval) => aval.toString()).join(", ");
+		const outTypes = this.outTypes.map((aval) => aval.toString()).join(", ");
 		return `(${inTypes}) -> (${outTypes})`;
 	}
 };
@@ -2244,7 +2586,7 @@ var JaxprTracer = class extends Tracer {
 		this.aval = aval;
 	}
 	toString() {
-		return `JaxprTracer(${this.aval.strShort()})`;
+		return `JaxprTracer(${this.aval.toString()})`;
 	}
 	get ref() {
 		return this;
@@ -2381,8 +2723,11 @@ const abstractEvalRules = {
 	},
 	[Primitive.Sin]: vectorizedUnopAbstractEval,
 	[Primitive.Cos]: vectorizedUnopAbstractEval,
+	[Primitive.Asin]: vectorizedUnopAbstractEval,
+	[Primitive.Atan]: vectorizedUnopAbstractEval,
 	[Primitive.Exp]: vectorizedUnopAbstractEval,
 	[Primitive.Log]: vectorizedUnopAbstractEval,
+	[Primitive.Sqrt]: vectorizedUnopAbstractEval,
 	[Primitive.Min]: binopAbstractEval,
 	[Primitive.Max]: binopAbstractEval,
 	[Primitive.Reduce]([x], { axis }) {
@@ -2390,6 +2735,15 @@ const abstractEvalRules = {
 		const newShape = x.shape.filter((_, i) => !axisSet.has(i));
 		return [new ShapedArray(newShape, x.dtype)];
 	},
+	[Primitive.Pool]([x], { window, strides }) {
+		const shape$1 = checkPoolShape(x.shape, window, strides);
+		return [new ShapedArray(shape$1, x.dtype)];
+	},
+	[Primitive.PoolTranspose]([x], { inShape, window, strides }) {
+		const shape$1 = checkPoolShape(inShape, window, strides);
+		if (!deepEqual(shape$1, x.shape)) throw new TypeError(`PoolTranspose shape mismatch: expected ${JSON.stringify(shape$1)}, got ${JSON.stringify(x.shape)}`);
+		return [new ShapedArray(inShape, x.dtype)];
+	},
 	[Primitive.Dot]([x, y]) {
 		if (x.dtype !== y.dtype) throw new TypeError(`Dot dtype mismatch, got ${x.dtype} vs ${y.dtype}`);
 		if (x.ndim === 0 && y.ndim === 0) throw new TypeError("Dot requires at least 1D inputs");
@@ -2397,6 +2751,11 @@ const abstractEvalRules = {
 		shape$1.splice(-1, 1);
 		return [new ShapedArray(shape$1, x.dtype)];
 	},
+	[Primitive.Conv]([lhs, rhs], params) {
+		if (lhs.dtype !== rhs.dtype) throw new TypeError(`Conv dtype mismatch, got ${lhs.dtype} vs ${rhs.dtype}`);
+		const shape$1 = checkConvShape(lhs.shape, rhs.shape, params);
+		return [new ShapedArray(shape$1, lhs.dtype)];
+	},
 	[Primitive.Compare]: compareAbstractEval,
 	[Primitive.Where]([cond, x, y]) {
 		if (cond.dtype !== DType.Bool) throw new TypeError(`Condition must be boolean, got ${cond.dtype}`);
@@ -2444,15 +2803,34 @@ const abstractEvalRules = {
 		return outTypes;
 	}
 };
-function makeJaxpr$1(f) {
+function splitIdx(values, argnums) {
+	const a = [];
+	const b = [];
+	for (let i = 0; i < values.length; i++) if (argnums.has(i)) a.push(values[i]);
+	else b.push(values[i]);
+	return [a, b];
+}
+function joinIdx(n, a, b, argnums) {
+	const result = [];
+	let ai = 0;
+	let bi = 0;
+	for (let i = 0; i < n; i++) if (argnums.has(i)) result.push(a[ai++]);
+	else result.push(b[bi++]);
+	return result;
+}
+function makeJaxpr$1(f, opts) {
 	return (...argsIn) => {
 		try {
 			var _usingCtx$1 = _usingCtx();
-			const [avalsIn, inTree] = flatten(argsIn);
-			const [fFlat, outTree] = flattenFun(f, inTree);
+			const staticArgnums = new Set(opts?.staticArgnums ?? []);
+			const [staticArgs, shapedArgs] = splitIdx(argsIn, staticArgnums);
+			const [avalsIn, inTree] = flatten(shapedArgs);
+			const [fFlat, outTree] = flattenFun((...dynamicArgs) => {
+				return f(...joinIdx(argsIn.length, staticArgs, dynamicArgs, staticArgnums));
+			}, inTree);
 			const builder = new JaxprBuilder();
 			const main = _usingCtx$1.u(newMain(JaxprTrace, builder));
-			const _dynamic = _usingCtx$1.u(newDynamic(main));
+			_usingCtx$1.u(newDynamic(main));
 			const trace = new JaxprTrace(main);
 			const tracersIn = avalsIn.map((aval) => trace.newArg(typeof aval === "object" ? aval : pureArray(aval)));
 			const outs = fFlat(...tracersIn);
@@ -2471,20 +2849,27 @@ function makeJaxpr$1(f) {
 		}
 	};
 }
-function jit$1(f) {
+function jit$1(f, opts) {
 	const cache = /* @__PURE__ */ new Map();
-	return ((...args) => {
-		const [argsFlat, inTree] = flatten(args);
+	const staticArgnums = new Set(opts?.staticArgnums ?? []);
+	const result = ((...args) => {
+		const [staticArgs, dynamicArgs] = splitIdx(args, staticArgnums);
+		const [argsFlat, inTree] = flatten(dynamicArgs);
 		const avalsInFlat = argsFlat.map((x) => ShapedArray.fromAval(getAval(x)));
 		const avalsIn = unflatten(inTree, avalsInFlat);
-		const cacheKey = JSON.stringify(avalsIn);
-		const { jaxpr, consts, treedef: outTree } = runWithCache(cache, cacheKey, () => makeJaxpr$1(f)(...avalsIn));
+		const jaxprArgs = joinIdx(args.length, staticArgs, avalsIn, staticArgnums);
+		const cacheKey = JSON.stringify(jaxprArgs);
+		const { jaxpr, consts, treedef: outTree } = runWithCache(cache, cacheKey, () => makeJaxpr$1(f, opts)(...jaxprArgs));
 		const outs = bind(Primitive.JitCall, [...consts.map((c) => c.ref), ...argsFlat], {
 			jaxpr,
 			numConsts: consts.length
 		});
 		return unflatten(outTree, outs);
 	});
+	result.dispose = () => {
+		for (const { consts } of cache.values()) for (const c of consts) c.dispose();
+	};
+	return result;
 }
 
 //#endregion
@@ -2515,7 +2900,7 @@ var JVPTrace = class extends Trace {
 		return this.lift(pureArray(val));
 	}
 	lift(val) {
-		return new JVPTracer(this, val, zerosLike(val));
+		return new JVPTracer(this, val, zerosLike$1(val.ref));
 	}
 	processPrimitive(primitive, tracers, params) {
 		const [primalsIn, tangentsIn] = unzip2(tracers.map((x) => [x.primal, x.tangent]));
@@ -2533,19 +2918,25 @@ function linearTangentsJvp(primitive) {
 		return [ys, dys];
 	};
 }
+/** Rule for product of gradients in bilinear operations. */
+function bilinearTangentsJvp(primitive) {
+	return ([x, y], [dx, dy], params) => {
+		const primal = bind1(primitive, [x.ref, y.ref], params);
+		const tangent = bind1(primitive, [x, dy], params).add(bind1(primitive, [dx, y], params));
+		return [[primal], [tangent]];
+	};
+}
 /** Rule that zeros out any tangents. */
 function zeroTangentsJvp(primitive) {
 	return (primals, tangents, params) => {
 		for (const t of tangents) t.dispose();
 		const ys = bind(primitive, primals, params);
-		return [ys, ys.map((y) => zerosLike(y))];
+		return [ys, ys.map((y) => zerosLike$1(y.ref))];
 	};
 }
 const jvpRules = {
 	[Primitive.Add]: linearTangentsJvp(Primitive.Add),
-	[Primitive.Mul]([x, y], [dx, dy]) {
-		return [[x.ref.mul(y.ref)], [x.mul(dy).add(dx.mul(y))]];
-	},
+	[Primitive.Mul]: bilinearTangentsJvp(Primitive.Mul),
 	[Primitive.Idiv]: zeroTangentsJvp(Primitive.Idiv),
 	[Primitive.Neg]: linearTangentsJvp(Primitive.Neg),
 	[Primitive.Reciprocal]([x], [dx]) {
@@ -2558,13 +2949,13 @@ const jvpRules = {
 		if (isFloatDtype(dtype) && isFloatDtype(x.dtype)) return [[cast(x, dtype)], [cast(dx, dtype)]];
 		else {
 			dx.dispose();
-			return [[cast(x, dtype)], [zerosLike(x)]];
+			return [[cast(x.ref, dtype)], [zerosLike$1(x)]];
 		}
 	},
 	[Primitive.Bitcast]([x], [dx], { dtype }) {
 		if (x.dtype === dtype) return [[x], [dx]];
 		dx.dispose();
-		return [[bitcast(x, dtype)], [zerosLike(x)]];
+		return [[bitcast(x.ref, dtype)], [zerosLike$1(x)]];
 	},
 	[Primitive.RandomBits]: zeroTangentsJvp(Primitive.RandomBits),
 	[Primitive.Sin]([x], [dx]) {
@@ -2573,6 +2964,14 @@ const jvpRules = {
 	[Primitive.Cos]([x], [dx]) {
 		return [[cos$1(x.ref)], [neg(sin$1(x)).mul(dx)]];
 	},
+	[Primitive.Asin]([x], [dx]) {
+		const denom = sqrt$1(reciprocal$1(cast(1, x.dtype).sub(x.ref.mul(x.ref))));
+		return [[asin$1(x)], [denom.mul(dx)]];
+	},
+	[Primitive.Atan]([x], [dx]) {
+		const denom = cast(1, x.dtype).add(x.ref.mul(x.ref));
+		return [[atan$1(x)], [dx.div(denom)]];
+	},
 	[Primitive.Exp]([x], [dx]) {
 		const z = exp$1(x);
 		return [[z.ref], [z.mul(dx)]];
@@ -2580,6 +2979,10 @@ const jvpRules = {
 	[Primitive.Log]([x], [dx]) {
 		return [[log$1(x.ref)], [reciprocal$1(x).mul(dx)]];
 	},
+	[Primitive.Sqrt]([x], [dx]) {
+		const z = sqrt$1(x);
+		return [[z.ref], [reciprocal$1(z.mul(2)).mul(dx)]];
+	},
 	[Primitive.Min]([x, y], [dx, dy]) {
 		return [[min$1(x.ref, y.ref)], [where$1(less$1(y, x), dy, dx)]];
 	},
@@ -2596,13 +2999,14 @@ const jvpRules = {
 			const primal = reduce(x.ref, op, axis);
 			const notMin = notEqual$1(x, broadcast(primal.ref, x.shape, axis));
 			const minCount = where$1(notMin.ref, 0, 1).sum(axis);
-			const tangent = where$1(notMin, op === AluOp.Min ? 0 : 0, dx).sum(axis).mul(reciprocal$1(minCount));
+			const tangent = where$1(notMin, 0, dx).sum(axis).div(minCount);
 			return [[primal], [tangent]];
 		} else throw new Error(`JVP rule not implemented for reduce op: ${op}`);
 	},
-	[Primitive.Dot]([x, y], [dx, dy]) {
-		return [[dot$1(x.ref, y.ref)], [dot$1(dx, y).add(dot$1(x, dy))]];
-	},
+	[Primitive.Pool]: linearTangentsJvp(Primitive.Pool),
+	[Primitive.PoolTranspose]: linearTangentsJvp(Primitive.PoolTranspose),
+	[Primitive.Dot]: bilinearTangentsJvp(Primitive.Dot),
+	[Primitive.Conv]: bilinearTangentsJvp(Primitive.Conv),
 	[Primitive.Compare]: zeroTangentsJvp(Primitive.Compare),
 	[Primitive.Where]([cond, x, y], [dcond, dx, dy]) {
 		dcond.dispose();
@@ -2683,7 +3087,10 @@ function mappedAval(batchDim, aval) {
 /** Move one axis to a different index. */
 function moveaxis$1(x, src, dst) {
 	const t = pureArray(x);
-	const perm = range(t.shape.length);
+	src = checkAxis(src, t.ndim);
+	dst = checkAxis(dst, t.ndim);
+	if (src === dst) return t;
+	const perm = range(t.ndim);
 	perm.splice(src, 1);
 	perm.splice(dst, 0, src);
 	return transpose$1(t, perm);
@@ -2776,8 +3183,11 @@ const vmapRules = {
 	[Primitive.Bitcast]: unopBatcher((x, { dtype }) => bitcast(x, dtype)),
 	[Primitive.Sin]: unopBatcher(sin$1),
 	[Primitive.Cos]: unopBatcher(cos$1),
+	[Primitive.Asin]: unopBatcher(asin$1),
+	[Primitive.Atan]: unopBatcher(atan$1),
 	[Primitive.Exp]: unopBatcher(exp$1),
 	[Primitive.Log]: unopBatcher(log$1),
+	[Primitive.Sqrt]: unopBatcher(sqrt$1),
 	[Primitive.Min]: broadcastBatcher(min$1),
 	[Primitive.Max]: broadcastBatcher(max$1),
 	[Primitive.Reduce](axisSize, [x], [xBdim], { op, axis }) {
@@ -2914,7 +3324,7 @@ var PartialVal = class PartialVal {
 		return this.val !== null;
 	}
 	toString() {
-		return this.val ? this.val.toString() : this.aval.strShort();
+		return this.val ? this.val.toString() : this.aval.toString();
 	}
 };
 function partialEvalFlat(f, pvalsIn) {
@@ -2960,20 +3370,28 @@ function linearizeFlatUtil(f, primalsIn) {
 function linearizeFlat(f, primalsIn) {
 	const { primalsOut, jaxpr, consts } = linearizeFlatUtil(f, primalsIn);
 	const fLin = (...tangents) => evalJaxpr(jaxpr, [...consts.map((c) => c.ref), ...tangents]);
-	return [primalsOut, fLin];
+	const dispose$1 = () => {
+		for (const c of consts) c.dispose();
+	};
+	return [
+		primalsOut,
+		fLin,
+		dispose$1
+	];
 }
 function linearize$1(f, ...primalsIn) {
 	const [primalsInFlat, inTree] = flatten(primalsIn);
 	const [fFlat, outTree] = flattenFun(f, inTree);
-	const [primalsOutFlat, fLinFlat] = linearizeFlat(fFlat, primalsInFlat.map(pureArray));
+	const [primalsOutFlat, fLinFlat, dispose$1] = linearizeFlat(fFlat, primalsInFlat.map(pureArray));
 	if (outTree.value === void 0) throw new Error("outTree was not set in linearize");
 	const primalsOut = unflatten(outTree.value, primalsOutFlat);
-	const fLin = (...tangentsIn) => {
+	const fLin = ((...tangentsIn) => {
 		const [tangentsInFlat, inTree2] = flatten(tangentsIn);
 		if (!inTree.equals(inTree2)) throw new TreeMismatchError("linearize", inTree, inTree2);
 		const tangentsOutFlat = fLinFlat(...tangentsInFlat.map(pureArray));
 		return unflatten(outTree.value, tangentsOutFlat);
-	};
+	});
+	fLin.dispose = dispose$1;
 	return [primalsOut, fLin];
 }
 var PartialEvalTracer = class extends Tracer {
@@ -3089,7 +3507,10 @@ var PartialEvalTrace = class extends Trace {
 			avalsOut: jaxpr2.outs.map((x) => x.aval),
 			tracerRefsOut: []
 		};
-		const outs2 = jaxpr2.outs.map((x) => new PartialEvalTracer(this, PartialVal.unknown(x.aval), recipe));
+		const outs2 = jaxpr2.outs.map((x, i$1) => {
+			if (i$1 > 0) recipe.tracersIn.forEach((t) => t.ref);
+			return new PartialEvalTracer(this, PartialVal.unknown(x.aval), recipe);
+		});
 		recipe.tracerRefsOut = outs2.map((t) => new WeakRef(t));
 		let i = 0;
 		let j = 0;
@@ -3173,13 +3594,15 @@ function partialEvalGraphToJaxpr(tracersIn, tracersOut) {
 	const [consts, constvars] = unzip2(constToVar.entries());
 	const inBinders = [...constvars, ...tracersIn.map((t) => tracerToVar.get(t))];
 	const outVars = tracersOut.map((t) => tracerToVar.get(t));
-	const jaxpr = new Jaxpr(inBinders, eqns, outVars);
+	let jaxpr = new Jaxpr(inBinders, eqns, outVars);
 	typecheckJaxpr(jaxpr);
 	for (const t of consts) t.ref;
 	for (const t of tracersIn) t.dispose();
 	for (const t of tracersOut) t.dispose();
+	jaxpr = jaxpr.simplify();
+	if (DEBUG >= 5) console.log("jaxpr from partial evaluation:\n" + jaxpr.toString());
 	return {
-		jaxpr: jaxpr.simplify(),
+		jaxpr,
 		consts
 	};
 }
@@ -3288,12 +3711,72 @@ const transposeRules = {
 		if (op === AluOp.Add) return [broadcast(ct, x.aval.shape, axis)];
 		else throw new NonlinearError(Primitive.Reduce);
 	},
+	[Primitive.Pool]([ct], [x], { window, strides }) {
+		if (!(x instanceof UndefPrimal)) throw new NonlinearError(Primitive.Pool);
+		return bind(Primitive.PoolTranspose, [ct], {
+			inShape: x.aval.shape,
+			window,
+			strides
+		});
+	},
+	[Primitive.PoolTranspose]([ct], [x], { window, strides }) {
+		if (!(x instanceof UndefPrimal)) throw new NonlinearError(Primitive.PoolTranspose);
+		return bind(Primitive.Pool, [ct], {
+			window,
+			strides
+		});
+	},
 	[Primitive.Dot]([ct], [x, y]) {
 		if (x instanceof UndefPrimal === y instanceof UndefPrimal) throw new NonlinearError(Primitive.Dot);
 		const axisSize = generalBroadcast(x.aval.shape, y.aval.shape).slice(-1)[0];
 		ct = broadcast(ct, ct.shape.concat(axisSize), [-1]);
 		return [x instanceof UndefPrimal ? unbroadcast(mul(ct, y), x) : null, y instanceof UndefPrimal ? unbroadcast(mul(x, ct), y) : null];
 	},
+	[Primitive.Conv]([ct], [lhs, rhs], params) {
+		if (lhs instanceof UndefPrimal === rhs instanceof UndefPrimal) throw new NonlinearError(Primitive.Conv);
+		const rev01 = [
+			1,
+			0,
+			...range(2, ct.ndim)
+		];
+		if (lhs instanceof UndefPrimal) {
+			let kernel = rhs;
+			kernel = transpose$1(kernel, rev01);
+			kernel = flip$1(kernel, range(2, kernel.ndim));
+			const result = conv(ct, kernel, {
+				strides: params.lhsDilation,
+				padding: params.padding.map(([pl, _pr], i) => {
+					const dilatedKernel = (kernel.shape[i + 2] - 1) * params.rhsDilation[i] + 1;
+					const dilatedCt = (ct.shape[i + 2] - 1) * params.strides[i] + 1;
+					const padBefore = dilatedKernel - 1 - pl;
+					const dilatedLhs = (lhs.aval.shape[i + 2] - 1) * params.lhsDilation[i] + 1;
+					const padAfter = dilatedLhs + dilatedKernel - 1 - dilatedCt - padBefore;
+					return [padBefore, padAfter];
+				}),
+				lhsDilation: params.strides,
+				rhsDilation: params.rhsDilation
+			});
+			return [result, null];
+		} else {
+			const newLhs = transpose$1(lhs, rev01);
+			const newRhs = transpose$1(ct, rev01);
+			let result = conv(newLhs, newRhs, {
+				strides: params.rhsDilation,
+				padding: params.padding.map(([pl, _pr], i) => {
+					const dilatedLhs = (lhs.aval.shape[i + 2] - 1) * params.lhsDilation[i] + 1;
+					const dilatedKernel = (rhs.aval.shape[i + 2] - 1) * params.rhsDilation[i] + 1;
+					const dilatedCt = (ct.shape[i + 2] - 1) * params.strides[i] + 1;
+					const padFromLhs = dilatedCt - dilatedLhs;
+					const padFromRhs = dilatedKernel - pl - 1;
+					return [pl, padFromLhs + padFromRhs];
+				}),
+				lhsDilation: params.lhsDilation,
+				rhsDilation: params.strides
+			});
+			result = transpose$1(result, rev01);
+			return [null, result];
+		}
+	},
 	[Primitive.Where]([ct], [cond, x, y]) {
 		const cts = [
 			null,
@@ -3385,20 +3868,28 @@ function vjpFlat(f, primalsIn) {
 		const transposeInputs = [...consts.map((c) => c.ref), ...primalsIn.map((t) => new UndefPrimal(t.aval))];
 		return evalJaxprTransposed(jaxpr, transposeInputs, cotangents);
 	};
-	return [primalsOut, fVjp];
+	const dispose$1 = () => {
+		for (const c of consts) c.dispose();
+	};
+	return [
+		primalsOut,
+		fVjp,
+		dispose$1
+	];
 }
 function vjp$1(f, ...primalsIn) {
 	const [primalsInFlat, inTree] = flatten(primalsIn);
 	const [fFlat, outTree] = flattenFun(f, inTree);
-	const [primalsOutFlat, fVjpFlat] = vjpFlat(fFlat, primalsInFlat.map(pureArray));
+	const [primalsOutFlat, fVjpFlat, dispose$1] = vjpFlat(fFlat, primalsInFlat.map(pureArray));
 	if (outTree.value === void 0) throw new Error("outTree was not set in vjp");
 	const primalsOut = unflatten(outTree.value, primalsOutFlat);
-	const fVjp = (cotangentsOut) => {
+	const fVjp = ((cotangentsOut) => {
 		const [cotangentsOutFlat, outTree2] = flatten(cotangentsOut);
 		if (!outTree.value.equals(outTree2)) throw new TreeMismatchError("vjp", outTree.value, outTree2);
 		const cotangentsInFlat = fVjpFlat(...cotangentsOutFlat.map(pureArray));
 		return unflatten(inTree, cotangentsInFlat);
-	};
+	});
+	fVjp.dispose = dispose$1;
 	return [primalsOut, fVjp];
 }
 function grad$1(f) {
@@ -3414,9 +3905,10 @@ function valueAndGrad$1(f) {
 		if (x.length === 0) throw new Error("grad requires at least one argument to differentiate");
 		const [y, fVjp] = vjp$1(f, x[0], ...x.slice(1).map(stopGradient));
 		if (!(y instanceof Tracer) || ndim$1(y) !== 0) throw new TypeError("grad requires a scalar output");
-		if (y.dtype !== DType.Float32) throw new TypeError("grad currently only supports float32");
-		const [ct, ...rest] = fVjp(pureArray(1));
-		for (const r of rest) r.dispose();
+		if (!isFloatDtype(y.dtype)) throw new TypeError("grad only supports floating-point dtypes");
+		const [ct, ...rest] = fVjp(scalar(1, { dtype: y.dtype }));
+		for (const r of rest) dispose(r);
+		fVjp.dispose();
 		return [y, ct];
 	};
 }
@@ -3424,11 +3916,84 @@ function jacrev$1(f) {
 	return function jacobianReverse(x) {
 		if (x.shape.length !== 1) throw new TypeError("jacrev only supports 1D inputs");
 		const [size$1] = x.shape;
-		const pullback = (ct) => vjp$1(f, x)[1](ct)[0];
+		const pullback = (ct) => {
+			const [y, fVjp] = vjp$1(f, x);
+			y.dispose();
+			const [ret] = fVjp(ct);
+			fVjp.dispose();
+			return ret;
+		};
 		return vmap$1(pullback, [1])(eye(size$1, void 0, { dtype: x.dtype }));
 	};
 }
 
+//#endregion
+//#region src/lax.ts
+var lax_exports = {};
+__export(lax_exports, {
+	conv: () => conv$1,
+	convGeneralDilated: () => convGeneralDilated,
+	convWithGeneralPadding: () => convWithGeneralPadding,
+	reduceWindow: () => reduceWindow
+});
+function padtypeToPads(inShape, filterShape, strides, dilation, padding) {
+	const padType = padding.toUpperCase();
+	switch (padType) {
+		case "VALID": return rep(inShape.length, [0, 0]);
+		case "SAME":
+		case "SAME_LOWER": {
+			const outShape = inShape.map((size$1, i) => Math.ceil(size$1 / strides[i]));
+			const padSizes = zipn(outShape, strides, filterShape, dilation, inShape).map(([o, s, k, d, i]) => Math.max(0, (o - 1) * s + 1 + (k - 1) * d - i));
+			if (padType === "SAME") return padSizes.map((size$1) => [size$1 >> 1, size$1 - (size$1 >> 1)]);
+			else return padSizes.map((size$1) => [size$1 - (size$1 >> 1), size$1 >> 1]);
+		}
+		default: throw new Error(`Unknown padding type: ${padType}`);
+	}
+}
+/**
+* General n-dimensional convolution operator, with optional dilation.
+*
+* The semantics of this operation mimic the `jax.lax.conv_general_dilated`
+* function in JAX, which wraps XLA's general convolution operator.
+*
+* Grouped convolutions are not supported right now.
+*/
+function convGeneralDilated(lhs, rhs, windowStrides, padding, { lhsDilation, rhsDilation } = {}) {
+	if (lhs.ndim < 2) throw new Error("lhs must have at least 2 dimensions");
+	if (rhs.ndim < 2) throw new Error("rhs must have at least 2 dimensions");
+	if (typeof padding === "string") {
+		if (lhsDilation?.some((d) => d !== 1)) throw new Error("String padding is not supported for transposed convolutions");
+		padding = padtypeToPads(lhs.shape.slice(2), rhs.shape.slice(2), windowStrides, rhsDilation ?? rep(rhs.ndim - 2, 1), padding);
+	}
+	return conv(lhs, rhs, {
+		strides: windowStrides,
+		padding,
+		lhsDilation,
+		rhsDilation
+	});
+}
+/** Convenience wrapper around `convGeneralDilated`. */
+function convWithGeneralPadding(lhs, rhs, windowStrides, padding, lhsDilation, rhsDilation) {
+	return convGeneralDilated(lhs, rhs, windowStrides, padding, {
+		lhsDilation,
+		rhsDilation
+	});
+}
+/** Convenience wrapper around `convGeneralDilated`. */
+function conv$1(lhs, rhs, windowStrides, padding) {
+	return convGeneralDilated(lhs, rhs, windowStrides, padding);
+}
+/** Reduce a computation over padded windows. */
+function reduceWindow(operand, computation, windowDimensions, windowStrides) {
+	if (operand.ndim < windowDimensions.length) throw new Error(`Operand dimensions ${operand.ndim} < window ${windowDimensions.length}`);
+	if (!windowStrides) windowStrides = rep(windowDimensions.length, 1);
+	for (let i = 0; i < operand.ndim; i++) computation = vmap$1(computation, 0);
+	return computation(bind1(Primitive.Pool, [operand], {
+		window: windowDimensions,
+		strides: windowStrides
+	}));
+}
+
 //#endregion
 //#region src/numpy.ts
 var numpy_exports = {};
@@ -3437,19 +4002,38 @@ __export(numpy_exports, {
 	DType: () => DType,
 	abs: () => abs,
 	absolute: () => absolute,
+	acos: () => acos,
+	acosh: () => acosh,
 	add: () => add,
 	allclose: () => allclose,
 	arange: () => arange,
+	arccos: () => arccos,
+	arccosh: () => arccosh,
+	arcsinh: () => arcsinh,
+	arctan: () => arctan,
+	arctan2: () => arctan2,
+	arctanh: () => arctanh,
 	argmax: () => argmax,
 	argmin: () => argmin,
 	array: () => array,
+	asin: () => asin,
+	asinh: () => asinh,
 	astype: () => astype,
+	atan: () => atan,
+	atan2: () => atan2,
+	atanh: () => atanh,
 	bool: () => bool,
+	broadcastArrays: () => broadcastArrays,
+	broadcastShapes: () => broadcastShapes,
+	broadcastTo: () => broadcastTo,
+	cbrt: () => cbrt,
 	clip: () => clip,
 	columnStack: () => columnStack,
-	complex64: () => complex64,
 	concatenate: () => concatenate,
 	cos: () => cos,
+	cosh: () => cosh,
+	deg2rad: () => deg2rad,
+	degrees: () => degrees,
 	diag: () => diag,
 	diagonal: () => diagonal,
 	divide: () => divide,
@@ -3460,23 +4044,29 @@ __export(numpy_exports, {
 	eulerGamma: () => eulerGamma,
 	exp: () => exp,
 	exp2: () => exp2,
+	expm1: () => expm1,
 	eye: () => eye,
 	flip: () => flip,
 	fliplr: () => fliplr,
 	flipud: () => flipud,
+	float16: () => float16,
 	float32: () => float32,
 	full: () => full,
+	fullLike: () => fullLike$1,
 	greater: () => greater,
 	greaterEqual: () => greaterEqual,
 	hstack: () => hstack,
+	hypot: () => hypot,
 	identity: () => identity$1,
 	inf: () => inf,
+	inner: () => inner,
 	int32: () => int32,
 	less: () => less,
 	lessEqual: () => lessEqual,
 	linspace: () => linspace,
 	log: () => log,
 	log10: () => log10,
+	log1p: () => log1p,
 	log2: () => log2,
 	matmul: () => matmul,
 	max: () => max,
@@ -3492,36 +4082,55 @@ __export(numpy_exports, {
 	negative: () => negative,
 	notEqual: () => notEqual,
 	ones: () => ones,
+	onesLike: () => onesLike,
+	outer: () => outer,
 	pad: () => pad,
 	permuteDims: () => permuteDims,
 	pi: () => pi,
+	pow: () => pow,
+	power: () => power,
 	prod: () => prod$1,
+	promoteTypes: () => promoteTypes,
+	rad2deg: () => rad2deg,
+	radians: () => radians,
 	ravel: () => ravel,
 	reciprocal: () => reciprocal,
+	repeat: () => repeat,
 	reshape: () => reshape,
-	scalar: () => scalar,
 	shape: () => shape,
+	sign: () => sign,
 	sin: () => sin,
+	sinh: () => sinh,
 	size: () => size,
+	sqrt: () => sqrt,
 	square: () => square,
 	stack: () => stack,
+	std: () => std,
+	subtract: () => subtract,
 	sum: () => sum,
 	tan: () => tan,
+	tanh: () => tanh,
+	tile: () => tile,
 	transpose: () => transpose,
+	tri: () => tri,
+	tril: () => tril,
+	triu: () => triu,
 	trueDivide: () => trueDivide,
 	trunc: () => trunc,
 	uint32: () => uint32,
+	var_: () => var_,
 	vdot: () => vdot,
 	vecdot: () => vecdot,
 	vstack: () => vstack,
 	where: () => where,
-	zeros: () => zeros
+	zeros: () => zeros,
+	zerosLike: () => zerosLike
 });
 const float32 = DType.Float32;
 const int32 = DType.Int32;
 const uint32 = DType.Uint32;
 const bool = DType.Bool;
-const complex64 = DType.Complex64;
+const float16 = DType.Float16;
 /** Euler's constant, `e = 2.7182818284590...` */
 const e = Math.E;
 /** Euler-Mascheroni constant, `γ = 0.5772156649...` */
@@ -3532,52 +4141,66 @@ const inf = Number.POSITIVE_INFINITY;
 const nan = NaN;
 /** This is Pi, `π = 3.14159265358979...` */
 const pi = Math.PI;
-/** Element-wise addition, with broadcasting. */
+/** @function Element-wise addition, with broadcasting. */
 const add = add$1;
-/** Element-wise multiplication, with broadcasting. */
+/** @function Element-wise multiplication, with broadcasting. */
 const multiply = mul;
-/** Numerical negative of every element of an array. */
+/** @function Numerical negative of every element of an array. */
 const negative = neg;
-/** Calculate element-wise reciprocal of the input. This is `1/x`. */
+/** @function Calculate element-wise reciprocal of the input. This is `1/x`. */
 const reciprocal = reciprocal$1;
-/** Element-wise sine function (takes radians). */
+/** @function Element-wise sine function (takes radians). */
 const sin = sin$1;
-/** Element-wise cosine function (takes radians). */
+/** @function Element-wise cosine function (takes radians). */
 const cos = cos$1;
-/** Calculate the exponential of all elements in the input array. */
+/** @function Element-wise inverse sine function (inverse of sin). */
+const asin = asin$1;
+/** @function Element-wise inverse tangent function (inverse of tan). */
+const atan = atan$1;
+/** @function Calculate the exponential of all elements in the input array. */
 const exp = exp$1;
-/** Calculate the natural logarithm of all elements in the input array. */
+/** @function Calculate the natural logarithm of all elements in the input array. */
 const log = log$1;
-/** Return element-wise minimum of the input arrays. */
+/** @function Calculate the square root of all elements in the input array. */
+const sqrt = sqrt$1;
+/** @function Return element-wise minimum of the input arrays. */
 const minimum = min$1;
-/** Return element-wise maximum of the input arrays. */
+/** @function Return element-wise maximum of the input arrays. */
 const maximum = max$1;
-/** Compare two arrays element-wise. */
+/** @function Compare two arrays element-wise. */
 const greater = greater$1;
-/** Compare two arrays element-wise. */
+/** @function Compare two arrays element-wise. */
 const less = less$1;
-/** Compare two arrays element-wise. */
+/** @function Compare two arrays element-wise. */
 const equal = equal$1;
-/** Compare two arrays element-wise. */
+/** @function Compare two arrays element-wise. */
 const notEqual = notEqual$1;
-/** Compare two arrays element-wise. */
+/** @function Compare two arrays element-wise. */
 const greaterEqual = greaterEqual$1;
-/** Compare two arrays element-wise. */
+/** @function Compare two arrays element-wise. */
 const lessEqual = lessEqual$1;
-/** Element-wise ternary operator, evaluates to `x` if cond else `y`. */
+/** @function Element-wise ternary operator, evaluates to `x` if cond else `y`. */
 const where = where$1;
-/** Permute the dimensions of an array. Defaults to reversing the axis order. */
+/**
+* @function
+* Permute the dimensions of an array. Defaults to reversing the axis order.
+*/
 const transpose = transpose$1;
 /**
+* @function
 * Give a new shape to an array without changing its data.
 *
 * One shape dimension can be -1. In this case, the value is inferred from the
 * length of the array and remaining dimensions.
 */
 const reshape = reshape$1;
-/** Move axes of an array to new positions. Other axes retain original order. */
+/**
+* @function
+* Move axes of an array to new positions. Other axes retain original order.
+*/
 const moveaxis = moveaxis$1;
 /**
+* @function
 * Add padding (zeros) to an array.
 *
 * The `width` argument is either an integer or pair of integers, in which case
@@ -3585,11 +4208,29 @@ const moveaxis = moveaxis$1;
 * pair specifies the padding for its corresponding axis.
 */
 const pad = pad$1;
-/** Return the number of dimensions of an array. Does not consume array reference. */
+/**
+* @function
+* Return the number of dimensions of an array. Does not consume array reference.
+*/
 const ndim = ndim$1;
-/** Return the shape of an array. Does not consume array reference. */
+/** @function Return the shape of an array. Does not consume array reference. */
 const shape = getShape;
 /**
+* @function
+* Return an array of zeros with the same shape and type as a given array.
+*/
+const zerosLike = zerosLike$1;
+/**
+* @function
+* Return an array of ones with the same shape and type as a given array.
+*/
+const onesLike = onesLike$1;
+/**
+* @function
+* Return a full array with the same shape and type as a given array.
+*/
+const fullLike$1 = fullLike;
+/**
 * Return the number of elements in an array, optionally along an axis.
 * Does not consume array reference.
 */
@@ -3602,23 +4243,23 @@ function astype(a, dtype) {
 	return fudgeArray(a).astype(dtype);
 }
 /** Sum of the elements of the array over a given axis, or axes. */
-function sum(a, axis, opts) {
+function sum(a, axis = null, opts) {
 	return reduce(a, AluOp.Add, axis, opts);
 }
 /** Product of the array elements over a given axis. */
-function prod$1(a, axis, opts) {
+function prod$1(a, axis = null, opts) {
 	return reduce(a, AluOp.Mul, axis, opts);
 }
 /** Return the minimum of array elements along a given axis. */
-function min(a, axis, opts) {
+function min(a, axis = null, opts) {
 	return reduce(a, AluOp.Min, axis, opts);
 }
 /** Return the maximum of array elements along a given axis. */
-function max(a, axis, opts) {
+function max(a, axis = null, opts) {
 	return reduce(a, AluOp.Max, axis, opts);
 }
 /** Compute the average of the array elements along the specified axis. */
-function mean(a, axis, opts) {
+function mean(a, axis = null, opts) {
 	return fudgeArray(a).mean(axis, opts);
 }
 /**
@@ -3634,18 +4275,12 @@ function argmin(a, axis, opts) {
 		axis = 0;
 	} else axis = checkAxis(axis, a.ndim);
 	const shape$1 = a.shape;
-	const isMax = equal(a, min(a.ref, axis, { keepDims: true }));
+	const isMax = equal(a, min(a.ref, axis, { keepdims: true }));
 	const length = scalar(shape$1[axis], {
 		dtype: int32,
 		device: a.device
 	});
-	const idx = where(isMax, scalar(1, {
-		dtype: int32,
-		device: a.device
-	}), scalar(0, {
-		dtype: int32,
-		device: a.device
-	})).mul(arange(shape$1[axis], 0, -1, {
+	const idx = isMax.astype(DType.Int32).mul(arange(shape$1[axis], 0, -1, {
 		dtype: int32,
 		device: a.device
 	}).reshape([shape$1[axis], ...rep(shape$1.length - axis - 1, 1)]));
@@ -3664,35 +4299,21 @@ function argmax(a, axis, opts) {
 		axis = 0;
 	} else axis = checkAxis(axis, a.ndim);
 	const shape$1 = a.shape;
-	const isMax = equal(a, max(a.ref, axis, { keepDims: true }));
+	const isMax = equal(a, max(a.ref, axis, { keepdims: true }));
 	const length = scalar(shape$1[axis], {
 		dtype: int32,
 		device: a.device
 	});
-	const idx = where(isMax, scalar(1, {
-		dtype: int32,
-		device: a.device
-	}), scalar(0, {
-		dtype: int32,
-		device: a.device
-	})).mul(arange(shape$1[axis], 0, -1, {
+	const idx = isMax.astype(DType.Int32).mul(arange(shape$1[axis], 0, -1, {
 		dtype: int32,
 		device: a.device
 	}).reshape([shape$1[axis], ...rep(shape$1.length - axis - 1, 1)]));
 	return length.sub(max(idx, axis, opts));
 }
 /** Reverse the elements in an array along the given axes. */
-function flip(x, axis) {
+function flip(x, axis = null) {
 	const nd = ndim(x);
-	if (axis === void 0) axis = range(nd);
-	else if (typeof axis === "number") axis = [axis];
-	const seen = /* @__PURE__ */ new Set();
-	for (let i = 0; i < axis.length; i++) {
-		if (axis[i] >= nd || axis[i] < -nd) throw new Error(`flip: axis ${axis[i]} out of bounds for array of ${nd} dimensions`);
-		if (axis[i] < 0) axis[i] += nd;
-		if (seen.has(axis[i])) throw new Error(`flip: duplicate axis ${axis[i]} in axis list`);
-		seen.add(axis[i]);
-	}
+	axis = normalizeAxis(axis, nd);
 	return flip$1(x, axis);
 }
 /**
@@ -3798,18 +4419,88 @@ function flipud(x) {
 function fliplr(x) {
 	return flip(x, 1);
 }
+/** @function Alternative name for `numpy.transpose()`. */
 const permuteDims = transpose;
 /** Return a 1-D flattened array containing the elements of the input. */
 function ravel(a) {
 	return fudgeArray(a).ravel();
 }
 /**
+* Repeat each element of an array after themselves.
+*
+* If no axis is provided, use the flattened input array, and return a flat
+* output array.
+*/
+function repeat(a, repeats, axis) {
+	if (!Number.isInteger(repeats) || repeats < 0) throw new Error(`repeat: repeats must be a non-negative integer, got ${repeats}`);
+	a = fudgeArray(a);
+	if (axis === void 0) {
+		a = ravel(a);
+		axis = 0;
+	}
+	axis = checkAxis(axis, a.ndim);
+	if (repeats === 1) return a;
+	const broadcastedShape = a.shape.toSpliced(axis + 1, 0, repeats);
+	const finalShape = a.shape.toSpliced(axis, 1, a.shape[axis] * repeats);
+	return broadcast(a, broadcastedShape, [axis + 1]).reshape(finalShape);
+}
+/**
+* Construct an array by repeating A the number of times given by reps.
+*
+* If `A` is an array of shape `(d1, d2, ..., dn)` and `reps` is a sequence of
+* integers, the resulting array will have a shape of `(reps[0] * d1,
+* reps[1] * d2, ..., reps[n] * dn)`, with `A` tiled along each dimension.
+*/
+function tile(a, reps) {
+	a = fudgeArray(a);
+	if (typeof reps === "number") reps = [reps];
+	if (!reps.every((r) => Number.isInteger(r) && r >= 0)) throw new Error(`tile: reps must be non-negative integers, got ${JSON.stringify(reps)}`);
+	const ndiff = reps.length - a.ndim;
+	if (ndiff > 0) a = a.reshape([...rep(ndiff, 1), ...a.shape]);
+	if (ndiff < 0) reps = [...rep(-ndiff, 1), ...reps];
+	const broadcastedShape = [];
+	const broadcastAxes = [];
+	for (let i = 0; i < a.ndim; i++) {
+		if (reps[i] > 1) {
+			broadcastedShape.push(reps[i]);
+			broadcastAxes.push(broadcastedShape.length - 1);
+		}
+		broadcastedShape.push(a.shape[i]);
+	}
+	const finalShape = a.shape.map((d, i) => reps[i] * d);
+	return broadcast(a, broadcastedShape, broadcastAxes).reshape(finalShape);
+}
+/**
+* Broadcast an array to a shape, with NumPy-style broadcasing rules.
+*
+* In other words, this lets you append axes to the left, and/or expand
+* dimensions where the shape is 1.
+*/
+function broadcastTo(a, shape$1) {
+	const nd = ndim(a);
+	if (shape$1.length < nd) throw new Error(`broadcastTo: target shape ${JSON.stringify(shape$1)} has fewer dimensions than input array: ${nd}`);
+	return broadcast(a, shape$1, range(shape$1.length - nd));
+}
+/** Broadcast input shapes to a common output shape. */
+function broadcastShapes(...shapes) {
+	if (shapes.length === 0) return [];
+	return shapes.reduce(generalBroadcast);
+}
+/** Broadcast arrays to a common shape. */
+function broadcastArrays(...arrays) {
+	const shapes = arrays.map((a) => shape(a));
+	const outShape = broadcastShapes(...shapes);
+	return arrays.map((a) => broadcastTo(a, outShape));
+}
+/**
 * Return specified diagonals.
 *
 * If a is 2D, return the diagonal of the array with the given offset. If a is
-* 3D or higher, compute diagonals along the two given axes.
+* 3D or higher, compute diagonals along the two given axes (default: 0, 1).
 *
-* This returns a view over the existing array.
+* This returns a view over the existing array. The shape of the resulting array
+* is determined by removing the two axes along which the diagonal is taken,
+* then appending a new axis to the right with holding the diagonals.
 */
 function diagonal(a, offset, axis1, axis2) {
 	return fudgeArray(a).diagonal(offset, axis1, axis2);
@@ -3825,15 +4516,16 @@ function diag(v, k = 0) {
 	if (!Number.isInteger(k)) throw new TypeError(`k must be an integer, got ${k}`);
 	if (a.ndim === 1) {
 		const n = a.shape[0];
-		const ret = where(eye(n).equal(1), a, 0);
-		if (k !== 0) throw new Error("diag() for 1D arrays only for k=0");
-		return ret;
+		const ret = where(eye(n).equal(1), a.ref, zerosLike(a));
+		if (k > 0) return pad(ret, [[0, k], [k, 0]]);
+		else if (k < 0) return pad(ret, [[-k, 0], [0, -k]]);
+		else return ret;
 	} else if (a.ndim === 2) return diagonal(a, k);
 	else throw new TypeError("numpy.diag only supports 1D and 2D arrays");
 }
 /** Return if two arrays are element-wise equal within a tolerance. */
 function allclose(actual, expected, options) {
-	const { rtol = 1e-5, atol = 1e-8 } = options ?? {};
+	const { rtol = 1e-5, atol = 1e-7 } = options ?? {};
 	const x = array(actual);
 	const y = array(expected);
 	if (!deepEqual(x.shape, y.shape)) return false;
@@ -3868,8 +4560,36 @@ function dot(x, y) {
 	]);
 	return dot$1(x, y);
 }
-/** Vector dot product of two arrays. */
-function vecdot(x, y) {
+/**
+* Compute the inner product of two arrays.
+*
+* Unlike `jax.numpy.matmul()` or `jax.numpy.dot()`, this always performs a
+* contraction on the last axis.
+*
+* Returned array has shape `[...x.shape[:-1], ...y.shape[:-1]]`.
+*/
+function inner(x, y) {
+	x = reshape(x, shape(x).toSpliced(-1, 0, ...rep(ndim(y) - 1, 1)));
+	return dot$1(x, y);
+}
+/**
+* Compute the outer product of two arrays.
+*
+* If the input arrays are not 1D, they will be flattened. Returned array will
+* be of shape `[x.size, y.size]`.
+*/
+function outer(x, y) {
+	x = ravel(x);
+	y = ravel(y);
+	return multiply(x.reshape([x.shape[0], 1]), y);
+}
+/** Vector dot product of two arrays along a given axis. */
+function vecdot(x, y, { axis } = {}) {
+	const xaxis = checkAxis(axis ?? -1, ndim(x));
+	const yaxis = checkAxis(axis ?? -1, ndim(y));
+	if (shape(x)[xaxis] !== shape(y)[yaxis]) throw new Error(`vecdot: shapes ${JSON.stringify(shape(x))} and ${JSON.stringify(shape(y))} not aligned along axis ${axis}: ${shape(x)[xaxis]} != ${shape(y)[yaxis]}`);
+	x = moveaxis(x, xaxis, -1);
+	y = moveaxis(y, yaxis, -1);
 	return dot$1(x, y);
 }
 /**
@@ -3878,7 +4598,7 @@ function vecdot(x, y) {
 * Like vecdot() but flattens the arguments first into vectors.
 */
 function vdot(x, y) {
-	return vecdot(ravel(x), ravel(y));
+	return dot$1(ravel(x), ravel(y));
 }
 /**
 * Return a tuple of coordinate matrices from coordinate vectors.
@@ -3907,6 +4627,43 @@ function meshgrid(xs, { indexing } = {}) {
 	return xs.map((x, i) => broadcast(x, shape$1, [...range(i), ...range(i + 1, xs.length)]));
 }
 /**
+* Return an array with ones on and below the diagonal and zeros elsewhere.
+*
+* If `k` is provided, it specifies the sub-diagonal on and below which the
+* array is filled with ones. `k=0` is the main diagonal, `k<0` is below it, and
+* `k>0` is above it.
+*/
+function tri(n, m, k = 0, { dtype, device } = {}) {
+	m ??= n;
+	dtype ??= DType.Float32;
+	if (!Number.isInteger(n) || n < 0) throw new TypeError(`tri: n must be a non-negative integer, got ${n}`);
+	if (!Number.isInteger(m) || m < 0) throw new TypeError(`tri: m must be a non-negative integer, got ${m}`);
+	if (!Number.isInteger(k)) throw new TypeError(`tri: k must be an integer, got ${k}`);
+	const rows = arange(k, n + k, 1, {
+		dtype: DType.Int32,
+		device
+	});
+	const cols = arange(0, m, 1, {
+		dtype: DType.Int32,
+		device
+	});
+	return rows.reshape([n, 1]).greaterEqual(cols).astype(dtype);
+}
+/** Return the lower triangle of an array. Must be of dimension >= 2. */
+function tril(a, k = 0) {
+	if (ndim(a) < 2) throw new TypeError(`tril: input array must be at least 2D, got ${ndim(a)}D`);
+	a = fudgeArray(a);
+	const [n, m] = a.shape.slice(-2);
+	return where(tri(n, m, k, { dtype: bool }), a.ref, zerosLike(a));
+}
+/** Return the upper triangle of an array. Must be of dimension >= 2. */
+function triu(a, k = 0) {
+	if (ndim(a) < 2) throw new TypeError(`tril: input array must be at least 2D, got ${ndim(a)}D`);
+	a = fudgeArray(a);
+	const [n, m] = a.shape.slice(-2);
+	return where(tri(n, m, k - 1, { dtype: bool }), zerosLike(a.ref), a);
+}
+/**
 * Clip (limit) the values in an array.
 *
 * Given an interval, values outside the interval are clipped to the interval
@@ -3930,18 +4687,70 @@ function absolute(x) {
 	x = fudgeArray(x);
 	return where(less(x.ref, 0), x.ref.mul(-1), x);
 }
-/** Alias of `jax.numpy.absolute()`. */
+/** @function Alias of `jax.numpy.absolute()`. */
 const abs = absolute;
+/** Return an element-wise indication of sign of the input. */
+function sign(x) {
+	x = fudgeArray(x);
+	return where(notEqual(x.ref, 0), where(less(x.ref, 0), -1, 1), 0);
+}
 /** Calculate element-wise square of the input array. */
 function square(x) {
 	x = fudgeArray(x);
 	return x.ref.mul(x);
 }
-/** Compute a trigonometric tangent of each element of input. */
+/** Element-wise tangent function (takes radians). */
 function tan(x) {
 	x = fudgeArray(x);
 	return sin(x.ref).div(cos(x));
 }
+/** Element-wise inverse cosine function (inverse of cos). */
+function acos(x) {
+	return subtract(pi / 2, asin(x));
+}
+/**
+* @function
+* Return element-wise hypotenuse for the given legs of a right triangle.
+*
+* In the original NumPy/JAX implementation, this function is more numerically
+* stable than sqrt(x1**2 + x2**2). We don't currently implement those stability
+* improvements.
+*/
+const hypot = jit$1((x1, x2) => {
+	return sqrt(square(x1).add(square(x2)));
+});
+/**
+* @function
+* Element-wise arc tangent of y/x with correct quadrant.
+*
+* Returns the angle in radians between the positive x-axis and the point (x, y).
+* The result is in the range [-π, π].
+*
+* Uses numerically stable formulas:
+* - When x >= 0: atan2(y, x) = 2 * atan(y / (sqrt(x^2 + y^2) + x))
+* - When x < 0:  atan2(y, x) = 2 * atan((sqrt(x^2 + y^2) - x) / y)
+*
+* The output is ill-defined when both x and y are zero.
+*/
+const atan2 = jit$1((y, x) => {
+	const r = sqrt(square(x.ref).add(square(y.ref)));
+	const xNeg = less(x.ref, 0);
+	const numer = where(xNeg.ref, r.ref.sub(x.ref), y.ref);
+	const denom = where(xNeg, y, r.add(x));
+	return atan(numer.div(denom)).mul(2);
+});
+/** @function Alias of `jax.numpy.acos()`. */
+const arccos = acos;
+/** @function Alias of `jax.numpy.atan()`. */
+const arctan = atan;
+/** @function Alias of `jax.numpy.atan2()`. */
+const arctan2 = atan2;
+/** Element-wise subtraction, with broadcasting. */
+function subtract(x, y) {
+	x = fudgeArray(x);
+	y = fudgeArray(y);
+	return x.sub(y);
+}
 /** Calculates the floating-point division of x by y element-wise. */
 function trueDivide(x, y) {
 	x = fudgeArray(x);
@@ -3949,7 +4758,7 @@ function trueDivide(x, y) {
 	if (!isFloatDtype(x.dtype) || !isFloatDtype(y.dtype)) throw new TypeError(`trueDivide: x and y must be floating-point arrays, got ${x.dtype} and ${y.dtype}`);
 	return x.div(y);
 }
-/** Alias of `jax.numpy.trueDivide()`. */
+/** @function Alias of `jax.numpy.trueDivide()`. */
 const divide = trueDivide;
 /** Round input to the nearest integer towards zero. */
 function trunc(x) {
@@ -3967,15 +4776,151 @@ function log2(x) {
 function log10(x) {
 	return log(x).mul(Math.LOG10E);
 }
+/** Calculate `exp(x) - 1` element-wise. */
+function expm1(x) {
+	return exp(x).sub(1);
+}
+/** Calculate the natural logarithm of `1 + x` element-wise. */
+function log1p(x) {
+	return log(add(1, x));
+}
+/** Convert angles from degrees to radians. */
+function deg2rad(x) {
+	return multiply(x, pi / 180);
+}
+/** @function Alias of `jax.numpy.deg2rad()`. */
+const radians = deg2rad;
+/** Convert angles from radians to degrees. */
+function rad2deg(x) {
+	return multiply(x, 180 / pi);
+}
+/** @function Alias of `jax.numpy.rad2deg()`. */
+const degrees = rad2deg;
+/**
+* @function
+* Computes first array raised to power of second array, element-wise.
+*/
+const power = jit$1((x1, x2) => {
+	return exp(log(x1).mul(x2));
+});
+/** @function Alias of `jax.numpy.power()`. */
+const pow = power;
+/** @function Calculate the element-wise cube root of the input array. */
+const cbrt = jit$1((x) => {
+	const sgn = where(less(x.ref, 0), -1, 1);
+	return sgn.ref.mul(exp(log(x.mul(sgn)).mul(1 / 3)));
+});
+/**
+* @function
+* Calculate element-wise hyperbolic sine of input.
+*
+* `sinh(x) = (exp(x) - exp(-x)) / 2`
+*/
+const sinh = jit$1((x) => {
+	const ex = exp(x);
+	const emx = reciprocal(ex.ref);
+	return ex.sub(emx).mul(.5);
+});
+/**
+* @function
+* Calculate element-wise hyperbolic cosine of input.
+*
+* `cosh(x) = (exp(x) + exp(-x)) / 2`
+*/
+const cosh = jit$1((x) => {
+	const ex = exp(x);
+	const emx = reciprocal(ex.ref);
+	return ex.add(emx).mul(.5);
+});
+/**
+* @function
+* Calculate element-wise hyperbolic tangent of input.
+*
+* `tanh(x) = sinh(x)/cosh(x) = (exp(x) - exp(-x)) / (exp(x) + exp(-x))`
+*/
+const tanh = jit$1((x) => {
+	const negsgn = where(less(x.ref, 0), 1, -1);
+	const en2x = exp(x.mul(negsgn.ref).mul(2));
+	return en2x.ref.sub(1).div(en2x.add(1)).mul(negsgn);
+});
+/**
+* @function
+* Calculate element-wise inverse hyperbolic sine of input.
+*
+* `arcsinh(x) = ln(x + sqrt(x^2 + 1))`
+*/
+const arcsinh = jit$1((x) => {
+	return log(x.ref.add(sqrt(square(x).add(1))));
+});
+/**
+* @function
+* Calculate element-wise inverse hyperbolic cosine of input.
+*
+* `arccosh(x) = ln(x + sqrt(x^2 - 1))`
+*/
+const arccosh = jit$1((x) => {
+	return log(x.ref.add(sqrt(square(x).sub(1))));
+});
+/**
+* @function
+* Calculate element-wise inverse hyperbolic tangent of input.
+*
+* `arctanh(x) = 0.5 * ln((1 + x) / (1 - x))`
+*/
+const arctanh = jit$1((x) => {
+	return log(add(1, x.ref).div(subtract(1, x))).mul(.5);
+});
+/** @function Alias of `jax.numpy.arcsinh()`. */
+const asinh = arcsinh;
+/** @function Alias of `jax.numpy.arccosh()`. */
+const acosh = arccosh;
+/** @function Alias of `jax.numpy.arctanh()`. */
+const atanh = arctanh;
+/**
+* Compute the variance of an array.
+*
+* The variance is computed for the flattened array by default, otherwise over
+* the specified axis.
+*
+* If `correction` is provided, the divisor in calculation is `N - correction`,
+* where `N` represents the number of elements (e.g., for Bessel's correction).
+*/
+function var_(x, axis = null, opts) {
+	x = fudgeArray(x);
+	axis = normalizeAxis(axis, x.ndim);
+	const n = axis.reduce((acc, a) => acc * x.shape[a], 1);
+	if (n === 0) throw new Error("var: cannot compute variance over zero-length axis");
+	const mu = opts?.mean !== void 0 ? opts.mean : mean(x.ref, axis, { keepdims: true });
+	return square(x.sub(mu)).sum(axis, { keepdims: opts?.keepdims }).mul(1 / (n - (opts?.correction ?? 0)));
+}
+/**
+* Compute the standard deviation of an array.
+*
+* The standard deviation is computed for the flattened array by default,
+* otherwise over the specified axis.
+*
+* If `correction` is provided, the divisor in calculation is `N - correction`,
+* where `N` represents the number of elements (e.g., for Bessel's correction).
+*/
+function std(x, axis = null, opts) {
+	return sqrt(var_(x, axis, opts));
+}
 
 //#endregion
 //#region src/nn.ts
 var nn_exports = {};
 __export(nn_exports, {
+	celu: () => celu,
+	elu: () => elu,
+	gelu: () => gelu,
+	glu: () => glu,
 	identity: () => identity,
+	leakyRelu: () => leakyRelu,
 	logSigmoid: () => logSigmoid,
 	logSoftmax: () => logSoftmax,
+	logmeanexp: () => logmeanexp,
 	logsumexp: () => logsumexp,
+	mish: () => mish,
 	oneHot: () => oneHot,
 	relu: () => relu,
 	relu6: () => relu6,
@@ -3984,6 +4929,8 @@ __export(nn_exports, {
 	softSign: () => softSign,
 	softmax: () => softmax,
 	softplus: () => softplus,
+	squareplus: () => squareplus,
+	standardize: () => standardize,
 	swish: () => swish
 });
 /**
@@ -4027,6 +4974,7 @@ function softSign(x) {
 	return x.ref.div(absolute(x).add(1));
 }
 /**
+* @function
 * Sigmoid-weighted Linear Unit (SiLU) activation function, also known as
 * Swish, computed element-wise:
 * `silu(x) = x * sigmoid(x) = x / (1 + exp(-x))`.
@@ -4035,11 +4983,9 @@ function softSign(x) {
 *
 * Reference: https://en.wikipedia.org/wiki/Swish_function
 */
-function silu(x) {
-	x = fudgeArray(x);
-	return x.ref.mul(sigmoid(x));
-}
+const silu = jit$1((x) => x.ref.mul(sigmoid(x)));
 /**
+* @function
 * Sigmoid-weighted Linear Unit (SiLU) activation function, also known as
 * Swish, computed element-wise:
 * `silu(x) = x * sigmoid(x) = x / (1 + exp(-x))`.
@@ -4056,8 +5002,88 @@ const swish = silu;
 function logSigmoid(x) {
 	return negative(softplus(negative(x)));
 }
-/** Identity activation function. Returns the argument unmodified. */
+/**
+* @function
+* Identity activation function. Returns the argument unmodified.
+*/
 const identity = fudgeArray;
+/** Leaky rectified linear (ReLU) activation function */
+function leakyRelu(x, negativeSlope = .01) {
+	x = fudgeArray(x);
+	return where(less(x.ref, 0), x.ref.mul(negativeSlope), x);
+}
+/**
+* Exponential linear unit activation function.
+*
+* Computes the element-wise function:
+* `elu(x) = x > 0 ? x : alpha * (exp(x) - 1)`
+*/
+function elu(x, alpha = 1) {
+	x = fudgeArray(x);
+	return where(less(x.ref, 0), exp(x.ref).sub(1).mul(alpha), x);
+}
+/**
+* Continuously-differentiable exponential linear unit activation function.
+*
+* Computes the element-wise function:
+* `celu(x) = x > 0 ? x : alpha * (exp(x/alpha) - 1)`
+*/
+function celu(x, alpha = 1) {
+	x = fudgeArray(x);
+	return where(less(x.ref, 0), exp(x.ref.div(alpha)).sub(1).mul(alpha), x);
+}
+/**
+* @function
+* Gaussion error linear unit (GELU) activation function.
+*
+* This is computed element-wise. Currently jax-js does not support the erf() or
+* gelu() functions exactly as primitives, so an approximation is used:
+* `gelu(x) ~= x * 0.5 * (1 + tanh(sqrt(2/pi) * (x + 0.044715 * x^3)))`.
+*
+* Reference: https://ml-explore.github.io/mlx/build/html/python/nn/_autosummary_functions/mlx.nn.gelu_approx.html
+*
+* This will be improved in the future.
+*/
+const gelu = jit$1((x) => {
+	const SQRT_2_OVER_PI = Math.sqrt(2 / Math.PI);
+	return x.ref.mul(.5).mul(tanh(x.ref.mul(x.ref.mul(x).mul(.044715).add(1)).mul(SQRT_2_OVER_PI)).add(1));
+});
+/**
+* Gated linear unit (GLU) activation function.
+*
+* Splits the `axis` dimension of the input into two halves, a and b, then
+* computes `a * sigmoid(b)`.
+*/
+function glu(x, axis = -1) {
+	x = fudgeArray(x);
+	axis = checkAxis(axis, x.ndim);
+	const size$1 = x.shape[axis];
+	if (size$1 % 2 !== 0) throw new Error(`glu: axis ${axis} of shape (${x.shape}) does not have even length`);
+	const slice = x.shape.map((a$1) => [0, a$1]);
+	const a = shrink(x.ref, slice.toSpliced(axis, 1, [0, size$1 / 2]));
+	const b = shrink(x, slice.toSpliced(axis, 1, [size$1 / 2, size$1]));
+	return a.mul(sigmoid(b));
+}
+/**
+* Squareplus activation function.
+*
+* Computes the element-wise function:
+* `squareplus(x) = 0.5 * (x + sqrt(x^2 + b))`
+*/
+function squareplus(x, b = 4) {
+	x = fudgeArray(x);
+	return x.ref.add(sqrt(square(x).add(b))).mul(.5);
+}
+/**
+* Mish activation function.
+*
+* Computes the element-wise function:
+* `mish(x) = x * tanh(softplus(x))`
+*/
+function mish(x) {
+	x = fudgeArray(x);
+	return x.ref.mul(tanh(softplus(x)));
+}
 /**
 * Softmax function. Computes the function which rescales elements to the range
 * [0, 1] such that the elements along `axis` sum to 1.
@@ -4066,17 +5092,13 @@ const identity = fudgeArray;
 *
 * Reference: https://en.wikipedia.org/wiki/Softmax_function
 */
-function softmax(x, axis) {
+function softmax(x, axis = -1) {
 	x = fudgeArray(x);
-	if (axis === void 0) axis = x.ndim ? [x.ndim - 1] : [];
-	else if (typeof axis === "number") axis = [axis];
-	if (axis.length === 0) {
-		x.dispose();
-		return ones(x.shape);
-	}
-	const xMax = max(x.ref, axis, { keepDims: true });
+	axis = normalizeAxis(axis, x.ndim);
+	if (axis.length === 0) return onesLike(x);
+	const xMax = max(x.ref, axis, { keepdims: true });
 	const unnormalized = exp(x.sub(stopGradient(xMax)));
-	return unnormalized.ref.div(unnormalized.sum(axis, { keepDims: true }));
+	return unnormalized.ref.div(unnormalized.sum(axis, { keepdims: true }));
 }
 /**
 * Log-Softmax function.
@@ -4086,17 +5108,13 @@ function softmax(x, axis) {
 *
 * If `axis` is not specified, it defaults to the last axis.
 */
-function logSoftmax(x, axis) {
+function logSoftmax(x, axis = -1) {
 	x = fudgeArray(x);
-	if (axis === void 0) axis = x.ndim ? [x.ndim - 1] : [];
-	else if (typeof axis === "number") axis = [axis];
-	if (axis.length === 0) {
-		x.dispose();
-		return zeros(x.shape);
-	}
-	const xMax = max(x.ref, axis, { keepDims: true });
+	axis = normalizeAxis(axis, x.ndim);
+	if (axis.length === 0) return zerosLike(x);
+	const xMax = max(x.ref, axis, { keepdims: true });
 	const shifted = x.sub(stopGradient(xMax));
-	const shiftedLogsumexp = log(exp(shifted.ref).sum(axis, { keepDims: true }));
+	const shiftedLogsumexp = log(exp(shifted.ref).sum(axis, { keepdims: true }));
 	return shifted.sub(shiftedLogsumexp);
 }
 /**
@@ -4107,16 +5125,39 @@ function logSoftmax(x, axis) {
 *
 * Reference: https://en.wikipedia.org/wiki/LogSumExp
 */
-function logsumexp(x, axis) {
+function logsumexp(x, axis = null) {
 	x = fudgeArray(x);
-	if (axis === void 0) axis = range(x.ndim);
-	else if (typeof axis === "number") axis = [axis];
+	axis = normalizeAxis(axis, x.ndim);
 	if (axis.length === 0) return x;
 	const xMax = stopGradient(max(x.ref, axis));
 	const xMaxDims = broadcast(xMax.ref, x.shape, axis);
 	const shifted = x.sub(xMaxDims);
 	return xMax.add(log(exp(shifted).sum(axis)));
 }
+/** Log-mean-exp reduction, like `jax.nn.logsumexp()` but subtracts `log(n)`. */
+function logmeanexp(x, axis = null) {
+	x = fudgeArray(x);
+	axis = normalizeAxis(axis, x.ndim);
+	if (axis.length === 0) return x;
+	const n = axis.reduce((acc, a) => acc * x.shape[a], 1);
+	return logsumexp(x, axis).sub(Math.log(n));
+}
+/**
+* Standardizes input to zero mean and unit variance.
+*
+* By default, this is computed over the last axis. You can pass in a different
+* axis, or `null` to standardize over all elements.
+*
+* Epsilon is added to denominator, it defaults to `1e-5` for stability.
+*/
+function standardize(x, axis = -1, opts = {}) {
+	x = fudgeArray(x);
+	axis = normalizeAxis(axis, x.ndim);
+	if (axis.length === 0) return x;
+	const mu = opts.mean !== void 0 ? fudgeArray(opts.mean) : x.ref.mean(axis, { keepdims: true });
+	const sigma2 = opts.variance !== void 0 ? fudgeArray(opts.variance) : square(x.ref).mean(axis, { keepdims: true }).sub(square(mu.ref));
+	return x.sub(mu).div(sqrt(sigma2.add(opts.epsilon ?? 1e-5)));
+}
 /**
 * One-hot encodes the given indices.
 *
@@ -4134,7 +5175,7 @@ function logsumexp(x, axis) {
 * ```
 */
 function oneHot(x, numClasses) {
-	if (x.dtype !== "int32") throw new TypeError(`oneHot expects integers, got ${x.dtype}`);
+	if (isFloatDtype(x.dtype)) throw new TypeError(`oneHot expects integers, got ${x.dtype}`);
 	return eye(numClasses, void 0, { device: x.device }).slice(x);
 }
 
@@ -4142,8 +5183,11 @@ function oneHot(x, numClasses) {
 //#region src/random.ts
 var random_exports = {};
 __export(random_exports, {
+	bernoulli: () => bernoulli,
 	bits: () => bits,
+	exponential: () => exponential,
 	key: () => key,
+	normal: () => normal,
 	split: () => split,
 	uniform: () => uniform
 });
@@ -4174,11 +5218,11 @@ function bits(key$1, shape$1 = []) {
 /** Sample uniform random values in [minval, maxval) with given shape. */
 function uniform(key$1, shape$1 = [], { minval = 0, maxval = 1 } = {}) {
 	if (minval >= maxval) throw new Error(`Invalid range: [${minval}, ${maxval}).`);
-	const mantissa = bits(key$1, shape$1).div(scalar(512, {
+	const mantissa = bits(key$1, shape$1).div(array(512, {
 		dtype: DType.Uint32,
 		device: key$1.device
 	}));
-	const float12 = mantissa.add(scalar(1065353216, {
+	const float12 = mantissa.add(array(1065353216, {
 		dtype: DType.Uint32,
 		device: key$1.device
 	}));
@@ -4186,6 +5230,36 @@ function uniform(key$1, shape$1 = [], { minval = 0, maxval = 1 } = {}) {
 	if (minval === 0 && maxval === 1) return rand;
 	else return rand.mul(maxval - minval).add(minval);
 }
+/**
+* Sample Bernoulli random variables with given mean (0,1 categorical).
+*
+* Returns a random Boolean array with the specified shape. `p` can be an array
+* and must be broadcastable to `shape`.
+*/
+function bernoulli(key$1, p = .5, shape$1 = []) {
+	p = fudgeArray(p);
+	return uniform(key$1, shape$1).less(p);
+}
+/** Sample exponential random values according to `p(x) = exp(-x)`. */
+function exponential(key$1, shape$1 = []) {
+	const u = uniform(key$1, shape$1);
+	return negative(log1p(negative(u)));
+}
+/**
+* Sample random values according to `p(x) = 1/sqrt(2pi) * exp(-x^2/2)`.
+*
+* Unlike JAX, this uses the Box-Muller transform. JAX uses the erf_inv primitive instead and
+* directly inverts the CDF, but we don't have support for that yet. Outputs will not be
+* bitwise identical to JAX.
+*/
+function normal(key$1, shape$1 = []) {
+	const [k1, k2] = split(key$1, 2);
+	const u1 = uniform(k1, shape$1);
+	const u2 = uniform(k2, shape$1);
+	const radius = sqrt(log1p(negative(u1)).mul(-2));
+	const theta = u2.mul(2 * Math.PI);
+	return radius.mul(cos(theta));
+}
 
 //#endregion
 //#region src/polyfills.ts
@@ -4195,33 +5269,91 @@ Symbol.asyncDispose ??= Symbol.for("Symbol.asyncDispose");
 
 //#endregion
 //#region src/index.ts
-/** Compute the forward-mode Jacobian-vector product for a function. */
+/**
+* @function
+* Compute the forward-mode Jacobian-vector product for a function.
+*/
 const jvp = jvp$1;
-/** Vectorize an operation on a batched axis for one or more inputs. */
+/**
+* @function
+* Vectorize an operation on a batched axis for one or more inputs.
+*/
 const vmap = vmap$1;
-/** Compute the Jacobian evaluated column-by-column by forward-mode AD. */
+/**
+* @function
+* Compute the Jacobian evaluated column-by-column by forward-mode AD.
+*/
 const jacfwd = jacfwd$1;
-/** Construct a Jaxpr by dynamically tracing a function with example inputs. */
+/**
+* @function
+* Construct a Jaxpr by dynamically tracing a function with example inputs.
+*/
 const makeJaxpr = makeJaxpr$1;
+/**
+* @function
+* Mark a function for automatic JIT compilation, with operator fusion.
+*
+* The function will be compiled the first time it is called with a set of
+* argument shapes.
+*
+* You can call `.dispose()` on the returned, JIT-compiled function after all
+* calls to free memory associated with array constants.
+*
+* **Options:**
+* - `staticArgnums`: An array of argument indices to treat as static
+*   (compile-time constant). These arguments must be hashable, won't be traced,
+*   and different values will trigger recompilation.
+* - `device`: The device to place the computation on. If not specified, the
+*   computation will be placed on the default device.
+*/
 const jit = jit$1;
 /**
+* @function
 * Produce a local linear approximation to a function at a point using jvp() and
 * partial evaluation.
 */
 const linearize = linearize$1;
-/** Calculate the reverse-mode vector-Jacobian product for a function. */
+/**
+* @function
+* Calculate the reverse-mode vector-Jacobian product for a function.
+*/
 const vjp = vjp$1;
 /**
+* @function
 * Compute the gradient of a scalar-valued function `f` with respect to its
 * first argument.
 */
 const grad = grad$1;
-/** Create a function that evaluates both `f` and the gradient of `f`. */
+/**
+* @function
+* Create a function that evaluates both `f` and the gradient of `f`.
+*/
 const valueAndGrad = valueAndGrad$1;
-/** Compute the Jacobian evaluated row-by-row by reverse-mode AD. */
+/**
+* @function
+* Compute the Jacobian evaluated row-by-row by reverse-mode AD.
+*/
 const jacrev = jacrev$1;
-/** Compute the Jacobian with reverse-mode AD. Alias for `jacrev()`. */
+/**
+* @function
+* Compute the Jacobian with reverse-mode AD. Alias for `jacrev()`.
+*/
 const jacobian = jacrev;
+/**
+* Wait until all `Array` leaves are ready by calling `Array.blockUntilReady()`.
+*
+* This can be used to wait for the results of an intermediate computation to
+* finish. It's recommended to call this regularly in an iterative computation
+* to avoid queueing up too many pending operations.
+*
+* Does not consume reference to the arrays.
+*/
+async function blockUntilReady(x) {
+	const promises = [];
+	for (const leaf of leaves(x)) if (leaf instanceof Array$1) promises.push(leaf.blockUntilReady());
+	await Promise.all(promises);
+	return x;
+}
 
 //#endregion
-export { devices, grad, init, jacfwd, jacobian, jacrev, jit, jvp, linearize, makeJaxpr, nn_exports as nn, numpy_exports as numpy, random_exports as random, setDevice, tree_exports as tree, valueAndGrad, vjp, vmap };
+export { Array$1 as Array, DType, Jaxpr, blockUntilReady, defaultDevice, devices, grad, init, jacfwd, jacobian, jacrev, jit, jvp, lax_exports as lax, linearize, makeJaxpr, nn_exports as nn, numpy_exports as numpy, random_exports as random, setDebug, tree_exports as tree, valueAndGrad, vjp, vmap };