From: <sch...@us...> - 2009-05-05 11:01:09
|
Revision: 5763 http://octave.svn.sourceforge.net/octave/?rev=5763&view=rev Author: schloegl Date: 2009-05-05 11:00:59 +0000 (Tue, 05 May 2009) Log Message: ----------- use *.mex instead of *.oct Modified Paths: -------------- trunk/octave-forge/extra/NaN/src/Makefile Modified: trunk/octave-forge/extra/NaN/src/Makefile =================================================================== --- trunk/octave-forge/extra/NaN/src/Makefile 2009-05-05 10:06:21 UTC (rev 5762) +++ trunk/octave-forge/extra/NaN/src/Makefile 2009-05-05 11:00:59 UTC (rev 5763) @@ -1,4 +1,4 @@ -PROGS = $(patsubst %.cc,%.oct,$(wildcard *.cc)) +PROGS = $(patsubst %.cpp,%.mex,$(wildcard *.cpp)) all: $(PROGS) @@ -7,4 +7,7 @@ %.oct: %.cc mkoctfile $< -clean: ; -$(RM) *.o core octave-core *.oct *~ +%.mex: %.cpp + mkoctfile --mex $< + +clean: ; -$(RM) *.o core octave-core *.oct *~ *.mex This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sch...@us...> - 2010-01-10 22:48:34
|
Revision: 6738 http://octave.svn.sourceforge.net/octave/?rev=6738&view=rev Author: schloegl Date: 2010-01-10 22:48:26 +0000 (Sun, 10 Jan 2010) Log Message: ----------- build for octave must be the default, matlab build is optional Modified Paths: -------------- trunk/octave-forge/extra/NaN/src/Makefile Modified: trunk/octave-forge/extra/NaN/src/Makefile =================================================================== --- trunk/octave-forge/extra/NaN/src/Makefile 2010-01-10 22:22:46 UTC (rev 6737) +++ trunk/octave-forge/extra/NaN/src/Makefile 2010-01-10 22:48:26 UTC (rev 6738) @@ -11,14 +11,13 @@ MATMEX = $(MATLABDIR)/bin/mex $(MEX_OPTION) MEX_EXT = $(shell $(MATLABDIR)/bin/mexext) -PROGS = $(patsubst %_mex.cpp,%_mex.mex,$(wildcard *.cpp)) +PROGS = $(patsubst %_mex.cpp,%_mex.mex,$(wildcard *.cpp)) +all: $(PROGS) matlab -matlab: $(patsubst %_mex.cpp,%_mex.$(MEX_EXT),$(wildcard *.cpp)) -octave: $(patsubst %_mex.cpp,%_mex.mex,$(wildcard *.cpp)) -all: matlab octave - $(PROGS): Makefile +matlab: $(patsubst %_mex.cpp,%_mex.$(MEX_EXT),$(wildcard *.cpp)) Makefile + %.oct: %.cc mkoctfile $< @@ -27,12 +26,11 @@ %.$(MEX_EXT): %.cpp $(MATMEX) $< ## Matlab - svmtrain_mex.mex: svmtrain_mex.cpp svm.h svm.o svm_model_matlab.o env CC=$(CXX) $(OCTMEX) svmtrain_mex.cpp svm.o svm_model_matlab.o svmtrain_mex.$(MEX_EXT): svmtrain_mex.cpp svm.h svm.o svm_model_matlab.o - env CC=$(CXX) $(MATMEX) svmtrain_mex.cpp svm.o svm_model_matlab.o + $(MATMEX) svmtrain_mex.cpp svm.o svm_model_matlab.o svm_model_matlab.o: svm_model_matlab.c svm.h $(CC) $(CFLAGS) -c svm_model_matlab.c This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sch...@us...> - 2010-01-10 23:26:37
|
Revision: 6740 http://octave.svn.sourceforge.net/octave/?rev=6740&view=rev Author: schloegl Date: 2010-01-10 23:26:31 +0000 (Sun, 10 Jan 2010) Log Message: ----------- add support for non-linear SVM and 1-1 scheme Modified Paths: -------------- trunk/octave-forge/extra/NaN/src/Makefile Modified: trunk/octave-forge/extra/NaN/src/Makefile =================================================================== --- trunk/octave-forge/extra/NaN/src/Makefile 2010-01-10 23:25:59 UTC (rev 6739) +++ trunk/octave-forge/extra/NaN/src/Makefile 2010-01-10 23:26:31 UTC (rev 6740) @@ -28,9 +28,13 @@ svmtrain_mex.mex: svmtrain_mex.cpp svm.h svm.o svm_model_matlab.o env CC=$(CXX) $(OCTMEX) svmtrain_mex.cpp svm.o svm_model_matlab.o +svmpredict_mex.mex: svmpredict_mex.cpp svm.h svm.o svm_model_matlab.o + env CC=$(CXX) $(OCTMEX) svmpredict_mex.cpp svm.o svm_model_matlab.o svmtrain_mex.$(MEX_EXT): svmtrain_mex.cpp svm.h svm.o svm_model_matlab.o $(MATMEX) svmtrain_mex.cpp svm.o svm_model_matlab.o +svmpredict_mex.$(MEX_EXT): svmpredict_mex.cpp svm.h svm.o svm_model_matlab.o + $(MATMEX) svmpredict_mex.cpp svm.o svm_model_matlab.o svm_model_matlab.o: svm_model_matlab.c svm.h $(CC) $(CFLAGS) -c svm_model_matlab.c This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sch...@us...> - 2010-01-10 23:55:03
|
Revision: 6741 http://octave.svn.sourceforge.net/octave/?rev=6741&view=rev Author: schloegl Date: 2010-01-10 23:54:57 +0000 (Sun, 10 Jan 2010) Log Message: ----------- libSVM: fix for Matlab Modified Paths: -------------- trunk/octave-forge/extra/NaN/src/Makefile Modified: trunk/octave-forge/extra/NaN/src/Makefile =================================================================== --- trunk/octave-forge/extra/NaN/src/Makefile 2010-01-10 23:26:31 UTC (rev 6740) +++ trunk/octave-forge/extra/NaN/src/Makefile 2010-01-10 23:54:57 UTC (rev 6741) @@ -1,11 +1,10 @@ -MATLABDIR = /usr/local/matlab CC = gcc CXX = g++ -CFLAGS = -Wall -Wconversion -O3 -fPIC -I/usr/include/octave +CFLAGS = -Wall -Wconversion -O3 -fPIC OCTMEX = mkoctfile --mex -#CFLAGS = -Wall -Wconversion -O3 -fPIC -I$(MATLABDIR)/extern/include +MATLABDIR = /usr/local/matlab # comment the following line if you use MATLAB on 32-bit computer MEX_OPTION += -largeArrayDims MATMEX = $(MATLABDIR)/bin/mex $(MEX_OPTION) @@ -16,7 +15,7 @@ $(PROGS): Makefile -matlab: $(patsubst %_mex.cpp,%_mex.$(MEX_EXT),$(wildcard *.cpp)) Makefile +matlab: $(patsubst %_mex.cpp,%_mex.$(MEX_EXT),$(wildcard *.cpp)) %.oct: %.cc mkoctfile $< @@ -26,20 +25,16 @@ %.$(MEX_EXT): %.cpp $(MATMEX) $< ## Matlab -svmtrain_mex.mex: svmtrain_mex.cpp svm.h svm.o svm_model_matlab.o +svmtrain_mex.mex svmpredict_mex.mex: svmtrain_mex.cpp svm.h + $(CXX) $(CFLAGS) -I /usr/include/octave -c svm.cpp + $(CC) $(CFLAGS) -I /usr/include/octave -c svm_model_matlab.c env CC=$(CXX) $(OCTMEX) svmtrain_mex.cpp svm.o svm_model_matlab.o -svmpredict_mex.mex: svmpredict_mex.cpp svm.h svm.o svm_model_matlab.o env CC=$(CXX) $(OCTMEX) svmpredict_mex.cpp svm.o svm_model_matlab.o -svmtrain_mex.$(MEX_EXT): svmtrain_mex.cpp svm.h svm.o svm_model_matlab.o +svmtrain_mex.$(MEX_EXT) svmpredict_mex.$(MEX_EXT): svmtrain_mex.cpp svm.h + $(CXX) $(CFLAGS) -I $(MATLABDIR)/extern/include -c svm.cpp + $(CC) $(CFLAGS) -I $(MATLABDIR)/extern/include -c svm_model_matlab.c $(MATMEX) svmtrain_mex.cpp svm.o svm_model_matlab.o -svmpredict_mex.$(MEX_EXT): svmpredict_mex.cpp svm.h svm.o svm_model_matlab.o $(MATMEX) svmpredict_mex.cpp svm.o svm_model_matlab.o -svm_model_matlab.o: svm_model_matlab.c svm.h - $(CC) $(CFLAGS) -c svm_model_matlab.c - -svm.o: svm.cpp svm.h - $(CXX) $(CFLAGS) -c svm.cpp - clean: ; -$(RM) *.o core octave-core *.oct *~ *.mex* This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sch...@us...> - 2010-01-11 17:12:43
|
Revision: 6747 http://octave.svn.sourceforge.net/octave/?rev=6747&view=rev Author: schloegl Date: 2010-01-11 17:12:37 +0000 (Mon, 11 Jan 2010) Log Message: ----------- fix for M* Modified Paths: -------------- trunk/octave-forge/extra/NaN/src/Makefile Modified: trunk/octave-forge/extra/NaN/src/Makefile =================================================================== --- trunk/octave-forge/extra/NaN/src/Makefile 2010-01-11 17:06:21 UTC (rev 6746) +++ trunk/octave-forge/extra/NaN/src/Makefile 2010-01-11 17:12:37 UTC (rev 6747) @@ -14,10 +14,10 @@ PROGS = histo_mex.mex covm_mex.mex sumskipnan_mex.mex train.mex svmtrain_mex.mex svmpredict_mex.mex -octave: $(PROGS) +octave: $(PROGS) MEX_EXT = $(shell $(MATLABDIR)/bin/mexext) -matlab: $(patsubst %.mex,%_mex.$(MEX_EXT),$(wildcard *.mex)) +matlab: $(patsubst $(PROGS), %_mex.$(MEX_EXT), $(wildcard *.mex)) $(PROGS): Makefile This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sch...@us...> - 2010-01-11 21:51:32
|
Revision: 6749 http://octave.svn.sourceforge.net/octave/?rev=6749&view=rev Author: schloegl Date: 2010-01-11 21:51:22 +0000 (Mon, 11 Jan 2010) Log Message: ----------- fix for ML* Modified Paths: -------------- trunk/octave-forge/extra/NaN/src/Makefile Modified: trunk/octave-forge/extra/NaN/src/Makefile =================================================================== --- trunk/octave-forge/extra/NaN/src/Makefile 2010-01-11 20:47:51 UTC (rev 6748) +++ trunk/octave-forge/extra/NaN/src/Makefile 2010-01-11 21:51:22 UTC (rev 6749) @@ -17,7 +17,8 @@ octave: $(PROGS) MEX_EXT = $(shell $(MATLABDIR)/bin/mexext) -matlab: $(patsubst $(PROGS), %_mex.$(MEX_EXT), $(wildcard *.mex)) +matlab: $(patsubst %.mex, %.$(MEX_EXT), $(PROGS)) +all: $(PROGS) $(patsubst %.mex, %.$(MEX_EXT), $(PROGS)) $(PROGS): Makefile @@ -42,14 +43,14 @@ $(MATMEX) svmpredict_mex.cpp svm.o svm_model_matlab.o train.$(MEX_EXT) predict.$(MEX_EXT): train.c linear.h tron.o linear.o linear_model_matlab.c - $(CXX) $(CFLAGS) -I $(MATLABDIR)/extern/include -c linear_model_matlab.c - $(MATMEX) $(MEX_OPTION) -lblas train.c tron.o linear.o linear_model_matlab.o - #$(MATMEX) $(MEX_OPTION) -lblas predict.c tron.o linear.o linear_model_matlab.o + $(CC) $(CFLAGS) -I $(MATLABDIR)/extern/include -c linear_model_matlab.c + $(MATMEX) -lblas train.c tron.o linear.o linear_model_matlab.o + #$(MATMEX) -lblas predict.c tron.o linear.o linear_model_matlab.o train.mex predict.mex: train.c linear.h tron.o linear.o linear_model_matlab.c - $(CXX) $(CFLAGS) -I /usr/include/octave -c linear_model_matlab.c + $(CC) $(CFLAGS) -I /usr/include/octave -c linear_model_matlab.c env CC=$(CXX) $(OCTMEX) -lblas train.c tron.o linear.o linear_model_matlab.o - #env CC=$(CXX) $(OCTMEX) -lblas predict.c tron.o linear.o linear_model_matlab.o + #env CC=$(CXX) $(OCTMEX) -lblas predict.c tron.o linear.o linear_model_matlab.o linear.o: linear.cpp linear.h $(CXX) $(CFLAGS) -c linear.cpp This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sch...@us...> - 2011-02-04 15:23:37
|
Revision: 8085 http://octave.svn.sourceforge.net/octave/?rev=8085&view=rev Author: schloegl Date: 2011-02-04 15:23:30 +0000 (Fri, 04 Feb 2011) Log Message: ----------- add support for WIN32 cross-compilation Modified Paths: -------------- trunk/octave-forge/extra/NaN/src/Makefile Modified: trunk/octave-forge/extra/NaN/src/Makefile =================================================================== --- trunk/octave-forge/extra/NaN/src/Makefile 2011-02-02 17:09:08 UTC (rev 8084) +++ trunk/octave-forge/extra/NaN/src/Makefile 2011-02-04 15:23:30 UTC (rev 8085) @@ -1,15 +1,20 @@ #################################################### -# Copyright 2010 Alois Schloegl +# Copyright 2010, 2011 Alois Schloegl # This is part of the NaN-toolbox - a statistics and machine learning toolbox for data with and without missing values. # http://pub.ist.ac.at/~schloegl/matlab/NaN/ #################################################### ### modify directories according to your needs INCOCTAVE = -I /usr/include/octave -MATLABDIR = /usr/local/matlab +MATLABDIR = /usr/local/MATLAB/R2010b/ # comment the following line if you use MATLAB on 32-bit operating system MEX_OPTION += -largeArrayDims - +# Mingw crosscompiler +CROSS = /scratch/schloegl/src/mingw-cross-env/usr/bin/i686-pc-mingw32- +# include directory for Win32-Matlab include +W32MAT_INC = /nfs4home/schloegl/bin/Matlab/R2010/extern/include/ +# path to GNUMEX libraries +GNUMEX = /nfs4home/schloegl/bin/gnumex #################################################### CC = gcc @@ -20,23 +25,27 @@ MEX_OPTION = CC\#$(CXX) CXX\#$(CXX) CFLAGS\#"$(CFLAGS)" CXXFLAGS\#"$(CFLAGS)" MATMEX = $(MATLABDIR)/bin/mex $(MEX_OPTION) -PROGS = histo_mex.mex covm_mex.mex kth_element.mex sumskipnan_mex.mex str2array.mex train.mex svmtrain_mex.mex svmpredict_mex.mex xptopen.mex +PROGS = histo_mex.mex covm_mex.mex kth_element.mex sumskipnan_mex.mex str2array.mex train.mex svmtrain_mex.mex svmpredict_mex.mex xptopen.mex -octave: $(PROGS) MEX_EXT = $(shell $(MATLABDIR)/bin/mexext) +octave: $(PROGS) matlab: $(patsubst %.mex, %.$(MEX_EXT), $(PROGS)) -all: $(PROGS) $(patsubst %.mex, %.$(MEX_EXT), $(PROGS)) +win32: $(patsubst %.mex, %.mexw32, $(PROGS)) +all: octave win32 matlab $(PROGS): Makefile +######################################################### +# Octave, MATLAB on Linux +######################################################### %.oct: %.cc mkoctfile $< %.mex: %.cpp $(OCTMEX) $< ## Octave %.$(MEX_EXT): %.cpp - $(MATMEX) $< ## Matlab + $(MATMEX) $< -lz ## Matlab svmtrain_mex.mex svmpredict_mex.mex: svmtrain_mex.cpp svm.h svm.cpp svm_model_matlab.c $(CXX) $(CFLAGS) $(INCOCTAVE) -c svm.cpp @@ -67,4 +76,29 @@ $(CXX) $(CFLAGS) -c tron.cpp -clean: ; -$(RM) *.o core octave-core *.oct *~ *.mex* +######################################################### +# MATLAB/WIN32 +######################################################### +%.obj: %.cpp + $(CROSS)$(CXX) -c -DMATLAB_MEX_FILE -x c++ -o $@ -I$(W32MAT_INC) -O3 -DMX_COMPAT_32 $< +%.obj: %.c + $(CROSS)$(CXX) -c -DMATLAB_MEX_FILE -x c++ -o $@ -I$(W32MAT_INC) -O3 -DMX_COMPAT_32 $< +#%.obj: LAPACK/%.f +# $(CROSS)$(CXX) -c -DMATLAB_MEX_FILE -o$@ -I$(W32MAT_INC) -O3 -DMX_COMPAT_32 $< + +train.mexw32 predict.mexw32: train.obj linear.obj linear_model_matlab.obj tron.obj + $(CROSS)$(CXX) -shared $(GNUMEX)/mex.def -o $@ -L$(GNUMEX) -s $< linear_model_matlab.obj linear.obj tron.obj -llibmx -llibmex -llibmat -lz -lcholmod -lblas + +%.mexw32: %.obj + $(CROSS)$(CXX) -shared $(GNUMEX)/mex.def -o $@ -L$(GNUMEX) -s $< -llibmx -llibmex -llibmat -lz -lcholmod + +svmpredict_mex.mexw32 : svmpredict_mex.obj svm.obj svm_model_matlab.obj + $(CROSS)$(CXX) -shared $(GNUMEX)/mex.def -o $@ -L$(GNUMEX) -s $< svm_model_matlab.obj svm.obj -llibmx -llibmex -llibmat -lz -lcholmod +svmtrain_mex.mexw32 : svmtrain_mex.obj svm.obj svm_model_matlab.obj + $(CROSS)$(CXX) -shared $(GNUMEX)/mex.def -o $@ -L$(GNUMEX) -s $< svm_model_matlab.obj svm.obj -llibmx -llibmex -llibmat -lz -lcholmod + + +clean: -$(RM) *.o *.obj core octave-core *.oct *~ *.mex* + + + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sch...@us...> - 2011-03-16 13:16:23
|
Revision: 8179 http://octave.svn.sourceforge.net/octave/?rev=8179&view=rev Author: schloegl Date: 2011-03-16 13:16:16 +0000 (Wed, 16 Mar 2011) Log Message: ----------- octave version support included Modified Paths: -------------- trunk/octave-forge/extra/NaN/src/Makefile Modified: trunk/octave-forge/extra/NaN/src/Makefile =================================================================== --- trunk/octave-forge/extra/NaN/src/Makefile 2011-03-15 20:31:04 UTC (rev 8178) +++ trunk/octave-forge/extra/NaN/src/Makefile 2011-03-16 13:16:16 UTC (rev 8179) @@ -5,10 +5,19 @@ #################################################### ### modify directories according to your needs + +# Octave - global install (e.g. from debian package) +OCTAVE_VERSION = INCOCTAVE = -I /usr/include/octave -MATLABDIR = /usr/local/MATLAB/R2010b/ +# Octave - local install (e.g. compiled from sources) +OCTAVE_VERSION = -3.4.0 +INCOCTAVE = -I /usr/local/include/octave$(OCTAVE_VERSION)/octave + +# Matlab configuration +MATLABDIR = /usr/local/MATLAB/R2010b # comment the following line if you use MATLAB on 32-bit operating system MEX_OPTION += -largeArrayDims + # Mingw crosscompiler: available at http://www.nongnu.org/mingw-cross-env/ CROSS = $(HOME)/src/mingw-cross-env/usr/bin/i686-pc-mingw32- # include directory for Win32-Matlab include @@ -20,7 +29,7 @@ CC = gcc CXX = g++ CFLAGS = -fopenmp -Wall -Wconversion -O3 -fPIC -OCTMEX = mkoctfile --mex +OCTMEX = mkoctfile$(OCTAVE_VERSION) --mex RM = rm MEX_OPTION += CC\#$(CXX) CXX\#$(CXX) CFLAGS\#"$(CFLAGS)" CXXFLAGS\#"$(CFLAGS)" @@ -40,12 +49,12 @@ # Octave, MATLAB on Linux ######################################################### %.oct: %.cc - mkoctfile $< + mkoctfile$(OCTAVE_VERSION) $< %.mex: %.cpp $(OCTMEX) $< ## Octave %.$(MEX_EXT): %.cpp - $(MATMEX) $< -lz ## Matlab + $(MATMEX) $< -lz lgomp ## Matlab svmtrain_mex.mex svmpredict_mex.mex: svmtrain_mex.cpp svm.h svm.cpp svm_model_matlab.c $(CXX) $(CFLAGS) $(INCOCTAVE) -c svm.cpp This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sch...@us...> - 2011-04-18 15:53:46
|
Revision: 8218 http://octave.svn.sourceforge.net/octave/?rev=8218&view=rev Author: schloegl Date: 2011-04-18 15:53:40 +0000 (Mon, 18 Apr 2011) Log Message: ----------- gomp (gnu openmp) support included in Makefile Modified Paths: -------------- trunk/octave-forge/extra/NaN/src/Makefile Modified: trunk/octave-forge/extra/NaN/src/Makefile =================================================================== --- trunk/octave-forge/extra/NaN/src/Makefile 2011-04-17 20:43:47 UTC (rev 8217) +++ trunk/octave-forge/extra/NaN/src/Makefile 2011-04-18 15:53:40 UTC (rev 8218) @@ -52,9 +52,9 @@ mkoctfile$(OCTAVE_VERSION) $< %.mex: %.cpp - $(OCTMEX) $< ## Octave + $(OCTMEX) $< -lz -lgomp ## Octave %.$(MEX_EXT): %.cpp - $(MATMEX) $< -lz lgomp ## Matlab + $(MATMEX) $< -lz -lgomp ## Matlab svmtrain_mex.mex svmpredict_mex.mex: svmtrain_mex.cpp svm.h svm.cpp svm_model_matlab.c $(CXX) $(CFLAGS) $(INCOCTAVE) -c svm.cpp This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sch...@us...> - 2011-05-06 19:53:41
|
Revision: 8252 http://octave.svn.sourceforge.net/octave/?rev=8252&view=rev Author: schloegl Date: 2011-05-06 19:53:34 +0000 (Fri, 06 May 2011) Log Message: ----------- add support for building mexw64 Modified Paths: -------------- trunk/octave-forge/extra/NaN/src/Makefile Modified: trunk/octave-forge/extra/NaN/src/Makefile =================================================================== --- trunk/octave-forge/extra/NaN/src/Makefile 2011-05-06 16:13:09 UTC (rev 8251) +++ trunk/octave-forge/extra/NaN/src/Makefile 2011-05-06 19:53:34 UTC (rev 8252) @@ -9,9 +9,9 @@ # Octave - global install (e.g. from debian package) OCTAVE_VERSION = INCOCTAVE = -I /usr/include/octave -# Octave - local install (e.g. compiled from sources) -OCTAVE_VERSION = -3.4.0 -INCOCTAVE = -I /usr/local/include/octave$(OCTAVE_VERSION)/octave +# Octave - local install (e.g. compiled from sources): I recomend to compile with --enable-openmp +#OCTAVE_VERSION = -3.4.0 +#INCOCTAVE = -I /usr/local/include/octave$(OCTAVE_VERSION)/octave # Matlab configuration MATLABDIR = /usr/local/MATLAB/R2010b @@ -20,10 +20,16 @@ # Mingw crosscompiler: available at http://www.nongnu.org/mingw-cross-env/ CROSS = $(HOME)/src/mingw-cross-env/usr/bin/i686-pc-mingw32- +CROSS64 = $(HOME)/src/mce-w64/usr/bin/x86_64-w64-mingw32- # include directory for Win32-Matlab include -W32MAT_INC = $(HOME)/bin/Matlab/R2010/extern/include/ +W32MAT_INC = $(HOME)/bin/win32/Matlab/R2010b/extern/include/ +W64MAT_INC = $(HOME)/bin/win64/Matlab/R2010b/extern/include/ # path to GNUMEX libraries, available from here http://sourceforge.net/projects/gnumex/ -GNUMEX = $(HOME)/bin/gnumex +GNUMEX = $(HOME)/bin/win32/gnumex +GNUMEX64 = $(HOME)/bin/win64/gnumex +# building gnumex64 was difficult, these hints were quite useful: +# http://sourceforge.net/mailarchive/forum.php?thread_name=AANLkTinZvxgC9ezp2P3UCX_a7TAUYuVsp2U40MQUV6qr%40mail.gmail.com&forum_name=gnumex-users +# Instead of building "mex shortpath.c" and "mex uigetpath.c", I used empty m-functions within argout=argin; #################################################### CC = gcc @@ -38,11 +44,15 @@ PROGS = histo_mex.mex covm_mex.mex kth_element.mex sumskipnan_mex.mex str2array.mex train.mex svmtrain_mex.mex svmpredict_mex.mex xptopen.mex MEX_EXT = $(shell $(MATLABDIR)/bin/mexext) -octave: $(PROGS) -matlab: $(patsubst %.mex, %.$(MEX_EXT), $(PROGS)) +mex4o octave: $(PROGS) +mex4m matlab: $(patsubst %.mex, %.$(MEX_EXT), $(PROGS)) mexw32 win32: $(patsubst %.mex, %.mexw32, $(PROGS)) -all: octave matlab win32 +mexw64 win64: $(patsubst %.mex, %.mexw64, $(PROGS)) +all: octave matlab win32 win64 +clean: + -$(RM) *.o *.obj *.o64 core octave-core *.oct *~ *.mex* + $(PROGS): Makefile ######################################################### @@ -85,8 +95,6 @@ $(CXX) $(CFLAGS) -c tron.cpp -clean: ; -$(RM) *.o core octave-core *.oct *~ *.mex* - ######################################################### # MATLAB/WIN32 ######################################################### @@ -94,8 +102,6 @@ $(CROSS)$(CXX) -fopenmp -c -DMATLAB_MEX_FILE -x c++ -o $@ -I$(W32MAT_INC) -O2 -DMX_COMPAT_32 $< %.obj: %.c $(CROSS)$(CXX) -fopenmp -c -DMATLAB_MEX_FILE -x c++ -o $@ -I$(W32MAT_INC) -O2 -DMX_COMPAT_32 $< -#%.obj: LAPACK/%.f -# $(CROSS)$(CXX) -c -DMATLAB_MEX_FILE -o$@ -I$(W32MAT_INC) -O3 -DMX_COMPAT_32 $< train.mexw32 predict.mexw32: train.obj linear.obj linear_model_matlab.obj tron.obj $(CROSS)$(CXX) -shared $(GNUMEX)/mex.def -o $@ -L$(GNUMEX) -s $< linear_model_matlab.obj linear.obj tron.obj -llibmx -llibmex -llibmat -lz -lcholmod -lblas @@ -108,8 +114,26 @@ %.mexw32: %.obj $(CROSS)$(CXX) -shared $(GNUMEX)/mex.def -o $@ -L$(GNUMEX) -s $< -llibmx -llibmex -llibmat -lz -lcholmod -lgomp -lpthread -clean: - -$(RM) *.o *.obj core octave-core *.oct *~ *.mex* +######################################################### +# MATLAB/WIN64 +######################################################### +## ToDO: fix OpenMP support: currently -fopenmp causes Matlab to crash +%.o64: %.cpp + $(CROSS64)$(CXX) -c -DMATLAB_MEX_FILE -x c++ -o $@ -I$(W64MAT_INC) -O2 $< +%.o64: %.c + $(CROSS64)$(CXX) -c -DMATLAB_MEX_FILE -x c++ -o $@ -I$(W64MAT_INC) -O2 $< + +train.mexw64 predict.mexw64: train.o64 linear.o64 linear_model_matlab.o64 tron.o64 + $(CROSS64)$(CXX) -shared $(GNUMEX64)/mex.def -o $@ -L$(GNUMEX64) -s $< linear_model_matlab.o64 linear.o64 tron.o64 -llibmx -llibmex -llibmat -lz -lcholmod -lblas + +svmpredict_mex.mexw64 : svmpredict_mex.o64 svm.o64 svm_model_matlab.o64 + $(CROSS64)$(CXX) -shared $(GNUMEX64)/mex.def -o $@ -L$(GNUMEX64) -s $< svm_model_matlab.o64 svm.o64 -llibmx -llibmex -llibmat -lz -lcholmod +svmtrain_mex.mexw64 : svmtrain_mex.o64 svm.o64 svm_model_matlab.o64 + $(CROSS64)$(CXX) -shared $(GNUMEX64)/mex.def -o $@ -L$(GNUMEX64) -s $< svm_model_matlab.o64 svm.o64 -llibmx -llibmex -llibmat -lz -lcholmod + +%.mexw64: %.o64 + $(CROSS64)$(CXX) -shared $(GNUMEX64)/mex.def -o $@ -L$(GNUMEX64) -s $< -llibmx -llibmex -llibmat -lz -lcholmod -lgomp -lpthread + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sch...@us...> - 2011-05-08 20:11:34
|
Revision: 8253 http://octave.svn.sourceforge.net/octave/?rev=8253&view=rev Author: schloegl Date: 2011-05-08 20:11:28 +0000 (Sun, 08 May 2011) Log Message: ----------- fix warnings when ML is not available Modified Paths: -------------- trunk/octave-forge/extra/NaN/src/Makefile Modified: trunk/octave-forge/extra/NaN/src/Makefile =================================================================== --- trunk/octave-forge/extra/NaN/src/Makefile 2011-05-06 19:53:34 UTC (rev 8252) +++ trunk/octave-forge/extra/NaN/src/Makefile 2011-05-08 20:11:28 UTC (rev 8253) @@ -43,12 +43,14 @@ PROGS = histo_mex.mex covm_mex.mex kth_element.mex sumskipnan_mex.mex str2array.mex train.mex svmtrain_mex.mex svmpredict_mex.mex xptopen.mex +mex4o octave: $(PROGS) +ifneq (, $(ls -1 $(MATLABDIR))) MEX_EXT = $(shell $(MATLABDIR)/bin/mexext) -mex4o octave: $(PROGS) mex4m matlab: $(patsubst %.mex, %.$(MEX_EXT), $(PROGS)) +endif mexw32 win32: $(patsubst %.mex, %.mexw32, $(PROGS)) mexw64 win64: $(patsubst %.mex, %.mexw64, $(PROGS)) -all: octave matlab win32 win64 +all: octave clean: -$(RM) *.o *.obj *.o64 core octave-core *.oct *~ *.mex* This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sch...@us...> - 2011-05-09 20:15:28
|
Revision: 8254 http://octave.svn.sourceforge.net/octave/?rev=8254&view=rev Author: schloegl Date: 2011-05-09 20:15:21 +0000 (Mon, 09 May 2011) Log Message: ----------- fix building mex4m Modified Paths: -------------- trunk/octave-forge/extra/NaN/src/Makefile Modified: trunk/octave-forge/extra/NaN/src/Makefile =================================================================== --- trunk/octave-forge/extra/NaN/src/Makefile 2011-05-08 20:11:28 UTC (rev 8253) +++ trunk/octave-forge/extra/NaN/src/Makefile 2011-05-09 20:15:21 UTC (rev 8254) @@ -44,19 +44,18 @@ PROGS = histo_mex.mex covm_mex.mex kth_element.mex sumskipnan_mex.mex str2array.mex train.mex svmtrain_mex.mex svmpredict_mex.mex xptopen.mex mex4o octave: $(PROGS) -ifneq (, $(ls -1 $(MATLABDIR))) + +ifneq ( , $(ls -1 $(MATLABDIR) ) ) MEX_EXT = $(shell $(MATLABDIR)/bin/mexext) mex4m matlab: $(patsubst %.mex, %.$(MEX_EXT), $(PROGS)) endif mexw32 win32: $(patsubst %.mex, %.mexw32, $(PROGS)) mexw64 win64: $(patsubst %.mex, %.mexw64, $(PROGS)) -all: octave +all: octave win32 win64 mex4m clean: -$(RM) *.o *.obj *.o64 core octave-core *.oct *~ *.mex* -$(PROGS): Makefile - ######################################################### # Octave, MATLAB on Linux ######################################################### This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sch...@us...> - 2011-05-25 16:31:44
|
Revision: 8287 http://octave.svn.sourceforge.net/octave/?rev=8287&view=rev Author: schloegl Date: 2011-05-25 16:31:38 +0000 (Wed, 25 May 2011) Log Message: ----------- workaround to avoid need for path to mex.h (INCOCTAVE) Modified Paths: -------------- trunk/octave-forge/extra/NaN/src/Makefile Modified: trunk/octave-forge/extra/NaN/src/Makefile =================================================================== --- trunk/octave-forge/extra/NaN/src/Makefile 2011-05-25 15:26:19 UTC (rev 8286) +++ trunk/octave-forge/extra/NaN/src/Makefile 2011-05-25 16:31:38 UTC (rev 8287) @@ -7,11 +7,7 @@ ### modify directories according to your needs # Octave - global install (e.g. from debian package) -OCTAVE_VERSION = -INCOCTAVE = -I /usr/include/octave -# Octave - local install (e.g. compiled from sources): I recomend to compile with --enable-openmp -#OCTAVE_VERSION = -3.4.0 -#INCOCTAVE = -I /usr/local/include/octave$(OCTAVE_VERSION)/octave +# OCTAVE_VERSION = # Matlab configuration MATLABDIR = /usr/local/MATLAB/R2010b @@ -68,10 +64,10 @@ $(MATMEX) $< -lz -lgomp ## Matlab svmtrain_mex.mex svmpredict_mex.mex: svmtrain_mex.cpp svm.h svm.cpp svm_model_matlab.c - $(CXX) $(CFLAGS) $(INCOCTAVE) -c svm.cpp - $(CC) $(CFLAGS) $(INCOCTAVE) -c svm_model_matlab.c - env CC=$(CXX) $(OCTMEX) svmtrain_mex.cpp svm.o svm_model_matlab.o - env CC=$(CXX) $(OCTMEX) svmpredict_mex.cpp svm.o svm_model_matlab.o + $(CXX) $(CFLAGS) -c svm.cpp + #$(CC) $(CFLAGS) $(INCOCTAVE) -c svm_model_matlab.c + env CC=$(CXX) $(OCTMEX) svmtrain_mex.cpp svm.o svm_model_matlab.c + env CC=$(CXX) $(OCTMEX) svmpredict_mex.cpp svm.o svm_model_matlab.c svmtrain_mex.$(MEX_EXT) svmpredict_mex.$(MEX_EXT): svmtrain_mex.cpp svm.h svm.cpp svm_model_matlab.c $(CXX) $(CFLAGS) -I $(MATLABDIR)/extern/include -c svm.cpp @@ -85,8 +81,7 @@ #$(MATMEX) -lblas predict.c tron.o linear.o linear_model_matlab.o train.mex predict.mex: train.c linear.h tron.o linear.o linear_model_matlab.c - $(CC) $(CFLAGS) $(INCOCTAVE) -c linear_model_matlab.c - env CC=$(CXX) $(OCTMEX) -lblas train.c tron.o linear.o linear_model_matlab.o + env CC=$(CXX) $(OCTMEX) -lblas train.c tron.o linear.o linear_model_matlab.c #env CC=$(CXX) $(OCTMEX) -lblas predict.c tron.o linear.o linear_model_matlab.o linear.o: linear.cpp linear.h This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |