Skip to content

Commit

Permalink
change mkl version for macos intel
Browse files Browse the repository at this point in the history
  • Loading branch information
carlosuc3m committed Oct 23, 2024
1 parent eff7ac5 commit 4aea22f
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,9 @@ public class EfficientSamEnvManager extends SamEnvManagerAbstract {
*/
final public static List<String> INSTALL_PIP_DEPS;
static {
if (!PlatformDetection.getArch().equals(PlatformDetection.ARCH_ARM64) && !PlatformDetection.isUsingRosseta())
if (!PlatformDetection.getArch().equals(PlatformDetection.ARCH_ARM64) && !PlatformDetection.isUsingRosseta() && PlatformDetection.isMacOS())
INSTALL_PIP_DEPS = Arrays.asList(new String[] {"mkl==2023.2.2", "appose"});
else if (!PlatformDetection.getArch().equals(PlatformDetection.ARCH_ARM64) && !PlatformDetection.isUsingRosseta())
INSTALL_PIP_DEPS = Arrays.asList(new String[] {"mkl==2024.0.0", "appose"});
else
INSTALL_PIP_DEPS = Arrays.asList(new String[] {"appose"});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,9 @@ public class EfficientViTSamEnvManager extends SamEnvManagerAbstract {
*/
final public static List<String> INSTALL_PIP_DEPS;
static {
if (!PlatformDetection.getArch().equals(PlatformDetection.ARCH_ARM64) && !PlatformDetection.isUsingRosseta())
if (!PlatformDetection.getArch().equals(PlatformDetection.ARCH_ARM64) && !PlatformDetection.isUsingRosseta() && PlatformDetection.isMacOS())
INSTALL_PIP_DEPS = Arrays.asList(new String[] {"mkl==2023.2.2", "appose"});
else if (!PlatformDetection.getArch().equals(PlatformDetection.ARCH_ARM64) && !PlatformDetection.isUsingRosseta())
INSTALL_PIP_DEPS = Arrays.asList(new String[] {"mkl==2024.0.0", "appose"});
else
INSTALL_PIP_DEPS = Arrays.asList(new String[] {"appose"});
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/ai/nets/samj/install/Sam2EnvManager.java
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,9 @@ public class Sam2EnvManager extends SamEnvManagerAbstract {
*/
final public static List<String> INSTALL_PIP_DEPS;
static {
if (!PlatformDetection.getArch().equals(PlatformDetection.ARCH_ARM64) && !PlatformDetection.isUsingRosseta())
if (!PlatformDetection.getArch().equals(PlatformDetection.ARCH_ARM64) && !PlatformDetection.isUsingRosseta() && PlatformDetection.isMacOS())
INSTALL_PIP_DEPS = Arrays.asList(new String[] {"mkl==2023.2.2", "samv2==0.0.4", "pytest"});
else if (!PlatformDetection.getArch().equals(PlatformDetection.ARCH_ARM64) && !PlatformDetection.isUsingRosseta())
INSTALL_PIP_DEPS = Arrays.asList(new String[] {"mkl==2024.0.0", "samv2==0.0.4", "pytest"});
else
INSTALL_PIP_DEPS = Arrays.asList(new String[] {"samv2==0.0.4", "pytest"});
Expand Down

0 comments on commit 4aea22f

Please sign in to comment.