Skip to content

Commit 0a069ee

Browse files
committed
update to new JDLL version
1 parent 199fd57 commit 0a069ee

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@
125125
<!-- NB: Deploy releases to the SciJava Maven repository. -->
126126
<releaseProfiles>sign,deploy-to-scijava</releaseProfiles>
127127

128-
<dl-modelrunner.version>0.4.1</dl-modelrunner.version>
128+
<dl-modelrunner.version>0.5.0</dl-modelrunner.version>
129129
<tensorflow-core.version>0.5.0</tensorflow-core.version>
130130
<scijava.jvm.build.version>[11,)</scijava.jvm.build.version>
131131
<scijava.jvm.version>11</scijava.jvm.version>

src/main/java/io/bioimage/modelrunner/tensorflow/v2/api050/Tensorflow2Interface.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -274,9 +274,9 @@ private void unzipTfWeights(ModelDescriptor descriptor) throws LoadModelExceptio
274274
if (new File(modelFolder, "tf_weights.zip").isFile()) {
275275
System.out.println("Unzipping model...");
276276
ZipUtils.unzipFolder(modelFolder + File.separator + "tf_weights.zip", modelFolder);
277-
} else if ( descriptor.getWeights().getSupportedDLFrameworks()
277+
} else if ( descriptor.getWeights().getAllSuportedWeightNames()
278278
.contains(EngineInfo.getBioimageioTfKey()) ) {
279-
String source = descriptor.getWeights().getSupportedWeights().stream()
279+
String source = descriptor.getWeights().gettAllSupportedWeightObjects().stream()
280280
.filter(ww -> ww.getFramework().equals(EngineInfo.getBioimageioTfKey()))
281281
.findFirst().get().getSource();
282282
source = DownloadModel.getFileNameFromURLString(source);

src/main/java/io/bioimage/modelrunner/tensorflow/v2/api050/tensor/TensorBuilder.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
package io.bioimage.modelrunner.tensorflow.v2.api050.tensor;
2323

2424
import io.bioimage.modelrunner.tensor.Utils;
25+
import io.bioimage.modelrunner.utils.CommonUtils;
2526
import net.imglib2.Cursor;
2627
import net.imglib2.RandomAccessibleInterval;
27-
import net.imglib2.blocks.PrimitiveBlocks;
2828
import net.imglib2.img.Img;
2929
import net.imglib2.type.Type;
3030
import net.imglib2.type.numeric.integer.IntType;
@@ -35,7 +35,6 @@
3535
import net.imglib2.util.Util;
3636
import net.imglib2.view.Views;
3737

38-
import java.nio.ByteBuffer;
3938
import java.util.Arrays;
4039

4140
import org.tensorflow.Tensor;

0 commit comments

Comments
 (0)