Add Mosek based libshogun examples if Mosek is enabled

Fix Mosek env creation in CCSOSVM for mosek v7 add USE_MOSEK macro to config.h
shogun-toolbox · Sep 20, 2013 · ac174a6 · ac174a6
1 parent 83b821f
commit ac174a6
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 0 deletions.
diff --git a/examples/undocumented/libshogun/CMakeLists.txt b/examples/undocumented/libshogun/CMakeLists.txt
@@ -106,6 +106,10 @@ SET(EXAMPLES
 	so_factorgraph 
 )
 
+IF (USE_MOSEK)
+	LIST(APPEND EXAMPLES so_fg_model so_multiclass)
+ENDIF ()
+
 FOREACH(EXAMPLE ${EXAMPLES})
 	add_executable(${EXAMPLE} ${CMAKE_CURRENT_SOURCE_DIR}/${EXAMPLE}.${EXT_SRC_CPP})
 	target_link_libraries(${EXAMPLE} shogun ${SANITIZER_LIBRARY})

diff --git a/src/shogun/lib/config.h.in b/src/shogun/lib/config.h.in
@@ -45,6 +45,7 @@
 #cmakedefine USE_PATHDEBUG 1
 
 #cmakedefine USE_SVMLIGHT 1
+#cmakedefine USE_MOSEK 1
 
 #cmakedefine USE_GLPK 1
 #cmakedefine USE_LZO 1

diff --git a/src/shogun/structure/CCSOSVM.cpp b/src/shogun/structure/CCSOSVM.cpp
@@ -108,7 +108,13 @@ int32_t CCCSOSVM::mosek_qp_optimize(float64_t** G, float64_t* delta, float64_t*
 	buc[0] = m_C;
 
 	/* create mosek environment */
+#if (MSK_VERSION_MAJOR == 6)
 	r = MSK_makeenv(&env, NULL, NULL, NULL, NULL);
+#elif (MSK_VERSION_MAJOR == 7)
+	r = MSK_makeenv(&env, NULL);
+#else
+	#error "Unsupported Mosek version"
+#endif
 
 	/* check return code */
 	if (r==MSK_RES_OK)