focus on fixing macos15-intel cp3 and cp4

Author: gletort

src/main/resources/pixi.toml

@@ -19,7 +19,6 @@ llvmlite = "*"
 
 [pypi-dependencies]
 appose = ">=0.10.1, <0.12"
-numpy = "<2"
 
 # --- PyTorch features ---
 # See for more details on torch versions and CUDA support: https://pytorch.org/get-started/previous-versions/
@@ -82,6 +81,8 @@ torchvision = { version = ">=0.17.2, <0.26", index = "https://download.pytorch.o
 # --- CellPose version features ---
 [feature.cp3.pypi-dependencies]
 cellpose = ">=3.1, <4"
+[feature.cp3.target.osx-64.pypi-dependencies]
+numpy = "<2"
 
 [feature.cp4.pypi-dependencies]
 cellpose = ">=4, <5"

src/test/java/net/imglib2/cellpose/EnvironmentTest.java

@@ -24,7 +24,7 @@ public class EnvironmentTest
 {
 
 	@Test 
-	public void createEnvironment()
+	public void createEnvironmentCP3()
 	{
 		int[] dims = new int[] { 300, 300 };
 		try {
@@ -58,7 +58,47 @@ public void createEnvironment()
 		}
 		catch ( BuildException | IOException | InterruptedException | TaskException e )
 		{
-			Assert.fail("Got an exception when installing environment: "+e);
+			Assert.fail("Got an exception when installing environment CP3: "+e);
+			e.printStackTrace();
+		}
+	
+	}
+
+	@Test 
+	public void createEnvironmentCP4()
+	{
+		int[] dims = new int[] { 300, 300 };
+		try {
+			ShmImg<UnsignedByteType> shimg = new ShmImg<>( new UnsignedByteType(), dims );
+			ShmImg<UnsignedByteType> shout = new ShmImg<>( new UnsignedByteType(), dims );
+			
+		
+			final Cellpose4Parameters params = Cellpose4Parameters.builder()
+				.model( Cellpose4BuiltinModels.CPSAM )
+				.computeFlows( false )
+				.build();
+			final String envName = "cp4-cpu";
+			final String pythonScriptPath = "/cp4.py";
+			final String pythonInitScriptPath = "/cp4_init.py";
+		
+			CellposeRunner<UnsignedByteType, UnsignedByteType> cprun = new CellposeRunner<>(
+					params,
+					pythonInitScriptPath,
+					pythonScriptPath,
+					envName,
+					ApposeTaskListener.STD,
+					shimg,
+					AxisInfo.XY,
+					shout,
+					null );
+			
+				cprun.init();
+				cprun.close();
+			
+		}
+		catch ( BuildException | IOException | InterruptedException | TaskException e )
+		{
+			Assert.fail("Got an exception when installing environment CP4: "+e);
 			e.printStackTrace();
 		}