Merge 'master' into 'amd-master'

Change-Id: I0750f37e58f989feda43e6a84396c118a8d0e7a0
Tento commit je obsažen v:
Jenkins
2017-12-13 04:11:35 -06:00
+2 -1
Zobrazit soubor
@@ -169,9 +169,10 @@ if ($HIP_PLATFORM eq "hcc") {
$CUDA_PATH=$ENV{'CUDA_PATH'} // '/usr/local/cuda';
$HIPCC="$CUDA_PATH/bin/nvcc";
$HIPCXXFLAGS .= " -Wno-deprecated-gpu-targets ";
$HIPCXXFLAGS .= " -I$CUDA_PATH/include";
$HIPLDFLAGS = "-lcuda -lcudart -L$CUDA_PATH/lib64";
$HIPLDFLAGS = " -Wno-deprecated-gpu-targets -lcuda -lcudart -L$CUDA_PATH/lib64";
} else {
printf ("error: unknown HIP_PLATFORM = '$HIP_PLATFORM'");
exit (-1);