Skip to content

Commit

Permalink
allow pytorch stream model loading
Browse files Browse the repository at this point in the history
Change-Id: I1b3d0194bf508ba1b2bcd1dad05ec343e7481791
  • Loading branch information
Qing Lan committed Mar 5, 2021
1 parent a059417 commit 21a5467
Show file tree
Hide file tree
Showing 3 changed files with 57 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ private OrtNDManager(NDManager parent, Device device, OrtEnvironment env) {
this.env = env;
}

static OrtNDManager getSystemManager() {
public static OrtNDManager getSystemManager() {
return SYSTEM_MANAGER;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import ai.djl.util.PairList;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.ArrayList;
Expand Down Expand Up @@ -101,6 +102,18 @@ public void load(Path modelPath, String prefix, Map<String, ?> options)
}
}

/**
* Load PyTorch model from {@link InputStream}.
*
* <p>Currently, only TorchScript file are supported
*
* @param modelStream the stream of the model file
* @throws IOException model loading error
*/
public void load(InputStream modelStream) throws IOException {
block = JniUtils.loadModule((PtNDManager) manager, modelStream, manager.getDevice(), false);
}

private Path findModelFile(String prefix) {
if (Files.isRegularFile(modelDir)) {
Path file = modelDir;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
/*
* Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance
* with the License. A copy of the License is located at
*
* http://aws.amazon.com/apache2.0/
*
* or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
* OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions
* and limitations under the License.
*/
package ai.djl.pytorch.integration;

import ai.djl.Model;
import ai.djl.inference.Predictor;
import ai.djl.ndarray.NDArray;
import ai.djl.ndarray.NDList;
import ai.djl.ndarray.types.Shape;
import ai.djl.pytorch.engine.PtModel;
import ai.djl.translate.NoopTranslator;
import ai.djl.translate.TranslateException;
import java.io.IOException;
import java.net.URL;
import org.testng.Assert;
import org.testng.annotations.Test;

public class PtModelTest {

@Test
public void testLoadFromStream() throws IOException, TranslateException {
URL url =
new URL("https://djl-ai.s3.amazonaws.com/resources/test-models/traced_resnet18.pt");
try (PtModel model = (PtModel) Model.newInstance("test model")) {
model.load(url.openStream());
try (Predictor<NDList, NDList> predictor = model.newPredictor(new NoopTranslator())) {
NDArray array = model.getNDManager().ones(new Shape(1, 3, 224, 224));
NDArray result = predictor.predict(new NDList(array)).singletonOrThrow();
Assert.assertEquals(result.getShape(), new Shape(1, 1000));
}
}
}
}

0 comments on commit 21a5467

Please sign in to comment.