#ifndef WIN32 to #ifdef HAVE_LAPACK transition

shogun-toolbox · Aug 27, 2011 · 417d6c9 · 417d6c9
1 parent 5599548
commit 417d6c9
Show file tree

Hide file tree

Showing 14 changed files with 39 additions and 39 deletions.
diff --git a/src/shogun/base/Parallel.h b/src/shogun/base/Parallel.h
@@ -61,7 +61,7 @@ class Parallel
 	 */
 	inline void set_num_threads(int32_t n)
 	{
-#ifdef WIN32
+#ifndef HAVE_PTHREAD
 		ASSERT(n==1);
 #endif
 		num_threads=n;

diff --git a/src/shogun/classifier/svm/SVM.cpp b/src/shogun/classifier/svm/SVM.cpp
@@ -18,7 +18,7 @@
 
 #include <string.h>
 
-#ifndef WIN32
+#ifdef HAVE_PTHREAD
 #include <pthread.h>
 #endif
 

diff --git a/src/shogun/classifier/svm/SVMLight.cpp b/src/shogun/classifier/svm/SVMLight.cpp
@@ -42,7 +42,7 @@
 
 #include <shogun/base/Parallel.h>
 
-#ifndef WIN32
+#ifdef HAVE_PTHREAD
 #include <pthread.h>
 #endif
 
@@ -1043,7 +1043,7 @@ void CSVMLight::compute_matrices_for_optimization_parallel(
 												   chosen, active2dnum, key, a, lin, c,
 												   varnum, totdoc, aicache, qp) ;
 	}
-#ifndef WIN32
+#ifdef HAVE_PTHREAD
 	else
 	{
 		register int32_t ki,kj,i,j;
@@ -1452,7 +1452,7 @@ void CSVMLight::update_linear_component(
 						lin[j]+=kernel->compute_optimized(docs[j]);
 					}
 				}
-#ifndef WIN32
+#ifdef HAVE_PTHREAD
 				else
 				{
 					int32_t num_elem = 0 ;
@@ -1626,7 +1626,7 @@ void CSVMLight::update_linear_component_mkl_linadd(
 		for (int32_t i=0; i<num; i++)
 			kernel->compute_by_subkernel(i,&W[i*num_kernels]);
 	}
-#ifndef WIN32
+#ifdef HAVE_PTHREAD
 	else
 	{
 		pthread_t* threads = SG_MALLOC(pthread_t, parallel->get_num_threads()-1);
@@ -2134,7 +2134,7 @@ void CSVMLight::reactivate_inactive_examples(
 				  params.end=totdoc;
 				  reactivate_inactive_examples_linadd_helper((void*) &params);
 			  }
-#ifndef WIN32
+#ifdef HAVE_PTHREAD
 			  else
 			  {
 				  pthread_t* threads = SG_MALLOC(pthread_t, num_threads-1);
@@ -2266,7 +2266,7 @@ void CSVMLight::reactivate_inactive_examples(
 					  lin[j]+=(a[i]-a_old[i])*aicache[j]*(float64_t)label[i];
 			  }
 		  }
-#ifndef WIN32
+#ifdef HAVE_PTHREAD
 		  else
 		  {
 			  //find number of the changed ones

diff --git a/src/shogun/classifier/svm/SVMLightOneClass.cpp b/src/shogun/classifier/svm/SVMLightOneClass.cpp
@@ -30,7 +30,7 @@ extern "C" {
 
 #include <shogun/base/Parallel.h>
 
-#ifndef WIN32
+#ifdef HAVE_PTHREAD
 #include <pthread.h>
 #endif
 

diff --git a/src/shogun/clustering/Hierarchical.cpp b/src/shogun/clustering/Hierarchical.cpp
@@ -15,7 +15,7 @@
 #include <shogun/mathematics/Math.h>
 #include <shogun/base/Parallel.h>
 
-#ifndef WIN32
+#ifdef HAVE_PTHREAD
 #include <pthread.h>
 #endif
 

diff --git a/src/shogun/clustering/KMeans.cpp b/src/shogun/clustering/KMeans.cpp
@@ -16,7 +16,7 @@
 #include <shogun/mathematics/Math.h>
 #include <shogun/base/Parallel.h>
 
-#ifndef WIN32
+#ifdef HAVE_PTHREAD
 #include <pthread.h>
 #endif
 

diff --git a/src/shogun/features/DotFeatures.cpp b/src/shogun/features/DotFeatures.cpp
@@ -14,7 +14,7 @@
 #include <shogun/base/Parallel.h>
 #include <shogun/base/Parameter.h>
 
-#ifndef WIN32
+#ifdef HAVE_PTHREAD
 #include <pthread.h>
 #endif
 
@@ -83,7 +83,7 @@ void CDotFeatures::dense_dot_range(float64_t* output, int32_t start, int32_t sto
 
 	CSignal::clear_cancel();
 
-#ifndef WIN32
+#ifdef HAVE_PTHREAD
 	if (num_threads < 2)
 	{
 #endif
@@ -99,7 +99,7 @@ void CDotFeatures::dense_dot_range(float64_t* output, int32_t start, int32_t sto
 		params.bias=b;
 		params.progress=false; //true;
 		dense_dot_range_helper((void*) &params);
-#ifndef WIN32
+#ifdef HAVE_PTHREAD
 	}
 	else
 	{
@@ -161,7 +161,7 @@ void CDotFeatures::dense_dot_range_subset(int32_t* sub_index, int32_t num, float
 
 	CSignal::clear_cancel();
 
-#ifndef WIN32
+#ifdef HAVE_PTHREAD
 	if (num_threads < 2)
 	{
 #endif
@@ -177,7 +177,7 @@ void CDotFeatures::dense_dot_range_subset(int32_t* sub_index, int32_t num, float
 		params.bias=b;
 		params.progress=false; //true;
 		dense_dot_range_helper((void*) &params);
-#ifndef WIN32
+#ifdef HAVE_PTHREAD
 	}
 	else
 	{

diff --git a/src/shogun/features/HashedWDFeaturesTransposed.cpp b/src/shogun/features/HashedWDFeaturesTransposed.cpp
@@ -13,7 +13,7 @@
 #include <shogun/lib/Signal.h>
 #include <shogun/base/Parallel.h>
 
-#ifndef WIN32
+#ifdef HAVE_PTHREAD
 #include <pthread.h>
 #endif
 
@@ -213,7 +213,7 @@ void CHashedWDFeaturesTransposed::dense_dot_range(float64_t* output, int32_t sta
 	if (dim != w_dim)
 		SG_ERROR("Dimensions don't match, vec_len=%d, w_dim=%d\n", dim, w_dim);
 
-#ifndef WIN32
+#ifdef HAVE_PTHREAD
 	if (num_threads < 2)
 	{
 #endif
@@ -229,7 +229,7 @@ void CHashedWDFeaturesTransposed::dense_dot_range(float64_t* output, int32_t sta
 		params.progress=false; //true;
 		params.index=index;
 		dense_dot_range_helper((void*) &params);
-#ifndef WIN32
+#ifdef HAVE_PTHREAD
 	}
 	else
 	{
@@ -297,7 +297,7 @@ void CHashedWDFeaturesTransposed::dense_dot_range_subset(int32_t* sub_index, int
 	if (dim != w_dim)
 		SG_ERROR("Dimensions don't match, vec_len=%d, w_dim=%d\n", dim, w_dim);
 
-#ifndef WIN32
+#ifdef HAVE_PTHREAD
 	if (num_threads < 2)
 	{
 #endif
@@ -313,7 +313,7 @@ void CHashedWDFeaturesTransposed::dense_dot_range_subset(int32_t* sub_index, int
 		params.progress=false; //true;
 		params.index=index;
 		dense_dot_range_helper((void*) &params);
-#ifndef WIN32
+#ifdef HAVE_PTHREAD
 	}
 	else
 	{

diff --git a/src/shogun/kernel/Kernel.cpp b/src/shogun/kernel/Kernel.cpp
@@ -32,7 +32,7 @@
 #include <unistd.h>
 #include <math.h>
 
-#ifndef WIN32
+#ifdef HAVE_PTHREAD
 #include <pthread.h>
 #endif
 
@@ -355,13 +355,13 @@ void* CKernel::cache_multiple_kernel_row_helper(void* p)
 // Fills cache for the rows in key
 void CKernel::cache_multiple_kernel_rows(int32_t* rows, int32_t num_rows)
 {
-#ifndef WIN32
+#ifdef HAVE_PTHREAD
 	if (parallel->get_num_threads()<2)
 	{
 #endif
 		for(int32_t i=0;i<num_rows;i++)
 			cache_kernel_row(rows[i]);
-#ifndef WIN32
+#ifdef HAVE_PTHREAD
 	}
 	else
 	{

diff --git a/src/shogun/kernel/SpectrumRBFKernel.cpp b/src/shogun/kernel/SpectrumRBFKernel.cpp
@@ -29,7 +29,7 @@
 
 #include <assert.h>
 
-#ifndef WIN32
+#ifdef HAVE_PTHREAD
 #include <pthread.h>
 #endif
 
@@ -121,13 +121,13 @@ void CSpectrumRBFKernel::read_profiles_and_sequences()
 	SG_DEBUG("initializing background\n");
 	double background[20]; // profile
 	background[0]=0.0799912015849807; //A
-  background[1]=0.0484482507611578;//R
-  background[2]=0.044293531582512;//N
-  background[3]=0.0578891399707563;//D
-  background[4]=0.0171846021407367;//C
-  background[5]=0.0380578923048682;//Q
-  background[6]=0.0638169929675978;//E
-  background[7]=0.0760659374742852;//G
+	background[1]=0.0484482507611578;//R
+	background[2]=0.044293531582512;//N
+	background[3]=0.0578891399707563;//D
+	background[4]=0.0171846021407367;//C
+	background[5]=0.0380578923048682;//Q
+	background[6]=0.0638169929675978;//E
+	background[7]=0.0760659374742852;//G
 	background[8]=0.0223465499452473;//H
 	background[9]=0.0550905793661343;//I
 	background[10]=0.0866897071203864;//L
@@ -151,7 +151,7 @@ void CSpectrumRBFKernel::read_profiles_and_sequences()
 
 	SG_DEBUG("Reading profiles from %s\n", filename);
 	std::string line;
-  while (!fin.eof())
+	while (!fin.eof())
 	{ 
 		std::getline(fin, line);
 

diff --git a/src/shogun/kernel/WeightedDegreePositionStringKernel.cpp b/src/shogun/kernel/WeightedDegreePositionStringKernel.cpp
@@ -22,7 +22,7 @@
 
 #include <shogun/classifier/svm/SVM.h>
 
-#ifndef WIN32
+#ifdef HAVE_PTHREAD
 #include <pthread.h>
 #endif
 
@@ -1277,7 +1277,7 @@ void CWeightedDegreePositionStringKernel::compute_batch(
 				SG_PROGRESS(j,0,num_feat);
 			}
 	}
-#ifndef WIN32
+#ifdef HAVE_PTHREAD
 	else
 	{
 

diff --git a/src/shogun/machine/DistanceMachine.cpp b/src/shogun/machine/DistanceMachine.cpp
@@ -67,7 +67,7 @@ void CDistanceMachine::distances_lhs(float64_t* result,int32_t idx_a1,int32_t id
 
         run_distance_thread_lhs((void*) &param);
     }
-#ifndef WIN32
+#ifdef HAVE_PTHREAD
     else
     {
         pthread_t* threads = SG_MALLOC(pthread_t, num_threads-1);

diff --git a/src/shogun/machine/KernelMachine.cpp b/src/shogun/machine/KernelMachine.cpp
@@ -150,7 +150,7 @@ CLabels* CKernelMachine::apply()
 				params.verbose=true;
 				apply_helper((void*) &params);
 			}
-#ifndef WIN32
+#ifdef HAVE_PTHREAD
 			else
 			{
 				pthread_t* threads = SG_MALLOC(pthread_t, num_threads-1);

diff --git a/src/shogun/regression/svr/SVRLight.cpp b/src/shogun/regression/svr/SVRLight.cpp
@@ -30,7 +30,7 @@ extern "C" {
 
 #include <shogun/base/Parallel.h>
 
-#ifndef WIN32
+#ifdef HAVE_PTHREAD
 #include <pthread.h>
 #endif
 
@@ -399,7 +399,7 @@ void CSVRLight::update_linear_component(
 						lin[j]+=kernel->compute_optimized(regression_fix_index(docs[j]));
 					}
 				}
-#ifndef WIN32
+#ifdef HAVE_PTHREAD
 				else
 				{
 					int32_t num_elem = 0 ;