Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
12 changes: 11 additions & 1 deletion tests/test_tf.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import pytest

from vaccel import Resource, ResourceType, Session
from vaccel.ops.tf import Node, Tensor, TensorType
from vaccel.ops.tf import Buffer, Node, Tensor, TensorType


@pytest.fixture
Expand Down Expand Up @@ -31,3 +31,13 @@ def test_tf(test_model):
assert out_tensors[0].dims == in_tensors[0].dims
assert out_tensors[0].data_type == in_tensors[0].data_type
assert out_tensors[0].data == in_tensors[0].data

run_options = Buffer(b"none")

(out_tensors, status) = session.tf_model_run(
model, in_nodes, in_tensors, out_nodes, run_options
)
assert status.message == "Operation handled by noop plugin"
assert out_tensors[0].dims == in_tensors[0].dims
assert out_tensors[0].data_type == in_tensors[0].data_type
assert out_tensors[0].data == in_tensors[0].data
11 changes: 10 additions & 1 deletion tests/test_torch.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import pytest

from vaccel import Resource, ResourceType, Session
from vaccel.ops.torch import Tensor, TensorType
from vaccel.ops.torch import Buffer, Tensor, TensorType


@pytest.fixture
Expand All @@ -23,3 +23,12 @@ def test_torch(test_model):
assert out_tensors[0].dims == in_tensors[0].dims
assert out_tensors[0].data_type == in_tensors[0].data_type
assert out_tensors[0].data == in_tensors[0].data

run_options = Buffer(b"none")

out_tensors = session.torch_jitload_forward(
model, in_tensors, run_options=run_options
)
assert out_tensors[0].dims == in_tensors[0].dims
assert out_tensors[0].data_type == in_tensors[0].data_type
assert out_tensors[0].data == in_tensors[0].data
6 changes: 3 additions & 3 deletions vaccel/ops/tf.py
Original file line number Diff line number Diff line change
Expand Up @@ -399,16 +399,16 @@ def _init_c_obj(self):
FFIError: If buffer initialization fails.
"""
self._c_data = CBytes(self._data)
self._c_obj_ptr = ffi.new("vaccel_tf_buffer **")
self._c_obj_ptr = ffi.new("struct vaccel_tf_buffer **")

ret = lib.vaccel_tf_buffer_new(
self._c_obj, self._c_data._c_ptr, len(self._c_data)
self._c_obj_ptr, self._c_data._c_ptr, len(self._c_data)
)
if ret != 0:
raise FFIError(ret, "Could not initialize buffer")

self._c_obj = self._c_obj_ptr[0]
self._c_size = ffi.sizeof("struct vaccel_tf_status")
self._c_size = ffi.sizeof("struct vaccel_tf_buffer")

@property
def value(self) -> ffi.CData:
Expand Down
6 changes: 3 additions & 3 deletions vaccel/ops/torch.py
Original file line number Diff line number Diff line change
Expand Up @@ -223,16 +223,16 @@ def _init_c_obj(self):
FFIError: If buffer initialization fails.
"""
self._c_data = CBytes(self._data)
self._c_obj_ptr = ffi.new("vaccel_torch_buffer **")
self._c_obj_ptr = ffi.new("struct vaccel_torch_buffer **")

ret = lib.vaccel_torch_buffer_new(
self._c_obj, self._c_data._c_ptr, len(self._c_data)
self._c_obj_ptr, self._c_data._c_ptr, len(self._c_data)
)
if ret != 0:
raise FFIError(ret, "Could not initialize buffer")

self._c_obj = self._c_obj_ptr[0]
self._c_size = ffi.sizeof("struct vaccel_torch_status")
self._c_size = ffi.sizeof("struct vaccel_torch_buffer")

@property
def value(self) -> ffi.CData:
Expand Down