diff options
| author |   Sebastien Fabbro <bicatali@gentoo.org> | 2011-12-29 19:52:41 +0000 |
|---|---|---|
| committer | Sebastien Fabbro <bicatali@gentoo.org> | 2011-12-29 19:52:41 +0000 |
| commit | 622f491113c4b6566a3977c033aa4ce69ae19217 (patch) | |
| tree | 1e72bab102130cd2a292ce79082e17677193985c /sci-libs/libsvm/files | |
| parent | Unmask dev-perl/DBD-SQLite (diff) | |
| download | gentoo-2-622f491113c4b6566a3977c033aa4ce69ae19217.tar.gz gentoo-2-622f491113c4b6566a3977c033aa4ce69ae19217.tar.bz2 gentoo-2-622f491113c4b6566a3977c033aa4ce69ae19217.zip | |
Version bump
(Portage version: 2.1.10.41/cvs/Linux x86_64)
Diffstat (limited to 'sci-libs/libsvm/files')
| -rw-r--r-- | sci-libs/libsvm/files/3.11-makefile.patch | 32 | ||||
| -rw-r--r-- | sci-libs/libsvm/files/3.11-openmp.patch | 34 |
2 files changed, 66 insertions, 0 deletions
diff --git a/sci-libs/libsvm/files/3.11-makefile.patch b/sci-libs/libsvm/files/3.11-makefile.patch new file mode 100644 index 000000000000..9de043fe62c2 --- /dev/null +++ b/sci-libs/libsvm/files/3.11-makefile.patch @@ -0,0 +1,32 @@ +--- Makefile.orig 2011-06-25 20:55:06.000000000 +0100 ++++ Makefile 2011-12-29 19:31:07.000000000 +0000 +@@ -1,19 +1,21 @@ + CXX ?= g++ +-CFLAGS = -Wall -Wconversion -O3 -fPIC ++CXXFLAGS ?= -Wall -Wconversion -O3 + SHVER = 2 ++PICFLAGS ?= -fPIC + +-all: svm-train svm-predict svm-scale ++all: svm-train svm-predict svm-scale lib + + lib: svm.o +- $(CXX) -shared -dynamiclib -Wl,-soname,libsvm.so.$(SHVER) svm.o -o libsvm.so.$(SHVER) ++ $(CXX) $(LDFLAGS) -shared -dynamiclib -Wl,-soname,libsvm.so.$(SHVER) svm.o -o libsvm.so.$(SHVER) -lm && \ ++ ln -s libsvm.so.$(SHVER) libsvm.so + + svm-predict: svm-predict.c svm.o +- $(CXX) $(CFLAGS) svm-predict.c svm.o -o svm-predict -lm ++ $(CXX) $(CXXFLAGS) $(LDFLAGS) svm-predict.c svm.o -o svm-predict -lm + svm-train: svm-train.c svm.o +- $(CXX) $(CFLAGS) svm-train.c svm.o -o svm-train -lm ++ $(CXX) $(CXXFLAGS) $(LDFLAGS) svm-train.c svm.o -o svm-train -lm + svm-scale: svm-scale.c +- $(CXX) $(CFLAGS) svm-scale.c -o svm-scale ++ $(CXX) $(CXXFLAGS) $(LDFLAGS) svm-scale.c -o svm-scale + svm.o: svm.cpp svm.h +- $(CXX) $(CFLAGS) -c svm.cpp ++ $(CXX) $(CXXFLAGS) $(PICFLAGS) -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 libsvm.so.$(SHVER) libsvm.so diff --git a/sci-libs/libsvm/files/3.11-openmp.patch b/sci-libs/libsvm/files/3.11-openmp.patch new file mode 100644 index 000000000000..6ddb6f0831f1 --- /dev/null +++ b/sci-libs/libsvm/files/3.11-openmp.patch @@ -0,0 +1,34 @@ +--- svm.cpp.orig 2011-05-27 04:32:19.000000000 +0100 ++++ svm.cpp 2011-12-29 19:17:07.000000000 +0000 +@@ -1281,6 +1281,9 @@ + int start, j; + if((start = cache->get_data(i,&data,len)) < len) + { ++#ifdef OPENMP ++#pragma omp parallel for private(j) ++#endif + for(j=start;j<len;j++) + data[j] = (Qfloat)(y[i]*y[j]*(this->*kernel_function)(i,j)); + } +@@ -2463,7 +2466,10 @@ + model->param.svm_type == NU_SVR) + { + double *sv_coef = model->sv_coef[0]; +- double sum = 0; ++ double sum = 0; int i; ++#ifdef OPENMP ++#pragma omp parallel for private(i) reduction(+:sum) ++#endif + for(i=0;i<model->l;i++) + sum += sv_coef[i] * Kernel::k_function(x,model->SV[i],model->param); + sum -= model->rho[0]; +@@ -2480,6 +2486,9 @@ + int l = model->l; + + double *kvalue = Malloc(double,l); ++#ifdef OPENMP ++#pragma omp parallel for private(i) ++#endif + for(i=0;i<l;i++) + kvalue[i] = Kernel::k_function(x,model->SV[i],model->param); + |