Skip to content

Commit 19a26af

Browse files
committedDec 6, 2024·
Upgrade finch-tensor to 0.2.1
1 parent f530bd9 commit 19a26af

14 files changed

+13
-17
lines changed
 

‎benchmarks_original/matmul_example.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
a = sparse.asarray(a_sps)
3030
b = sparse.asarray(b_sps)
3131

32-
@sparse.compiled
32+
@sparse.compiled()
3333
def sddmm_finch(a, b):
3434
return a @ b
3535

‎benchmarks_original/mttkrp_example.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
D = sparse.asarray(np.array(D_sps, order="F"))
3232
C = sparse.asarray(np.array(C_sps, order="F"))
3333

34-
@sparse.compiled
34+
@sparse.compiled()
3535
def mttkrp_finch(B, D, C):
3636
return sparse.sum(B[:, :, :, None] * D[None, None, :, :] * C[None, :, None, :], axis=(1, 2))
3737

‎benchmarks_original/sddmm_example.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
a = sparse.asarray(np.array(a_sps, order="F"))
3131
b = sparse.asarray(np.array(b_sps, order="C"))
3232

33-
@sparse.compiled
33+
@sparse.compiled()
3434
def sddmm_finch(s, a, b):
3535
return sparse.sum(
3636
s[:, :, None] * (a[:, None, :] * sparse.permute_dims(b, (1, 0))[None, :, :]),

‎benchmarks_original/spmv_add_example.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
x = sparse.asarray(np.array(x_sps, order="C"))
3030
y = sparse.asarray(np.array(y_sps, order="C"))
3131

32-
@sparse.compiled
32+
@sparse.compiled()
3333
def spmv_finch(A, x, y):
3434
return sparse.sum(A[:, None, :] * sparse.permute_dims(x, (1, 0))[None, :, :], axis=-1) + y
3535

‎ci/environment.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ dependencies:
1313
- pytest-cov
1414
- pytest-xdist
1515
- pip:
16-
- finch-tensor>=0.1.31
16+
- finch-tensor>=0.2.1
1717
- finch-mlir>=0.0.2
1818
- pytest-codspeed

‎examples/matmul_example.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
a = sparse.asarray(a_sps)
3030
b = sparse.asarray(b_sps)
3131

32-
@sparse.compiled
32+
@sparse.compiled()
3333
def sddmm_finch(a, b):
3434
return a @ b
3535

‎examples/mttkrp_example.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
D = sparse.asarray(np.array(D_sps, order="F"))
3232
C = sparse.asarray(np.array(C_sps, order="F"))
3333

34-
@sparse.compiled
34+
@sparse.compiled()
3535
def mttkrp_finch(B, D, C):
3636
return sparse.sum(B[:, :, :, None] * D[None, None, :, :] * C[None, :, None, :], axis=(1, 2))
3737

‎examples/sddmm_example.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
a = sparse.asarray(np.array(a_sps, order="F"))
3131
b = sparse.asarray(np.array(b_sps, order="C"))
3232

33-
@sparse.compiled
33+
@sparse.compiled()
3434
def sddmm_finch(s, a, b):
3535
return sparse.sum(
3636
s[:, :, None] * (a[:, None, :] * sparse.permute_dims(b, (1, 0))[None, :, :]),

‎examples/sparse_finch.ipynb

-4
Original file line numberDiff line numberDiff line change
@@ -397,8 +397,6 @@
397397
"ax.set_xlabel(\"size N\")\n",
398398
"ax.set_ylabel(\"time (sec)\")\n",
399399
"ax.set_title(\"SDDMM\")\n",
400-
"# ax.set_xscale(\"log\")\n",
401-
"# ax.set_yscale(\"log\")\n",
402400
"ax.legend(loc=\"best\", numpoints=1)\n",
403401
"\n",
404402
"plt.show()"
@@ -517,8 +515,6 @@
517515
"ax.set_xlabel(\"size N\")\n",
518516
"ax.set_ylabel(\"time (sec)\")\n",
519517
"ax.set_title(\"Counting Triangles\")\n",
520-
"# ax.set_xscale(\"log\")\n",
521-
"# ax.set_yscale(\"log\")\n",
522518
"ax.legend(loc=\"best\", numpoints=1)\n",
523519
"\n",
524520
"plt.show()"

‎examples/spmv_add_example.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
x = sparse.asarray(np.array(x_sps, order="C"))
3030
y = sparse.asarray(np.array(y_sps, order="C"))
3131

32-
@sparse.compiled
32+
@sparse.compiled()
3333
def spmv_finch(A, x, y):
3434
return sparse.sum(A[:, None, :] * sparse.permute_dims(x, (1, 0))[None, :, :], axis=-1) + y
3535

‎examples/triangles_example.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
a_sps = nx.to_scipy_sparse_array(G)
2424
a = sparse.asarray(a_sps)
2525

26-
# @sparse.compiled NOTE: blocked by https://github.com/willow-ahrens/Finch.jl/issues/615
26+
@sparse.compiled()
2727
def count_triangles_finch(a):
2828
return sparse.sum(a @ a * a) / 6
2929

‎pixi.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ precompile = "python -c 'import finch'"
4949

5050
[feature.finch.pypi-dependencies]
5151
scipy = ">=0.19"
52-
finch-tensor = ">=0.1.31"
52+
finch-tensor = ">=0.2.1"
5353

5454
[feature.finch.activation.env]
5555
SPARSE_BACKEND = "Finch"

‎pyproject.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ tests = [
5454
tox = ["sparse[tests]", "tox"]
5555
notebooks = ["sparse[tests]", "nbmake", "matplotlib"]
5656
all = ["sparse[docs,tox,notebooks]", "matrepr"]
57-
finch = ["finch-tensor>=0.1.35"]
57+
finch = ["finch-tensor>=0.2.1"]
5858

5959
[project.urls]
6060
Documentation = "https://sparse.pydata.org/"

‎sparse/tests/test_backends.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ def test_finch_lazy_backend(backend):
5454

5555
assert_equal(transposed.todense(), np_eye.T)
5656

57-
@sparse.compiled
57+
@sparse.compiled()
5858
def my_fun(tns1, tns2):
5959
tmp = sparse.add(tns1, tns2)
6060
return sparse.sum(tmp, axis=0)

0 commit comments

Comments
 (0)
Please sign in to comment.