Merge pull request #43 from bmerry/c++11

Use C++11

Author: bmerry

Changelog

@@ -1,3 +1,8 @@
+Development version
+-------------------
+* Remove some uses of TR1/Boost in favour of C++11
+* Make C++11 mandatory
+
 1.5.1
 -----
 * Workaround for NVIDIA driver bug that prevents scan from autotuning on Pascal hardware

LICENSE

@@ -1,4 +1,5 @@
-Copyright (c) 2012-2013 University of Cape Town
+Copyright (c) 2012-2014 University of Cape Town
+Copyright (c) 2014-2018 Bruce Merry
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README

@@ -6,7 +6,6 @@ For the impatient, the process is
 $ ./waf configure [ --prefix=install-path ]
 $ ./waf build
 $ sudo ./waf install
-$ clogs-tune
 
 which will build and install to the install path (defaults to /usr/local),
 and which will install the documentation in /usr/local/share/doc/clogs

doc/RELEASE-PROCESS

@@ -6,7 +6,6 @@
 - On machines with 480 GTX and R9 270
   - Install the new version
   - rm -rf ~/.cache/clogs
-  - clogs-tune --cl-gpu
   - Run benchmark
 - Update clogs-benchmark-plot.sh with new version and run it
 - Add the new benchmarks to git

doc/clogs-user.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
 <!--
    Copyright (c) 2012-2014 University of Cape Town
-   Copyright (c) 2014, 2015 Bruce Merry
+   Copyright (c) 2014, 2015, 2018 Bruce Merry
 
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal
@@ -39,6 +39,7 @@
         <copyright>
             <year>2014</year>
             <year>2015</year>
+            <year>2018</year>
             <holder>Bruce Merry</holder>
         </copyright>
         <!-- The releaseinfo element is replaced by the stylesheet to inject
@@ -68,8 +69,11 @@
         <section id="installation.requirements">
             <title>Requirements</title>
             <para>
-                At present CLOGS is only supported with GCC on GNU/Linux and
-                with Visual C++ on Windows. The code for the library
+                At present CLOGS is only supported with GCC and Clang on
+                GNU/Linux. It has also been used with Visual C++ on Windows,
+                but the author no longer has a Windows installation and so it
+                is unknown if it still works (if it doesn't, you can submit a
+                patch). The code for the library
                 itself is portable, but some aspects of the build system and
                 test suite require porting.
             </para>
@@ -98,8 +102,12 @@
                         OpenCL version.
                 </para></listitem>
                 <listitem><para>
-                        A C++ compiler. GCC 4.8 and Visual C++ 2013 have been
-                        tested.
+                        A C++ compiler supporting C++11. GCC 4.8 and Visual C++
+                        2013 have been tested. The public interface does not
+                        rely on any C++11 features, so it might not be
+                        necessary to build against clogs in C++11 mode,
+                        although ABI changes in classes like std::string may
+                        cause issues.
                 </para></listitem>
                 <listitem><para>
                         The Boost headers. No dynamic libraries are needed to
@@ -196,10 +204,6 @@
                 the root of the filesystem. This is intended for use with
                 package management tools.
             </para>
-            <para>
-                After installing, it is necessary to tune CLOGS for your OpenCL
-                devices. See the next section for details.
-            </para>
         </section>
         <section id="installation.tune">
             <title>Autotuning</title>
@@ -422,8 +426,8 @@ sorter.enqueue(queue, keys, values, numElements, 20, &amp;wait, &amp;event);
             <para>
                 The algorithm objects are non-copyable, to avoid
                 accidently triggering expensive copies of OpenCL objects.
-                However, they are default-constructible, swappable, and (if a
-                C++11 compiler is used) movable.
+                However, they are default-constructible, swappable, and
+                moveable.
             </para>
         </section>
         <section id="using.profile">
@@ -503,7 +507,7 @@ problem.setTunePolicy(policy);
         <title>License</title>
         <para>
             Copyright (c) 2012-2014 University of Cape Town
-            Copyright (c) 2014 Bruce Merry
+            Copyright (c) 2014, 2015, 2018 Bruce Merry
         </para>
         <para>
             Permission is hereby granted, free of charge, to any person obtaining a copy

src/parameters.h

@@ -38,9 +38,8 @@
 #include <cstddef>
 #include <locale>
 #include <cassert>
+#include <type_traits>
 #include <boost/preprocessor.hpp>
-#include <boost/type_traits/is_integral.hpp>
-#include <boost/utility/enable_if.hpp>
 #include <clogs/visibility_pop.h>
 
 #include <clogs/core.h>
@@ -83,7 +82,7 @@ CLOGS_LOCAL int readFields(sqlite3_stmt *stmt, int pos, std::vector<unsigned cha
 
 /// @copydoc readFields(sqlite3_stmt *, int, std::string &)
 template<typename T>
-typename boost::enable_if<boost::is_integral<T>, int>::type
+typename std::enable_if<std::is_integral<T>::value, int>::type
 static inline readFields(sqlite3_stmt *stmt, int pos, T &value)
 {
     assert(pos >= 0 && pos < sqlite3_column_count(stmt));
@@ -130,7 +129,7 @@ static inline void fieldTypes(const std::vector<unsigned char> *, std::vector<co
 
 /// @copydoc fieldTypes(const std::string *, std::vector<const char *> &)
 template<typename T>
-static inline typename boost::enable_if<boost::is_integral<T> >::type
+static inline typename std::enable_if<std::is_integral<T>::value>::type
 fieldTypes(const T *, std::vector<const char *> &out)
 {
     out.push_back("INT");

src/radixsort.cpp

@@ -1,5 +1,5 @@
 /* Copyright (c) 2012-2014 University of Cape Town
- * Copyright (c) 2014 Bruce Merry
+ * Copyright (c) 2014, 2018 Bruce Merry
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -38,6 +38,8 @@
 #include <algorithm>
 #include <vector>
 #include <utility>
+#include <random>
+#include <functional>
 #include <clogs/visibility_pop.h>
 
 #include <clogs/core.h>
@@ -47,8 +49,6 @@
 #include "parameters.h"
 #include "tune.h"
 #include "cache.h"
-#include "tr1_random.h"
-#include "tr1_functional.h"
 
 namespace clogs
 {
@@ -459,7 +459,7 @@ static cl::Buffer makeRandomBuffer(const cl::CommandQueue &queue, ::size_t size)
     cl::Buffer buffer(queue.getInfo<CL_QUEUE_CONTEXT>(), CL_MEM_READ_WRITE, size);
     cl_uchar *data = reinterpret_cast<cl_uchar *>(
         queue.enqueueMapBuffer(buffer, CL_TRUE, CL_MAP_WRITE, 0, size));
-    RANDOM_NAMESPACE::mt19937 engine;
+    std::mt19937 engine;
     for (::size_t i = 0; i < size; i++)
     {
         /* We take values directly from the engine rather than using a
@@ -665,10 +665,10 @@ RadixsortParameters::Value Radixsort::tune(
                 params.reduceWorkGroupSize = reduceWorkGroupSize;
                 sets.push_back(params);
             }
-            using namespace FUNCTIONAL_NAMESPACE::placeholders;
+            using namespace std::placeholders;
             cand = boost::any_cast<RadixsortParameters::Value>(tuneOne(
                 policy, device, sets, problemSizes,
-                FUNCTIONAL_NAMESPACE::bind(&Radixsort::tuneReduceCallback, _1, _2, _3, _4, problem)));
+                std::bind(&Radixsort::tuneReduceCallback, _1, _2, _3, _4, problem)));
         }
 
         // Tune the scatter kernel
@@ -687,10 +687,10 @@ RadixsortParameters::Value Radixsort::tune(
                     sets.push_back(params);
                 }
             }
-            using namespace FUNCTIONAL_NAMESPACE::placeholders;
+            using namespace std::placeholders;
             cand = boost::any_cast<RadixsortParameters::Value>(tuneOne(
                 policy, device, sets, problemSizes,
-                FUNCTIONAL_NAMESPACE::bind(&Radixsort::tuneScatterCallback, _1, _2, _3, _4, problem)));
+                std::bind(&Radixsort::tuneScatterCallback, _1, _2, _3, _4, problem)));
         }
 
         // Tune the block count
@@ -729,10 +729,10 @@ RadixsortParameters::Value Radixsort::tune(
                 sets.push_back(params);
             }
 
-            using namespace FUNCTIONAL_NAMESPACE::placeholders;
+            using namespace std::placeholders;
             cand = boost::any_cast<RadixsortParameters::Value>(tuneOne(
                 policy, device, sets, problemSizes,
-                FUNCTIONAL_NAMESPACE::bind(&Radixsort::tuneBlocksCallback, _1, _2, _3, _4, problem)));
+                std::bind(&Radixsort::tuneBlocksCallback, _1, _2, _3, _4, problem)));
         }
 
         // TODO: benchmark the whole combination

src/reduce.cpp

@@ -1,4 +1,4 @@
-/* Copyright (c) 2014, 2015 Bruce Merry
+/* Copyright (c) 2014, 2015, 2018 Bruce Merry
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -176,10 +176,10 @@ ReduceParameters::Value Reduce::tune(
             sets.push_back(params);
         }
 
-        using namespace FUNCTIONAL_NAMESPACE::placeholders;
+        using namespace std::placeholders;
         cand = boost::any_cast<ReduceParameters::Value>(tuneOne(
                 policy, device, sets, problemSizes,
-                FUNCTIONAL_NAMESPACE::bind(&Reduce::tuneReduceCallback, _1, _2, _3, _4, problem)));
+                std::bind(&Reduce::tuneReduceCallback, _1, _2, _3, _4, problem)));
     }
 
     {
@@ -192,10 +192,10 @@ ReduceParameters::Value Reduce::tune(
             sets.push_back(params);
         }
 
-        using namespace FUNCTIONAL_NAMESPACE::placeholders;
+        using namespace std::placeholders;
         cand = boost::any_cast<ReduceParameters::Value>(tuneOne(
                 policy, device, sets, problemSizes,
-                FUNCTIONAL_NAMESPACE::bind(&Reduce::tuneReduceCallback, _1, _2, _3, _4, problem)));
+                std::bind(&Reduce::tuneReduceCallback, _1, _2, _3, _4, problem)));
     }
 
     policy.logEndAlgorithm();

src/scan.cpp

@@ -1,5 +1,5 @@
 /* Copyright (c) 2012-2014 University of Cape Town
- * Copyright (c) 2014 Bruce Merry
+ * Copyright (c) 2014, 2018 Bruce Merry
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -286,10 +286,10 @@ ScanParameters::Value Scan::tune(
             sets.push_back(params);
         }
 
-        using namespace FUNCTIONAL_NAMESPACE::placeholders;
+        using namespace std::placeholders;
         ScanParameters::Value params = boost::any_cast<ScanParameters::Value>(tuneOne(
             policy, device, sets, problemSizes,
-            FUNCTIONAL_NAMESPACE::bind(&Scan::tuneReduceCallback, _1, _2, _3, _4, problem)));
+            std::bind(&Scan::tuneReduceCallback, _1, _2, _3, _4, problem)));
         bestReduceWorkGroupSize = params.reduceWorkGroupSize;
     }
 
@@ -314,10 +314,10 @@ ScanParameters::Value Scan::tune(
             }
         }
 
-        using namespace FUNCTIONAL_NAMESPACE::placeholders;
+        using namespace std::placeholders;
         ScanParameters::Value params = boost::any_cast<ScanParameters::Value>(tuneOne(
             policy, device, sets, problemSizes,
-            FUNCTIONAL_NAMESPACE::bind(&Scan::tuneScanCallback, _1, _2, _3, _4, problem)));
+            std::bind(&Scan::tuneScanCallback, _1, _2, _3, _4, problem)));
         bestScanWorkGroupSize = params.scanWorkGroupSize;
         bestScanWorkScale = params.scanWorkScale;
     }
@@ -337,10 +337,10 @@ ScanParameters::Value Scan::tune(
             params.scanBlocks = blocks;
             sets.push_back(params);
         }
-        using namespace FUNCTIONAL_NAMESPACE::placeholders;
+        using namespace std::placeholders;
         ScanParameters::Value params = boost::any_cast<ScanParameters::Value>(tuneOne(
             policy, device, sets, problemSizes,
-            FUNCTIONAL_NAMESPACE::bind(&Scan::tuneBlocksCallback, _1, _2, _3, _4, problem)));
+            std::bind(&Scan::tuneBlocksCallback, _1, _2, _3, _4, problem)));
         bestBlocks = params.scanBlocks;
     }