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

Some build fixups after merging hip backend #283

Closed
wants to merge 1 commit into from
+99 −147
Closed

Some build fixups after merging hip backend #283

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
49 changes: 19 additions & 30 deletions hat/backends/cuda/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!--Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

This code is free software; you can redistribute it and/or modify it
@@ -22,62 +21,52 @@ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
or visit www.oracle.com if you need additional information or have any
questions.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
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">
--><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">
<modelVersion>4.0.0</modelVersion>
<groupId>oracle.code</groupId>
<artifactId>hat-backend-cuda</artifactId>
<version>1.0</version>
<packaging>jar</packaging>
<!-- this required to inherit parent properties -->
<parent>
<groupId>oracle.code</groupId>
<artifactId>hat-backends</artifactId>
<version>1.0</version>
<artifactId>hat.backends</artifactId>
</parent>

<groupId>oracle.code</groupId>
<artifactId>hat-backend-cuda</artifactId>
<version>1.0</version>
<dependencies>
<dependency>
<groupId>oracle.code</groupId>
<version>1.0</version>
<artifactId>hat</artifactId>
<version>1.0</version>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<configuration>
<skip>true</skip>
<!-- we want to inherit properties from parent but not the
plugin that calls cmake -->
</configuration>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<configuration>
<skip>true</skip>
<!--We want to inherit properties from parent but not plugin that calls cmake-->
</configuration>
</plugin>


<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.8</version>
<executions>
<execution>
<phase>install</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<target>
<copy file="target/hat-backend-cuda-1.0.jar" todir="${hat.target}"/>
<copy file="target/hat-backend-cuda-1.0.jar" toDir="${hat.target}"/>
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

</project>
67 changes: 40 additions & 27 deletions hat/backends/hip/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,59 +1,72 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
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">
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!--Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

This code is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License version 2 only, as
published by the Free Software Foundation. Oracle designates this
particular file as subject to the "Classpath" exception as provided
by Oracle in the LICENSE file that accompanied this code.

This code is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
version 2 for more details (a copy is included in the LICENSE file that
accompanied this code).

You should have received a copy of the GNU General Public License version
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.

Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
or visit www.oracle.com if you need additional information or have any
questions.
--><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">
<modelVersion>4.0.0</modelVersion>
<groupId>oracle.code</groupId>
<artifactId>hat-backend-hip</artifactId>
<version>1.0</version>
<packaging>jar</packaging>
<!-- this required to inherit parent properties -->
<parent>
<groupId>oracle.code</groupId>
<artifactId>hat-backends</artifactId>
<version>1.0</version>
<artifactId>hat.backends</artifactId>
</parent>

<groupId>oracle.code</groupId>
<artifactId>hat-backend-hip</artifactId>
<version>1.0</version>
<dependencies>
<dependency>
<groupId>oracle.code</groupId>
<version>1.0</version>
<artifactId>hat</artifactId>
<version>1.0</version>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<configuration>
<skip>true</skip>
<!-- we want to inherit properties from parent but not the
plugin that calls cmake -->
</configuration>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<configuration>
<skip>true</skip>
<!--We want to inherit properties from parent but not plugin that calls cmake-->
</configuration>
</plugin>


<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.8</version>
<executions>
<execution>
<phase>install</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<target>
<copy file="target/hat-backend-hip-1.0.jar" todir="${hat.target}"/>
<copy file="target/hat-backend-hip-1.0.jar" toDir="${hat.target}"/>
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

</project>
46 changes: 18 additions & 28 deletions hat/backends/mock/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!--Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

This code is free software; you can redistribute it and/or modify it
@@ -22,61 +21,52 @@ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
or visit www.oracle.com if you need additional information or have any
questions.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
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">
--><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">
<modelVersion>4.0.0</modelVersion>
<groupId>oracle.code</groupId>
<artifactId>hat-backend-mock</artifactId>
<version>1.0</version>
<packaging>jar</packaging>
<!-- this required to inherit parent properties -->
<parent>
<groupId>oracle.code</groupId>
<artifactId>hat-backends</artifactId>
<version>1.0</version>
<artifactId>hat.backends</artifactId>
</parent>

<groupId>oracle.code</groupId>
<artifactId>hat-backend-mock</artifactId>
<version>1.0</version>
<dependencies>
<dependency>
<groupId>oracle.code</groupId>
<version>1.0</version>
<artifactId>hat</artifactId>
<version>1.0</version>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<configuration>
<skip>true</skip>
<!-- we want to inherit properties from parent but not the
plugin that calls cmake -->
</configuration>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<configuration>
<skip>true</skip>
<!--We want to inherit properties from parent but not plugin that calls cmake-->
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.8</version>
<executions>
<execution>
<phase>install</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<target>
<copy file="target/hat-backend-mock-1.0.jar" todir="${hat.target}"/>
<copy file="target/hat-backend-mock-1.0.jar" toDir="${hat.target}"/>
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

</project>
4 changes: 2 additions & 2 deletions hat/backends/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -32,7 +32,6 @@ questions.
<artifactId>hat-root</artifactId>
<version>1.0</version>
</parent>

<dependencies>
<dependency>
<groupId>oracle.code</groupId>
@@ -42,8 +41,9 @@ questions.
</dependencies>
<modules>
<module>ptx</module>
<module>cuda</module>
<module>mock</module>
<module>opencl</module>
<module>hip</module>
</modules>
<build>
<plugins>
Loading