| 1 |
bicatali 11/12/29 19:52:41 |
| 2 |
|
| 3 |
Added: 3.11-openmp.patch 3.11-makefile.patch |
| 4 |
Log: |
| 5 |
Version bump |
| 6 |
|
| 7 |
(Portage version: 2.1.10.41/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 sci-libs/libsvm/files/3.11-openmp.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/libsvm/files/3.11-openmp.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/libsvm/files/3.11-openmp.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: 3.11-openmp.patch |
| 16 |
=================================================================== |
| 17 |
--- svm.cpp.orig 2011-05-27 04:32:19.000000000 +0100 |
| 18 |
+++ svm.cpp 2011-12-29 19:17:07.000000000 +0000 |
| 19 |
@@ -1281,6 +1281,9 @@ |
| 20 |
int start, j; |
| 21 |
if((start = cache->get_data(i,&data,len)) < len) |
| 22 |
{ |
| 23 |
+#ifdef OPENMP |
| 24 |
+#pragma omp parallel for private(j) |
| 25 |
+#endif |
| 26 |
for(j=start;j<len;j++) |
| 27 |
data[j] = (Qfloat)(y[i]*y[j]*(this->*kernel_function)(i,j)); |
| 28 |
} |
| 29 |
@@ -2463,7 +2466,10 @@ |
| 30 |
model->param.svm_type == NU_SVR) |
| 31 |
{ |
| 32 |
double *sv_coef = model->sv_coef[0]; |
| 33 |
- double sum = 0; |
| 34 |
+ double sum = 0; int i; |
| 35 |
+#ifdef OPENMP |
| 36 |
+#pragma omp parallel for private(i) reduction(+:sum) |
| 37 |
+#endif |
| 38 |
for(i=0;i<model->l;i++) |
| 39 |
sum += sv_coef[i] * Kernel::k_function(x,model->SV[i],model->param); |
| 40 |
sum -= model->rho[0]; |
| 41 |
@@ -2480,6 +2486,9 @@ |
| 42 |
int l = model->l; |
| 43 |
|
| 44 |
double *kvalue = Malloc(double,l); |
| 45 |
+#ifdef OPENMP |
| 46 |
+#pragma omp parallel for private(i) |
| 47 |
+#endif |
| 48 |
for(i=0;i<l;i++) |
| 49 |
kvalue[i] = Kernel::k_function(x,model->SV[i],model->param); |
| 50 |
|
| 51 |
|
| 52 |
|
| 53 |
|
| 54 |
1.1 sci-libs/libsvm/files/3.11-makefile.patch |
| 55 |
|
| 56 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/libsvm/files/3.11-makefile.patch?rev=1.1&view=markup |
| 57 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/libsvm/files/3.11-makefile.patch?rev=1.1&content-type=text/plain |
| 58 |
|
| 59 |
Index: 3.11-makefile.patch |
| 60 |
=================================================================== |
| 61 |
--- Makefile.orig 2011-06-25 20:55:06.000000000 +0100 |
| 62 |
+++ Makefile 2011-12-29 19:31:07.000000000 +0000 |
| 63 |
@@ -1,19 +1,21 @@ |
| 64 |
CXX ?= g++ |
| 65 |
-CFLAGS = -Wall -Wconversion -O3 -fPIC |
| 66 |
+CXXFLAGS ?= -Wall -Wconversion -O3 |
| 67 |
SHVER = 2 |
| 68 |
+PICFLAGS ?= -fPIC |
| 69 |
|
| 70 |
-all: svm-train svm-predict svm-scale |
| 71 |
+all: svm-train svm-predict svm-scale lib |
| 72 |
|
| 73 |
lib: svm.o |
| 74 |
- $(CXX) -shared -dynamiclib -Wl,-soname,libsvm.so.$(SHVER) svm.o -o libsvm.so.$(SHVER) |
| 75 |
+ $(CXX) $(LDFLAGS) -shared -dynamiclib -Wl,-soname,libsvm.so.$(SHVER) svm.o -o libsvm.so.$(SHVER) -lm && \ |
| 76 |
+ ln -s libsvm.so.$(SHVER) libsvm.so |
| 77 |
|
| 78 |
svm-predict: svm-predict.c svm.o |
| 79 |
- $(CXX) $(CFLAGS) svm-predict.c svm.o -o svm-predict -lm |
| 80 |
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) svm-predict.c svm.o -o svm-predict -lm |
| 81 |
svm-train: svm-train.c svm.o |
| 82 |
- $(CXX) $(CFLAGS) svm-train.c svm.o -o svm-train -lm |
| 83 |
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) svm-train.c svm.o -o svm-train -lm |
| 84 |
svm-scale: svm-scale.c |
| 85 |
- $(CXX) $(CFLAGS) svm-scale.c -o svm-scale |
| 86 |
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) svm-scale.c -o svm-scale |
| 87 |
svm.o: svm.cpp svm.h |
| 88 |
- $(CXX) $(CFLAGS) -c svm.cpp |
| 89 |
+ $(CXX) $(CXXFLAGS) $(PICFLAGS) -c svm.cpp |
| 90 |
clean: |
| 91 |
- rm -f *~ svm.o svm-train svm-predict svm-scale libsvm.so.$(SHVER) |
| 92 |
+ rm -f *~ svm.o svm-train svm-predict svm-scale libsvm.so.$(SHVER) libsvm.so |
Archives