Search for GPU compute libs under various paths. re:#181

Author: jcoffland

src/cbang/hw/CUDALibrary.cpp

@@ -55,7 +55,7 @@ static const char *cudaLib = "/Library/Frameworks/CUDA.framework/CUDA";
 #define STDCALL
 
 #else
-static const char *cudaLib = "libcuda.so";
+static vector<string> cudaLib = {"libcuda.so.1", "libcuda.so"};
 #define STDCALL
 #endif
 
@@ -65,10 +65,10 @@ static const char *cudaLib = "libcuda.so";
 #define CUDA_API
 #endif
 
-#define DYNAMIC_CALL(name, args) {                                  \
-    name##_t name = (name##_t)getSymbol(#name);                     \
-    if ((err = name args)) THROW(#name "() returned " << err);     \
-  }
+#define DYNAMIC_CALL(name, args) {                           \
+  name##_t name = (name##_t)getSymbol(#name);                \
+  if ((err = name args)) THROW(#name "() returned " << err); \
+}
 
 
 namespace {

src/cbang/hw/HIPLibrary.cpp

@@ -55,7 +55,10 @@ static const char *hipLib = "/Library/Frameworks/HIP.framework/HIP";
 #define STDCALL
 
 #else
-static const char *hipLib = "libamdhip64.so";
+static vector<string> hipLib = {"/opt/rocm/lib/libamdhip64.so.7",
+  "libamdhip64.so.7", "/opt/rocm/lib/libamdhip64.so.6", "libamdhip64.so.6",
+  "/opt/rocm/lib/libamdhip64.so.5", "libamdhip64.so.5",
+  "/opt/rocm/lib/libamdhip64.so", "libamdhip64.so"};
 #define STDCALL
 #endif
 

src/cbang/hw/OpenCLLibrary.cpp

@@ -56,7 +56,7 @@ static const char *openclLib =
   "/System/Library/Frameworks/OpenCL.framework/OpenCL";
 
 #else
-static const char *openclLib = "libOpenCL.so.1";
+static vector<string> openclLib = {"libOpenCL.so.1", "libOpenCL.so"};
 #endif
 
 

src/cbang/os/DynamicLibrary.cpp

@@ -34,6 +34,7 @@
 #include "SysError.h"
 
 #include <cbang/Exception.h>
+#include <cbang/String.h>
 
 #undef CBANG_EXCEPTION
 #define CBANG_EXCEPTION DynamicLibraryException
@@ -53,67 +54,68 @@ using namespace cb;
 bool DynamicLibrary::enabled = true;
 
 
-struct DynamicLibrary::private_t {
+struct DynamicLibrary::impl_t {
 #ifdef _WIN32
   HMODULE handle;
-#else
-  void *handle;
-#endif
-};
 
+  impl_t(const string &path) :
+    handle(LoadLibraryEx(path.c_str(), 0, LOAD_LIBRARY_SEARCH_DEFAULT_DIRS)) {}
+  ~impl_t() {if (handle) CloseHandle(handle);}
 
-DynamicLibrary::DynamicLibrary(const string &path) :
-  path(path), pri(new private_t) {
+  static void clear() {SysError::clear();}
+  string error() {return SysError().toString();}
+  void *get(const string &name) {return GetProcAddress(handle, name.c_str());}
 
-  if (!enabled) THROW("DynamicLibrary disabled globally");
+#else // !_WIN32
+  void *handle;
 
-#ifdef _WIN32
-  pri->handle =
-    LoadLibraryEx(path.c_str(), 0, LOAD_LIBRARY_SEARCH_DEFAULT_DIRS);
-  if (!pri->handle)
-    THROW("Failed to open dynamic library '" << path << "': " << SysError());
+  impl_t(const string &path) : handle(dlopen(path.c_str(), RTLD_LAZY)) {}
+  ~impl_t() {if (handle) dlclose(handle);}
 
-#else
-  dlerror(); // Clear errors
+  static void clear() {dlerror();} // Clear errors
+  string error() {return dlerror();}
+  void *get(const string &name) {return dlsym(handle, name.c_str());}
+#endif // !_WIN32
+};
 
-  if (path.empty()) THROW("Library path is ''");
 
-  pri->handle = dlopen(path.c_str(), RTLD_LAZY);
-  if (!pri->handle)
-    THROW("Failed to open dynamic library '" << path << "': " << dlerror());
-#endif
+DynamicLibrary::DynamicLibrary(const string &path) :
+  path(path), impl(load(path)) {
+  if (!impl->handle)
+    THROW("Failed to open dynamic library '" << path << "': " << impl->error());
 }
 
 
-DynamicLibrary::~DynamicLibrary() {
-#ifdef _WIN32
-  if (pri->handle) CloseHandle(pri->handle);
+DynamicLibrary::DynamicLibrary(const vector<string> &paths) {
+  for (auto &path: paths) {
+    impl = load(this->path = path);
+    if (impl->handle) return;
+  }
 
-#else
-  if (pri->handle) dlclose(pri->handle);
-#endif
-
-  delete pri;
+  THROW("Failed to open any of the following dynamic libraries: "
+    << String::join(paths, ", "));
 }
 
 
+DynamicLibrary::~DynamicLibrary() {}
+
+
 void *DynamicLibrary::getSymbol(const string &name) {
-#ifdef _WIN32
-  void *symbol = (void *)GetProcAddress(pri->handle, name.c_str());
+  impl_t::clear();
+  auto symbol = impl->get(name);
+
   if (!symbol)
     THROW("Failed to load dynamic symbol '" << name << "' from library '"
-           << path << "': " << SysError());
+      << path << "': " << impl->error());
 
-#else
-  dlerror(); // Clear errors
+  return symbol;
+}
 
-  void *symbol = dlsym(pri->handle, name.c_str());
 
-  char *err = dlerror();
-  if (err)
-    THROW("Failed to load dynamic symbol '" << name << "' from library '"
-           << path << "': " << err);
-#endif
+SmartPointer<DynamicLibrary::impl_t> DynamicLibrary::load(const string &path) {
+  if (!enabled) THROW("DynamicLibrary disabled globally");
+  if (path.empty()) THROW("Library path is ''");
 
-  return symbol;
+  impl_t::clear();
+  return new impl_t(path);
 }

src/cbang/os/DynamicLibrary.h

@@ -40,23 +40,27 @@ namespace cb {
   CBANG_DEFINE_EXCEPTION_SUBCLASS(DynamicLibraryException);
 
   class DynamicLibrary {
-    struct private_t;
-
-    const std::string path;
-    private_t *pri;
-
     static bool enabled;
 
+    std::string path;
+    struct impl_t;
+    SmartPointer<impl_t> impl;
+
   public:
     DynamicLibrary(const std::string &path);
+    DynamicLibrary(const std::vector<std::string> &paths);
     ~DynamicLibrary();
 
+    const std::string &getPath() const {return path;}
     void *getSymbol(const std::string &name);
 
     template <typename T>
     T accessSymbol(const std::string &name) {return (T)getSymbol(name);}
 
     static inline bool isEnabled() {return enabled;}
     static inline void setEnabled(bool x) {enabled = x;}
+
+  private:
+    static SmartPointer<impl_t> load(const std::string &path);
   };
 }