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
Binary file not shown.
Binary file not shown.
Binary file not shown.
5 changes: 3 additions & 2 deletions tfjs-node/src/saved_model.ts
Original file line number Diff line number Diff line change
Expand Up @@ -284,9 +284,10 @@ export class TFSavedModel implements InferenceModel {
let inputTensors: Tensor[] = [];
if (inputs instanceof Tensor) {
inputTensors.push(inputs);
return this.backend.runSavedModel(
const result = this.backend.runSavedModel(
this.sessionId, inputTensors, Object.values(this.inputNodeNames),
Object.values(this.outputNodeNames))[0];
Object.values(this.outputNodeNames));
return result.length > 1 ? result : result[0];
} else if (Array.isArray(inputs)) {
inputTensors = inputs;
return this.backend.runSavedModel(
Expand Down
21 changes: 20 additions & 1 deletion tfjs-node/src/saved_model_test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -429,7 +429,26 @@ describe('SavedModel', () => {
model2.dispose();
});

it('execute model with multiple inputs and outputs', async () => {
it('execute model with single input and multiple outputs', async () => {
// This test model behaves as: f(x)=[2*x, x]
const model = await tf.node.loadSavedModel(
'./test_objects/saved_model/model_single_input_multi_output', ['serve'],
'serving_default');
const input = tf.tensor1d([1, 2, 3], 'int32');
const output = model.predict(input) as tf.Tensor[];
const output1 = output[0];
const output2 = output[1];
expect(output1.shape).toEqual(input.shape);
expect(output1.dtype).toBe(input.dtype);
expect(output2.shape).toEqual(input.shape);
expect(output2.dtype).toBe(input.dtype);
test_util.expectArraysClose(await output1.data(), [2, 4, 6]);
test_util.expectArraysClose(await output2.data(), [1, 2, 3]);
model.dispose();
});

it('execute model with multiple inputs and multiple outputs', async () => {
// This test model behaves as: f(x, y)=[2*x, y]
const model = await tf.node.loadSavedModel(
'./test_objects/saved_model/model_multi_output', ['serve'],
'serving_default');
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.