Version 18.75

Author: mkazhdan

Src/FEMTree.h

@@ -2525,7 +2525,7 @@ namespace PoissonRecon
 			const DenseNodeData< T , FEMSignatures >& _coefficients;
 			DenseNodeData< T , FEMSignatures > _coarseCoefficients;
 		public:
-			_MultiThreadedEvaluator( const FEMTree* tree , const DenseNodeData< T , FEMSignatures >& coefficients , int threads=std::thread::hardware_concurrency() );
+			_MultiThreadedEvaluator( const FEMTree* tree , const DenseNodeData< T , FEMSignatures >& coefficients , int threads=ThreadPool::NumThreads() );
 			template< unsigned int _PointD=PointD > CumulativeDerivativeValues< T , Dim , _PointD > values( Point< Real , Dim > p , int thread=0 , const FEMTreeNode* node=NULL );
 			template< unsigned int _PointD=PointD > CumulativeDerivativeValues< T , Dim , _PointD > centerValues( const FEMTreeNode* node , int thread=0 );
 			template< unsigned int _PointD=PointD > CumulativeDerivativeValues< T , Dim , _PointD > cornerValues( const FEMTreeNode* node , int corner , int thread=0 );
@@ -2539,7 +2539,7 @@ namespace PoissonRecon
 			std::vector< ConstPointSupportKey< IsotropicUIntPack< Dim , DensityDegree > > > _neighborKeys;
 			const DensityEstimator< DensityDegree >& _density;
 		public:
-			MultiThreadedWeightEvaluator( const FEMTree* tree , const DensityEstimator< DensityDegree >& density , int threads=std::thread::hardware_concurrency() );
+			MultiThreadedWeightEvaluator( const FEMTree* tree , const DensityEstimator< DensityDegree >& density , int threads=ThreadPool::NumThreads() );
 			Real weight( Point< Real , Dim > p , int thread=0 );
 		};
 
@@ -2555,7 +2555,7 @@ namespace PoissonRecon
 			typename FEMIntegrator::template PointEvaluator< UIntPack< FEMSigs ... > , ZeroUIntPack< Dim > > *_pointEvaluator;
 			const SparseNodeData< T , FEMSignatures >& _coefficients;
 		public:
-			MultiThreadedSparseEvaluator( const FEMTree* tree , const SparseNodeData< T , FEMSignatures >& coefficients , int threads=std::thread::hardware_concurrency() );
+			MultiThreadedSparseEvaluator( const FEMTree* tree , const SparseNodeData< T , FEMSignatures >& coefficients , int threads=ThreadPool::NumThreads() );
 			~MultiThreadedSparseEvaluator( void ){ if( _pointEvaluator ) delete _pointEvaluator; }
 			void addValue( Point< Real , Dim > p , T &t , int thread=0 , const FEMTreeNode* node=NULL );
 			template< typename AccumulationFunctor/*=std::function< void ( const T & , Real s ) > */ >

Src/FEMTree.inl

@@ -337,7 +337,7 @@ FEMTree< Dim , Real >::FEMTree( size_t blockSize ) : _nodeInitializer( *this ) ,
 {
 	if( blockSize )
 	{
-		nodeAllocators.resize( std::thread::hardware_concurrency() );
+		nodeAllocators.resize( ThreadPool::NumThreads() );
 		for( size_t i=0 ; i<nodeAllocators.size() ; i++ )
 		{
 			nodeAllocators[i] = new Allocator< FEMTreeNode >();

Src/PreProcessor.h

@@ -46,7 +46,7 @@ DAMAGE.
 #define USE_DEEP_TREE_NODES						// Chances are that if you are using big data, you want to support a tree with depth>15.
 #endif // BIG_DATA
 
-#define ADAPTIVE_SOLVERS_VERSION "18.74"		// The version of the code
+#define ADAPTIVE_SOLVERS_VERSION "18.75"		// The version of the code
 #define MEMORY_ALLOCATOR_BLOCK_SIZE 1<<12		// The chunk size for memory allocation
 
 #define ADAPTIVE_PADDING						// Only pushes padding points deep enough so that they are "close" to the slab in terms of units at that depth

Src/Reconstructors.streams.h

@@ -240,7 +240,7 @@ namespace PoissonRecon
 
 			OutputInputFaceStream( void )
 			{
-				size_t sz = std::thread::hardware_concurrency();
+				size_t sz = ThreadPool::NumThreads();
 
 				_backingVectors.resize( sz , nullptr );
 
@@ -293,7 +293,7 @@ namespace PoissonRecon
 
 			~OutputInputFaceStream( void )
 			{
-				size_t sz = std::thread::hardware_concurrency();
+				size_t sz = ThreadPool::NumThreads();
 
 				delete _backingVector;
 				delete _backingFile;
@@ -351,7 +351,7 @@ namespace PoissonRecon
 			OutputInputFactoryTypeStream( Factory &factory , std::function< Vertex ( const Position< Real , Dim > & , const Gradient< Real , Dim > & , const Weight< Real > & , const Data & ...  ) > converter )
 				: _converter( converter )
 			{
-				size_t sz = std::thread::hardware_concurrency();
+				size_t sz = ThreadPool::NumThreads();
 
 				_backingVectors.resize( sz , nullptr );
 
@@ -399,7 +399,7 @@ namespace PoissonRecon
 
 			~OutputInputFactoryTypeStream( void )
 			{
-				size_t sz = std::thread::hardware_concurrency();
+				size_t sz = ThreadPool::NumThreads();
 
 				delete _backingVector;
 				delete _backingFile;