Merge branch 'fix-opencl' into 'main'

Add support for NVVM Compiler library

See merge request nvidia/container-toolkit/libnvidia-container!182

Author: Evan Lezar

pkg/deb/changelog

@@ -1,3 +1,9 @@
+libnvidia-container (1.12.0~rc.1-1) experimental; urgency=medium
+
+  * Include NVVM compiler library in compute libs
+
+ -- NVIDIA CORPORATION <[email protected]>  Wed, 28 Sep 2022 10:52:27 +0200
+
 libnvidia-container (1.11.0-1) UNRELEASED; urgency=medium
 
   * Promote 1.11.0~rc.3-1 to 1.11.0-1

pkg/rpm/SPECS/libnvidia-container.spec

@@ -99,6 +99,9 @@ This package contains command-line tools that facilitate using the library.
 %{_bindir}/*
 
 %changelog
+* Wed Sep 28 2022 NVIDIA CORPORATION <[email protected]> 1.12.0-0.1.rc.1
+- Include NVVM compiler library in compute libs
+
 * Mon Sep 05 2022 NVIDIA CORPORATION <[email protected]> 1.11.0-1
 - Promote 1.11.0-0.1.rc.3 to 1.11.0-1
 

src/nvc.h

@@ -26,15 +26,15 @@ extern "C" {
 #endif /* __cplusplus */
 
 #define NVC_MAJOR   1
-#define NVC_MINOR   11
+#define NVC_MINOR   12
 #define NVC_PATCH   0
 
 // Specify the release tag.
 // For stable releases, this should be defined as empty.
 // For release candidates, this should be defined with the format "rc.1"
 // The version string should also be updated accordingly, using a ~ separator where applicable.
-#define NVC_TAG
-#define NVC_VERSION "1.11.0"
+#define NVC_TAG "rc.1"
+#define NVC_VERSION "1.12.0~rc.1"
 
 #define NVC_ARG_MAX 256
 

src/nvc_info.c

@@ -88,6 +88,7 @@ static const char * const compute_libs[] = {
         "libnvidia-allocator.so",           /* NVIDIA allocator runtime library */
         "libnvidia-compiler.so",            /* NVVM-PTX compiler for OpenCL (used by libnvidia-opencl) */
         "libnvidia-pkcs11.so",              /* Encrypt/Decrypt library */
+        "libnvidia-nvvm.so",                /* The NVVM Compiler library */
 };
 
 static const char * const video_libs[] = {