Skip to content

[OpenVINO Backend] Support np.diag #20967

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.

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
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
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
Next Next commit
Support np.diag() for openvino
srinjoydutta03 committed Feb 26, 2025
commit 2aa81e17d66080a564b8dad7e6408e24bd8eae0d
2 changes: 0 additions & 2 deletions keras/src/backend/openvino/excluded_concrete_tests.txt
Original file line number Diff line number Diff line change
@@ -21,7 +21,6 @@ NumpyDtypeTest::test_count_nonzero
NumpyDtypeTest::test_cross
NumpyDtypeTest::test_cumprod
NumpyDtypeTest::test_cumsum_bool
NumpyDtypeTest::test_diag
NumpyDtypeTest::test_diff
NumpyDtypeTest::test_digitize
NumpyDtypeTest::test_dot
@@ -101,7 +100,6 @@ NumpyOneInputOpsCorrectnessTest::test_conj
NumpyOneInputOpsCorrectnessTest::test_correlate
NumpyOneInputOpsCorrectnessTest::test_count_nonzero
NumpyOneInputOpsCorrectnessTest::test_cumprod
NumpyOneInputOpsCorrectnessTest::test_diag
NumpyOneInputOpsCorrectnessTest::test_diagonal
NumpyOneInputOpsCorrectnessTest::test_diff
NumpyOneInputOpsCorrectnessTest::test_dot
58 changes: 56 additions & 2 deletions keras/src/backend/openvino/numpy.py
Original file line number Diff line number Diff line change
@@ -473,8 +473,62 @@ def cumsum(x, axis=None, dtype=None):


def diag(x, k=0):
raise NotImplementedError("`diag` is not supported with openvino backend")

x = get_ov_output(x)
x_shape = x.get_partial_shape()
rank = x_shape.rank.get_length()

if rank == 1:
N_dim = x_shape[0]
if not N_dim.is_static:
raise ValueError("diag requires input with static shape for 1D input.")
N = N_dim.get_length()
output_size = N + np.abs(k)
out_shape = ov_opset.constant([output_size, output_size], dtype=Type.i32).output(0)
zeros_const = ov_opset.constant(0, x.get_element_type()).output(0)
diag_matrix = ov_opset.broadcast(zeros_const, out_shape)

indices = []
if k >= 0:
for i in range(N):
indices.append([i, i + k])
else:
for i in range(N):
indices.append([i - k, i])

indices = np.array(indices, dtype=np.int32)
indices_const = ov_opset.constant(indices, dtype=Type.i32).output(0)
updated = ov_opset.scatter_nd_update(diag_matrix, indices_const, x)
return OpenVINOKerasTensor(updated.output(0))

elif rank == 2:
M_dim = x_shape[0]
N_dim = x_shape[1]
if not M_dim.is_static or not N_dim.is_static:
raise ValueError("diag requires input with static shape for 2D input.")
M = M_dim.get_length()
N = N_dim.get_length()

if k >= 0:
L = np.minimum(M, N - k) if (N - k) > 0 else 0
indices = [[i, i + k] for i in range(L)]
else:
L = np.minimum(M + k, N) if (M + k) > 0 else 0
indices = [[i - k, i] for i in range(L)]

if L <= 0:
keras_dtype = ov_to_keras_type(x.get_element_type())
np_dtype = np.dtype(keras_dtype)
empty_np = np.empty((0,), dtype=np_dtype)
empty_const = ov_opset.constant(empty_np, x.get_element_type()).output(0)
return OpenVINOKerasTensor(empty_const)

indices = np.array(indices, dtype=np.int32)
indices_const = ov_opset.constant(indices, dtype=Type.i32).output(0)
diag_vec = ov_opset.gather_nd(x, indices_const)
return OpenVINOKerasTensor(diag_vec.output(0))

else:
raise ValueError("diag supports only 1D or 2D tensors")

def diagonal(x, offset=0, axis1=0, axis2=1):
raise NotImplementedError(
Loading
Oops, something went wrong.