Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added inversion of control pattern so capabilities can coordinate with jextract #313

Closed
wants to merge 1 commit into from
+42 −31
Closed

Added inversion of control pattern so capabilities can coordinate with jextract #313

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 5 additions & 30 deletions hat/bld
View file
Original file line number Diff line number Diff line change
@@ -105,26 +105,13 @@ void main(String[] args) {
if (openclCapability.available()) {
if (!openclCapability.jarFile(buildDir).exists()) {
if (!openclCapability.stage(stageDir).exists()) {
jextract(jextractCapability.executable, $ -> $
.verbose(verbose)
.capability(openclCapability,stageDir)
.os(
mac -> $
.compile_flag("-F" + openclCapability.appLibFrameworks() + "/System/library/Frameworks")
.library(mac.frameworkLibrary("OpenCL"))
.header(Path.of(openclCapability.includeDir()).resolve("Headers/opencl.h")),
linux -> {
throw new RuntimeException("Unsupported OS: " + os);
}
)
);
jextract(jextractCapability.executable, $ -> $ .verbose(verbose) .capability(openclCapability,stageDir));
}else{
out.println("Using previously extracted "+openclCapability.stage(buildDir).fileName());
}
jar(jar ->
jar
.jarFile(openclCapability.jarFile(buildDir))
.javac(javac -> javac.current_source().source_path(SourceDir.of(openclCapability.stage(stageDir).path())))
jar(jar -> jar
.jarFile(openclCapability.jarFile(buildDir))
.javac(javac -> javac.current_source().source_path(SourceDir.of(openclCapability.stage(stageDir).path())))

);
}else{
@@ -137,19 +124,7 @@ void main(String[] args) {
if (openglCapability.available()) {
if (!openglCapability.jarFile(buildDir).exists()) {
if (!openglCapability.stage(stageDir).exists()) {
jextract(jextractCapability, $ -> $
.verbose(verbose)
.capability(openglCapability, stageDir)
.os(
mac -> $
.compile_flag("-F" + openglCapability.appLibFrameworks() + "/System/library/Frameworks")
.library(mac.frameworkLibrary("GLUT"), mac.frameworkLibrary("OpenGL"))
.header(mac.frameworkHeader("GLUT", "glut.h")),
linux -> {
throw new RuntimeException("Unsupported OS: " + os);
}
)
);
jextract(jextractCapability, $ -> $ .verbose(verbose) .capability(openglCapability, stageDir));
}else{
out.println("Using previously extracted "+openglCapability.stage(buildDir).fileName());
}
38 changes: 37 additions & 1 deletion hat/bldr/Bldr.java
View file
Original file line number Diff line number Diff line change
@@ -1999,9 +1999,11 @@ public JExtractBuilder header(Path header) {
}

public JExtractBuilder capability(Capabilities.Jextractable jextractable, BuildDir stageDir) {
return output(jextractable.stage(stageDir))
output(jextractable.stage(stageDir))
.target_package(jextractable.packageName())
.header_class_name(jextractable.headerClassName());
jextractable.inversionOfControl(this);
return self();
}
}

@@ -2517,6 +2519,8 @@ default String headerClassName() {
default JarFile jarFile(BuildDir buildDir) {
return buildDir.jarFile(packageName() + ".jar");
}

void inversionOfControl(JExtractBuilder jextractBuilder);
}

public Map<String, Capability> capabilityMap = new HashMap<>();
@@ -2599,6 +2603,17 @@ public void accept(Bldr.CMakeProbe cmakeProbe) {
}


@Override
public void inversionOfControl(JExtractBuilder jextractBuilder) {
jextractBuilder.os(mac -> jextractBuilder
.compile_flag("-F"
+ appLibFrameworks() + "/System/library/Frameworks")
.library(mac.frameworkLibrary("OpenCL"))
.header(Path.of(includeDir()).resolve("Headers/opencl.h")),
linux -> {
throw new IllegalStateException("Linux not handled yet");
});
}
}

public static final class OpenGL extends Capability implements CMakeProbeable, Jextractable {
@@ -2678,6 +2693,19 @@ public void accept(Bldr.CMakeProbe cmakeProbe) {
}); */

}
@Override public void inversionOfControl(JExtractBuilder jextractBuilder){
jextractBuilder
.os(mac -> jextractBuilder
.compile_flag("-F"
+ appLibFrameworks() + "/System/library/Frameworks")
.library(mac.frameworkLibrary("OpenGL"))
.library(mac.frameworkLibrary("GLUT"))
.header(glutIncludeDir().dir("glut.h").path()),
linux -> {
throw new IllegalStateException("Linux not handled yet");
}
);
}
}

public static final class HIP extends Capability implements CMakeProbeable, Jextractable {
@@ -2715,6 +2743,10 @@ public void accept(Bldr.CMakeProbe cmakeProbe) {
this.cmakeProbe = cmakeProbe;
}

@Override
public void inversionOfControl(JExtractBuilder jextractBuilder) {

}
}

public static final class CUDA extends Capability implements CMakeProbeable, Jextractable {
@@ -2757,6 +2789,10 @@ public void accept(Bldr.CMakeProbe cmakeProbe) {
this.cmakeProbe = cmakeProbe;
}

@Override
public void inversionOfControl(JExtractBuilder jextractBuilder) {

}
}

public static final class JExtract extends Capability implements Executable {