Mercurial > forge

changeset 12586:43fdbcb25f46 octave-forge

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[nan] test for libsvm-dev and liblinear-dev
author schloegl
date Mon, 06 Apr 2015 18:44:52 +0000
parents 26be3bc7237c
children 75ddf8166364
files extra/NaN/DESCRIPTION extra/NaN/src/Makefile
diffstat 2 files changed, 17 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/extra/NaN/DESCRIPTION	Mon Apr 06 12:01:45 2015 +0000
+++ b/extra/NaN/DESCRIPTION	Mon Apr 06 18:44:52 2015 +0000
@@ -1,11 +1,12 @@
 Name: NaN
-Version: 2.7.2
-Date: 2015-03-31
+Version: 2.9.0
+Date: 2015-04-06
 Author: Alois Schloegl <alois.schloegl@ist.ac.at>
 Maintainer: Alois Schloegl
 Title: The NaN-toolbox
 Description: A statistics and machine learning toolbox for data with and w/o missing values
 Depends: octave (> 3.2.0)
+BuildDepends: libsvm-dev (>2.8), liblinear-dev (> 1.50)
 License: GPLv3+
 Url: http://pub.ist.ac.at/~schloegl/matlab/NaN
 Autoload: no
--- a/extra/NaN/src/Makefile	Mon Apr 06 12:01:45 2015 +0000
+++ b/extra/NaN/src/Makefile	Mon Apr 06 18:44:52 2015 +0000
@@ -81,18 +81,13 @@
 #########################################################
 #	Octave, MATLAB on Linux 
 #########################################################
-%.oct: %.cc
-	mkoctfile$(OCTAVE_VERSION) "$<"
-
-%.mex: %.cpp
-	$(OCTMEX) "$<"
-
-ifeq (,$(shell /sbin/ldconfig -p | grep libsvm))
+ifeq (,$(wildcard /usr/include/libsvm/svm.h))
+## package libsvm-dev is not installed
 svm%_mex.mex: svm%_mex.cpp svm.o svm_model_octave.o
 	env CC=$(CXX) $(OCTMEX) "$<" svm.o svm_model_octave.o
 svm%_mex.$(MEX_EXT): svm%_mex.cpp svm.o svm_model_matlab.o
 	$(MATMEX) "$<" svm.o svm_model_matlab.o
-%.$(MEX_EXT): %.cpp  svm.o svm_model_matlab.o
+%.$(MEX_EXT): %.cpp svm.o svm_model_matlab.o
 	$(MATMEX) "$<" svm.o svm_model_matlab.o
 
 svm_model_octave.o: svm_model_matlab.c 
@@ -104,9 +99,10 @@
 	$(CC) $(CFLAGS) -c svm.cpp
 
 else
-svm%_mex.mex: svm%_mex.cpp #svm.o svm_model_octave.o
+## package libsvm-dev is installed
+svm%_mex.mex: svm%_mex.cpp
 	env CC=$(CXX) $(OCTMEX) "$<" -lsvm
-svm%_mex.$(MEX_EXT): svm%_mex.cpp svm.o svm_model_matlab.o
+svm%_mex.$(MEX_EXT): svm%_mex.cpp
 	$(MATMEX) "$<" -lsvm
 %.$(MEX_EXT): %.cpp  
 	$(MATMEX) "$<" -lsvm
@@ -114,7 +110,8 @@
 endif
 
 
-ifeq (,$(shell /sbin/ldconfig -p | grep liblinear))
+ifeq (,$(wildcard /usr/include/linear.h))
+## liblinear-dev is not available
 train.$(MEX_EXT) predict.$(MEX_EXT): train.c tron.o linear.o linear_model_matlab.c
 	$(CC) $(CFLAGS) -I $(MATLABDIR)/extern/include -c linear_model_matlab.c
 	$(MATMEX)  -lblas train.c tron.o linear.o linear_model_matlab.o 
@@ -128,6 +125,7 @@
 	$(CXX) $(CFLAGS) -c tron.cpp
 
 else
+## package liblinear-dev is installed
 train.$(MEX_EXT) predict.$(MEX_EXT): train.c
 	$(CC) $(CFLAGS) -I $(MATLABDIR)/extern/include -c linear_model_matlab.c
 	$(MATMEX)  -lblas -llinear train.c
@@ -136,6 +134,11 @@
 
 endif
 
+%.oct: %.cc
+	mkoctfile$(OCTAVE_VERSION) "$<"
+
+%.mex: %.cpp
+	$(OCTMEX) "$<"
 
 #########################################################
 #	MATLAB/WIN32