Skip to content

use tensordot to have proper generalized outer product #134

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

Open
marcelluethi wants to merge 1 commit into
base: main
Choose a base branch
from
Open

use tensordot to have proper generalized outer product #134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 1 addition & 5 deletions core/src/main/scala/dimwit/tensor/tensorops/ContractionOps.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,7 @@ object ContractionOps:
primeConcat: PrimeConcat[T, OtherShape],
labels: Labels[primeConcat.Out]
): Tensor[primeConcat.Out, V] = Tensor(
// Jax outer product flattens, reshape required
Jax.jnp.reshape(
Jax.jnp.outer(tensor.jaxValue, other.jaxValue),
(tensor.shape.dimensions ++ other.shape.dimensions).toPythonProxy
)
Jax.jnp.tensordot(tensor.jaxValue, other.jaxValue, axes = 0) // generalized outer product
)

/** Computes the dot product of this tensor with another tensor along the specified axis.
Expand Down
22 changes: 22 additions & 0 deletions core/src/test/scala/dimwit/tensor/TensorOpsContractionSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,3 +73,25 @@ class TensorOpsContractionSuite extends DimwitTest:
Array(10.0f, 20.0f, 20.0f, 40.0f)
)
)

it("Tensor2[A, B] and Tensor2[C, D] to Tensor4[A, B, C, D]"):
val mAB = m1
val mCD = m2.relabelAll((Axis[C], Axis[D]))

val res = mAB.outerProduct(mCD)

res.shape.labels shouldBe List("A", "B", "C", "D")
res should approxEqual(
Tensor.like(res).fromArray(
Array(
10.0f, 20.0f,
30.0f, 40.0f,
20.0f, 40.0f,
60.0f, 80.0f,
30.0f, 60.0f,
90.0f, 120.0f,
40.0f, 80.0f,
120.0f, 160.0f
)
)
)
Loading