Skip to content

Commit 2224a53

Browse files
author
Gary Frost
committedMar 10, 2025
synced up maven and bld artifact names
1 parent c5ba520 commit 2224a53

File tree

34 files changed

+402
-119
lines changed

34 files changed

+402
-119
lines changed
 

‎hat/backends/ffi/cuda/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ questions.
3636
<dependencies>
3737
<dependency>
3838
<groupId>oracle.code</groupId>
39-
<artifactId>hat</artifactId>
39+
<artifactId>hat-core</artifactId>
4040
<version>1.0</version>
4141
</dependency>
4242
</dependencies>

‎hat/backends/ffi/hip/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ questions.
3636
<dependencies>
3737
<dependency>
3838
<groupId>oracle.code</groupId>
39-
<artifactId>hat</artifactId>
39+
<artifactId>hat-core</artifactId>
4040
<version>1.0</version>
4141
</dependency>
4242
</dependencies>

‎hat/backends/ffi/mock/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ questions.
3636
<dependencies>
3737
<dependency>
3838
<groupId>oracle.code</groupId>
39-
<artifactId>hat</artifactId>
39+
<artifactId>hat-core</artifactId>
4040
<version>1.0</version>
4141
</dependency>
4242
</dependencies>

‎hat/backends/ffi/opencl/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ questions.
3636
<dependencies>
3737
<dependency>
3838
<groupId>oracle.code</groupId>
39-
<artifactId>hat</artifactId>
39+
<artifactId>hat-core</artifactId>
4040
<version>1.0</version>
4141
</dependency>
4242
</dependencies>

‎hat/backends/ffi/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ questions.
3636
<dependencies>
3737
<dependency>
3838
<groupId>oracle.code</groupId>
39-
<artifactId>hat</artifactId>
39+
<artifactId>hat-core</artifactId>
4040
<version>1.0</version>
4141
</dependency>
4242
</dependencies>

‎hat/backends/ffi/ptx/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ questions.
3636
<dependencies>
3737
<dependency>
3838
<groupId>oracle.code</groupId>
39-
<artifactId>hat</artifactId>
39+
<artifactId>hat-core</artifactId>
4040
<version>1.0</version>
4141
</dependency>
4242
</dependencies>

‎hat/backends/ffi/shared/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ questions.
3636
<dependencies>
3737
<dependency>
3838
<groupId>oracle.code</groupId>
39-
<artifactId>hat</artifactId>
39+
<artifactId>hat-core</artifactId>
4040
<version>1.0</version>
4141
</dependency>
4242
</dependencies>

‎hat/backends/ffi/spirv/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ questions.
3636
<dependencies>
3737
<dependency>
3838
<groupId>oracle.code</groupId>
39-
<artifactId>hat</artifactId>
39+
<artifactId>hat-core</artifactId>
4040
<version>1.0</version>
4141
</dependency>
4242
</dependencies>

‎hat/backends/java/mt/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ questions.
3636
<dependencies>
3737
<dependency>
3838
<groupId>oracle.code</groupId>
39-
<artifactId>hat</artifactId>
39+
<artifactId>hat-core</artifactId>
4040
<version>1.0</version>
4141
</dependency>
4242
</dependencies>

‎hat/backends/java/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ questions.
3636
<dependencies>
3737
<dependency>
3838
<groupId>oracle.code</groupId>
39-
<artifactId>hat</artifactId>
39+
<artifactId>hat-core</artifactId>
4040
<version>1.0</version>
4141
</dependency>
4242
</dependencies>

‎hat/backends/java/seq/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ questions.
3636
<dependencies>
3737
<dependency>
3838
<groupId>oracle.code</groupId>
39-
<artifactId>hat</artifactId>
39+
<artifactId>hat-core</artifactId>
4040
<version>1.0</version>
4141
</dependency>
4242
</dependencies>

‎hat/backends/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ questions.
3636
<dependencies>
3737
<dependency>
3838
<groupId>oracle.code</groupId>
39-
<artifactId>hat</artifactId>
39+
<artifactId>hat-core</artifactId>
4040
<version>1.0</version>
4141
</dependency>
4242
</dependencies>

‎hat/bld

+5-5
Original file line numberDiff line numberDiff line change
@@ -98,11 +98,11 @@ void main(String[] args) {
9898
out.println();
9999

100100
var verbose = false;
101-
var wrapJar= buildDir.jarFile("wrap.jar");
102-
var clWrapJar= buildDir.jarFile("clwrap.jar");
103-
var glWrapJar= buildDir.jarFile("glwrap.jar");
104-
var cuWrapJar= buildDir.jarFile("cuwrap.jar");
105-
var hatJar = buildDir.jarFile("hat-1.0.jar");
101+
var wrapJar= buildDir.jarFile("hat-wrap-1.0.jar");
102+
var clWrapJar= buildDir.jarFile("hat-clwrap-1.0.jar");
103+
var glWrapJar= buildDir.jarFile("hat-glwrap-1.0.jar");
104+
var cuWrapJar= buildDir.jarFile("hat-cuwrap-1.0.jar");
105+
var hatJar = buildDir.jarFile("hat-core-1.0.jar");
106106

107107
var hatJavacOpts = javacBuilder($ -> $
108108
.enable_preview()

‎hat/bldr/Bldr.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -2517,7 +2517,7 @@ default String headerClassName() {
25172517
}
25182518

25192519
default JarFile jarFile(BuildDir buildDir) {
2520-
return buildDir.jarFile(packageName() + ".jar");
2520+
return buildDir.jarFile("hat-jextracted-"+packageName() + "-1.0.jar");
25212521
}
25222522

25232523
void inversionOfControl(JExtractBuilder jextractBuilder);

‎hat/examples/blackscholes/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ questions.
3636
<dependencies>
3737
<dependency>
3838
<groupId>oracle.code</groupId>
39-
<artifactId>hat</artifactId>
39+
<artifactId>hat-core</artifactId>
4040
<version>1.0</version>
4141
</dependency>
4242
</dependencies>
@@ -55,7 +55,7 @@ questions.
5555
</goals>
5656
<configuration>
5757
<target>
58-
<copy file="target/hat-example-blackscholes-1.0.jar" toDir="${hat.build}"/>
58+
<copy file="target/${project.artifactId}-${project.version}.jar" toDir="${hat.build}"/>
5959
</target>
6060
</configuration>
6161
</execution>

‎hat/examples/experiments/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ questions.
4242
<dependency>
4343
<groupId>oracle.code</groupId>
4444
<version>1.0</version>
45-
<artifactId>hat</artifactId>
45+
<artifactId>hat-core</artifactId>
4646
</dependency>
4747
</dependencies>
4848

@@ -57,7 +57,7 @@ questions.
5757
<phase>install</phase>
5858
<configuration>
5959
<target>
60-
<copy file="target/hat-example-experiments-1.0.jar" todir="${hat.build}"/>
60+
<copy file="target/${project.artifactId}-${project.version}.jar" toDir="${hat.build}"/>
6161
</target>
6262
</configuration>
6363
<goals>

‎hat/examples/heal/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ questions.
3636
<dependencies>
3737
<dependency>
3838
<groupId>oracle.code</groupId>
39-
<artifactId>hat</artifactId>
39+
<artifactId>hat-core</artifactId>
4040
<version>1.0</version>
4141
</dependency>
4242
</dependencies>
@@ -55,7 +55,7 @@ questions.
5555
</goals>
5656
<configuration>
5757
<target>
58-
<copy file="target/hat-example-heal-1.0.jar" toDir="${hat.build}"/>
58+
<copy file="target/${project.artifactId}-${project.version}.jar" toDir="${hat.build}"/>
5959
</target>
6060
</configuration>
6161
</execution>

‎hat/examples/life/pom.xml

+17-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,22 @@ questions.
3636
<dependencies>
3737
<dependency>
3838
<groupId>oracle.code</groupId>
39-
<artifactId>hat</artifactId>
39+
<artifactId>hat-core</artifactId>
40+
<version>1.0</version>
41+
</dependency>
42+
<dependency>
43+
<groupId>oracle.code</groupId>
44+
<artifactId>hat-backend-ffi-opencl</artifactId>
45+
<version>1.0</version>
46+
</dependency>
47+
<dependency>
48+
<groupId>oracle.code</groupId>
49+
<artifactId>hat-clwrap</artifactId>
50+
<version>1.0</version>
51+
</dependency>
52+
<dependency>
53+
<groupId>oracle.code</groupId>
54+
<artifactId>hat-jextracted-opencl</artifactId>
4055
<version>1.0</version>
4156
</dependency>
4257
</dependencies>
@@ -55,7 +70,7 @@ questions.
5570
</goals>
5671
<configuration>
5772
<target>
58-
<copy file="target/hat-example-life-1.0.jar" toDir="${hat.build}"/>
73+
<copy file="target/${project.artifactId}-${project.version}.jar" toDir="${hat.build}"/>
5974
</target>
6075
</configuration>
6176
</execution>

‎hat/examples/mandel/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ questions.
3636
<dependencies>
3737
<dependency>
3838
<groupId>oracle.code</groupId>
39-
<artifactId>hat</artifactId>
39+
<artifactId>hat-core</artifactId>
4040
<version>1.0</version>
4141
</dependency>
4242
</dependencies>
@@ -55,7 +55,7 @@ questions.
5555
</goals>
5656
<configuration>
5757
<target>
58-
<copy file="target/hat-example-mandel-1.0.jar" toDir="${hat.build}"/>
58+
<copy file="target/${project.artifactId}-${project.version}.jar" toDir="${hat.build}"/>
5959
</target>
6060
</configuration>
6161
</execution>

‎hat/examples/pom.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2+
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0">
23
<!--Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
34
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
45
@@ -21,8 +22,7 @@ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
2122
Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
2223
or visit www.oracle.com if you need additional information or have any
2324
questions.
24-
--><project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0">
25-
<!--Auto generated by mkpoms-->
25+
--><!--Auto generated by mkpoms-->
2626
<modelVersion>4.0.0</modelVersion>
2727
<packaging>pom</packaging>
2828
<groupId>oracle.code</groupId>
@@ -36,16 +36,16 @@ questions.
3636
<dependencies>
3737
<dependency>
3838
<groupId>oracle.code</groupId>
39-
<artifactId>hat</artifactId>
39+
<artifactId>hat-core</artifactId>
4040
<version>1.0</version>
4141
</dependency>
4242
</dependencies>
4343
<modules>
44-
<module>life</module>
4544
<module>blackscholes</module>
4645
<module>mandel</module>
4746
<module>heal</module>
4847
<module>violajones</module>
4948
<module>squares</module>
49+
<!--<module>life</module>-->
5050
</modules>
5151
</project>

‎hat/examples/squares/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ questions.
3636
<dependencies>
3737
<dependency>
3838
<groupId>oracle.code</groupId>
39-
<artifactId>hat</artifactId>
39+
<artifactId>hat-core</artifactId>
4040
<version>1.0</version>
4141
</dependency>
4242
</dependencies>
@@ -55,7 +55,7 @@ questions.
5555
</goals>
5656
<configuration>
5757
<target>
58-
<copy file="target/hat-example-squares-1.0.jar" toDir="${hat.build}"/>
58+
<copy file="target/${project.artifactId}-${project.version}.jar" toDir="${hat.build}"/>
5959
</target>
6060
</configuration>
6161
</execution>

‎hat/examples/violajones/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ questions.
3636
<dependencies>
3737
<dependency>
3838
<groupId>oracle.code</groupId>
39-
<artifactId>hat</artifactId>
39+
<artifactId>hat-core</artifactId>
4040
<version>1.0</version>
4141
</dependency>
4242
</dependencies>
@@ -55,7 +55,7 @@ questions.
5555
</goals>
5656
<configuration>
5757
<target>
58-
<copy file="target/hat-example-violajones-1.0.jar" toDir="${hat.build}"/>
58+
<copy file="target/${project.artifactId}-${project.version}.jar" toDir="${hat.build}"/>
5959
</target>
6060
</configuration>
6161
</execution>

‎hat/extractions/opencl/pom.xml

+38-23
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,10 @@ questions.
2424
--><project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0">
2525
<!--Auto generated by mkpoms-->
2626
<modelVersion>4.0.0</modelVersion>
27-
<packaging>pom</packaging>
27+
<!--<packaging>pom</packaging>-->
28+
<!-- we want to create a jar -->
2829
<groupId>oracle.code</groupId>
29-
<artifactId>hat-extraction-opencl</artifactId>
30+
<artifactId>hat-jextracted-opencl</artifactId>
3031
<version>1.0</version>
3132
<parent>
3233
<groupId>oracle.code</groupId>
@@ -35,14 +36,47 @@ questions.
3536
</parent>
3637
<build>
3738
<plugins>
39+
<plugin>
40+
<groupId>org.apache.maven.plugins</groupId>
41+
<artifactId>maven-antrun-plugin</artifactId>
42+
<version>1.8</version>
43+
<executions>
44+
<execution>
45+
<id>createDirAndMacCompileFlags</id>
46+
<phase>initialize</phase>
47+
<goals>
48+
<goal>run</goal>
49+
</goals>
50+
<configuration>
51+
<target>
52+
<mkdir dir="${hat.stage.jextract}"/>
53+
<echo file="${hat.stage.jextract}/compile_flags.txt" message="-F${mac.app.frameworks}"/>
54+
</target>
55+
</configuration>
56+
</execution>
57+
<execution>
58+
<id>copyJarToBuild</id>
59+
<phase>install</phase>
60+
<goals>
61+
<goal>run</goal>
62+
</goals>
63+
<configuration>
64+
<target>
65+
<jar basedir="${hat.stage.jextract}" destfile="${hat.build}/${project.artifactId}-${project.version}.jar" includes="opencl/**"/>
66+
</target>
67+
</configuration>
68+
</execution>
69+
</executions>
70+
</plugin>
71+
3872
<plugin>
3973
<groupId>org.codehaus.mojo</groupId>
4074
<artifactId>exec-maven-plugin</artifactId>
4175
<version>3.1.0</version>
4276
<executions>
4377
<execution>
44-
<id>2</id>
45-
<phase>compile</phase>
78+
<id>runJextractOnOpenCL</id>
79+
<phase>generate-sources</phase>
4680
<goals>
4781
<goal>exec</goal>
4882
</goals>
@@ -62,25 +96,6 @@ questions.
6296
</execution>
6397
</executions>
6498
</plugin>
65-
<plugin>
66-
<groupId>org.apache.maven.plugins</groupId>
67-
<artifactId>maven-antrun-plugin</artifactId>
68-
<version>1.8</version>
69-
<executions>
70-
<execution>
71-
<id>1</id>
72-
<phase>install</phase>
73-
<goals>
74-
<goal>run</goal>
75-
</goals>
76-
<configuration>
77-
<target>
78-
<jar basedir="${hat.stage.jextract}" destfile="${hat.build}/jextracted-opencl-1.0.jar" includes="opencl/**"/>
79-
</target>
80-
</configuration>
81-
</execution>
82-
</executions>
83-
</plugin>
8499
</plugins>
85100
</build>
86101
</project>

0 commit comments

Comments
 (0)
Please sign in to comment.