added test suite for runtime and engine

fixed runtime support for matlab 7.6

darcs-hash:20080707210847-56c21-5e5c71053831ccf74c8be7aca894e2f9548a8292

Author: dylex

Foreign/Matlab/Runtime.hsc

@@ -30,7 +30,8 @@ import Foreign.Matlab.Util
 import Foreign.Matlab.Internal
 import Foreign.Matlab.Types
 
-#include <mclmcr.h>
+#include "hsc_sym.h"
+#include "libhsmatlab.h"
 
 initialized :: MVar Integer
 initialized = unsafePerformIO (newMVar 0)
@@ -89,9 +90,9 @@ openMLibrary mlname opt = do
       file = (if isPrefixOf "lib" base then id else ("lib" ++)) ((if isSuffixOf dllExtension base || isInfixOf (dllExtension++[extSeparator]) base then id else (<.> dllExtension)) base)
   dl <- dlopen (path </> file) [RTLD_NOW]
   let ml = MLibrary name dl
-  inia <- mkInitApp =.< dlsym dl "mclInitializeApplication"
+  inia <- mkInitApp =.< dlsym dl #SYM mclInitializeApplication
   initializeApp inia opt
-  --initialize
+  --initialize opt
   inif <- mkInitFun =.< dlsym dl ("lib" ++ name ++ "Initialize")
   r <- inif
   if boolC r
@@ -103,7 +104,7 @@ closeMLibrary :: MLibrary -> IO ()
 closeMLibrary (MLibrary name dl) = do
   fini <- mkFiniFun =.< dlsym dl ("lib" ++ name ++ "Terminate")
   fini
-  fina <- mkTermApp =.< dlsym dl "mclTerminateApplication"
+  fina <- mkTermApp =.< dlsym dl #SYM mclTerminateApplication
   terminateApp fina
   --terminate
   dlclose dl

Setup.hs

@@ -13,7 +13,7 @@ programs = [
     simpleProgram "matlab", 
     Program "mcr" (\_ -> return Nothing) (\_ _ -> return Nothing)
   ]
-runtime desc = maybe False (elem "Matlab.Runtime" . exposedModules) $ library desc
+runtime desc = maybe False (elem "Foreign.Matlab.Runtime" . exposedModules) $ library desc
 postconf args flags desc build = do
   confExists <- doesFileExist "configure"
   unless confExists $ rawSystemPathExit verb "autoconf" []

configure.ac

@@ -41,16 +41,16 @@ env -i $MATLAB_BIN -e > $matlab_env 2>&AS_MESSAGE_LOG_FD
 matlab_envres=$?
 cat $matlab_env >&AS_MESSAGE_LOG_FD
 
+AC_DEFUN([MATLAB_GETENV], [`. $matlab_env && echo "${$1}"`])
+
 unset MATLAB
 AS_IF([test $matlab_envres -gt 0], 
       [AC_MSG_RESULT([failed])
       AC_MSG_FAILURE([$MATLAB_BIN -e failed])],
       [! (. $matlab_env > /dev/null 2>&1 && test -n "$MATLAB")],
       [AC_MSG_RESULT([invalid])
       AC_MSG_FAILURE([$MATLAB_BIN -e output invalid])],
-      [AC_MSG_RESULT([ok])])
-
-AC_DEFUN([MATLAB_GETENV], [`. $matlab_env && echo "${$1}"`])
+      [AC_MSG_RESULT([MATLAB_GETENV([MATLAB])])])
 
 MATLAB_DIR=MATLAB_GETENV([MATLAB])
 MATLAB_ARCH=MATLAB_GETENV([ARCH])

matlab.buildinfo.in

@@ -1,3 +1,3 @@
-include-dirs: @MATLAB_DIR@/extern/include
+include-dirs: @srcdir@/src @MATLAB_DIR@/extern/include
 extra-lib-dirs: @MATLAB_LIB_PATH@
 ld-options: "-Wl,-rpath,@MATLAB_LIB_DIR@" "-Wl,--disable-new-dtags"

src/Makefile.in

@@ -3,8 +3,11 @@ MCCFLAGS=@MCCFLAGS@
 
 libhsmatlab.so: hsmatlab.m hsmatlab.c
 	$(MCC) $(MCCFLAGS) -W lib:$(basename $@) -c hsmatlab.m
+	[ -f $@ ] && mv $@ $@.post
 	cat hsmatlab.c >> $(basename $@).c
 	$(MCC) $(MCCFLAGS) -W none -T link:lib $(basename $@).c
+	[ -f $@.post ] && cat $(basename $@).ctf >> $@
 
 clean:
-	rm -rf libhsmatlab* mccExcludedFiles.log readme.txt
+	rm -rf libhsmatlab_mcr
+	rm -f libhsmatlab* mccExcludedFiles.log readme.txt

src/hsc_sym.h

@@ -0,0 +1,2 @@
+#define hsc_SYM2(X) hsc_const_str(#X)
+#define hsc_SYM(X) hsc_SYM2(X)

test/Makefile.in

@@ -0,0 +1,22 @@
+MCC=@MATLAB_MCC@
+MCCFLAGS=@MCCFLAGS@
+
+TESTS=engine runtime generic
+default: $(TESTS)
+	@echo "All tests should have produced:"
+	@echo "  ready"
+	@echo "  MXClassDouble"
+	@echo "  -1.0"
+	@for t in $^ ; do echo Running $$t... ; ./$$t ; done
+
+%: %.hs
+	ghc -I.. --make $@
+
+lib%.so: %.m
+	$(MCC) $(MCCFLAGS) -W lib:$(basename $@) -T link:lib $^
+
+runtime: libmtest.so
+
+clean:
+	rm -rf libmtest_mcr
+	rm -f *.o *.hi $(TESTS) libmtest* mccExcludedFiles.log readme.txt

test/engine.hs

@@ -0,0 +1,12 @@
+import Foreign.Matlab
+import Foreign.Matlab.Engine
+
+main = do
+  eng <- newEngine Nothing
+  putStrLn "ready"
+  x <- createMXScalar (pi :: MDouble)
+  [y] <- engineEvalFun eng "cos" [EvalArray x] 1
+  mxArrayClass y >>= print
+  Just y <- castMXArray y
+  y <- mxScalarGet y
+  print (y :: MDouble)

test/generic.hs

@@ -0,0 +1,13 @@
+import Foreign.Matlab
+import Foreign.Matlab.Runtime.Generic
+
+main = do
+  ml <- openMLGeneric ["-nojvm", "-nojit"]
+  putStrLn "ready"
+  x <- createMXScalar (pi :: MDouble)
+  [y] <- mlGenericFun ml "cos" [anyMXArray x] 1
+  mxArrayClass y >>= print
+  Just y <- castMXArray y
+  y <- mxScalarGet y
+  print (y :: MDouble)
+  closeMLGeneric ml

test/mtest.m

@@ -0,0 +1,2 @@
+function y = mtest(x)
+y = cos(x);