Skip to content

allow tensors in binary zipvmap to have different vtype #159

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
marcelluethi merged 2 commits into from
Aug 27, 2026
Merged

allow tensors in binary zipvmap to have different vtype #159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2483da2
allow tensors in binary zipvmap to have different vtype
marcelluethi Aug 25, 2026
4ca1312
add test for zipvmap for two tensors with different vtype
marcelluethi Aug 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions core/src/main/scala/dimwit/tensor/tensorops/FunctionalOps.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,12 +130,12 @@ object FunctionalOps:
* @param f A function that takes a tuple of tensors (with the specified axis removed) and returns a new tensor.
* @return A new tensor resulting from applying `f` to the zipped tensors.
*/
def zipvmap[L: Label, T2 <: Tuple, FOut](axis: Axis[L])(
other: Tensor[T2, V]
def zipvmap[L: Label, T2 <: Tuple, V2, FOut](axis: Axis[L])(
other: Tensor[T2, V2]
)(using
ev: SharedAxisRemover[(T, T2), L]
)(
f: TensorsOf[ev.RemainingAxes, (V, V)] => FOut
f: TensorsOf[ev.RemainingAxes, (V, V2)] => FOut
)(using
prependAxis: PrependAxis[L, FOut],
toPyTree: TensorTree[FOut],
Expand Down
10 changes: 10 additions & 0 deletions core/src/test/scala/dimwit/tensor/TensorOpsFunctionalSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,16 @@ class TensorOpsFunctionalSuite extends DimwitTest:
// Each row of ta sums to 3.0, each row of tc sums to 8.0 => 11.0 per row
res.shouldEqual(Tensor1(Axis[A]).fromArray(Array(11.0f, 11.0f)))

it("extension zipvmap with two different-vtype tensors"):
val floats = Tensor(Shape(Axis[A] -> 2, Axis[B] -> 3)).fill(2.0f)
val ints = Tensor(Shape(Axis[A] -> 2, Axis[C] -> 4)).fill(3)
val res = floats.zipvmap(Axis[A])(ints) {
case (rowFloat, rowInt) =>
rowFloat.sum + rowInt.asFloat32.sum
}
// Each row of floats sums to 6.0, each row of ints sums to 12 => 18.0 per row
res shouldEqual Tensor1(Axis[A]).fromArray(Array(18.0f, 18.0f))

it("zipvmap2 return tuple"):
val t1 = Tensor(Shape(Axis[A] -> 2, Axis[B] -> 3)).fill(0f)
val t2 = Tensor(Shape(Axis[A] -> 2, Axis[B] -> 3)).fill(1f)
Expand Down
Loading