Commit 770912f9 authored by Robert Maynard's avatar Robert Maynard

Correct compiler issues found with GCC 4.8.5 + CUDA 9.2 on summit

parent b248b2c9
...@@ -113,7 +113,7 @@ struct VTKM_CONT_EXPORT ScheduleParameterBuilder ...@@ -113,7 +113,7 @@ struct VTKM_CONT_EXPORT ScheduleParameterBuilder
} }
auto preset = this->Presets.find(static_cast<GPU_STRATA>(strataAsInt)); auto preset = this->Presets.find(static_cast<GPU_STRATA>(strataAsInt));
ScheduleParameters params{ preset->second }; ScheduleParameters params = preset->second;
params.one_d_blocks = params.one_d_blocks * numSMs; params.one_d_blocks = params.one_d_blocks * numSMs;
params.two_d_blocks = params.two_d_blocks * numSMs; params.two_d_blocks = params.two_d_blocks * numSMs;
params.three_d_blocks = params.three_d_blocks * numSMs; params.three_d_blocks = params.three_d_blocks * numSMs;
......
...@@ -241,7 +241,10 @@ private: ...@@ -241,7 +241,10 @@ private:
std::is_same<GlobalPopCountType, vtkm::UInt64>::value), std::is_same<GlobalPopCountType, vtkm::UInt64>::value),
"Unsupported GlobalPopCountType. Must support CUDA atomicAdd."); "Unsupported GlobalPopCountType. Must support CUDA atomicAdd.");
using Word = typename BitsPortal::WordTypePreferred; //Using typename BitsPortal::WordTypePreferred causes dependent type errors using GCC 4.8.5
//which is the GCC required compiler for CUDA 9.2 on summit/power9
using Word = typename vtkm::cont::internal::AtomicInterfaceExecution<
DeviceAdapterTagCuda>::WordTypePreferred;
VTKM_STATIC_ASSERT( VTKM_STATIC_ASSERT(
VTKM_PASS_COMMAS(std::is_same<typename IndicesPortal::ValueType, vtkm::Id>::value)); VTKM_PASS_COMMAS(std::is_same<typename IndicesPortal::ValueType, vtkm::Id>::value));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment