Merge pull request #866 from DrTimothyAldenDavis/dev2 #693

Job	Run time
msvc (cl with OpenMP without CUDA, both)	36m 29s
msvc (cl without OpenMP without CUDA, both)	45m 28s
msvc (cl with OpenMP with CUDA, both)	56m 40s
msvc (cl with OpenMP with CUDA, static)	54m 51s
msvc (clang-cl with OpenMP without CUDA, both)	42m 14s
msvc (clang with OpenMP without CUDA, both)	44m 57s
ubuntu (gcc with CUDA, both)	1h 34m 59s
ubuntu (gcc without CUDA, both)	1h 27m 26s
ubuntu (clang with CUDA, both)	1h 25m 50s
ubuntu (clang without CUDA, both)	1h 16m 21s
ubuntu (gcc with CUDA, static)	1h 26m 55s
	11h 52m 10s

Provide feedback