Bladeren bron

mosek 8

Former-commit-id: eb5b63d1f48886385d259374699df8c9701771e6
Alec Jacobson 8 jaren geleden
bovenliggende
commit
77905ede1b
3 gewijzigde bestanden met toevoegingen van 7 en 1 verwijderingen
  1. 2 0
      include/igl/mosek/mosek_linprog.cpp
  2. 2 0
      include/igl/mosek/mosek_quadprog.cpp
  3. 3 1
      shared/cmake/FindMOSEK.cmake

+ 2 - 0
include/igl/mosek/mosek_linprog.cpp

@@ -26,7 +26,9 @@ IGL_INLINE bool igl::mosek::mosek_linprog(
   // Create the MOSEK environment
   // Create the MOSEK environment
   mosek_guarded(MSK_makeenv(&env,NULL));
   mosek_guarded(MSK_makeenv(&env,NULL));
   // initialize mosek environment
   // initialize mosek environment
+#if MSK_VERSION_MAJOR <= 7
   mosek_guarded(MSK_initenv(env));
   mosek_guarded(MSK_initenv(env));
+#endif
   const bool ret = mosek_linprog(c,A,lc,uc,lx,ux,env,x);
   const bool ret = mosek_linprog(c,A,lc,uc,lx,ux,env,x);
   MSK_deleteenv(&env);
   MSK_deleteenv(&env);
   return ret;
   return ret;

+ 2 - 0
include/igl/mosek/mosek_quadprog.cpp

@@ -111,7 +111,9 @@ IGL_INLINE bool igl::mosek::mosek_quadprog(
   //}
   //}
   //mosek_guarded(MSK_linkfunctoenvstream(env,MSK_STREAM_LOG,NULL,printstr));
   //mosek_guarded(MSK_linkfunctoenvstream(env,MSK_STREAM_LOG,NULL,printstr));
   // initialize mosek environment
   // initialize mosek environment
+#if MSK_VERSION_MAJOR <= 7
   mosek_guarded(MSK_initenv(env));
   mosek_guarded(MSK_initenv(env));
+#endif
   // Create the optimization task
   // Create the optimization task
   mosek_guarded(MSK_maketask(env,m,n,&task));
   mosek_guarded(MSK_maketask(env,m,n,&task));
   verbose("Creating task with %ld linear constraints and %ld variables...\n",m,n);
   verbose("Creating task with %ld linear constraints and %ld variables...\n",m,n);

+ 3 - 1
shared/cmake/FindMOSEK.cmake

@@ -8,7 +8,9 @@
 #
 #
 
 
 FIND_PATH(MOSEK_INCLUDE_DIR mosek.h
 FIND_PATH(MOSEK_INCLUDE_DIR mosek.h
-  PATHS /usr/local/mosek/7/tools/platform/osx64x86/h/
+  PATHS 
+  /usr/local/mosek/7/tools/platform/osx64x86/h/
+  /usr/local/mosek/8/tools/platform/osx64x86/h/
     )
     )
 
 
 SET(SEARCH_PATHS "${MOSEK_INCLUDE_DIR}" "${MOSEK_INCLUDE_DIR}/../bin" "${MOSEK_INCLUDE_DIR}/lib")
 SET(SEARCH_PATHS "${MOSEK_INCLUDE_DIR}" "${MOSEK_INCLUDE_DIR}/../bin" "${MOSEK_INCLUDE_DIR}/lib")