From: Timo Heister <timo.heister@gmail.com>
Date: Thu, 21 Mar 2019 00:22:43 +0000 (-0600)
Subject: use 64 bit tbb range
X-Git-Tag: v9.1.0-rc1~266^2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F7836%2Fhead;p=dealii.git

use 64 bit tbb range
---

diff --git a/include/deal.II/lac/la_vector.templates.h b/include/deal.II/lac/la_vector.templates.h
index 7eaa6b3eea..94309bde36 100644
--- a/include/deal.II/lac/la_vector.templates.h
+++ b/include/deal.II/lac/la_vector.templates.h
@@ -92,7 +92,7 @@ namespace LinearAlgebra
     dealii::internal::VectorOperations::Vector_copy<Number, Number> copier(
       in_vector.values.get(), this->values.get());
     internal::VectorOperations::parallel_for(copier,
-                                             0,
+                                             static_cast<size_type>(0),
                                              this->size(),
                                              this->thread_loop_partitioner);
 
@@ -113,7 +113,7 @@ namespace LinearAlgebra
     dealii::internal::VectorOperations::Vector_copy<Number, Number2> copier(
       in_vector.values.get(), this->values.get());
     internal::VectorOperations::parallel_for(copier,
-                                             0,
+                                             static_cast<size_type>(0),
                                              this->size(),
                                              this->thread_loop_partitioner);
 
@@ -151,7 +151,7 @@ namespace LinearAlgebra
     internal::VectorOperations::Vectorization_multiply_factor<Number>
       vector_multiply(this->values.get(), factor);
     internal::VectorOperations::parallel_for(vector_multiply,
-                                             0,
+                                             static_cast<size_type>(0),
                                              this->size(),
                                              this->thread_loop_partitioner);
 
diff --git a/include/deal.II/lac/vector_operations_internal.h b/include/deal.II/lac/vector_operations_internal.h
index 95ea6bc18c..542c31499f 100644
--- a/include/deal.II/lac/vector_operations_internal.h
+++ b/include/deal.II/lac/vector_operations_internal.h
@@ -149,7 +149,7 @@ namespace internal
       }
 
       void
-      operator()(const tbb::blocked_range<unsigned int> &range) const
+      operator()(const tbb::blocked_range<size_type> &range) const
       {
         const size_type r_begin = start + range.begin() * chunk_size;
         const size_type r_end = std::min(start + range.end() * chunk_size, end);
@@ -188,8 +188,12 @@ namespace internal
             partitioner->acquire_one_partitioner();
 
           TBBForFunctor<Functor> generic_functor(functor, start, end);
-          parallel::internal::parallel_for(
-            0U, generic_functor.n_chunks, generic_functor, 1, tbb_partitioner);
+          parallel::internal::parallel_for(static_cast<size_type>(0),
+                                           static_cast<size_type>(
+                                             generic_functor.n_chunks),
+                                           generic_functor,
+                                           1,
+                                           tbb_partitioner);
           partitioner->release_one_partitioner(tbb_partitioner);
         }
       else if (vec_size > 0)
@@ -1317,7 +1321,7 @@ namespace internal
        * [range.begin(), range.end()).
        */
       void
-      operator()(const tbb::blocked_range<unsigned int> &range) const
+      operator()(const tbb::blocked_range<size_type> &range) const
       {
         for (size_type i = range.begin(); i < range.end(); ++i)
           accumulate_recursive(op,
@@ -1387,8 +1391,12 @@ namespace internal
           TBBReduceFunctor<Operation, ResultType> generic_functor(op,
                                                                   start,
                                                                   end);
-          parallel::internal::parallel_for(
-            0U, generic_functor.n_chunks, generic_functor, 1, tbb_partitioner);
+          parallel::internal::parallel_for(static_cast<size_type>(0),
+                                           static_cast<size_type>(
+                                             generic_functor.n_chunks),
+                                           generic_functor,
+                                           1,
+                                           tbb_partitioner);
           partitioner->release_one_partitioner(tbb_partitioner);
           result = generic_functor.do_sum();
         }