From fbd2e1bdc1b040db645f771b5d0efa7c01e2741c Mon Sep 17 00:00:00 2001
From: Tom Lin <tom91136@gmail.com>
Date: Wed, 22 Dec 2021 09:10:41 +0000
Subject: [PATCH] Add comments for custom range iterator Remove debug leftovers
 from CMakeList Update copyright

---
 CMakeLists.txt                       | 40 +---------------------------
 src/std-data/STDDataStream.cpp       |  3 ++-
 src/std-data/STDDataStream.h         |  3 ++-
 src/std-indices/STDIndicesStream.cpp |  3 ++-
 src/std-indices/STDIndicesStream.h   |  7 ++++-
 5 files changed, 13 insertions(+), 43 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d47dcad..3730602 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 3.13 FATAL_ERROR)
 
 project(BabelStream VERSION 3.5 LANGUAGES CXX)
 
+# uncomment for debugging build issues:
 #set(CMAKE_VERBOSE_MAKEFILE ON)
 
 # some nicer defaults for standard C++
@@ -23,45 +24,6 @@ macro(setup_opencl_header_includes)
     endif ()
 endmacro()
 
-#set(MODEL SYCL)
-#set(SYCL_COMPILER COMPUTECPP)
-#set(SYCL_COMPILER_DIR /home/tom/Desktop/computecpp_archive/ComputeCpp-CE-2.3.0-x86_64-linux-gnu)
-#set(MODEL RAJA)
-#set(RAJA_IN_TREE /home/tom/Downloads/RAJA-v0.13.0/)
-#set(ENABLE_CUDA ON)
-#set(TARGET NVIDIA)
-#set(CUDA_TOOLKIT_ROOT_DIR /opt/cuda-11.2)
-#set(CUDA_ARCH sm_70)
-#set(BLT_DIR /home/tom/Downloads/blt-0.3.6/)
-
-#set(MODEL std-data)
-#set(CMAKE_CXX_COMPILER /home/tom/Downloads/nvhpc_2021_219_Linux_x86_64_cuda_multi/install_components/Linux_x86_64/21.9/compilers/bin/nvc++)
-#set(NVHPC_OFFLOAD "cuda11.4,cc61")
-
-#set(MODEL CUDA)
-#set(ARCH  sm_70)
-#set(CMAKE_CUDA_COMPILER /opt/cuda-11.2/bin/nvcc)
-
-#set(MODEL OCL)
-#set(OpenCL_LIBRARY /opt/rocm-4.0.0/opencl/lib/libOpenCL.so)
-#set(OpenCL_INCLUDE_DIR /opt/rocm-4.0.0/opencl/lib)
-#set(RELEASE_FLAGS -Ofast)
-#set(CXX_EXTRA_FLAGS -O2)
-
-#set(CMAKE_CXX_COMPILER /usr/lib/aomp/bin/clang++)
-#set(MODEL omp)
-##set(OFFLOAD "AMD:gfx803")
-#set(OFFLOAD "NVIDIA:sm_35")
-#set(CXX_EXTRA_FLAGS --cuda-path=/opt/cuda-10.2/)
-
-#set(OFFLOAD "AMD:_70")
-#set(CXX_EXTRA_FLAGS --cuda-path=/opt/cuda-10.2/ --gcc-toolchain=/home/tom/spack/opt/spack/linux-fedora33-zen2/gcc-10.2.1/gcc-8.3.0-latmjo2hl2yv53255xkwko7k3y7bx2vv)
-#set(CXX_EXTRA_LINKER_FLAGS  )
-#set(MODEL HIP)
-
-#set(MODEL KOKKOS)
-#set(KOKKOS_IN_TREE /home/tom/Downloads/kokkos-3.3.00/)
-
 # the final executable name
 set(EXE_NAME babelstream)
 
diff --git a/src/std-data/STDDataStream.cpp b/src/std-data/STDDataStream.cpp
index 64a37a4..a2628e1 100644
--- a/src/std-data/STDDataStream.cpp
+++ b/src/std-data/STDDataStream.cpp
@@ -1,4 +1,5 @@
-// Copyright (c) 2020, NVIDIA CORPORATION. All rights reserved.
+// Copyright (c) 2020 Tom Deakin
+// University of Bristol HPC
 //
 // For full license terms please see the LICENSE file distributed with this
 // source code
diff --git a/src/std-data/STDDataStream.h b/src/std-data/STDDataStream.h
index 7279070..f8bc302 100644
--- a/src/std-data/STDDataStream.h
+++ b/src/std-data/STDDataStream.h
@@ -1,4 +1,5 @@
-// Copyright (c) 2020, NVIDIA CORPORATION. All rights reserved.
+// Copyright (c) 2020 Tom Deakin
+// University of Bristol HPC
 //
 // For full license terms please see the LICENSE file distributed with this
 // source code
diff --git a/src/std-indices/STDIndicesStream.cpp b/src/std-indices/STDIndicesStream.cpp
index e16fb91..a88dd18 100644
--- a/src/std-indices/STDIndicesStream.cpp
+++ b/src/std-indices/STDIndicesStream.cpp
@@ -1,4 +1,5 @@
-// Copyright (c) 2020, NVIDIA CORPORATION. All rights reserved.
+// Copyright (c) 2020 Tom Deakin
+// University of Bristol HPC
 //
 // For full license terms please see the LICENSE file distributed with this
 // source code
diff --git a/src/std-indices/STDIndicesStream.h b/src/std-indices/STDIndicesStream.h
index 87592a5..66c8bb0 100644
--- a/src/std-indices/STDIndicesStream.h
+++ b/src/std-indices/STDIndicesStream.h
@@ -1,4 +1,5 @@
-// Copyright (c) 2020, NVIDIA CORPORATION. All rights reserved.
+// Copyright (c) 2020 Tom Deakin
+// University of Bristol HPC
 //
 // For full license terms please see the LICENSE file distributed with this
 // source code
@@ -11,6 +12,10 @@
 
 #define IMPLEMENTATION_STRING "STD (index-oriented)"
 
+
+// A lightweight counting iterator which will be used by the STL algorithms
+// NB: C++ <= 17 doesn't have this built-in, and it's only added later in ranges-v3 (C++2a) which this
+// implementation doesn't target
 template <typename N>
 class ranged {
   N from, to;