Merge pull request #13 from CESNET/alfClassifier-lightGBM

CMake - Fix LightGBM Dependency

Author: plnyrich

cmake/modules/FindLIGHTGBM.cmake

@@ -14,27 +14,40 @@ if(PKG_CONFIG_FOUND)
     pkg_check_modules(PC_LIGHTGBM QUIET lightgbm)
 endif()
 
+# Find headers
 find_path(
-    LIGHTGBM_INCLUDE_DIR lightgbm
+    LIGHTGBM_INCLUDE_DIR
     NAMES LightGBM/c_api.h
     HINTS ${PC_LIGHTGBM_INCLUDEDIR} ${PC_LIGHTGBM_INCLUDE_DIRS}
-    PATH_SUFFIXES include
+          /usr/local/include
+          /usr/include
 )
 
-if(PC_LIGHTGBM_VERSION)
-    # Version extracted from pkg-config
-    set(LIGHTGBM_VERSION_STRING ${PC_LIGHTGBM_VERSION})
-endif()
+# Find library
+find_library(
+    LIGHTGBM_LIBRARY
+    NAMES lightgbm lib_lightgbm _lightgbm
+    HINTS ${PC_LIGHTGBM_LIBDIR} ${PC_LIGHTGBM_LIBRARY_DIRS}
+          /usr/local/lib
+          /usr/lib
+)
 
-# Handle find_package() arguments (i.e. QUIETLY and REQUIRED) and set
-# LIGHTGBM_FOUND to TRUE if all listed variables are filled.
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(
     LIGHTGBM
-    REQUIRED_VARS LIGHTGBM_INCLUDE_DIR
-    VERSION_VAR LIGHTGBM_VERSION_STRING
+    REQUIRED_VARS LIGHTGBM_INCLUDE_DIR LIGHTGBM_LIBRARY
 )
 
-set(LIGHTGBM_INCLUDE_DIRS ${LIGHTGBM_INCLUDE_DIR})
-mark_as_advanced(LIGHTGBM_INCLUDE_DIR)
+if(LIGHTGBM_FOUND)
+    set(LIGHTGBM_INCLUDE_DIRS ${LIGHTGBM_INCLUDE_DIR})
+    set(LIGHTGBM_LIBRARIES ${LIGHTGBM_LIBRARY})
+
+    add_library(LightGBM::lightgbm SHARED IMPORTED)
+    set_target_properties(LightGBM::lightgbm PROPERTIES
+        IMPORTED_LOCATION "${LIGHTGBM_LIBRARY}"
+        INTERFACE_INCLUDE_DIRECTORIES "${LIGHTGBM_INCLUDE_DIRS}"
+    )
+endif()
+
+mark_as_advanced(LIGHTGBM_INCLUDE_DIR LIGHTGBM_LIBRARY)
 

include/wif/classifiers/genericMlClassifier.hpp

@@ -16,8 +16,8 @@
 namespace WIF {
 
 /**
- * @brief Abstract class specifying interfaces for ML classifiers (ScikitMlClassifier and
- * MlpackClassifier)
+ * @brief Abstract class specifying interfaces for ML classifiers (ScikitMlClassifier,
+ * MlpackClassifier and LightGBMClassifier)
  *
  */
 class GenericMlClassifier : public Classifier {
@@ -32,7 +32,7 @@ class GenericMlClassifier : public Classifier {
 	 * @brief Reload the model from file, which was set in the constructor
 	 *
 	 * @param logicalName contains the logical name of the trained model. The parameter is used only
-	 * with MlpackClassifier (it is unused with ScikitMlClassifier)
+	 * with MlpackClassifier (it is unused with ScikitMlClassifier and LightGBMClassifier)
 	 */
 	virtual void reloadModelFromDisk(const std::string& logicalName = "trained_data") = 0;
 };

src/wif/CMakeLists.txt

@@ -31,6 +31,7 @@ set(LIBWIF_LIBS
 	Boost::regex
 	Boost::serialization
 	dstlib::dst
+	LightGBM::lightgbm
 	OpenMP::OpenMP_CXX
 	Python3::Python
 	Python3::NumPy

src/wif/classifiers/lightGBMClassifier.cpp

@@ -42,4 +42,4 @@ void LightGBMClassifier::reloadModelFromDisk([[maybe_unused]] const std::string&
 	m_lightGBMWrapper->loadModel(m_lightGBMWrapper->getModelPath());
 }
 
-} // namespace WIF
+} // namespace WIF