Merge pull request #731 from DrTimothyAldenDavis/dev2 #457

Job	Run time
msvc (with OpenMP without CUDA, both)	14m 57s
msvc (without OpenMP without CUDA, both)	14m 21s
msvc (with OpenMP with CUDA, both)	30m 47s
ubuntu (gcc with CUDA, both)	6m 28s
msvc (with OpenMP with CUDA, static)	33m 34s
ubuntu (gcc without CUDA, both)	6m 15s
ubuntu (clang with CUDA, both)	9m 33s
ubuntu (clang without CUDA, both)	6m 27s
ubuntu (gcc with CUDA, static)	8m 24s
	2h 10m 46s

Provide feedback