Add option to build against Bandicoot (by default we build against Bandicoot if found).

Author: zoq

CMake/FindBandicoot.cmake

@@ -96,20 +96,6 @@ if(EXISTS "${BANDICOOT_INCLUDE_DIR}/bandicoot_bits/config.hpp")
         set(SUPPORT_LIBRARIES "${SUPPORT_LIBRARIES}" "${CLBLAS_LIBRARIES}")
         set(HAVE_CLBLAS true)
       endif ()
-
-      # Search for clBlast.
-      set(CLBLAST_FIND_QUIETLY true)
-      include(COOT_FindCLBlast)
-
-      if (CLBLAST_FOUND)
-        message(STATUS "clBlast includes: ${CLBLAST_INCLUDE_DIR}")
-        message(STATUS "clBlast libraries: ${CLBLAST_LIBRARIES}")
-
-        set(SUPPORT_INCLUDE_DIRS "${SUPPORT_INCLUDE_DIRS}"
-            "${CLBLAST_INCLUDE_DIR}")
-        set(SUPPORT_LIBRARIES "${SUPPORT_LIBRARIES}" "${CLBLAST_LIBRARIES}")
-        set(HAVE_CLBLAST true)
-      endif ()
     endif ()
 
     # Search for CUDA.

CMakeLists.txt

@@ -10,6 +10,7 @@ project(ensmallen
 
 # Configurable options for CMake.
 option(USE_OPENMP "If available, use OpenMP for parallelization." ON)
+option(USE_BANDICOOT "If available, build against Bandicoot for GPU support." ON)
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/CMake")
 
@@ -59,13 +60,15 @@ if(USE_OPENMP)
   target_link_libraries(ensmallen INTERFACE OpenMP::OpenMP_CXX)
 endif()
 
-# Find Bandicoot and link it.
-find_package(Bandicoot 0.100.0)
-if(BANDICOOT_FOUND AND NOT TARGET Bandicoot::Bandicoot)
-  target_link_libraries(ensmallen INTERFACE Bandicoot::Bandicoot)
-  target_include_directories(ensmallen INTERFACE ${BANDICOOT_INCLUDE_DIR})
+if (USE_BANDICOOT)
+  # Find Bandicoot and link it.
+  find_package(Bandicoot 0.100.0)
+  if(BANDICOOT_FOUND AND NOT TARGET Bandicoot::Bandicoot)
+    target_link_libraries(ensmallen INTERFACE Bandicoot::Bandicoot)
+    target_include_directories(ensmallen INTERFACE ${BANDICOOT_INCLUDE_DIR})
 
-  add_definitions(-DUSE_COOT)
+    add_definitions(-DUSE_COOT)
+  endif()
 endif()
 
 # Find Armadillo and link it.

include/ensmallen_bits/utility/arma_traits.hpp

@@ -40,58 +40,48 @@ struct IsArmaType
   const static bool value = false;
 };
 
-// Commenting out the first template per case, because
-// Visual Studio doesn't like this instantiaion pattern (error C2910).
-// template<>
 template<typename eT>
 struct IsArmaType<arma::Col<eT> >
 {
   const static bool value = true;
 };
 
-// template<>
 template<typename eT>
 struct IsArmaType<arma::SpCol<eT> >
 {
   const static bool value = true;
 };
 
-// template<>
 template<typename eT>
 struct IsArmaType<arma::Row<eT> >
 {
   const static bool value = true;
 };
 
-// template<>
 template<typename eT>
 struct IsArmaType<arma::SpRow<eT> >
 {
   const static bool value = true;
 };
 
-// template<>
 template<typename eT>
 struct IsArmaType<arma::subview<eT> >
 {
   const static bool value = true;
 };
 
-// template<>
 template<typename eT>
 struct IsArmaType<arma::subview_col<eT> >
 {
   const static bool value = true;
 };
 
-// template<>
 template<typename eT>
 struct IsArmaType<arma::subview_row<eT> >
 {
   const static bool value = true;
 };
 
-// template<>
 template<typename eT>
 struct IsArmaType<arma::SpSubview<eT> >
 {
@@ -110,28 +100,24 @@ struct IsArmaType<arma::SpSubview_row<eT> >
   const static bool value = true;
 };
 
-// template<>
 template<typename eT>
 struct IsArmaType<arma::Mat<eT> >
 {
   const static bool value = true;
 };
 
-// template<>
 template<typename eT>
 struct IsArmaType<arma::SpMat<eT> >
 {
   const static bool value = true;
 };
 
-// template<>
 template<typename eT>
 struct IsArmaType<arma::Cube<eT> >
 {
   const static bool value = true;
 };
 
-// template<>
 template<typename eT>
 struct IsArmaType<arma::subview_cube<eT> >
 {