Fix builds for CUDA

bytedeco · Oct 31, 2024 · f51e511 · f51e511
1 parent 52a829d
commit f51e511
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/.github/actions/deploy-ubuntu/action.yml b/.github/actions/deploy-ubuntu/action.yml
@@ -184,8 +184,8 @@ runs:
 
           if [[ -n ${NVCOMP:-} ]]; then
             curl -LO https://developer.download.nvidia.com/compute/nvcomp/redist/nvcomp/linux-$ARCH_CUDA/$NVCOMP.tar.xz
-            $SUDO tar -xvf $NVCOMP.tar.xz -C /usr/local/cuda/lib64/ --strip-components=2 */lib/
-            $SUDO tar -xvf $NVCOMP.tar.xz -C /usr/local/cuda/include/ --strip-components=2 */include/
+            $SUDO tar --wildcards -xvf $NVCOMP.tar.xz -C /usr/local/cuda/lib64/ --strip-components=2 */lib/
+            $SUDO tar --wildcards -xvf $NVCOMP.tar.xz -C /usr/local/cuda/include/ --strip-components=2 */include/
             rm -f $NVCOMP.tar.gz
           fi
 

diff --git a/.github/actions/deploy-windows/action.yml b/.github/actions/deploy-windows/action.yml
@@ -119,7 +119,7 @@ runs:
           move nvcomp-windows-x86_64-4.1.0.6_cuda12-archive\include\* "%ProgramFiles%\NVIDIA GPU Computing Toolkit\CUDA\v12.6\include"
           move nvcomp-windows-x86_64-4.1.0.6_cuda12-archive\include\nvcomp "%ProgramFiles%\NVIDIA GPU Computing Toolkit\CUDA\v12.6\include"
           move nvcomp-windows-x86_64-4.1.0.6_cuda12-archive\bin\nvcomp*.dll "%ProgramFiles%\NVIDIA GPU Computing Toolkit\CUDA\v12.6\bin"
-          move nvcomp-windows-x86_64-4.1.0.6_cuda12-archive\bin\nvcomp*.lib "%ProgramFiles%\NVIDIA GPU Computing Toolkit\CUDA\v12.6\lib\x64"
+          move nvcomp-windows-x86_64-4.1.0.6_cuda12-archive\lib\nvcomp*.lib "%ProgramFiles%\NVIDIA GPU Computing Toolkit\CUDA\v12.6\lib\x64"
 
           rem echo Applying hotfix to Visual Studio 2019 for CUDA
           rem curl -LO https://raw.githubusercontent.com/microsoft/STL/main/stl/inc/cmath

diff --git a/cuda/src/main/java/org/bytedeco/cuda/presets/nvcomp.java b/cuda/src/main/java/org/bytedeco/cuda/presets/nvcomp.java
@@ -51,6 +51,10 @@ public void map(InfoMap infoMap) {
                              "nvcomp::set_scratch_allocators",
                              "PinnedPtrPool",
                              // TODO: Fix bitcomp symbols
+                             "nvcompBatchedGzipCompressAsync",
+                             "nvcompBatchedGzipCompressGetTempSize",
+                             "nvcompBatchedGzipCompressGetTempSizeEx",
+                             "nvcompBatchedGzipCompressGetMaxOutputChunkSize",
                              "nvcompBitcompDecompressConfigure",
                              "nvcompBitcompCompressAsync",
                              "nvcompBitcompCompressConfigure",