[Mode] Mode registration can now be toggled at runtime

libocca · Sep 9, 2018 · 0c975e1 · 0c975e1
1 parent e2ab51f
commit 0c975e1
Show file tree

Hide file tree

Showing 14 changed files with 36 additions and 19 deletions.
diff --git a/include/occa/mode.hpp b/include/occa/mode.hpp
@@ -51,7 +51,7 @@ namespace occa {
   public:
     modeInfo_v();
 
-    virtual void init() = 0;
+    virtual bool init() = 0;
     virtual styling::section& getDescription();
   };
 
@@ -71,8 +71,9 @@ namespace occa {
   public:
     mode(std::string modeName_) {
       modeName = modeName_;
-      registerMode(this);
-      modeInfo_t().init();
+      if (modeInfo_t().init()) {
+        registerMode(this);
+      }
     }
 
     styling::section &getDescription() {

diff --git a/include/occa/mode/cuda/registration.hpp b/include/occa/mode/cuda/registration.hpp
@@ -39,7 +39,7 @@ namespace occa {
     public:
       modeInfo();
 
-      void init();
+      bool init();
       styling::section& getDescription();
     };
 

diff --git a/include/occa/mode/hip/registration.hpp b/include/occa/mode/hip/registration.hpp
@@ -39,7 +39,7 @@ namespace occa {
     public:
       modeInfo();
 
-      void init();
+      bool init();
       styling::section& getDescription();
     };
 

diff --git a/include/occa/mode/opencl/registration.hpp b/include/occa/mode/opencl/registration.hpp
@@ -39,7 +39,7 @@ namespace occa {
     public:
       modeInfo();
 
-      void init();
+      bool init();
       styling::section& getDescription();
     };
 

diff --git a/include/occa/mode/opencl/utils.hpp b/include/occa/mode/opencl/utils.hpp
@@ -65,6 +65,8 @@ namespace occa {
       std::string vendor(int type);
     }
 
+    bool isEnabled();
+
     cl_device_type deviceType(int type);
 
     int getPlatformCount();

diff --git a/include/occa/mode/openmp/registration.hpp b/include/occa/mode/openmp/registration.hpp
@@ -37,7 +37,7 @@ namespace occa {
     public:
       modeInfo();
 
-      void init();
+      bool init();
       void setupProperties();
     };
 

diff --git a/include/occa/mode/serial/registration.hpp b/include/occa/mode/serial/registration.hpp
@@ -37,7 +37,7 @@ namespace occa {
     public:
       modeInfo();
 
-      void init();
+      bool init();
       styling::section& getDescription();
     };
 

diff --git a/src/mode/cuda/registration.cpp b/src/mode/cuda/registration.cpp
@@ -31,8 +31,9 @@ namespace occa {
   namespace cuda {
     modeInfo::modeInfo() {}
 
-    void modeInfo::init() {
+    bool modeInfo::init() {
       cuda::init();
+      return true;
     }
 
     styling::section& modeInfo::getDescription() {

diff --git a/src/mode/hip/registration.cpp b/src/mode/hip/registration.cpp
@@ -31,8 +31,9 @@ namespace occa {
   namespace hip {
     modeInfo::modeInfo() {}
 
-    void modeInfo::init() {
+    bool modeInfo::init() {
       hip::init();
+      return true;
     }
 
     styling::section& modeInfo::getDescription() {

diff --git a/src/mode/opencl/registration.cpp b/src/mode/opencl/registration.cpp
@@ -24,13 +24,16 @@
 
 #if OCCA_OPENCL_ENABLED
 
+#include <occa/mode/opencl/utils.hpp>
 #include <occa/mode/opencl/registration.hpp>
 
 namespace occa {
   namespace opencl {
     modeInfo::modeInfo() {}
 
-    void modeInfo::init() {}
+    bool modeInfo::init() {
+      return occa::opencl::isEnabled();
+    }
 
     styling::section& modeInfo::getDescription() {
       static styling::section section("OpenCL");

diff --git a/src/mode/opencl/utils.cpp b/src/mode/opencl/utils.cpp
@@ -63,6 +63,12 @@ namespace occa {
       }
     }
 
+    bool isEnabled() {
+      cl_uint platformCount;
+      cl_int error = clGetPlatformIDs(0, NULL, &platformCount);
+      return !error;
+    }
+
     cl_device_type deviceType(int type) {
       cl_device_type ret = 0;
 

diff --git a/src/mode/openmp/device.cpp b/src/mode/openmp/device.cpp
@@ -24,8 +24,6 @@
 
 #if OCCA_OPENMP_ENABLED
 
-#include <omp.h>
-
 #include <occa/mode/serial/device.hpp>
 #include <occa/mode/openmp/device.hpp>
 #include <occa/mode/openmp/utils.hpp>
@@ -34,10 +32,7 @@
 namespace occa {
   namespace openmp {
     device::device(const occa::properties &properties_) :
-      serial::device(properties_) {
-      // Generate an OpenMP library dependency (so it doesn't crash when dlclose())
-      omp_get_num_threads();
-    }
+      serial::device(properties_) {}
 
     hash_t device::kernelHash(const occa::properties &props) const {
       return (

diff --git a/src/mode/openmp/registration.cpp b/src/mode/openmp/registration.cpp
@@ -24,13 +24,19 @@
 
 #if OCCA_OPENMP_ENABLED
 
+#include <omp.h>
+
 #include <occa/mode/openmp/registration.hpp>
 
 namespace occa {
   namespace openmp {
     modeInfo::modeInfo() {}
 
-    void modeInfo::init() {}
+    bool modeInfo::init() {
+      // Generate an OpenMP library dependency (so it doesn't crash when dlclose())
+      omp_get_num_threads();
+      return true;
+    }
 
     occa::mode<openmp::modeInfo,
                openmp::device> mode("OpenMP");

diff --git a/src/mode/serial/registration.cpp b/src/mode/serial/registration.cpp
@@ -26,7 +26,9 @@ namespace occa {
   namespace serial {
     modeInfo::modeInfo() {}
 
-    void modeInfo::init() {}
+    bool modeInfo::init() {
+      return true;
+    }
 
     styling::section& modeInfo::getDescription() {
       static styling::section section("CPU(s)");