Skip to content

Commit

Permalink
Fix arm64 detection
Browse files Browse the repository at this point in the history
  • Loading branch information
HGuillemet committed May 5, 2024
1 parent 8001d5d commit 5a20af5
Showing 1 changed file with 8 additions and 3 deletions.
11 changes: 8 additions & 3 deletions pytorch/src/main/java/org/bytedeco/pytorch/presets/torch.java
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,11 @@
import org.bytedeco.javacpp.annotation.Platform;
import org.bytedeco.javacpp.annotation.Properties;

import org.bytedeco.javacpp.tools.BuildEnabled;
import org.bytedeco.javacpp.tools.Info;
import org.bytedeco.javacpp.tools.InfoMap;
import org.bytedeco.javacpp.tools.InfoMapper;
import org.bytedeco.javacpp.tools.Logger;

import org.bytedeco.openblas.presets.openblas;

Expand Down Expand Up @@ -99,7 +101,7 @@
target = "org.bytedeco.pytorch",
global = "org.bytedeco.pytorch.global.torch"
)
public class torch implements LoadEnabled, InfoMapper {
public class torch implements LoadEnabled, InfoMapper, BuildEnabled {
static {
Loader.checkVersion("org.bytedeco", "pytorch");
}
Expand Down Expand Up @@ -140,8 +142,6 @@ public void init(ClassProperties properties) {

initIncludes(getClass(), properties);

arm64 = platform.contains("arm64");

// Only apply this at load time since we don't want to copy the CUDA libraries here
if (!Loader.isLoadLibraries() || extension == null || !extension.endsWith("-gpu")) {
return;
Expand Down Expand Up @@ -191,6 +191,11 @@ public void init(ClassProperties properties) {
}
}

@Override
public void init(Logger logger, java.util.Properties properties, String encoding) {
arm64 = properties.getProperty("platform").contains("arm64");
}

public void mapModule(InfoMap infoMap, String name) {
mapModule(infoMap, name, null, null, true);
}
Expand Down

0 comments on commit 5a20af5

Please sign in to comment.