[libsvm/el5] Upstream update:3.11
Ding-Yi Chen
dchen at fedoraproject.org
Tue Nov 8 06:53:57 UTC 2011
commit e0682851cf01d6ecde79284211fbbe3b36f9823d
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date: Tue Nov 8 16:53:53 2011 +1000
Upstream update:3.11
.gitignore | 1 +
libsvm-2.91.patch | 379 --------------------
...-3.1.javaDir.patch => libsvm-3.11.javaDir.patch | 0
...kageMain.patch => libsvm-3.11.packageMain.patch | 13 +-
....pythonDir.patch => libsvm-3.11.pythonDir.patch | 12 +-
...-3.1.svm-toy.patch => libsvm-3.11.svm-toy.patch | 53 ++--
....1.toolsDir.patch => libsvm-3.11.toolsDir.patch | 0
libsvm.spec | 12 +-
log | 15 +-
sources | 2 +-
10 files changed, 61 insertions(+), 426 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2068ba3..4373f69 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ libsvm-2.91.tar.gz
/guide.pdf
/libsvm-3.0.tar.gz
/libsvm-3.1.tar.gz
+/libsvm-3.11.tar.gz
diff --git a/libsvm-3.1.javaDir.patch b/libsvm-3.11.javaDir.patch
similarity index 100%
rename from libsvm-3.1.javaDir.patch
rename to libsvm-3.11.javaDir.patch
diff --git a/libsvm-3.1.packageMain.patch b/libsvm-3.11.packageMain.patch
similarity index 93%
rename from libsvm-3.1.packageMain.patch
rename to libsvm-3.11.packageMain.patch
index 87209e9..5fbadbe 100644
--- a/libsvm-3.1.packageMain.patch
+++ b/libsvm-3.11.packageMain.patch
@@ -1,6 +1,6 @@
diff -up ./Makefile.packageMain ./Makefile
---- ./Makefile.packageMain 2010-09-12 22:11:10.000000000 +1000
-+++ ./Makefile 2011-06-14 17:00:32.774749405 +1000
+--- ./Makefile.packageMain 2011-06-26 05:55:06.000000000 +1000
++++ ./Makefile 2011-11-08 09:42:13.106501233 +1000
@@ -1,11 +1,44 @@
CXX ?= g++
-CFLAGS = -Wall -Wconversion -O3 -fPIC
@@ -10,7 +10,8 @@ diff -up ./Makefile.packageMain ./Makefile
+DOT_LIBS=.libs
+LIBS= -L${DOT_LIBS} -lsvm
+export LIBSVM_VER
-+
+
+-all: svm-train svm-predict svm-scale
+IS_64:=$(shell /bin/uname -i | awk '/64/ {print 64}')
+
+PREFIXDIR?= /usr
@@ -40,12 +41,10 @@ diff -up ./Makefile.packageMain ./Makefile
+
+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)
+ $(CXX) -shared -dynamiclib -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
diff --git a/libsvm-3.1.pythonDir.patch b/libsvm-3.11.pythonDir.patch
similarity index 78%
rename from libsvm-3.1.pythonDir.patch
rename to libsvm-3.11.pythonDir.patch
index 8d8d7ec..ff0991d 100644
--- a/libsvm-3.1.pythonDir.patch
+++ b/libsvm-3.11.pythonDir.patch
@@ -1,18 +1,19 @@
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
+--- ./python/Makefile.pythonDir 2011-05-10 09:35:15.000000000 +1000
++++ ./python/Makefile 2011-11-08 09:49:54.280501207 +1000
+@@ -1,4 +1,20 @@
+PYTHONDIR_NAME ?= python${PYTHON_VERSION}/site-packages/libsvm
+PYTHONDIR?=${LIBDIR}/${PYTHONDIR_NAME}
+PYTHONDIR_INSTALL=${DESTDIR}/${PYTHONDIR}
+SVM_TOOLS:= $(notdir $(wildcard ../tools/*.py))
++
+ all = lib
-lib:
+all: lib
+
+lib: ../svm.cpp ../svm.h
- cd ..; make lib; cd -
+ make -C .. lib
+
+install: all
+ mkdir -p ${PYTHONDIR_INSTALL}
@@ -22,4 +23,3 @@ diff -up ./python/Makefile.pythonDir ./python/Makefile
+
+uninstall:
+ rm -fr ${LIBDIR}/${PYTHON_PATH} $(addprefix ${BINDIR_INSTALL}/svm-,$(SVM_TOOLS))
-+
diff --git a/libsvm-3.1.svm-toy.patch b/libsvm-3.11.svm-toy.patch
similarity index 50%
rename from libsvm-3.1.svm-toy.patch
rename to libsvm-3.11.svm-toy.patch
index baad72a..e8d4e69 100644
--- a/libsvm-3.1.svm-toy.patch
+++ b/libsvm-3.11.svm-toy.patch
@@ -1,6 +1,6 @@
diff -up ./svm-toy/gtk/callbacks.cpp.svm-toy ./svm-toy/gtk/callbacks.cpp
--- ./svm-toy/gtk/callbacks.cpp.svm-toy 2010-09-12 22:11:10.000000000 +1000
-+++ ./svm-toy/gtk/callbacks.cpp 2011-06-14 13:36:25.726748304 +1000
++++ ./svm-toy/gtk/callbacks.cpp 2011-11-08 09:57:01.782500360 +1000
@@ -3,6 +3,7 @@
#include <stdlib.h>
#include <ctype.h>
@@ -10,61 +10,66 @@ diff -up ./svm-toy/gtk/callbacks.cpp.svm-toy ./svm-toy/gtk/callbacks.cpp
#include "interface.h"
#include "../../svm.h"
diff -up ./svm-toy/gtk/Makefile.svm-toy ./svm-toy/gtk/Makefile
---- ./svm-toy/gtk/Makefile.svm-toy 2010-11-14 10:59:28.000000000 +1000
-+++ ./svm-toy/gtk/Makefile 2011-06-14 13:47:23.529749429 +1000
+--- ./svm-toy/gtk/Makefile.svm-toy 2011-05-11 12:15:45.000000000 +1000
++++ ./svm-toy/gtk/Makefile 2011-11-08 10:06:35.686501266 +1000
@@ -1,10 +1,12 @@
CC? = gcc
CXX? = g++
- CFLAGS = -Wall -O3 -g `pkg-config --cflags gtk+-2.0`
+-CFLAGS = -Wall -O3 -g `pkg-config --cflags gtk+-2.0`
-LIBS = `pkg-config --libs gtk+-2.0`
-+LOCAL_LIBDIR=../../
-+LIBS = `pkg-config --libs gtk+-2.0` -L${LOCAL_LIBDIR} -lsvm
++CFLAGS = -Wall -O3 -g `pkg-config --cflags --libs gtk+-2.0`
++LOCAL_LIBDIR=../..
++LIBS = -L${LOCAL_LIBDIR} -lsvm
-svm-toy: main.o interface.o callbacks.o ../../svm.o
- $(CXX) $(CFLAGS) main.o interface.o callbacks.o ../../svm.o -o svm-toy $(LIBS)
+
-+svm-toy-gtk: main.o interface.o callbacks.o
++svm-toy-gtk: main.o interface.o callbacks.o ${LOCAL_LIBDIR}/svm.o
+ $(CXX) $(CFLAGS) main.o interface.o callbacks.o $(LIBS) -o $@
main.o: main.c
$(CC) $(CFLAGS) -c main.c
-@@ -15,8 +17,5 @@ interface.o: interface.c interface.h
+@@ -15,8 +17,8 @@ interface.o: interface.c interface.h
callbacks.o: callbacks.cpp callbacks.h
$(CXX) $(CFLAGS) -c callbacks.cpp
--../../svm.o:
-- cd ../..; make svm.o
--
+-../../svm.o: ../../svm.cpp ../../svm.h
+- make -C ../.. svm.o
++${LOCAL_LIBDIR}/svm.o: ${LOCAL_LIBDIR}/svm.cpp ${LOCAL_LIBDIR}/svm.h
++ make -C ${LOCAL_LIBDIR} svm.o
+
clean:
- rm -f *~ callbacks.o svm-toy main.o interface.o callbacks.o ../../svm.o
-+ rm -f *~ callbacks.o svm-toy main.o interface.o callbacks.o
++ rm -f *~ callbacks.o svm-toy main.o interface.o callbacks.o ${LOCAL_LIBDIR}/svm.o
diff -up ./svm-toy/qt/Makefile.svm-toy ./svm-toy/qt/Makefile
---- ./svm-toy/qt/Makefile.svm-toy 2008-12-19 16:42:05.000000000 +1000
-+++ ./svm-toy/qt/Makefile 2011-06-14 13:50:02.634748539 +1000
-@@ -1,17 +1,18 @@
+--- ./svm-toy/qt/Makefile.svm-toy 2011-05-11 12:15:45.000000000 +1000
++++ ./svm-toy/qt/Makefile 2011-11-08 10:06:11.702501216 +1000
+@@ -1,17 +1,20 @@
CXX? = g++
-CFLAGS = -Wall -O3 -I$(INCLUDE) -I$(INCLUDE)/QtGui -lQtGui
-+CFLAGS = -Wall -O3 -I$(INCLUDE) `pkg-config --cflags --libs QtGui`
- INCLUDE = /usr/include/qt4
+-INCLUDE = /usr/include/qt4
-MOC = /usr/bin/moc-qt4
++CFLAGS = -Wall -O3 `pkg-config --cflags --libs QtGui`
+MOC=${MOC_PATH}
-+LOCAL_LIBDIR=../../
-+LIBS = `pkg-config --libs QtGui` -L${LOCAL_LIBDIR} -lsvm
++LOCAL_LIBDIR=../..
++LIBS = -L${LOCAL_LIBDIR} -lsvm
-svm-toy: svm-toy.cpp svm-toy.moc ../../svm.o
- $(CXX) $(CFLAGS) svm-toy.cpp ../../svm.o -o svm-toy
+all: svm-toy-qt
+
-+svm-toy-qt: svm-toy.cpp svm-toy.moc
++svm-toy-qt: svm-toy.cpp svm-toy.moc ${LOCAL_LIBDIR}/svm.o
+ $(CXX) $(CFLAGS) svm-toy.cpp ${LIBS} -o $@
svm-toy.moc: svm-toy.cpp
$(MOC) svm-toy.cpp -o svm-toy.moc
--../../svm.o:
-- cd ../..; make svm.o
--
+-../../svm.o: ../../svm.cpp ../../svm.h
+- make -C ../.. svm.o
++${LOCAL_LIBDIR}/svm.o: ${LOCAL_LIBDIR}/svm.cpp ${LOCAL_LIBDIR}/svm.h
++ make -C ${LOCAL_LIBDIR} svm.o
+
clean:
- rm -f *~ svm-toy svm-toy.moc ../../svm.o
-+ rm -f *~ svm-toy svm-toy.moc
++ rm -f *~ svm-toy svm-toy.moc ${LOCAL_LIBDIR}/svm.o
diff --git a/libsvm-3.1.toolsDir.patch b/libsvm-3.11.toolsDir.patch
similarity index 100%
rename from libsvm-3.1.toolsDir.patch
rename to libsvm-3.11.toolsDir.patch
diff --git a/libsvm.spec b/libsvm.spec
index efaa12d..9fffb40 100644
--- a/libsvm.spec
+++ b/libsvm.spec
@@ -1,7 +1,7 @@
%define shver 2
Name: libsvm
-Version: 3.1
-Release: 2%{?dist}
+Version: 3.11
+Release: 1%{?dist}
Summary: A Library for Support Vector Machines
Group: Development/Libraries
@@ -239,6 +239,14 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri Jun 17 2011 Ding-Yi Chen <dchen at redhat.com> - 3.11-1
+- Upstream update:
+ + Set max number of iterations in the main loop of solvers
+ + matlab:
+ new make.m for unix/mac/windows and for matlab/octave
+ + matlab and python:
+ fix a problem that decision values returned by svmpredict is empty if number of classes = 1
+
* Fri Jun 17 2011 Ding-Yi Chen <dchen at redhat.com> - 3.1-2
- Fix the build error on EL-5
diff --git a/log b/log
index ede03f3..dac608b 100644
--- a/log
+++ b/log
@@ -193,7 +193,7 @@ file updated.
Java:
Math.random is replaced by Random in java interface
Python interface:
- subroutines to get SVs
+i subroutines to get SVs
relative path to load *.dll and *.so
svm.cpp:
null pointer check before release memory in svm_free_model_content()
@@ -206,9 +206,10 @@ file updated.
Using new string formatting/encoding in tools/*.py
clearer png output, fix grid.py legend
-------------------
-
-Future plan:
-?.?:
-
- update make.m of matlab interface to use max(...)
\ No newline at end of file
+3.11: 2011/11/5
+ Set max number of iterations in the main loop of solvers
+ matlab:
+ new make.m for unix/mac/windows and for matlab/octave
+ matlab and python:
+ fix a problem that decision values returned by svmpredict is empty if number of classes = 1
+
\ No newline at end of file
diff --git a/sources b/sources
index 045b743..3a815ba 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
aae7a8f7e357e86e1c893b706bb02a63 guide.pdf
-a157c1edfdb290fe8081d6a011022055 libsvm-3.1.tar.gz
+44d2a3a611280ecd0d66aafe0d52233e libsvm-3.11.tar.gz
More information about the scm-commits
mailing list