Removed ExternGpu
Fixed merge mistake
Merge branch 'CPlusPlius-Improvement-gpu'
For sandbox testing