Merge pull request #1514 from boded/mstflint_4_34_1_lts

Mstflint 4 34 1 lts

Author: ahmadawwad

configure.ac

@@ -391,7 +391,7 @@ AM_CONDITIONAL(ENABLE_INBAND, [ test "x$enable_inband" = "xyes" ])
 
 AC_MSG_CHECKING(--enable-nvml argument)
 AC_ARG_ENABLE(nvml,
-    AS_HELP_STRING([--enable-nvml], [enable GPU device access using NVML library (Linux only), requires libnvidia-ml.so]),
+    AS_HELP_STRING([--enable-nvml], [enable GPU device access using NVML library (Linux only), requires libnvidia-ml.so.1]),
     [enable_nvml="$enableval"],
     [enable_nvml="$default_en_nvml"]
 )

mtcr_ul/mtcr_nvml.c

@@ -78,10 +78,10 @@ int init_nvml_lib_handle(mfile* mf)
     }
     memset(nvml_ctx, 0, sizeof(*nvml_ctx));
 
-    nvml_ctx->dl_handle = dlopen("libnvidia-ml.so", RTLD_LAZY);
+    nvml_ctx->dl_handle = dlopen("libnvidia-ml.so.1", RTLD_LAZY);
 
     if (!nvml_ctx->dl_handle) {
-        printf("Failed to load libnvidia-ml.so, %s\n", dlerror());
+        printf("Failed to load libnvidia-ml.so.1, %s\n", dlerror());
         return -1;
     }
 

nvml_lib/nvml_lib_wrapper.cpp

@@ -66,7 +66,7 @@ void NvmlLibWrapper::LoadDynamicLib()
 {
     _libraryHandle = dlopen(_libPath.c_str(), RTLD_LAZY);
     if (!_libraryHandle) {
-        throw NvmlException("Failed to load libnvidia-ml.so, %s\n", dlerror());
+        throw NvmlException("Failed to load libnvidia-ml.so.1, %s\n", dlerror());
     }
 }
 

nvml_lib/nvml_lib_wrapper.h

@@ -50,7 +50,7 @@ typedef nvmlReturn_t (*f_nvmlDeviceReadWritePRM)(nvmlDevice_t, nvmlPRMTLV_v1_t*)
 class NvmlLibWrapper
 {
 public:
-    NvmlLibWrapper(const string libPath = "libnvidia-ml.so");
+    NvmlLibWrapper(const string libPath = "libnvidia-ml.so.1");
     ~NvmlLibWrapper();
     /* Dynamic functions */
     f_nvmlDeviceGetHandleByIndex_v2 nvmlDeviceGetHandleByIndex;