Skip to content

Commit 5bb1bb7

Browse files
saudetsaudet
committed
Fix builds for CUDA, TensorRT
1 parent 5fbe394 commit 5bb1bb7

4 files changed

Lines changed: 42 additions & 67 deletions

File tree

‎cuda/src/main/java/org/bytedeco/cuda/presets/cudart.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@
4848
linkpath = {"/Developer/NVIDIA/CUDA-13.0/lib/", "/usr/local/cuda/lib/"}),
4949
@Platform(value = "windows-x86_64", preload = "cudart64_13",
5050
includepath = "C:/Program Files/NVIDIA GPU Computing Toolkit/CUDA/v13.0/include/",
51-
preloadpath = "C:/Program Files/NVIDIA GPU Computing Toolkit/CUDA/v13.0/bin/",
51+
preloadpath = {"C:/Program Files/NVIDIA GPU Computing Toolkit/CUDA/v13.0/bin/",
52+
"C:/Program Files/NVIDIA GPU Computing Toolkit/CUDA/v13.0/bin/x64/"},
5253
linkpath = "C:/Program Files/NVIDIA GPU Computing Toolkit/CUDA/v13.0/lib/x64/") },
5354
target = "org.bytedeco.cuda.cudart", global = "org.bytedeco.cuda.global.cudart")
5455
@NoException

‎tensorrt/pom.xml‎

Lines changed: 39 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,50 @@
6565
</includes>
6666
</configuration>
6767
</execution>
68+
<execution>
69+
<id>javacpp-${javacpp.platform}-redist</id>
70+
<phase>package</phase>
71+
<goals>
72+
<goal>jar</goal>
73+
</goals>
74+
<configuration>
75+
<classifier>${javacpp.platform}-redist</classifier>
76+
<classesDirectory>${project.build.directory}/native</classesDirectory>
77+
<includes>
78+
<include>org/bytedeco/tensorrt/${javacpp.platform}/</include>
79+
<include>META-INF/native-image/${javacpp.platform}/</include>
80+
</includes>
81+
<excludes>
82+
<exclude>org/bytedeco/tensorrt/${javacpp.platform}/*jni*</exclude>
83+
</excludes>
84+
</configuration>
85+
</execution>
6886
</executions>
6987
</plugin>
7088
<plugin>
7189
<groupId>org.moditect</groupId>
7290
<artifactId>moditect-maven-plugin</artifactId>
91+
<executions>
92+
<execution>
93+
<id>add-module-info-redist</id>
94+
<phase>package</phase>
95+
<goals>
96+
<goal>add-module-info</goal>
97+
</goals>
98+
<configuration>
99+
<modules>
100+
<module>
101+
<file>${project.build.directory}/${project.artifactId}-${javacpp.platform}-redist.jar</file>
102+
<moduleInfoSource>
103+
open module org.bytedeco.${javacpp.packageName}.${javacpp.platform.module}.redist {
104+
requires transitive org.bytedeco.${javacpp.packageName};
105+
}
106+
</moduleInfoSource>
107+
</module>
108+
</modules>
109+
</configuration>
110+
</execution>
111+
</executions>
73112
</plugin>
74113
<plugin>
75114
<artifactId>maven-dependency-plugin</artifactId>
@@ -86,68 +125,4 @@
86125
</plugins>
87126
</build>
88127

89-
<profiles>
90-
<profile>
91-
<id>redist</id>
92-
<activation>
93-
<property>
94-
<name>redist</name>
95-
<value>true</value>
96-
</property>
97-
</activation>
98-
<build>
99-
<plugins>
100-
<plugin>
101-
<artifactId>maven-jar-plugin</artifactId>
102-
<executions>
103-
<execution>
104-
<id>javacpp-${javacpp.platform}-redist</id>
105-
<phase>package</phase>
106-
<goals>
107-
<goal>jar</goal>
108-
</goals>
109-
<configuration>
110-
<classifier>${javacpp.platform}-redist</classifier>
111-
<classesDirectory>${project.build.directory}/native</classesDirectory>
112-
<includes>
113-
<include>org/bytedeco/tensorrt/${javacpp.platform}/</include>
114-
<include>META-INF/native-image/${javacpp.platform}/</include>
115-
</includes>
116-
<excludes>
117-
<exclude>org/bytedeco/tensorrt/${javacpp.platform}/*jni*</exclude>
118-
</excludes>
119-
</configuration>
120-
</execution>
121-
</executions>
122-
</plugin>
123-
<plugin>
124-
<groupId>org.moditect</groupId>
125-
<artifactId>moditect-maven-plugin</artifactId>
126-
<executions>
127-
<execution>
128-
<id>add-module-info-redist</id>
129-
<phase>package</phase>
130-
<goals>
131-
<goal>add-module-info</goal>
132-
</goals>
133-
<configuration>
134-
<modules>
135-
<module>
136-
<file>${project.build.directory}/${project.artifactId}-${javacpp.platform}-redist.jar</file>
137-
<moduleInfoSource>
138-
open module org.bytedeco.${javacpp.packageName}.${javacpp.platform.module}.redist {
139-
requires transitive org.bytedeco.${javacpp.packageName};
140-
}
141-
</moduleInfoSource>
142-
</module>
143-
</modules>
144-
</configuration>
145-
</execution>
146-
</executions>
147-
</plugin>
148-
</plugins>
149-
</build>
150-
</profile>
151-
</profiles>
152-
153128
</project>

‎tensorrt/src/main/java/org/bytedeco/tensorrt/presets/nvinfer.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
"NvInferPluginBase.h", "NvInferRuntimePlugin.h", /*, "NvUtils.h"*/},
5353
exclude = "NvInferRuntimeBase.h",
5454
link = "nvinfer@.10",
55-
preload = "nvinfer_builder_resource@.10.13.0"
55+
preload = "nvinfer_builder_resource@.10.13.3"
5656
),
5757
@Platform(
5858
value = "linux-arm64",

‎tritonserver/pom.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@
7171
</excludes>
7272
</configuration>
7373
</execution>
74-
7574
</executions>
7675
</plugin>
7776
<plugin>

0 commit comments

Comments
 (0)