experiments/STT-tensorflow
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[ROCm] Fix for the broken --config=rocm build.

Browse Source 
This PR contains a fix for the broken `--config=rocm` build.

Currently the file `tensorflow/core/util/gpuLaunch_config.h` is not included in any code that is enabled for the `--config=rocm` build. Once that is included within ROCm enabled code, it will break the `--config=rocm` build, because that file currrently contains a couple of Cuda* names that should not be visible in the ROCm build. This commit/PR fixes that.
This commit is contained in:
Deven Desai 2019-05-19 02:28:04 +00:00
parent bcbb1db93f
commit e0c05bb427
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tensorflow/core/util/gpu_launch_config.h
View File

@ -142,10 +142,12 @@ inline GpuLaunchConfig GetGpuLaunchConfig(int work_element_count,
config.block_count = block_count; config.block_count = block_count;
return config; return config;
} }
#ifndef TENSORFLOW_USE_ROCM
inline CudaLaunchConfig GetCudaLaunchConfig(int work_element_count, inline CudaLaunchConfig GetCudaLaunchConfig(int work_element_count,
const Eigen::GpuDevice& d) { const Eigen::GpuDevice& d) {
return GetGpuLaunchConfig(work_element_count, d); return GetGpuLaunchConfig(work_element_count, d);
} }
#endif
// Calculate the GPU launch config we should use for a kernel launch. This // Calculate the GPU launch config we should use for a kernel launch. This
// variant takes the resource limits of func into account to maximize occupancy. // variant takes the resource limits of func into account to maximize occupancy.
@ -275,10 +277,12 @@ inline Gpu2DLaunchConfig GetGpu2DLaunchConfig(int xdim, int ydim,
grid_x, std::min(max_blocks / grid_x, std::max(ydim / block_rows, 1)), 1); grid_x, std::min(max_blocks / grid_x, std::max(ydim / block_rows, 1)), 1);
return config; return config;
} }
#ifndef TENSORFLOW_USE_ROCM
inline Cuda2DLaunchConfig GetCuda2DLaunchConfig(int xdim, int ydim, inline Cuda2DLaunchConfig GetCuda2DLaunchConfig(int xdim, int ydim,
const Eigen::GpuDevice& d) { const Eigen::GpuDevice& d) {
return GetGpu2DLaunchConfig(xdim, ydim, d); return GetGpu2DLaunchConfig(xdim, ydim, d);
} }
#endif
// Calculate the GPU 2D and 3D launch config we should use for a kernel launch. // Calculate the GPU 2D and 3D launch config we should use for a kernel launch.
// This variant takes the resource limits of func into account to maximize // This variant takes the resource limits of func into account to maximize