Distributed vector

README.rst

@@ -59,7 +59,7 @@ If you plan to use HPX we suggest to start with the latest released version
 
 If you would like to work with the cutting edge version from this repository
 we suggest following the current health status of the master branch by looking at
-our `contiguous integration results website <http://hermione.cct.lsu.edu/waterfall>`_.
+our `contiguous integration results website <http://hermione.cct.lsu.edu/console>`_.
 While we try to keep the master branch stable and usable, sometimes new bugs
 trick their way into the code base - you have been warned!
 
@@ -76,7 +76,7 @@ Version 1.0 (See accompanying file LICENSE_1_0.txt or an online copy available
 `here <http://www.boost.org/LICENSE_1_0.txt>`_).
 
 Before starting to build HPX, please read about the
-`prerequisites <http://stellar-group.github.io/hpx/docs/html/hpx/tutorial/getting_started/prereqs.html>`_.
+`prerequisites <http://stellar-group.github.io/hpx/docs/html/hpx/manual/build_system/prerequisites.html>`_.
 
 Linux
 -----
@@ -101,7 +101,7 @@ Linux
             /path/to/hpx/source/tree
 
    for instance::
-   
+
       cmake -DBOOST_ROOT=~/packages/boost \
             -DHWLOC_ROOT=/packages/hwloc \
             -DCMAKE_INSTALL_PREFIX=~/packages/hpx \
@@ -127,7 +127,7 @@ Linux
       gmake install
 
    to build and install the examples.
-   
+
 Please refer `here <http://stellar-group.github.io/hpx/docs/html/hpx/manual/build_system/building_hpx/build_recipes.html#hpx.manual.build_system.building_hpx.build_recipes.unix_installation>`_
 for more information about building HPX on a Linux system.
 
@@ -256,7 +256,7 @@ Windows
    "Where to build the binaries:", enter the full path to the build folder you
    created in step 2.
 
-4) Add CMake variable definitions (if any) by clicking the "Add Entry" button and selecting type 
+4) Add CMake variable definitions (if any) by clicking the "Add Entry" button and selecting type
    "String". Most probably you will need to at least add the directories where `Boost <http://www.boost.org>`_
    is located as BOOST_ROOT and where `Hwloc <http://www.open-mpi.org/projects/hwloc/>`_ is
    located as HWLOC_ROOT.
@@ -322,7 +322,7 @@ So far we only support BGClang for compiling HPX on the BlueGene/Q.
 5) Generate the HPX buildfiles using cmake::
 
     cmake -DHPX_PLATFORM=BlueGeneQ \
-          -CMAKE_TOOLCHAIN_FILE=/path/to/hpx/cmake/toolchains/BGQ.cmake \
+          -DCMAKE_TOOLCHAIN_FILE=/path/to/hpx/cmake/toolchains/BGQ.cmake \
           -DCMAKE_CXX_COMPILER=bgclang++11 \
           -DMPI_CXX_COMPILER=mpiclang++11 \
           -DHWLOC_ROOT=/path/to/hwloc/installation \
@@ -348,10 +348,10 @@ You can find more details about using HPX on a BlueGene/Q system
 Intel(R) Xeon/Phi
 -----------------
 
-After installing Boost and HWLOC, the build procedure is almost the same as 
-for how to build HPX on Unix Variants with the sole difference that you have 
+After installing Boost and HWLOC, the build procedure is almost the same as
+for how to build HPX on Unix Variants with the sole difference that you have
 to enable the Xeon Phi in the CMake Build system. This is achieved by invoking
-CMake in the following way:: 
+CMake in the following way::
 
     cmake \
          -DCMAKE_TOOLCHAIN_FILE=/path/to/hpx/cmake/toolchains/XeonPhi.cmake \
@@ -367,38 +367,38 @@ the `documentation <http://stellar-group.github.io/hpx/docs/html/hpx/manual/buil
  Acknowledgements
 ******************
 
-We would like to acknowledge the NSF, DoE, DARPA, the Center for Computation 
-and Technology (CCT) at Louisiana State University, and the Department of 
+We would like to acknowledge the NSF, DoE, DARPA, the Center for Computation
+and Technology (CCT) at Louisiana State University, and the Department of
 Computer Science 3 - Computer Architecture at the University of Erlangen
-Nuremberg who fund and support our work. 
+Nuremberg who fund and support our work.
 
-We would also like to thank the following 
-organizations for granting us allocations of their compute resources: 
+We would also like to thank the following
+organizations for granting us allocations of their compute resources:
 LSU HPC, LONI, XSEDE, NERSC, and the Gauss Center for Supercomputing.
 
 HPX is currently funded by
 
-* The National Science Foundation through awards 1117470 (APX), 
-  1240655 (STAR), 1447831 (PXFS), and 1339782 (STORM). 
+* The National Science Foundation through awards 1117470 (APX),
+  1240655 (STAR), 1447831 (PXFS), and 1339782 (STORM).
 
-  Any opinions, findings, and conclusions or 
-  recommendations expressed in this material are those of the author(s) 
+  Any opinions, findings, and conclusions or
+  recommendations expressed in this material are those of the author(s)
   and do not necessarily reflect the views of the National Science Foundation.
 
-* The Department of Energy (DoE) through the award DE-SC0008714 (XPRESS). 
-
-  Neither the United States Government nor any agency thereof, nor any of 
-  their employees, makes any warranty, express or implied, or assumes any 
-  legal liability or responsibility for the accuracy, completeness, or 
-  usefulness of any information, apparatus, product, or process disclosed, 
-  or represents that its use would not infringe privately owned rights. 
-  Reference herein to any specific commercial product, process, or service 
-  by trade name, trademark, manufacturer, or otherwise does not necessarily 
-  constitute or imply its endorsement, recommendation, or favoring by the 
-  United States Government or any agency thereof. The views and opinions of 
-  authors expressed herein do not necessarily state or reflect those of the 
+* The Department of Energy (DoE) through the award DE-SC0008714 (XPRESS).
+
+  Neither the United States Government nor any agency thereof, nor any of
+  their employees, makes any warranty, express or implied, or assumes any
+  legal liability or responsibility for the accuracy, completeness, or
+  usefulness of any information, apparatus, product, or process disclosed,
+  or represents that its use would not infringe privately owned rights.
+  Reference herein to any specific commercial product, process, or service
+  by trade name, trademark, manufacturer, or otherwise does not necessarily
+  constitute or imply its endorsement, recommendation, or favoring by the
+  United States Government or any agency thereof. The views and opinions of
+  authors expressed herein do not necessarily state or reflect those of the
   United States Government or any agency thereof.
 
-* The Bavarian Research Foundation (Bayerische Forschungsstfitung) through 
-  the grant AZ-987-11. 
+* The Bavarian Research Foundation (Bayerische Forschungsstfitung) through
+  the grant AZ-987-11.
 

docs/manual/build_system/recipe_bgq.qbk

@@ -58,7 +58,7 @@ You can then use this as your build command:
 
 ``
     cmake -DHPX_PLATFORM=BlueGeneQ \
-            -CMAKE_TOOLCHAIN_FILE=/path/to/hpx/cmake/toolchains/BGQ.cmake \
+            -DCMAKE_TOOLCHAIN_FILE=/path/to/hpx/cmake/toolchains/BGQ.cmake \
             -DCMAKE_CXX_COMPILER=bgclang++11 \
             -DMPI_CXX_COMPILER=mpiclang++11 \
             -DHWLOC_ROOT=/path/to/hwloc/installation \

examples/transpose/CMakeLists.txt

@@ -10,6 +10,7 @@ set(example_programs
   transpose_smp
   transpose_smp_block
   transpose
+  transpose_serial_vector
 )
 
 foreach(example_program ${example_programs})

examples/transpose/transpose.cpp

@@ -3,11 +3,6 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-// This is the eighth in a series of examples demonstrating the development
-// of a fully distributed solver for a simple 1D heat distribution problem.
-//
-// This example builds on example seven.
-
 #include <hpx/hpx_init.hpp>
 #include <hpx/hpx.hpp>
 #include <hpx/lcos/local/detail/invoke_when_ready.hpp>
@@ -19,10 +14,8 @@
 #include <algorithm>
 #include <vector>
 
-// Constant to shift column index
-#define COL_SHIFT 1000.00
-// Constant to shift row index
-#define ROW_SHIFT 0.001
+#define COL_SHIFT 1000.00           // Constant to shift column index
+#define ROW_SHIFT 0.001             // Constant to shift row index
 
 bool verbose = false;
 
@@ -176,8 +169,12 @@ HPX_REGISTER_MINIMAL_COMPONENT_FACTORY(block_component_type, block_component);
 typedef block_component::get_sub_block_action get_sub_block_action;
 HPX_REGISTER_ACTION(get_sub_block_action);
 
-void transpose(hpx::future<sub_block> A, hpx::future<sub_block> B, hpx::future<boost::uint64_t> block_order, hpx::future<boost::uint64_t> tile_size);
-double test_results(boost::uint64_t order, boost::uint64_t block_order, std::vector<block> & trans, boost::uint64_t blocks_start, boost::uint64_t blocks_end);
+void transpose(hpx::future<sub_block> A, hpx::future<sub_block> B,
+    hpx::future<boost::uint64_t> block_order,
+    hpx::future<boost::uint64_t> tile_size);
+double test_results(boost::uint64_t order, boost::uint64_t block_order,
+    std::vector<block> & trans, boost::uint64_t blocks_start,
+    boost::uint64_t blocks_end);
 
 ///////////////////////////////////////////////////////////////////////////////
 int hpx_main(boost::program_options::variables_map& vm)
@@ -194,11 +191,12 @@ int hpx_main(boost::program_options::variables_map& vm)
         boost::uint64_t tile_size = order;
 
         if(vm.count("tile_size"))
-          tile_size = vm["tile_size"].as<boost::uint64_t>();
+            tile_size = vm["tile_size"].as<boost::uint64_t>();
 
-        verbose = vm.count("verbose");
+        verbose = vm.count("verbose") ? true : false;
 
-        boost::uint64_t bytes = 2.0 * sizeof(double) * order * order;
+        boost::uint64_t bytes =
+            static_cast<boost::uint64_t>(2.0 * sizeof(double) * order * order);
 
         boost::uint64_t num_blocks = num_localities * num_local_blocks;
 
@@ -254,8 +252,10 @@ int hpx_main(boost::program_options::variables_map& vm)
         for_each(par, boost::begin(range), boost::end(range),
             [&](boost::uint64_t b)
             {
-                boost::shared_ptr<block_component> A_ptr = hpx::get_ptr<block_component>(A[b].get_gid()).get();
-                boost::shared_ptr<block_component> B_ptr = hpx::get_ptr<block_component>(B[b].get_gid()).get();
+                boost::shared_ptr<block_component> A_ptr =
+                    hpx::get_ptr<block_component>(A[b].get_gid()).get();
+                boost::shared_ptr<block_component> B_ptr =
+                    hpx::get_ptr<block_component>(B[b].get_gid()).get();
 
                 for(boost::uint64_t i = 0; i < order; ++i)
                 {
@@ -273,7 +273,7 @@ int hpx_main(boost::program_options::variables_map& vm)
         double avgtime = 0.0;
         double maxtime = 0.0;
         double mintime = 366.0 * 24.0*3600.0; // set the minimum time to a large value;
-                                             // one leap year should be enough
+                                              // one leap year should be enough
         for(boost::uint64_t iter = 0; iter < iterations; ++iter)
         {
             hpx::util::high_resolution_timer t;
@@ -334,15 +334,16 @@ int hpx_main(boost::program_options::variables_map& vm)
             if(errsq < epsilon)
             {
                 std::cout << "Solution validates\n";
-                avgtime = avgtime/static_cast<double>((std::max)(iterations-1, static_cast<boost::uint64_t>(1)));
+                avgtime = avgtime/static_cast<double>(
+                    (std::max)(iterations-1, static_cast<boost::uint64_t>(1)));
                 std::cout
                   << "Rate (MB/s): " << 1.e-6 * bytes/mintime << ", "
                   << "Avg time (s): " << avgtime << ", "
                   << "Min time (s): " << mintime << ", "
                   << "Max time (s): " << maxtime << "\n";
 
                 if(verbose)
-                  std::cout << "Squared errors: " << errsq << "\n";
+                    std::cout << "Squared errors: " << errsq << "\n";
             }
             else
             {
@@ -368,9 +369,11 @@ int main(int argc, char* argv[])
         ("iterations", value<boost::uint64_t>()->default_value(10),
          "# iterations")
         ("tile_size", value<boost::uint64_t>(),
-         "Number of tiles to divide the individual matrix blocks for improved cache and TLB performance")
+         "Number of tiles to divide the individual matrix blocks for improved "
+         "cache and TLB performance")
         ("num_blocks", value<boost::uint64_t>()->default_value(1),
-         "Number of blocks to divide the individual matrix blocks for improved cache and TLB performance")
+         "Number of blocks to divide the individual matrix blocks for "
+         "improved cache and TLB performance")
         ( "verbose", "Verbose output")
     ;
 
@@ -382,7 +385,9 @@ int main(int argc, char* argv[])
     return hpx::init(desc_commandline, argc, argv, cfg);
 }
 
-void transpose(hpx::future<sub_block> Af, hpx::future<sub_block> Bf, hpx::future<boost::uint64_t> block_order_fut, hpx::future<boost::uint64_t> tile_size_fut)
+void transpose(hpx::future<sub_block> Af, hpx::future<sub_block> Bf,
+    hpx::future<boost::uint64_t> block_order_fut,
+    hpx::future<boost::uint64_t> tile_size_fut)
 {
     const sub_block A(Af.get());
     sub_block B(Bf.get());
@@ -416,7 +421,9 @@ void transpose(hpx::future<sub_block> Af, hpx::future<sub_block> Bf, hpx::future
     }
 }
 
-double test_results(boost::uint64_t order, boost::uint64_t block_order, std::vector<block> & trans, boost::uint64_t blocks_start, boost::uint64_t blocks_end)
+double test_results(boost::uint64_t order, boost::uint64_t block_order,
+    std::vector<block> & trans, boost::uint64_t blocks_start,
+    boost::uint64_t blocks_end)
 {
     using hpx::parallel::for_each;
     using hpx::parallel::par;
@@ -445,7 +452,7 @@ double test_results(boost::uint64_t order, boost::uint64_t block_order, std::vec
         );
 
     if(verbose)
-      std::cout << " Squared sum of differences: " << errsq << "\n";
+        std::cout << " Squared sum of differences: " << errsq << "\n";
 
     return errsq;
 }

examples/transpose/transpose_serial.cpp

@@ -3,21 +3,14 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-// This is the eighth in a series of examples demonstrating the development
-// of a fully distributed solver for a simple 1D heat distribution problem.
-//
-// This example builds on example seven.
-
 #include <hpx/hpx_init.hpp>
 #include <hpx/hpx.hpp>
 
 #include <algorithm>
 #include <vector>
 
-// Constant to shift column index
-#define COL_SHIFT 1000.00
-// Constant to shift row index
-#define ROW_SHIFT 0.001
+#define COL_SHIFT 1000.00           // Constant to shift column index
+#define ROW_SHIFT 0.001             // Constant to shift row index
 
 bool verbose = false;
 
@@ -31,11 +24,12 @@ int hpx_main(boost::program_options::variables_map& vm)
     boost::uint64_t tile_size = order;
 
     if(vm.count("tile_size"))
-      tile_size = vm["tile_size"].as<boost::uint64_t>();
+        tile_size = vm["tile_size"].as<boost::uint64_t>();
 
-    verbose = vm.count("verbose");
+    verbose = vm.count("verbose") ? true : false;
 
-    boost::uint64_t bytes = 2.0 * sizeof(double) * order * order;
+    boost::uint64_t bytes =
+        static_cast<boost::uint64_t>(2.0 * sizeof(double) * order * order);
 
     std::vector<double> A(order * order);
     std::vector<double> B(order * order);
@@ -64,7 +58,7 @@ int hpx_main(boost::program_options::variables_map& vm)
     double avgtime = 0.0;
     double maxtime = 0.0;
     double mintime = 366.0 * 24.0*3600.0; // set the minimum time to a large value;
-                                         // one leap year should be enough
+                                          // one leap year should be enough
     for(boost::uint64_t iter = 0; iter < iterations; ++iter)
     {
         hpx::util::high_resolution_timer t;
@@ -75,16 +69,17 @@ int hpx_main(boost::program_options::variables_map& vm)
             {
                 for(boost::uint64_t j = 0; j < order; j += tile_size)
                 {
-                    for(boost::uint64_t it = i; it < (std::min)(order, i + tile_size); ++it)
+                    boost::uint64_t i_max = (std::min)(order, i + tile_size);
+                    for(boost::uint64_t it = i; it < i_max; ++it)
                     {
-                        for(boost::uint64_t jt = j; jt < (std::min)(order, j + tile_size); ++jt)
+                        boost::uint64_t j_max = (std::min)(order, j + tile_size);
+                        for(boost::uint64_t jt = j; jt < j_max; ++jt)
                         {
                             B[it + order * jt] = A[jt + order * it];
                         }
                     }
                 }
             }
-
         }
         else
         {
@@ -115,15 +110,16 @@ int hpx_main(boost::program_options::variables_map& vm)
     if(errsq < epsilon)
     {
         std::cout << "Solution validates\n";
-        avgtime = avgtime/static_cast<double>((std::max)(iterations-1, static_cast<boost::uint64_t>(1)));
+        avgtime = avgtime/static_cast<double>(
+            (std::max)(iterations-1, static_cast<boost::uint64_t>(1)));
         std::cout
           << "Rate (MB/s): " << 1.e-6 * bytes/mintime << ", "
           << "Avg time (s): " << avgtime << ", "
           << "Min time (s): " << mintime << ", "
           << "Max time (s): " << maxtime << "\n";
 
         if(verbose)
-          std::cout << "Squared errors: " << errsq << "\n";
+            std::cout << "Squared errors: " << errsq << "\n";
     }
     else
     {
@@ -147,7 +143,8 @@ int main(int argc, char* argv[])
         ("iterations", value<boost::uint64_t>()->default_value(10),
          "# iterations")
         ("tile_size", value<boost::uint64_t>(),
-         "Number of tiles to divide the individual matrix blocks for improved cache and TLB performance")
+         "Number of tiles to divide the individual matrix blocks for improved "
+         "cache and TLB performance")
         ( "verbose", "Verbose output")
     ;
 
@@ -173,7 +170,7 @@ double test_results(boost::uint64_t order, std::vector<double> const & trans)
     }
 
     if(verbose)
-      std::cout << " Squared sum of differences: " << errsq << "\n";
+        std::cout << " Squared sum of differences: " << errsq << "\n";
 
     return errsq;
 }