Various fixes to the new CMake build system branch to keep the old legacy build

system working.

Author: brycelelbach

CHANGELOG

@@ -11,6 +11,11 @@ Summary
     objects, which can be waited upon to synchronize with the completion of the
     parallel operation.
 
+Breaking API Changes
+    Synchronous Thrust algorithms now block until all of their operations have
+    completed. Use the new asynchronous Thrust algorithms for non-blocking
+    behavior.
+
 New Features
     `thrust::event` and `thrust::future<T>`, uniquely-owned asynchronous handles consisting of a state (ready or not ready), content (some value; for `thrust::future` only), and an optional set of objects that should be destroyed only when the future's value is ready and has been consumed.
       The design is loosely based on C++11's `std::future`.
@@ -196,7 +201,7 @@ Bug Fixes
     1777043 `complex` does not work with `sequence`.
 
 #######################################
-#     Thrust v1.9.1-2 (CUDA 9.1)      #
+#      Thrust v1.9.1 (CUDA 9.1)       #
 #######################################
 
 Summary
@@ -209,7 +214,7 @@ Bug Fixes
     1904217 Allow callables that take non-const refs to be used with reduce and scan.
 
 #######################################
-#     Thrust v1.9.0-4 (CUDA 9.0)      #
+#      Thrust v1.9.0 (CUDA 9.0)       #
 #######################################
 
 Summary
@@ -242,14 +247,14 @@ Bug Fixes
 Acknowledgments
     Thanks to Manuel Schiller for contributing a C++11 based enhancement 
     regarding the deduction of functor return types, improving the performance 
-    of thrust::unique and implementing transform_output_iterator.
+    of `thrust::unique` and implementing `thrust::transform_output_iterator`.
     Thanks to Thibault Notargiacomo for the implementation of move semantics for 
     the vector_base based class.
     Thanks to Duane Merrill for developing CUB and helping to integrate it into
     Thrust's backend.
 
 #######################################
-#     Thrust v1.8.3-2 (CUDA 8.0)      #
+#      Thrust v1.8.3 (CUDA 8.0)       #
 #######################################
 
 Summary
@@ -309,9 +314,6 @@ Summary
     request a CUDA stream for kernels launched during algorithm execution. Finally, new CUDA algorithm
     implementations provide substantial performance improvements.
 
-Breaking API Changes
-    None.
-
 New Features
     Algorithms in CUDA __device__ code
       Thrust algorithms may now be invoked from CUDA __device__ and __host__ __device__ functions.

Makefile

@@ -116,7 +116,7 @@ ifneq ($(TEST_EXAMPLES),)
   # Empty PROJECTS.
   PROJECTS :=
 
-	# Populate PROJECTS with examples.
+  # Populate PROJECTS with examples.
   include $(THRUST_MKDIR)/examples.mk
 
   # Once PROJECTS is populated with examples, re-add the previous projects.
@@ -133,25 +133,25 @@ endif
 
 VERSION_FLAG :=
 ifeq ($(OS),$(filter $(OS),Linux Darwin))
-	ifdef USEPGCXX        # PGI
-		VERSION_FLAG := -V
-	else
-		ifdef USEXLC        # XLC
-			VERSION_FLAG := -qversion
-		else                # GCC, ICC or Clang AKA the sane ones.
-			VERSION_FLAG := --version
-		endif
-	endif
+  ifdef USEPGCXX        # PGI
+    VERSION_FLAG := -V
+  else
+    ifdef USEXLC        # XLC
+      VERSION_FLAG := -qversion
+    else                # GCC, ICC or Clang AKA the sane ones.
+      VERSION_FLAG := --version
+    endif
+  endif
 else ifeq ($(OS),win32) # MSVC
-	# cl.exe run without any options will print its version info and exit.
-	VERSION_FLAG :=
+  # cl.exe run without any options will print its version info and exit.
+  VERSION_FLAG :=
 endif
 
 CCBIN_ENVIRONMENT :=
 ifeq ($(OS), QNX)
-	# QNX's GCC complains if QNX_HOST and QNX_TARGET aren't defined in the
-	# environment.
-	CCBIN_ENVIRONMENT := QNX_HOST=$(QNX_HOST) QNX_TARGET=$(QNX_TARGET)
+  # QNX's GCC complains if QNX_HOST and QNX_TARGET aren't defined in the
+  # environment.
+  CCBIN_ENVIRONMENT := QNX_HOST=$(QNX_HOST) QNX_TARGET=$(QNX_TARGET)
 endif
 
 $(info #### CCBIN         : $(CCBIN))

doc/branching.md

@@ -16,9 +16,9 @@ versions don't directly map to any CUDA Toolkit version.
 | 1.9.4             | 10.1          |
 | 1.9.3             | 10.0          |
 | 1.9.2             | 9.2           |
-| 1.9.1-2           | 9.1           |
-| 1.9.0-4           | 9.0           |
-| 1.8.3-2           | 8.0           |
+| 1.9.1             | 9.1           |
+| 1.9.0             | 9.0           |
+| 1.8.3             | 8.0           |
 | 1.8.2             | 7.5           |
 | 1.8.1             | 7.0           |
 | 1.8.0             | *N/A*         |

generate_mk.py

@@ -33,7 +33,7 @@ def Glob(pattern, directory,exclude='\B'):
 def generate_test_mk(mk_path, test_path, group, TEST_DIR):
     print 'Generating makefiles in "'+mk_path+'" for tests in "'+test_path+'"'
     src_cu  = Glob("*.cu",  test_path, ".*testframework.cu$")
-    src_cxx = Glob("*.cpp", test_path, ".*testframework.cpp$")
+    src_cxx = Glob("*.cpp", test_path)
     src_cu.sort();
     src_cxx.sort();
     src_all = src_cu + src_cxx;

internal/build/testframework.mk

@@ -1,7 +1,7 @@
 STATIC_LIBRARY := testframework
 
 SRC_PATH := $(ROOTDIR)/thrust/testing/
-BUILD_SRC := testframework.cpp
+BUILD_SRC := unittest/testframework.cu
 
 CUSRC := unittest/cuda/testframework.cu
 $(CUSRC).CUDACC_FLAGS    := -I$(ROOTDIR)/thrust/testing/cuda/