Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-08 13:23:51 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Make DeviceAdapterId constructor protected.

Browse Source 
This forces users to use a defined tag, since they shouldn't need
to create their own.
This commit is contained in:
Allison Vacanti 2018-08-24 16:38:08 -04:00
parent e9d8ff4371
commit 024a75821d
6 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vtkm/cont/cuda/internal/ExecutionArrayInterfaceBasicCuda.cu
View File

@ -31,7 +31,7 @@ namespace internal
DeviceAdapterId ExecutionArrayInterfaceBasic<DeviceAdapterTagCuda>::GetDeviceId() const
{
return DeviceAdapterId(VTKM_DEVICE_ADAPTER_CUDA);
return DeviceAdapterTagCuda{};
}
void ExecutionArrayInterfaceBasic<DeviceAdapterTagCuda>::Allocate(TypelessExecutionArray& execArray,

11
vtkm/cont/internal/DeviceAdapterTag.h
View File

@ -44,11 +44,6 @@ namespace cont
struct DeviceAdapterId
{
constexpr explicit DeviceAdapterId(vtkm::Int8 id)
: Value(id)
{
}
constexpr bool operator==(DeviceAdapterId other) const { return this->Value == other.Value; }
constexpr bool operator!=(DeviceAdapterId other) const { return this->Value != other.Value; }
constexpr bool operator<(DeviceAdapterId other) const { return this->Value < other.Value; }
@ -60,6 +55,12 @@ struct DeviceAdapterId
constexpr vtkm::Int8 GetValue() const { return this->Value; }
protected:
constexpr explicit DeviceAdapterId(vtkm::Int8 id)
: Value(id)
{
}
private:
vtkm::Int8 Value;
};

2
vtkm/cont/openmp/internal/ExecutionArrayInterfaceBasicOpenMP.cxx
View File

@ -28,7 +28,7 @@ namespace internal
DeviceAdapterId ExecutionArrayInterfaceBasic<DeviceAdapterTagOpenMP>::GetDeviceId() const
{
return DeviceAdapterId(VTKM_DEVICE_ADAPTER_OPENMP);
return DeviceAdapterTagOpenMP{};
}
} // namespace internal

2
vtkm/cont/serial/internal/ExecutionArrayInterfaceBasicSerial.cxx
View File

@ -27,7 +27,7 @@ namespace internal
{
DeviceAdapterId ExecutionArrayInterfaceBasic<DeviceAdapterTagSerial>::GetDeviceId() const
{
return DeviceAdapterId(VTKM_DEVICE_ADAPTER_SERIAL);
return DeviceAdapterTagSerial{};
}
} // namespace internal

2
vtkm/cont/tbb/internal/ExecutionArrayInterfaceBasicTBB.cxx
View File

@ -27,7 +27,7 @@ namespace internal
{
DeviceAdapterId ExecutionArrayInterfaceBasic<DeviceAdapterTagTBB>::GetDeviceId() const
{
return DeviceAdapterId(VTKM_DEVICE_ADAPTER_TBB);
return DeviceAdapterTagTBB{};
}
} // namespace internal

2
vtkm/cont/testing/UnitTestDeviceAdapterAlgorithmGeneral.cxx
View File

@ -131,7 +131,7 @@ struct ExecutionArrayInterfaceBasic<DeviceAdapterTagTestAlgorithmGeneral>
using ExecutionArrayInterfaceBasicShareWithControl::ExecutionArrayInterfaceBasicShareWithControl;
VTKM_CONT
DeviceAdapterId GetDeviceId() const final { return DeviceAdapterId(7); }
DeviceAdapterId GetDeviceId() const final { return DeviceAdapterTagTestAlgorithmGeneral{}; }
};
}
}