Ding-Yi Chen
14 years ago
commit
9e1806dd21
@ -1,114 +0,0 @@
|
||||
diff -up ./Makefile.packageMain ./Makefile
|
||||
--- ./Makefile.packageMain 2010-09-12 22:11:10.000000000 +1000
|
||||
+++ ./Makefile 2010-12-14 16:00:15.269681221 +1000
|
||||
@@ -1,11 +1,40 @@
|
||||
CXX ?= g++
|
||||
-CFLAGS = -Wall -Wconversion -O3 -fPIC
|
||||
+CFLAGS = ${RPM_CFLAGS} -Wall -Wconversion -O3 -fPIC
|
||||
SHVER = 2
|
||||
+MAKE = make
|
||||
+DOT_LIBS=.libs
|
||||
+LIBS= -L${DOT_LIBS} -lsvm
|
||||
+export LIBSVM_VER
|
||||
+
|
||||
+ifndef DESTDIR
|
||||
+ INSTDIR=/usr
|
||||
+else
|
||||
+ INSTDIR=${DESTDIR}/usr
|
||||
+endif
|
||||
+
|
||||
+export INSTDIR
|
||||
+
|
||||
+IS_64=$(shell /bin/uname -i | awk '/64/ {print 64}')
|
||||
+
|
||||
+ifndef LIBDIR
|
||||
+ LIB_INSTDIR=${INSTDIR}/lib${IS_64}
|
||||
+else
|
||||
+ LIB_INSTDIR=${INSTDIR}/..${LIBDIR}
|
||||
+endif
|
||||
+
|
||||
+ifndef LIBDIR
|
||||
+ LIBDIR=/usr/lib${IS_64}
|
||||
+endif
|
||||
+
|
||||
+export LIBDIR
|
||||
+export LIB_INSTDIR
|
||||
+
|
||||
+all: lib svm-train svm-predict svm-scale svm-python svm-java svm-toy-gtk svm-toy-qt
|
||||
|
||||
-all: svm-train svm-predict svm-scale
|
||||
|
||||
lib: svm.o
|
||||
- $(CXX) -shared -dynamiclib svm.o -o libsvm.so.$(SHVER)
|
||||
+ $(CXX) -shared -Wl,-soname,libsvm.so.$(SHVER) svm.o -o libsvm.so.$(SHVER)
|
||||
+ ln -sf libsvm.so.$(SHVER) libsvm.so
|
||||
|
||||
svm-predict: svm-predict.c svm.o
|
||||
$(CXX) $(CFLAGS) svm-predict.c svm.o -o svm-predict -lm
|
||||
@@ -16,4 +45,65 @@ svm-scale: svm-scale.c
|
||||
svm.o: svm.cpp svm.h
|
||||
$(CXX) $(CFLAGS) -c svm.cpp
|
||||
clean:
|
||||
- rm -f *~ svm.o svm-train svm-predict svm-scale libsvm.so.$(SHVER)
|
||||
+ rm -f *~ svm.o svm-train svm-predict svm-scale svm-toy/gtk/svm-toy-gtk svm-toy/qt/svm-toy-qt
|
||||
+ ${MAKE} -C python clean
|
||||
+ ${MAKE} -C java clean
|
||||
+svm-python:
|
||||
+ ${MAKE} -C python
|
||||
+
|
||||
+svm-java:
|
||||
+ifneq ("${NO_JAVA}","NO_JAVA")
|
||||
+ ${MAKE} -C java
|
||||
+endif
|
||||
+svm-toy-gtk:
|
||||
+ ${MAKE} -C svm-toy/gtk
|
||||
+
|
||||
+svm-toy-qt:
|
||||
+ ${MAKE} -C svm-toy/qt
|
||||
+
|
||||
+install: all
|
||||
+ mkdir -p ${INSTDIR}/bin
|
||||
+ install -m 755 svm-train ${INSTDIR}/bin
|
||||
+ install -m 755 svm-predict ${INSTDIR}/bin
|
||||
+ install -m 755 svm-scale ${INSTDIR}/bin
|
||||
+ mkdir -p ${LIB_INSTDIR}
|
||||
+ install -m 755 libsvm.so.$(SHVER) ${LIB_INSTDIR}
|
||||
+# install package libsvm-devel
|
||||
+ mkdir -p ${INSTDIR}/include/libsvm
|
||||
+ install -m 644 svm.h ${INSTDIR}/include/libsvm
|
||||
+ mkdir -p ${INSTDIR}/share/libsvm/src/java/libsvm
|
||||
+ install -m 644 *.h ${INSTDIR}/share/libsvm/src
|
||||
+ install -m 644 *.c ${INSTDIR}/share/libsvm/src
|
||||
+ install -m 644 *.cpp ${INSTDIR}/share/libsvm/src
|
||||
+ install -m 644 Makefile ${INSTDIR}/share/libsvm/src
|
||||
+ifneq ("${NO_JAVA}","NO_JAVA")
|
||||
+ install -m 644 java/*.java ${INSTDIR}/share/libsvm/src/java
|
||||
+ install -m 644 java/Makefile ${INSTDIR}/share/libsvm/src/java
|
||||
+ install -m 644 java/libsvm/*.java ${INSTDIR}/share/libsvm/src/java/libsvm
|
||||
+ install -m 644 java/libsvm/*.m4 ${INSTDIR}/share/libsvm/src/java/libsvm
|
||||
+# install package libsvm-java
|
||||
+ ${MAKE} -C java install
|
||||
+endif
|
||||
+# install package libsvm-python
|
||||
+ ${MAKE} -C python install
|
||||
+# install package svm-toy
|
||||
+ install -m 755 svm-toy/gtk/svm-toy-gtk ${INSTDIR}/bin
|
||||
+ install -m 755 svm-toy/qt/svm-toy-qt ${INSTDIR}/bin
|
||||
+# install examples
|
||||
+ mkdir -p ${INSTDIR}/share/libsvm/examples
|
||||
+ install -m 644 heart_scale ${INSTDIR}/share/libsvm/examples
|
||||
+uninstall:
|
||||
+ rm -f ${INSTDIR}/bin/svm-train
|
||||
+ rm -f ${INSTDIR}/bin/svm-predict
|
||||
+ rm -f ${INSTDIR}/bin/svm-scale
|
||||
+ rm -fr ${INSTDIR}/libsvm/examples
|
||||
+ rm -f ${INSTDIR}/include/libsvm/svm.h
|
||||
+ rm -f ${LIB_INSTDIR}/libsvm/svm.o
|
||||
+ rm -fr ${INSTDIR}/libsvm/src
|
||||
+ rm -fr ${INSTDIR}/libsvm
|
||||
+ ${MAKE} -C python uninstall
|
||||
+ifneq ("${NO_JAVA}","NO_JAVA")
|
||||
+ ${MAKE} -C java uninstall
|
||||
+endif
|
||||
+ rm -f ${INSTDIR}/bin/svm-toy-gtk
|
||||
+ rm -f ${INSTDIR}/bin/svm-toy-qt
|
||||
@ -1,22 +0,0 @@
|
||||
diff -up ./python/Makefile.pythonDir ./python/Makefile
|
||||
--- ./python/Makefile.pythonDir 2010-06-16 14:04:46.000000000 +1000
|
||||
+++ ./python/Makefile 2010-11-08 11:07:55.950510378 +1000
|
||||
@@ -1,4 +1,16 @@
|
||||
-all = lib
|
||||
+PYTHON_PATH ?= python${PYTHON_VERSION}/site-packages/libsvm
|
||||
+PYTHON_TARGETDIR=${LIB_INSTDIR}/${PYTHON_PATH}
|
||||
|
||||
-lib:
|
||||
+all: lib
|
||||
+
|
||||
+lib: ../svm.cpp ../svm.h
|
||||
cd ..; make lib; cd -
|
||||
+
|
||||
+install: all
|
||||
+ mkdir -p ${PYTHON_TARGETDIR}
|
||||
+ install -m 755 *.py ${PYTHON_TARGETDIR}
|
||||
+ install -m 755 ../tools/*.py ${PYTHON_TARGETDIR}
|
||||
+
|
||||
+uninstall:
|
||||
+ rm -fr ${LIBDIR}/${PYTHON_PATH}all = lib
|
||||
+
|
||||
@ -1,30 +0,0 @@
|
||||
diff -up ./tools/easy.py.toolsDir ./tools/easy.py
|
||||
--- ./tools/easy.py.toolsDir 2010-11-08 11:42:36.754570359 +1000
|
||||
+++ ./tools/easy.py 2010-11-08 11:53:23.724570788 +1000
|
||||
@@ -12,10 +12,10 @@ if len(sys.argv) <= 1:
|
||||
|
||||
is_win32 = (sys.platform == 'win32')
|
||||
if not is_win32:
|
||||
- svmscale_exe = "../svm-scale"
|
||||
- svmtrain_exe = "../svm-train"
|
||||
- svmpredict_exe = "../svm-predict"
|
||||
- grid_py = "./grid.py"
|
||||
+ svmscale_exe = "/usr/bin/svm-scale"
|
||||
+ svmtrain_exe = "/usr/bin/svm-train"
|
||||
+ svmpredict_exe = "/usr/bin/svm-predict"
|
||||
+ grid_py = "/usr/bin/grid.py"
|
||||
gnuplot_exe = "/usr/bin/gnuplot"
|
||||
else:
|
||||
# example for windows
|
||||
diff -up ./tools/grid.py.toolsDir ./tools/grid.py
|
||||
--- ./tools/grid.py.toolsDir 2010-11-08 11:42:36.756570467 +1000
|
||||
+++ ./tools/grid.py 2010-11-08 11:52:59.144511925 +1000
|
||||
@@ -17,7 +17,7 @@ else:
|
||||
|
||||
is_win32 = (sys.platform == 'win32')
|
||||
if not is_win32:
|
||||
- svmtrain_exe = "../svm-train"
|
||||
+ svmtrain_exe = "/usr/bin/svm-train"
|
||||
gnuplot_exe = "/usr/bin/gnuplot"
|
||||
else:
|
||||
# example for windows
|
||||
@ -0,0 +1,117 @@
|
||||
diff -up ./Makefile.packageMain ./Makefile
|
||||
--- ./Makefile.packageMain 2010-09-12 22:11:10.000000000 +1000
|
||||
+++ ./Makefile 2011-06-14 17:00:32.774749405 +1000
|
||||
@@ -1,11 +1,44 @@
|
||||
CXX ?= g++
|
||||
-CFLAGS = -Wall -Wconversion -O3 -fPIC
|
||||
+CFLAGS = ${RPM_CFLAGS} -Wall -Wconversion -O3 -fPIC
|
||||
SHVER = 2
|
||||
+MAKE = make
|
||||
+DOT_LIBS=.libs
|
||||
+LIBS= -L${DOT_LIBS} -lsvm
|
||||
+export LIBSVM_VER
|
||||
+
|
||||
+IS_64:=$(shell /bin/uname -i | awk '/64/ {print 64}')
|
||||
+
|
||||
+PREFIXDIR?= /usr
|
||||
+export PREFIXDIR
|
||||
+
|
||||
+LIBDIR?=${PREFIXDIR}/lib${IS_64}
|
||||
+export LIBDIR
|
||||
+
|
||||
+DATADIR?=${PREFIXDIR}/share
|
||||
+export DATADIR
|
||||
+
|
||||
+BINDIR?=${PREFIXDIR}/bin
|
||||
+export BINDIR
|
||||
+
|
||||
+INCLUDEDIR_INSTALL:=${DESTDIR}/${PREFIXDIR}/include
|
||||
+export INCLUDEDIR_INSTALL
|
||||
+
|
||||
+LIBDIR_INSTALL:=${DESTDIR}/${LIBDIR}
|
||||
+export LIBDIR_INSTALL
|
||||
+
|
||||
+DATADIR_INSTALL:=${DESTDIR}/${DATADIR}
|
||||
+export DATA_INSTALL
|
||||
+
|
||||
+BINDIR_INSTALL:=${DESTDIR}/${BINDIR}
|
||||
+export BINDIR_INSTALL
|
||||
+
|
||||
+
|
||||
+all: lib svm-train svm-predict svm-scale svm-python svm-java svm-toy-gtk svm-toy-qt
|
||||
|
||||
-all: svm-train svm-predict svm-scale
|
||||
|
||||
lib: svm.o
|
||||
- $(CXX) -shared -dynamiclib svm.o -o libsvm.so.$(SHVER)
|
||||
+ $(CXX) -shared -Wl,-soname,libsvm.so.$(SHVER) svm.o -o libsvm.so.$(SHVER)
|
||||
+ ln -sf libsvm.so.$(SHVER) libsvm.so
|
||||
|
||||
svm-predict: svm-predict.c svm.o
|
||||
$(CXX) $(CFLAGS) svm-predict.c svm.o -o svm-predict -lm
|
||||
@@ -16,4 +49,64 @@ svm-scale: svm-scale.c
|
||||
svm.o: svm.cpp svm.h
|
||||
$(CXX) $(CFLAGS) -c svm.cpp
|
||||
clean:
|
||||
- rm -f *~ svm.o svm-train svm-predict svm-scale libsvm.so.$(SHVER)
|
||||
+ rm -f *~ svm.o svm-train svm-predict svm-scale svm-toy/gtk/svm-toy-gtk svm-toy/qt/svm-toy-qt
|
||||
+ ${MAKE} -C python clean
|
||||
+ ${MAKE} -C java clean
|
||||
+svm-python:
|
||||
+ ${MAKE} -C python
|
||||
+
|
||||
+svm-java:
|
||||
+ifneq ("${NO_JAVA}","NO_JAVA")
|
||||
+ ${MAKE} -C java
|
||||
+endif
|
||||
+svm-toy-gtk:
|
||||
+ ${MAKE} -C svm-toy/gtk
|
||||
+
|
||||
+svm-toy-qt:
|
||||
+ ${MAKE} -C svm-toy/qt
|
||||
+
|
||||
+install: all
|
||||
+ mkdir -p ${BINDIR_INSTALL}
|
||||
+ install -m 755 svm-train ${BINDIR_INSTALL}
|
||||
+ install -m 755 svm-predict ${BINDIR_INSTALL}
|
||||
+ install -m 755 svm-scale ${BINDIR_INSTALL}
|
||||
+ mkdir -p ${LIBDIR_INSTALL}
|
||||
+ install -m 755 libsvm.so.$(SHVER) ${LIBDIR_INSTALL}
|
||||
+# install package libsvm-devel
|
||||
+ mkdir -p ${INCLUDEDIR_INSTALL}/libsvm
|
||||
+ install -m 644 svm.h ${INCLUDEDIR_INSTALL}/libsvm
|
||||
+ mkdir -p ${DATADIR_INSTALL}/libsvm/src/java/libsvm
|
||||
+ install -m 644 *.h ${DATADIR_INSTALL}/libsvm/src
|
||||
+ install -m 644 *.c ${DATADIR_INSTALL}/libsvm/src
|
||||
+ install -m 644 *.cpp ${DATADIR_INSTALL}/libsvm/src
|
||||
+ install -m 644 Makefile ${DATADIR_INSTALL}/libsvm/src
|
||||
+ifneq ("${NO_JAVA}","NO_JAVA")
|
||||
+ install -m 644 java/*.java ${DATADIR_INSTALL}/libsvm/src/java
|
||||
+ install -m 644 java/Makefile ${DATADIR_INSTALL}/libsvm/src/java
|
||||
+ install -m 644 java/libsvm/*.java ${DATADIR_INSTALL}/libsvm/src/java/libsvm
|
||||
+ install -m 644 java/libsvm/*.m4 ${DATADIR_INSTALL}/libsvm/src/java/libsvm
|
||||
+# install package libsvm-java
|
||||
+ ${MAKE} -C java install
|
||||
+endif
|
||||
+# install package libsvm-python
|
||||
+ ${MAKE} -C python install
|
||||
+# install package svm-toy
|
||||
+ install -m 755 svm-toy/gtk/svm-toy-gtk ${BINDIR_INSTALL}
|
||||
+ install -m 755 svm-toy/qt/svm-toy-qt ${BINDIR_INSTALL}
|
||||
+# install examples
|
||||
+ mkdir -p ${DATADIR_INSTALL}/libsvm/examples
|
||||
+ install -m 644 heart_scale ${DATADIR_INSTALL}/libsvm/examples
|
||||
+uninstall:
|
||||
+ rm -f ${BINDIR_INSTALL}/svm-train
|
||||
+ rm -f ${BINDIR_INSTALL}/svm-predict
|
||||
+ rm -f ${BINDIR_INSTALL}/svm-scale
|
||||
+ rm -fr ${DATADIR_INSTALL}/libsvm
|
||||
+ rm -f ${INCLUDEDIR_INSTALL}/libsvm/svm.h
|
||||
+ rm -f ${LIBDIR_INSTALL}/libsvm.so*
|
||||
+ ${MAKE} -C python uninstall
|
||||
+ifneq ("${NO_JAVA}","NO_JAVA")
|
||||
+ ${MAKE} -C java uninstall
|
||||
+endif
|
||||
+ rm -f ${BINDIR_INSTALL}/svm-toy-gtk
|
||||
+ rm -f ${BINDIR_INSTALL}/svm-toy-qt
|
||||
+
|
||||
@ -0,0 +1,25 @@
|
||||
diff -up ./python/Makefile.pythonDir ./python/Makefile
|
||||
--- ./python/Makefile.pythonDir 2010-06-16 14:04:46.000000000 +1000
|
||||
+++ ./python/Makefile 2011-06-14 16:53:39.365997401 +1000
|
||||
@@ -1,4 +1,19 @@
|
||||
-all = lib
|
||||
+PYTHONDIR_NAME ?= python${PYTHON_VERSION}/site-packages/libsvm
|
||||
+PYTHONDIR?=${LIBDIR}/${PYTHONDIR_NAME}
|
||||
+PYTHONDIR_INSTALL=${DESTDIR}/${PYTHONDIR}
|
||||
+SVM_TOOLS:= $(notdir $(wildcard ../tools/*.py))
|
||||
|
||||
-lib:
|
||||
+all: lib
|
||||
+
|
||||
+lib: ../svm.cpp ../svm.h
|
||||
cd ..; make lib; cd -
|
||||
+
|
||||
+install: all
|
||||
+ mkdir -p ${PYTHONDIR_INSTALL}
|
||||
+ install -m 755 *.py ${PYTHONDIR_INSTALL}
|
||||
+ install -m 755 ../tools/*.py ${PYTHONDIR_INSTALL}
|
||||
+ $(foreach toolPy,$(SVM_TOOLS),ln -s ${PYTHONDIR}/$(toolPy) ${BINDIR_INSTALL}/svm-$(toolPy);)
|
||||
+
|
||||
+uninstall:
|
||||
+ rm -fr ${LIBDIR}/${PYTHON_PATH} $(addprefix ${BINDIR_INSTALL}/svm-,$(SVM_TOOLS))
|
||||
+
|
||||
@ -0,0 +1,52 @@
|
||||
diff -up ./tools/easy.py.toolsDir ./tools/easy.py
|
||||
--- ./tools/easy.py.toolsDir 2010-12-31 15:51:25.000000000 +1000
|
||||
+++ ./tools/easy.py 2011-06-14 15:15:06.611622820 +1000
|
||||
@@ -12,10 +12,10 @@ if len(sys.argv) <= 1:
|
||||
|
||||
is_win32 = (sys.platform == 'win32')
|
||||
if not is_win32:
|
||||
- svmscale_exe = "../svm-scale"
|
||||
- svmtrain_exe = "../svm-train"
|
||||
- svmpredict_exe = "../svm-predict"
|
||||
- grid_py = "./grid.py"
|
||||
+ svmscale_exe = "/usr/bin/svm-scale"
|
||||
+ svmtrain_exe = "/usr/bin/svm-train"
|
||||
+ svmpredict_exe = "/usr/bin/svm-predict"
|
||||
+ grid_py = "/usr/bin/svm-grid.py"
|
||||
gnuplot_exe = "/usr/bin/gnuplot"
|
||||
else:
|
||||
# example for windows
|
||||
@@ -47,7 +47,7 @@ if len(sys.argv) > 2:
|
||||
|
||||
cmd = '{0} -s "{1}" "{2}" > "{3}"'.format(svmscale_exe, range_file, train_pathname, scaled_file)
|
||||
print('Scaling training data...')
|
||||
-Popen(cmd, shell = True, stdout = PIPE).communicate()
|
||||
+Popen(cmd, shell = True, stdout = PIPE).communicate()
|
||||
|
||||
cmd = '{0} -svmtrain "{1}" -gnuplot "{2}" "{3}"'.format(grid_py, svmtrain_exe, gnuplot_exe, scaled_file)
|
||||
print('Cross validation...')
|
||||
@@ -70,10 +70,10 @@ print('Output model: {0}'.format(model_f
|
||||
if len(sys.argv) > 2:
|
||||
cmd = '{0} -r "{1}" "{2}" > "{3}"'.format(svmscale_exe, range_file, test_pathname, scaled_test_file)
|
||||
print('Scaling testing data...')
|
||||
- Popen(cmd, shell = True, stdout = PIPE).communicate()
|
||||
+ Popen(cmd, shell = True, stdout = PIPE).communicate()
|
||||
|
||||
cmd = '{0} "{1}" "{2}" "{3}"'.format(svmpredict_exe, scaled_test_file, model_file, predict_test_file)
|
||||
print('Testing...')
|
||||
- Popen(cmd, shell = True).communicate()
|
||||
+ Popen(cmd, shell = True).communicate()
|
||||
|
||||
print('Output prediction: {0}'.format(predict_test_file))
|
||||
diff -up ./tools/grid.py.toolsDir ./tools/grid.py
|
||||
--- ./tools/grid.py.toolsDir 2011-02-03 01:55:20.000000000 +1000
|
||||
+++ ./tools/grid.py 2011-06-14 14:56:11.817748117 +1000
|
||||
@@ -17,7 +17,7 @@ else:
|
||||
|
||||
is_win32 = (sys.platform == 'win32')
|
||||
if not is_win32:
|
||||
- svmtrain_exe = "../svm-train"
|
||||
+ svmtrain_exe = "/usr/bin/svm-train"
|
||||
gnuplot_exe = "/usr/bin/gnuplot"
|
||||
else:
|
||||
# example for windows
|
||||
Loading…
Reference in new issue