Changeset 662

Timestamp:

10/15/09 12:07:25 (15 years ago)

Author:

suzdalev

Message:

mac compilation

Location:

library

Files:

• bdm/itpp_ext.cpp (modified) (2 diffs)
• bdm/itpp_ext.h (modified) (2 diffs)
• system/FindMatlab.cmake (modified) (4 diffs)
• system/SetBdmEnv.cmake (modified) (4 diffs)
• tests/arx_straux_test.cpp (modified) (1 diff)

library/bdm/itpp_ext.cpp

@@ -115 +115 @@
 }
 
-#if 0
+//#if 0
 Gamma_RNG::Gamma_RNG (double a, double b)
 {
@@ -317 +317 @@
 }
 
-#endif
+//#endif
 std::string num2str (double d)
 {

library/bdm/itpp_ext.h

@@ -43 +43 @@
 const double inf = std::numeric_limits<double>::infinity();
 
-#if 0
+//#if 0
 /*!
   \brief Gamma distribution
@@ -91 +91 @@
 };
 bool qr ( const mat &A, mat &R );
-#endif
+//#endif
 //! reimplementation of matlab num2str
 std::string num2str ( double d );

library/system/FindMatlab.cmake

@@ -64 +64 @@
 
   FILE(GLOB _auto_matlab_prefixes "/usr/local/matlab*" "/opt/matlab*" "~/bin" ${MATLAB_ROOT})
+  IF(APPLE)
+        FILE(GLOB _auto_matlab_prefixes "/Applications/MATLAB*")
+  ENDIF(APPLE)
 
   IF(CMAKE_SIZEOF_VOID_P EQUAL 4)
@@ -73 +76 @@
     SET(MATLAB_MEX_SUFFIX mexa64)
   ENDIF(CMAKE_SIZEOF_VOID_P EQUAL 4)
+  
+  IF(APPLE)
+    SET(_matlab_path_suffixes "bin/maci")
+    SET(MATLAB_MEX_SUFFIX mexmaci)
+  ENDIF(APPLE)
 
   SET(_libmex_name "mex")
@@ -116 +124 @@
 ENDFOREACH(_matlab_prefix)
 
+# APPLE has system libmx.dylib which is prefrred over the matlab one -- hard code Matlab
+     IF(APPLE)
+      SET(MATLAB_MX_LIBRARY "${_matlab_libdir}/libmx.dylib")
+     ENDIF(APPLE)
+ 
 SET(MATLAB_LIBRARIES
   ${MATLAB_MEX_LIBRARY}
@@ -125 +138 @@
   SET(MATLAB_FOUND 1)
   MESSAGE(STATUS "Found Matlab arch ${MATLAB_MEX_SUFFIX} at ${MATLAB_INCLUDE_DIR}")
+  IF(APPLE)
+    MESSAGE(STATUS "MX at ${MATLAB_MX_LIBRARY}")
+    ENDIF(APPLE)
+  
 ELSE(MATLAB_INCLUDE_DIR AND MATLAB_LIBRARIES)
   MESSAGE(STATUS "Matlab not found")

library/system/SetBdmEnv.cmake

@@ -30 +30 @@
 IF(APPLE)
         IF(NOT ITPP_DIR)
-                SET(ITPP_DIR "${BDM_SOURCE_DIR}/macosx/itpp-4.0.6")
+                SET(ITPP_DIR "${BDM_SOURCE_DIR}/system/macosx/itpp-4.0.6")
         ENDIF(NOT ITPP_DIR)
         FIND_LIBRARY(FRAMEWORK_VECLIB vecLib)
@@ -51 +51 @@
 FIND_PACKAGE(ACML COMPONENTS)
 FIND_PACKAGE(Matlab COMPONENTS)
-FIND_PROGRAM(MEX_COMPILER mex)
 
 IF(ITPP_FOUND)
@@ -122 +121 @@
         
 MACRO(MEX FN)
-        IF(MEX_COMPILER)
+        IF(MATLAB_FOUND)
         INCLUDE_DIRECTORIES(${MATLAB_INCLUDE_DIR} "${BDM_SOURCE_DIR}/bdm")
         LINK_DIRECTORIES("${BDM_SOURCE_DIR}/bdm")
+        IF(APPLE)
+            LINK_DIRECTORIES("/Applications/MATLAB_R2007b/bin/maci/")
+        ENDIF(APPLE)
         IF(WIN32)
                 ADD_LIBRARY("${FN}.${MATLAB_MEX_SUFFIX}" MODULE ${FN}.cpp "${BDM_SOURCE_DIR}/system/mexFunction.def")
@@ -148 +150 @@
         ## Additional libraries can be added to a macro
         target_link_libraries ("${FN}.${MATLAB_MEX_SUFFIX}" ${ARGN}) 
-        ENDIF(MEX_COMPILER)
+        ENDIF(MATLAB_FOUND)
 ENDMACRO(MEX)

library/tests/arx_straux_test.cpp

@@ -27 +27 @@
 //          straux1(L, d, nu, L0, d0, nu0, belief, nbest, max_nrep, lambda,
 //          order_k);
-ivec o2;
+Array<str_aux> o2;
 ivec o1 = straux1(Ld1,20, Ld0, 10,  belief, nbest, nrep, lambda, k, o2);