Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-10-05 01:49:02 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Merge topic 'clang-tidy-fixes'

Browse Source 
1541cfa8a clang-tidy: fix `bugprone-incorrect-roundings` lints
0ce73eb68 clang-tidy: fix `readability-avoid-const-params-in-decls` lints
e07fb9fec clang-tidy: fix `performance-move-const-arg` lints
5aad5ca37 clang-tidy: fix `modernize-redundant-void-arg` lints
6c00a8755 clang-tidy: fix `readability-redundant-access-specifiers` lints
219f44c25 clang-tidy: fix `readability-const-return-type` lints
b99920d47 Oscillator: use a type of the right size for `oIdx`
13e935c35 clang-tidy: fix `readability-redundant-member-init` lints
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !3053
This commit is contained in:
Ben Boeckel 2023-12-04 15:42:28 +00:00 committed by Kitware Robot
commit a5994a8129
22 changed files with 34 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
vtkm/cont/ArrayHandle.h
View File

@ -154,10 +154,7 @@ struct GetTypeInParentheses<void(T)>
VTKM_IS_ARRAY_HANDLE(Superclass); \
\
VTKM_CONT \
classname() \
: Superclass() \
{ \
} \
classname() {} \
\
VTKM_CONT \
classname(const Thisclass& src) \

2
vtkm/cont/ArrayHandleIndex.h
View File

@ -124,7 +124,7 @@ namespace cont
template <>
struct SerializableTypeString<vtkm::cont::ArrayHandleIndex>
{
static VTKM_CONT const std::string Get() { return "AH_Index"; }
static VTKM_CONT std::string Get() { return "AH_Index"; }
};
template <>

2
vtkm/cont/ArrayHandleSOA.h
View File

@ -260,7 +260,7 @@ public:
(ArrayHandle<T, vtkm::cont::StorageTagSOA>));
ArrayHandleSOA(std::initializer_list<vtkm::cont::internal::Buffer>&& componentBuffers)
: Superclass(std::move(componentBuffers))
: Superclass(componentBuffers)
{
}

2
vtkm/cont/ArrayHandleUniformPointCoordinates.h
View File

@ -114,7 +114,7 @@ namespace cont
template <>
struct SerializableTypeString<vtkm::cont::ArrayHandleUniformPointCoordinates>
{
static VTKM_CONT const std::string Get() { return "AH_UniformPointCoordinates"; }
static VTKM_CONT std::string Get() { return "AH_UniformPointCoordinates"; }
};
template <>

1
vtkm/cont/CellLocatorTwoLevel.h
View File

@ -86,7 +86,6 @@ public:
void PrintSummary(std::ostream& out) const;
public:
ExecObjType PrepareForExecution(vtkm::cont::DeviceAdapterId device,
vtkm::cont::Token& token) const;

2
vtkm/cont/CellSetExplicit.h
View File

@ -121,7 +121,7 @@ public:
VTKM_CONT Thisclass& operator=(const Thisclass& src);
VTKM_CONT Thisclass& operator=(Thisclass&& src) noexcept;
VTKM_CONT virtual ~CellSetExplicit() override;
VTKM_CONT ~CellSetExplicit() override;
VTKM_CONT vtkm::Id GetNumberOfCells() const override;
VTKM_CONT vtkm::Id GetNumberOfPoints() const override;

2
vtkm/cont/CellSetExtrude.h
View File

@ -70,7 +70,7 @@ public:
VTKM_CONT CellSetExtrude& operator=(const CellSetExtrude& src);
VTKM_CONT CellSetExtrude& operator=(CellSetExtrude&& src) noexcept;
virtual ~CellSetExtrude() override;
~CellSetExtrude() override;
vtkm::Int32 GetNumberOfPlanes() const;

2
vtkm/cont/CellSetPermutation.h
View File

@ -78,7 +78,6 @@ public:
}
};
public:
template <typename CellSetPermutationType>
static VTKM_CONT vtkm::cont::ArrayHandle<vtkm::IdComponent> GetNumIndicesArray(
const CellSetPermutationType& cs,
@ -465,7 +464,6 @@ public:
return this->FullCellSet.GetNumberOfPoints();
}
public:
template <typename VisitTopology, typename IncidentTopology>
using ExecConnectivityType = typename internal::CellSetPermutationConnectivityChooser<
VisitTopology,

4
vtkm/cont/CellSetSingleType.h
View File

@ -97,7 +97,7 @@ public:
return *this;
}
virtual ~CellSetSingleType() override {}
~CellSetSingleType() override {}
/// @brief Start adding cells one at a time.
///
@ -252,7 +252,7 @@ public:
this->NumberOfPointsPerCell = other->NumberOfPointsPerCell;
}
virtual void PrintSummary(std::ostream& out) const override
void PrintSummary(std::ostream& out) const override
{
out << " CellSetSingleType: Type=" << this->CellShapeAsId << std::endl;
out << " CellPointIds:" << std::endl;

2
vtkm/cont/CoordinateSystem.h
View File

@ -132,7 +132,7 @@ public:
return vtkm::Bounds(ranges[0], ranges[1], ranges[2]);
}
virtual void PrintSummary(std::ostream& out) const override;
void PrintSummary(std::ostream& out) const override;
/// Releases any resources being used in the execution environment (that are
/// not being shared by the control environment).

1
vtkm/cont/internal/DeviceAdapterAlgorithmGeneral.h
View File

@ -1011,7 +1011,6 @@ public:
//--------------------------------------------------------------------------
// Sort by Key
public:
template <typename T, typename U, class StorageT, class StorageU>
VTKM_CONT static void SortByKey(vtkm::cont::ArrayHandle<T, StorageT>& keys,
vtkm::cont::ArrayHandle<U, StorageU>& values)

23
vtkm/cont/internal/DeviceAdapterMemoryManagerShared.h
View File

@ -30,28 +30,25 @@ class VTKM_CONT_EXPORT DeviceAdapterMemoryManagerShared : public DeviceAdapterMe
public:
VTKM_CONT BufferInfo Allocate(vtkm::BufferSizeType size) const override;
VTKM_CONT virtual vtkm::cont::internal::BufferInfo CopyHostToDevice(
VTKM_CONT vtkm::cont::internal::BufferInfo CopyHostToDevice(
const vtkm::cont::internal::BufferInfo& src) const override;
VTKM_CONT virtual void CopyHostToDevice(
const vtkm::cont::internal::BufferInfo& src,
const vtkm::cont::internal::BufferInfo& dest) const override;
VTKM_CONT void CopyHostToDevice(const vtkm::cont::internal::BufferInfo& src,
const vtkm::cont::internal::BufferInfo& dest) const override;
VTKM_CONT virtual vtkm::cont::internal::BufferInfo CopyDeviceToHost(
VTKM_CONT vtkm::cont::internal::BufferInfo CopyDeviceToHost(
const vtkm::cont::internal::BufferInfo& src) const override;
VTKM_CONT virtual void CopyDeviceToHost(
const vtkm::cont::internal::BufferInfo& src,
const vtkm::cont::internal::BufferInfo& dest) const override;
VTKM_CONT void CopyDeviceToHost(const vtkm::cont::internal::BufferInfo& src,
const vtkm::cont::internal::BufferInfo& dest) const override;
VTKM_CONT virtual vtkm::cont::internal::BufferInfo CopyDeviceToDevice(
VTKM_CONT vtkm::cont::internal::BufferInfo CopyDeviceToDevice(
const vtkm::cont::internal::BufferInfo& src) const override;
VTKM_CONT virtual void CopyDeviceToDevice(
const vtkm::cont::internal::BufferInfo& src,
const vtkm::cont::internal::BufferInfo& dest) const override;
VTKM_CONT void CopyDeviceToDevice(const vtkm::cont::internal::BufferInfo& src,
const vtkm::cont::internal::BufferInfo& dest) const override;
VTKM_CONT virtual void DeleteRawPointer(void* mem) const override;
VTKM_CONT void DeleteRawPointer(void* mem) const override;
};
}
}

1
vtkm/cont/serial/internal/DeviceAdapterAlgorithmSerial.h
View File

@ -446,7 +446,6 @@ private:
}
}
private:
/// Reorder the value array along with the sorting algorithm
template <typename T, typename U, class StorageT, class StorageU, class BinaryCompare>
VTKM_CONT static void SortByKeyDirect(vtkm::cont::ArrayHandle<T, StorageT>& keys,

2
vtkm/cont/serial/internal/RuntimeDeviceConfigurationSerial.h
View File

@ -24,7 +24,7 @@ template <>
class RuntimeDeviceConfiguration<vtkm::cont::DeviceAdapterTagSerial>
: public vtkm::cont::internal::RuntimeDeviceConfigurationBase
{
VTKM_CONT vtkm::cont::DeviceAdapterId GetDevice() const override final
VTKM_CONT vtkm::cont::DeviceAdapterId GetDevice() const final
{
return vtkm::cont::DeviceAdapterTagSerial{};
}

9
vtkm/cont/tbb/internal/RuntimeDeviceConfigurationTBB.h
View File

@ -51,12 +51,12 @@ public:
{
}
VTKM_CONT vtkm::cont::DeviceAdapterId GetDevice() const override final
VTKM_CONT vtkm::cont::DeviceAdapterId GetDevice() const final
{
return vtkm::cont::DeviceAdapterTagTBB{};
}
VTKM_CONT virtual RuntimeDeviceConfigReturnCode SetThreads(const vtkm::Id& value) override final
VTKM_CONT RuntimeDeviceConfigReturnCode SetThreads(const vtkm::Id& value) final
{
this->CurrentNumThreads = value > 0 ? value : this->HardwareMaxThreads;
#if TBB_VERSION_MAJOR >= 2020
@ -69,7 +69,7 @@ public:
return RuntimeDeviceConfigReturnCode::SUCCESS;
}
VTKM_CONT virtual RuntimeDeviceConfigReturnCode GetThreads(vtkm::Id& value) const override final
VTKM_CONT RuntimeDeviceConfigReturnCode GetThreads(vtkm::Id& value) const final
{
#if TBB_VERSION_MAJOR >= 2020
value = ::tbb::global_control::active_value(::tbb::global_control::max_allowed_parallelism);
@ -79,8 +79,7 @@ public:
return RuntimeDeviceConfigReturnCode::SUCCESS;
}
VTKM_CONT virtual RuntimeDeviceConfigReturnCode GetMaxThreads(
vtkm::Id& value) const override final
VTKM_CONT RuntimeDeviceConfigReturnCode GetMaxThreads(vtkm::Id& value) const final
{
value = this->HardwareMaxThreads;
return RuntimeDeviceConfigReturnCode::SUCCESS;

2
vtkm/cont/testing/MakeTestDataSet.h
View File

@ -53,7 +53,7 @@ public:
vtkm::cont::DataSet Make3DUniformDataSet0();
vtkm::cont::DataSet Make3DUniformDataSet1();
vtkm::cont::DataSet Make3DUniformDataSet2();
vtkm::cont::DataSet Make3DUniformDataSet3(const vtkm::Id3 dims = vtkm::Id3(10));
vtkm::cont::DataSet Make3DUniformDataSet3(vtkm::Id3 dims = vtkm::Id3(10));
vtkm::cont::DataSet Make3DUniformDataSet4();
vtkm::cont::DataSet Make3DRegularDataSet0();
vtkm::cont::DataSet Make3DRegularDataSet1();

2
vtkm/cont/testlib/MakeTestDataSet.cxx
View File

@ -293,7 +293,7 @@ vtkm::cont::DataSet MakeTestDataSet::Make3DUniformDataSet2()
return dataSet;
}
vtkm::cont::DataSet MakeTestDataSet::Make3DUniformDataSet3(const vtkm::Id3 dims)
vtkm::cont::DataSet MakeTestDataSet::Make3DUniformDataSet3(vtkm::Id3 dims)
{
vtkm::cont::DataSetBuilderUniform dsb;
vtkm::cont::DataSet dataSet = dsb.Create(dims);

1
vtkm/exec/CellLocatorRectilinearGrid.h
View File

@ -37,6 +37,7 @@ private:
using AxisPortalType = typename AxisHandle::ReadPortalType;
using RectilinearPortalType = typename RectilinearType::ReadPortalType;
// NOLINTNEXTLINE(performance-move-const-arg)
VTKM_CONT static vtkm::Id3&& ToId3(vtkm::Id3&& src) { return std::move(src); }
VTKM_CONT static vtkm::Id3 ToId3(vtkm::Id2&& src) { return vtkm::Id3(src[0], src[1], 1); }
VTKM_CONT static vtkm::Id3 ToId3(vtkm::Id&& src) { return vtkm::Id3(src, 1, 1); }

5
vtkm/exec/FunctorBase.h
View File

@ -31,10 +31,7 @@ class VTKM_ALWAYS_EXPORT FunctorBase
{
public:
VTKM_EXEC_CONT
FunctorBase()
: ErrorMessage()
{
}
FunctorBase() {}
VTKM_EXEC
void RaiseError(const char* message) const { this->ErrorMessage.RaiseError(message); }

2
vtkm/internal/ArrayPortalValueReference.h
View File

@ -61,7 +61,7 @@ struct ArrayPortalValueReference
VTKM_SUPPRESS_EXEC_WARNINGS
VTKM_EXEC_CONT
operator ValueType(void) const { return this->Get(); }
operator ValueType() const { return this->Get(); }
// Declaring Set as const seems a little weird because we are changing the value. But remember
// that ArrayPortalReference is only a reference class. The reference itself does not change,

2
vtkm/source/Oscillator.cxx
View File

@ -75,7 +75,7 @@ public:
VTKM_EXEC
vtkm::FloatDefault operator()(const vtkm::Vec3f& vec) const
{
vtkm::UInt8 oIdx;
vtkm::IdComponent oIdx;
vtkm::FloatDefault t0, t, result = 0;
const Oscillation* oscillator;

6
vtkm/worklet/colorconversion/Conversions.h
View File

@ -10,6 +10,8 @@
#ifndef vtk_m_worklet_colorconversion_Conversions_h
#define vtk_m_worklet_colorconversion_Conversions_h
#include <cmath>
namespace vtkm
{
namespace worklet
@ -26,13 +28,13 @@ VTKM_EXEC inline vtkm::UInt8 ColorToUChar(T t)
template <>
VTKM_EXEC inline vtkm::UInt8 ColorToUChar(vtkm::Float64 t)
{
return static_cast<vtkm::UInt8>(t * 255.0f + 0.5f);
return static_cast<vtkm::UInt8>(std::round(t * 255.0f));
}
template <>
VTKM_EXEC inline vtkm::UInt8 ColorToUChar(vtkm::Float32 t)
{
return static_cast<vtkm::UInt8>(t * 255.0f + 0.5f);
return static_cast<vtkm::UInt8>(std::round(t * 255.0f));
}