Changeset 235

Timestamp:

01/15/09 14:46:53 (16 years ago)

Author:

smidl

Message:

compilation fixes for multicore

Files:

• CMakeLists.txt (modified) (1 diff)
• bdm/CMakeLists.txt (modified) (1 diff)
• bdm/stat/emix.cpp (modified) (1 diff)
• bdm/stat/libEF.h (modified) (2 diffs)
• tests/CMakeLists.txt (modified) (1 diff)

CMakeLists.txt

@@ -35 +35 @@
 FIND_PACKAGE(ITPP REQUIRED)
 FIND_PACKAGE(ACML COMPONENTS)
-FIND_PACKAGE(XERCES REQUIRED)
+FIND_PACKAGE(XERCES COMPONENTS)
 
 IF(ITPP_FOUND)

bdm/CMakeLists.txt

@@ -6 +6 @@
 SET(BdmUI userinfo.cpp userinfo.h)
 
+IF(${XERCES_FOUND})
 add_library (bdm itpp_ext.cpp itpp_ext.h osutils.cpp osutils.h ${BdmMath} ${BdmStat} ${BdmEstim} ${BdmUI})
-
+ELSE(${XERCES_FOUND})
+add_library (bdm itpp_ext.cpp itpp_ext.h osutils.cpp osutils.h ${BdmMath} ${BdmStat} ${BdmEstim})
+ENDIF(${XERCES_FOUND})

bdm/stat/emix.cpp

@@ -24 +24 @@
         //Sample which component
         vec cumDist = cumsum ( w );
-        double u0 = UniRNG.sample();
+        double u0;
+        #pragma omp critical
+        u0 = UniRNG.sample();
 
         int i=0;

bdm/stat/libEF.h

@@ -688 +688 @@
 vec enorm<sq_T>::sample() const {
         vec x ( dim );
+        #pragma omp critical 
         NorRNG.sample_vector ( dim,x );
         vec smp = R.sqrt_mult ( x );
@@ -703 +704 @@
 
         for ( i=0;i<N;i++ ) {
+        #pragma omp critical 
                 NorRNG.sample_vector ( dim,x );
                 pom = R.sqrt_mult ( x );

tests/CMakeLists.txt

@@ -39 +39 @@
 EXEC(blas_test)
 
+IF(${XERCES_FOUND})
 EXEC(testUI)
 target_link_libraries (testUI ${XERCES_LIBRARIES})
+ENDIF(${XERCES_FOUND})