Skip to content

Commit f0b1d32

Browse files
committed
correct one bug for macos
1 parent 33a4a8f commit f0b1d32

File tree

3 files changed

+21
-6
lines changed

3 files changed

+21
-6
lines changed

src/main/java/ai/nets/samj/models/EfficientSamJ.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -410,9 +410,14 @@ protected void processPromptsBatchWithSAM(SharedMemoryArray shmArr,
410410
if (shmArr != null) {
411411
code += ""
412412
+ "shm_mask = shared_memory.SharedMemory(name='" + shmArr.getNameForPython() + "')" + System.lineSeparator()
413-
+ "mask_batch = np.frombuffer(buffer=shm_mask.buf, dtype='" + shmArr.getOriginalDataType() + "').reshape([";
414-
for (long l : shmArr.getOriginalShape())
413+
+ "mask_batch = np.ndarray(%s, buffer=shm_mask.buf, dtype='"
414+
+ shmArr.getOriginalDataType() + "').reshape([";
415+
long size = 1;
416+
for (long l : shmArr.getOriginalShape()) {
415417
code += l + ",";
418+
size *= l;
419+
}
420+
code = String.format(code, size);
416421
code += "])" + System.lineSeparator();
417422
code += "labeled_array, num_features = label(mask_batch)" + System.lineSeparator();
418423
code += "num_features -= 1" + System.lineSeparator();

src/main/java/ai/nets/samj/models/EfficientViTSamJ.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -491,9 +491,14 @@ protected void processPromptsBatchWithSAM(SharedMemoryArray shmArr,
491491
if (shmArr != null) {
492492
code += ""
493493
+ "shm_mask = shared_memory.SharedMemory(name='" + shmArr.getNameForPython() + "')" + System.lineSeparator()
494-
+ "mask_batch = np.frombuffer(buffer=shm_mask.buf, dtype='" + shmArr.getOriginalDataType() + "').reshape([";
495-
for (long l : shmArr.getOriginalShape())
494+
+ "mask_batch = np.ndarray(%s, buffer=shm_mask.buf, dtype='"
495+
+ shmArr.getOriginalDataType() + "').reshape([";
496+
long size = 1;
497+
for (long l : shmArr.getOriginalShape()) {
496498
code += l + ",";
499+
size *= l;
500+
}
501+
code = String.format(code, size);
497502
code += "])" + System.lineSeparator();
498503
code += "labeled_array, num_features = label(mask_batch)" + System.lineSeparator();
499504
code += "num_features -= 1" + System.lineSeparator();

src/main/java/ai/nets/samj/models/Sam2.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -465,9 +465,14 @@ protected void processPromptsBatchWithSAM(SharedMemoryArray shmArr, boolean retu
465465
if (shmArr != null) {
466466
code += ""
467467
+ "shm_mask = shared_memory.SharedMemory(name='" + shmArr.getNameForPython() + "')" + System.lineSeparator()
468-
+ "mask_batch = np.frombuffer(buffer=shm_mask.buf, dtype='" + shmArr.getOriginalDataType() + "').reshape([";
469-
for (long l : shmArr.getOriginalShape())
468+
+ "mask_batch = np.ndarray(%s, buffer=shm_mask.buf, dtype='"
469+
+ shmArr.getOriginalDataType() + "').reshape([";
470+
long size = 1;
471+
for (long l : shmArr.getOriginalShape()) {
470472
code += l + ",";
473+
size *= l;
474+
}
475+
code = String.format(code, size);
471476
code += "])" + System.lineSeparator();
472477
code += "labeled_array, num_features = label(mask_batch)" + System.lineSeparator();
473478
code += "num_features -= 1" + System.lineSeparator();

0 commit comments

Comments
 (0)