瀏覽代碼

Fix GPU-Direct disabling logic

Samuel Thibault 13 年之前
父節點
當前提交
1183c55f8f
共有 2 個文件被更改,包括 3 次插入3 次删除
  1. 2 2
      src/core/perfmodel/perfmodel_bus.c
  2. 1 1
      src/drivers/cuda/driver_cuda.c

+ 2 - 2
src/core/perfmodel/perfmodel_bus.c

@@ -191,7 +191,7 @@ static void measure_bandwidth_between_dev_and_dev_cuda(int src, int dst)
 	/* Initialize CUDA context on the source */
 	cudaSetDevice(src);
 
-	if (starpu_get_env_number("STARPU_DISABLE_CUDA_GPU_GPU_DIRECT") > 0) {
+	if (starpu_get_env_number("STARPU_DISABLE_CUDA_GPU_GPU_DIRECT") <= 0) {
 		cures = cudaDeviceCanAccessPeer(&can, src, dst);
 		if (!cures && can) {
 			cures = cudaDeviceEnablePeerAccess(dst, 0);
@@ -209,7 +209,7 @@ static void measure_bandwidth_between_dev_and_dev_cuda(int src, int dst)
 	/* Initialize CUDA context on the destination */
 	cudaSetDevice(dst);
 
-	if (starpu_get_env_number("STARPU_DISABLE_CUDA_GPU_GPU_DIRECT") > 0) {
+	if (starpu_get_env_number("STARPU_DISABLE_CUDA_GPU_GPU_DIRECT") <= 0) {
 		cures = cudaDeviceCanAccessPeer(&can, dst, src);
 		if (!cures && can) {
 			cures = cudaDeviceEnablePeerAccess(src, 0);

+ 1 - 1
src/drivers/cuda/driver_cuda.c

@@ -156,7 +156,7 @@ static void init_context(int devid)
 	starpu_cuda_set_device(devid);
 
 #ifdef HAVE_CUDA_MEMCPY_PEER
-	if (starpu_get_env_number("STARPU_DISABLE_CUDA_GPU_GPU_DIRECT") > 0) {
+	if (starpu_get_env_number("STARPU_DISABLE_CUDA_GPU_GPU_DIRECT") <= 0) {
 		int nworkers = starpu_worker_get_count();
 		for (workerid = 0; workerid < nworkers; workerid++) {
 			struct _starpu_worker *worker = _starpu_get_worker_struct(workerid);