correct one bug for macos

segment-anything-models-java · Dec 9, 2024 · f0b1d32 · f0b1d32
1 parent 33a4a8f
commit f0b1d32
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 6 deletions.
diff --git a/src/main/java/ai/nets/samj/models/EfficientSamJ.java b/src/main/java/ai/nets/samj/models/EfficientSamJ.java
@@ -410,9 +410,14 @@ protected void processPromptsBatchWithSAM(SharedMemoryArray shmArr,
 		if (shmArr != null) {
 			code += ""
 					+ "shm_mask = shared_memory.SharedMemory(name='" + shmArr.getNameForPython() + "')" + System.lineSeparator()
-					+ "mask_batch = np.frombuffer(buffer=shm_mask.buf, dtype='" + shmArr.getOriginalDataType() + "').reshape([";
-			for (long l : shmArr.getOriginalShape()) 
+					+ "mask_batch = np.ndarray(%s, buffer=shm_mask.buf, dtype='" 
+					+ shmArr.getOriginalDataType() + "').reshape([";
+			long size = 1;
+			for (long l : shmArr.getOriginalShape()) {
 				code += l + ",";
+				size *= l;
+			}
+			code = String.format(code, size);
 			code += "])" + System.lineSeparator();
 			code += "labeled_array, num_features = label(mask_batch)" + System.lineSeparator();
 			code += "num_features -= 1" + System.lineSeparator();

diff --git a/src/main/java/ai/nets/samj/models/EfficientViTSamJ.java b/src/main/java/ai/nets/samj/models/EfficientViTSamJ.java
@@ -491,9 +491,14 @@ protected void processPromptsBatchWithSAM(SharedMemoryArray shmArr,
 		if (shmArr != null) {
 			code += ""
 					+ "shm_mask = shared_memory.SharedMemory(name='" + shmArr.getNameForPython() + "')" + System.lineSeparator()
-					+ "mask_batch = np.frombuffer(buffer=shm_mask.buf, dtype='" + shmArr.getOriginalDataType() + "').reshape([";
-			for (long l : shmArr.getOriginalShape()) 
+					+ "mask_batch = np.ndarray(%s, buffer=shm_mask.buf, dtype='" 
+					+ shmArr.getOriginalDataType() + "').reshape([";
+			long size = 1;
+			for (long l : shmArr.getOriginalShape()) {
 				code += l + ",";
+				size *= l;
+			}
+			code = String.format(code, size);
 			code += "])" + System.lineSeparator();
 			code += "labeled_array, num_features = label(mask_batch)" + System.lineSeparator();
 			code += "num_features -= 1" + System.lineSeparator();

diff --git a/src/main/java/ai/nets/samj/models/Sam2.java b/src/main/java/ai/nets/samj/models/Sam2.java
@@ -465,9 +465,14 @@ protected void processPromptsBatchWithSAM(SharedMemoryArray shmArr, boolean retu
 		if (shmArr != null) {
 			code += ""
 					+ "shm_mask = shared_memory.SharedMemory(name='" + shmArr.getNameForPython() + "')" + System.lineSeparator()
-					+ "mask_batch = np.frombuffer(buffer=shm_mask.buf, dtype='" + shmArr.getOriginalDataType() + "').reshape([";
-			for (long l : shmArr.getOriginalShape()) 
+					+ "mask_batch = np.ndarray(%s, buffer=shm_mask.buf, dtype='" 
+					+ shmArr.getOriginalDataType() + "').reshape([";
+			long size = 1;
+			for (long l : shmArr.getOriginalShape()) {
 				code += l + ",";
+				size *= l;
+			}
+			code = String.format(code, size);
 			code += "])" + System.lineSeparator();
 			code += "labeled_array, num_features = label(mask_batch)" + System.lineSeparator();
 			code += "num_features -= 1" + System.lineSeparator();