Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit ecab8af

Browse files
committed
proper classifiers!
1 parent 95819f5 commit ecab8af

File tree

3 files changed

+50
-43
lines changed

3 files changed

+50
-43
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ replay_pid*
3232

3333
models/*.gguf
3434
src/main/cpp/de_kherud_llama_*.h
35+
src/main/resources_cuda_linux/
3536
src/main/resources/**/*.so
3637
src/main/resources/**/*.dylib
3738
src/main/resources/**/*.dll
@@ -40,3 +41,4 @@ src/test/resources/**/*.gbnf
4041

4142
**/*.etag
4243
**/*.lastModified
44+
src/main/cpp/llama.cpp/

pom.xml

Lines changed: 48 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -69,13 +69,47 @@
6969
<plugin>
7070
<groupId>org.apache.maven.plugins</groupId>
7171
<artifactId>maven-compiler-plugin</artifactId>
72-
<version>3.11.0</version>
73-
<configuration>
74-
<compilerArgs>
75-
<arg>-h</arg>
76-
<arg>src/main/cpp</arg>
77-
</compilerArgs>
78-
</configuration>
72+
<version>3.13.0</version>
73+
<executions>
74+
<!-- We have to perform a separate build pass for cuda classifier -->
75+
<execution>
76+
<id>gpu</id>
77+
<phase>compile</phase>
78+
<goals><goal>compile</goal></goals>
79+
<configuration>
80+
<compilerArgs>
81+
<arg>-h</arg>
82+
<arg>src/main/cpp</arg>
83+
</compilerArgs>
84+
<outputDirectory>${project.build.outputDirectory}_cuda</outputDirectory>
85+
</configuration>
86+
</execution>
87+
</executions>
88+
</plugin>
89+
<plugin>
90+
<artifactId>maven-resources-plugin</artifactId>
91+
<version>3.3.1</version>
92+
<executions>
93+
<!-- Copy custom cuda libs to the output directory -->
94+
<execution>
95+
<id>copy-resources</id>
96+
<phase>process-classes</phase>
97+
<goals>
98+
<goal>copy-resources</goal>
99+
</goals>
100+
<configuration>
101+
<outputDirectory>${project.build.outputDirectory}_cuda</outputDirectory>
102+
<resources>
103+
<resource>
104+
<directory>${basedir}/src/main/resources_cuda_linux/</directory>
105+
<includes>
106+
<include>**/*.*</include>
107+
</includes>
108+
</resource>
109+
</resources>
110+
</configuration>
111+
</execution>
112+
</executions>
79113
</plugin>
80114

81115
</plugins>
@@ -139,23 +173,19 @@
139173
</plugin>
140174
<plugin>
141175
<groupId>org.apache.maven.plugins</groupId>
142-
<artifactId>maven-assembly-plugin</artifactId>
143-
<version>3.3.0</version>
176+
<artifactId>maven-jar-plugin</artifactId>
177+
<version>3.4.2</version>
144178
<executions>
179+
<!-- Pick class files AND libs from custom output directory -->
145180
<execution>
146-
<id>cuda-linux</id>
181+
<id>cuda</id>
147182
<phase>package</phase>
148183
<goals>
149-
<goal>single</goal>
184+
<goal>jar</goal>
150185
</goals>
151186
<configuration>
152-
<descriptors>
153-
<descriptor>src/main/assembly/cuda-linux.xml</descriptor>
154-
</descriptors>
155-
<appendAssemblyId>false</appendAssemblyId>
156-
<finalName>${project.artifactId}-${project.version}-cuda12-linux-x86_64</finalName>
157-
<attach>true</attach>
158-
<classifier>cuda12-linux-x86_64</classifier>
187+
<classifier>cuda12-linux-x86-64</classifier>
188+
<classesDirectory>${project.build.outputDirectory}_cuda</classesDirectory>
159189
</configuration>
160190
</execution>
161191
</executions>

src/main/assembly/cuda-linux.xml

Lines changed: 0 additions & 25 deletions
This file was deleted.

0 commit comments

Comments
 (0)