Changeset 130

Timestamp:

Jan 14, 2010, 12:17:47 AM (14 years ago)

Author:

(none)

Message:

added eigen parallel files

Location:

proiecte/PPPP/eigenface2

Files:

• Makefile (modified) (1 diff)
• pca (modified) (previous)
• pca.c (modified) (2 diffs)

proiecte/PPPP/eigenface2/Makefile

@@ -1 @@
-all: 
+all: pca pca_p
+pca: 
         gcc `pkg-config opencv --cflags --libs` -g -o pca facedet.c capture.c pca.c eigenface.c main.c
+pca_p:
+        gcc `pkg-config opencv --cflags --libs` -lm -fopenmp -g -o pca_p facedet.c capture.c pca_p.c eigenface_p.c main.c

proiecte/PPPP/eigenface2/pca.c

@@ -77 +77 @@
         {
                 //int offset = i * nEigens;
-                //~ cvEigenDecomposite(
+                cvEigenDecomposite(
+                        faceImgArr[i],
+                        nEigens,
+                        eigenVectArr,
+                        0, 0,
+                        pAvgTrainImg,
+                        //projectedTrainFaceMat->data.fl + i*nEigens);
+                        projectedTrainFaceMat->data.fl + i*offset);
+                //~ calcDecomp(
                         //~ faceImgArr[i],
                         //~ nEigens,
                         //~ eigenVectArr,
-                        //~ 0, 0,
                         //~ pAvgTrainImg,
                         //~ //projectedTrainFaceMat->data.fl + i*nEigens);
                         //~ projectedTrainFaceMat->data.fl + i*offset);
-                calcDecomp(
-                        faceImgArr[i],
-                        nEigens,
-                        eigenVectArr,
-                        pAvgTrainImg,
-                        //projectedTrainFaceMat->data.fl + i*nEigens);
-                        projectedTrainFaceMat->data.fl + i*offset);
         }
         
@@ -120 +120 @@
 
         // project the test image onto the PCA subspace
-        //~ cvEigenDecomposite(
+        cvEigenDecomposite(
+                faceImg,
+                nEigens,
+                eigenVectArr,
+                0, 0,
+                pAvgTrainImg,
+                projectedTestFace);
+        //~ calcDecomp(
                 //~ faceImg,
                 //~ nEigens,
                 //~ eigenVectArr,
-                //~ 0, 0,
                 //~ pAvgTrainImg,
                 //~ projectedTestFace);
-        calcDecomp(
-                faceImg,
-                nEigens,
-                eigenVectArr,
-                pAvgTrainImg,
-                projectedTestFace);
 
         iNearest = findNearestNeighbor(projectedTestFace);