Skip to content
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

Supports PyTorch stream imperative model load #2981

Merged
merged 1 commit into from
Feb 7, 2024
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
8 changes: 6 additions & 2 deletions api/src/main/java/ai/djl/BaseModel.java
Original file line number Diff line number Diff line change
Expand Up @@ -339,8 +339,12 @@ protected Path paramPathResolver(String prefix, Map<String, ?> options) throws I
protected boolean readParameters(Path paramFile, Map<String, ?> options)
throws IOException, MalformedModelException {
logger.debug("Try to load model from {}", paramFile);
try (DataInputStream dis =
new DataInputStream(new BufferedInputStream(Files.newInputStream(paramFile)))) {
return readParameters(Files.newInputStream(paramFile), options);
}

protected boolean readParameters(InputStream paramStream, Map<String, ?> options)
throws IOException, MalformedModelException {
try (DataInputStream dis = new DataInputStream(new BufferedInputStream(paramStream))) {
byte[] buf = new byte[4];
dis.readFully(buf);
if (!"DJL@".equals(new String(buf, StandardCharsets.US_ASCII))) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.function.Predicate;
Expand Down Expand Up @@ -132,7 +133,8 @@ public void load(Path modelPath, String prefix, Map<String, ?> options)

/** {@inheritDoc} */
@Override
public void load(InputStream modelStream, Map<String, ?> options) throws IOException {
public void load(InputStream modelStream, Map<String, ?> options)
throws IOException, MalformedModelException {
boolean mapLocation = false;
if (options != null) {
mapLocation = Boolean.parseBoolean((String) options.get("mapLocation"));
Expand All @@ -146,11 +148,26 @@ public void load(InputStream modelStream, Map<String, ?> options) throws IOExcep
* @param modelStream the stream of the model file
* @param mapLocation force load to specified device if true
* @throws IOException model loading error
* @throws MalformedModelException if model file is corrupted
*/
public void load(InputStream modelStream, boolean mapLocation) throws IOException {
modelDir = Files.createTempDirectory("pt-model");
modelDir.toFile().deleteOnExit();
block = JniUtils.loadModule((PtNDManager) manager, modelStream, mapLocation, false);
public void load(InputStream modelStream, boolean mapLocation)
throws IOException, MalformedModelException {
wasLoaded = true;
if (block == null) {
modelDir = Files.createTempDirectory("pt-model");
modelDir.toFile().deleteOnExit();
block = JniUtils.loadModule((PtNDManager) manager, modelStream, mapLocation, false);

/*
* By default, the parameters are frozen, since the previous version before adding this
* trainParam, they were frozen due to the setting JITCallGuard guard, which disables
* autograd. Also, the pretrained parameters usually should not be updated too much. It
* is safe to freeze it. Users may unfreeze it and set their learning rate small.
*/
block.freezeParameters(true);
} else {
readParameters(modelStream, Collections.emptyMap());
}
}

private Path findModelFile(String... prefixes) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import org.testng.annotations.Test;

import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Paths;

public class ModelTest {
Expand All @@ -37,7 +38,9 @@ public void testModelSaveAndLoad() throws IOException, MalformedModelException {
block.add(Conv2d.builder().setKernelShape(new Shape(1, 1)).setFilters(10).build());
block.add(BatchNorm.builder().build());
try (Model saveModel = Model.newInstance("saveModel", TestUtils.getEngine());
Model loadModel = Model.newInstance("loadModel", TestUtils.getEngine())) {
Model loadModel = Model.newInstance("loadModel", TestUtils.getEngine());
Model loadStreamModel =
Model.newInstance("loadStreamModel", TestUtils.getEngine()); ) {
block.initialize(saveModel.getNDManager(), DataType.FLOAT32, new Shape(1, 3, 32, 32));
ParameterList savedParameters = block.getParameters();
saveModel.setBlock(block);
Expand All @@ -48,6 +51,13 @@ public void testModelSaveAndLoad() throws IOException, MalformedModelException {
loadModel.load(Paths.get("build/tmp/test/models"), "saveAndLoad");
ParameterList loadedParameters = loadModel.getBlock().getParameters();
compareParameters(savedParameters, loadedParameters);

loadStreamModel.setBlock(block);
loadStreamModel.load(
Files.newInputStream(
Paths.get("build/tmp/test/models/saveAndLoad-0000.params")));
loadedParameters = loadStreamModel.getBlock().getParameters();
compareParameters(savedParameters, loadedParameters);
}
}

Expand Down
Loading