Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Sudhanshu Sane
VTK-m
Commits
a6258b63
Commit
a6258b63
authored
Mar 06, 2019
by
Robert Maynard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert BoundingIntervalHierarchy.hxx back into existence.
parent
2eca1d7a
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
11 additions
and
4 deletions
+11
-4
CMake/VTKmCompilerFlags.cmake
CMake/VTKmCompilerFlags.cmake
+3
-1
vtkm/cont/BoundingIntervalHierarchy.h
vtkm/cont/BoundingIntervalHierarchy.h
+1
-1
vtkm/cont/BoundingIntervalHierarchy.hxx
vtkm/cont/BoundingIntervalHierarchy.hxx
+0
-0
vtkm/cont/CMakeLists.txt
vtkm/cont/CMakeLists.txt
+0
-1
vtkm/cont/CellLocator.h
vtkm/cont/CellLocator.h
+3
-1
vtkm/filter/testing/UnitTestLagrangianFilter.cxx
vtkm/filter/testing/UnitTestLagrangianFilter.cxx
+3
-0
vtkm/worklet/testing/UnitTestBoundingIntervalHierarchy.cxx
vtkm/worklet/testing/UnitTestBoundingIntervalHierarchy.cxx
+1
-0
No files found.
CMake/VTKmCompilerFlags.cmake
View file @
a6258b63
...
...
@@ -120,12 +120,14 @@ elseif(VTKM_COMPILER_IS_ICC)
elseif
(
VTKM_COMPILER_IS_GNU OR VTKM_COMPILER_IS_CLANG
)
set
(
cxx_flags -Wall -Wcast-align -Wchar-subscripts -Wextra -Wpointer-arith -Wformat -Wformat-security -Wshadow -Wunused-parameter -fno-common
)
set
(
cuda_flags -Xcompiler=-Wall,-Wno-unknown-pragmas,-Wno-unused-local-typedefs,-Wno-unused-local-typedefs,-Wno-unused-function,-Wcast-align,-Wchar-subscripts,-Wpointer-arith,-Wformat,-Wformat-security,-Wshadow,-Wunused-parameter,-fno-common
)
if
(
VTKM_COMPILER_IS_GNU AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.99
)
list
(
APPEND cxx_flags -Wfloat-conversion
)
set
(
cuda_flags
"
${
cuda_flags
}
,-Wfloat-conversion"
)
elseif
(
VTKM_COMPILER_IS_CLANG
)
list
(
APPEND cxx_flags -Wconversion
)
set
(
cuda_flags
"
${
cuda_flags
}
,-Wconversion"
)
endif
()
set
(
cuda_flags -Xcompiler=-Wall,-Wno-unknown-pragmas,-Wno-unused-local-typedefs,-Wno-unused-local-typedefs,-Wno-unused-function,-Wcast-align,-Wconversion,-Wchar-subscripts,-Wpointer-arith,-Wformat,-Wformat-security,-Wshadow,-Wunused-parameter,-fno-common
)
#GCC 5, 6 don't properly handle strict-overflow suppression through pragma's.
#Instead of suppressing around the location of the strict-overflow you
...
...
vtkm/cont/BoundingIntervalHierarchy.h
View file @
a6258b63
...
...
@@ -36,7 +36,7 @@ namespace vtkm
{
namespace
cont
{
class
VTKM_
CONT
_EXPORT
BoundingIntervalHierarchy
:
public
vtkm
::
cont
::
CellLocator
class
VTKM_
ALWAYS
_EXPORT
BoundingIntervalHierarchy
:
public
vtkm
::
cont
::
CellLocator
{
private:
using
IdArrayHandle
=
vtkm
::
cont
::
ArrayHandle
<
vtkm
::
Id
>
;
...
...
vtkm/cont/BoundingIntervalHierarchy.
c
xx
→
vtkm/cont/BoundingIntervalHierarchy.
h
xx
View file @
a6258b63
File moved
vtkm/cont/CMakeLists.txt
View file @
a6258b63
...
...
@@ -166,7 +166,6 @@ set(sources
# compiled with a device-specific compiler (like CUDA).
set
(
device_sources
ArrayRangeCompute.cxx
BoundingIntervalHierarchy.cxx
CellSetExplicit.cxx
CoordinateSystem.cxx
StorageVirtual.cxx
...
...
vtkm/cont/CellLocator.h
View file @
a6258b63
...
...
@@ -28,6 +28,8 @@
#include <vtkm/cont/DynamicCellSet.h>
#include <vtkm/cont/ExecutionObjectBase.h>
#include <vtkm/cont/VirtualObjectHandle.h>
#include <vtkm/exec/BoundingIntervalHierarchyExec.h>
#include <vtkm/exec/CellLocator.h>
namespace
vtkm
...
...
@@ -35,7 +37,7 @@ namespace vtkm
namespace
cont
{
class
VTKM_
CONT
_EXPORT
CellLocator
:
public
vtkm
::
cont
::
ExecutionObjectBase
class
VTKM_
ALWAYS
_EXPORT
CellLocator
:
public
vtkm
::
cont
::
ExecutionObjectBase
{
public:
...
...
vtkm/filter/testing/UnitTestLagrangianFilter.cxx
View file @
a6258b63
...
...
@@ -19,9 +19,12 @@
//============================================================================
#include <iostream>
#include <vtkm/cont/BoundingIntervalHierarchy.h>
#include <vtkm/cont/BoundingIntervalHierarchy.hxx>
#include <vtkm/cont/DataSetBuilderUniform.h>
#include <vtkm/cont/DataSetFieldAdd.h>
#include <vtkm/cont/testing/Testing.h>
#include <vtkm/filter/Lagrangian.h>
vtkm
::
cont
::
DataSet
MakeTestUniformDataSet
()
...
...
vtkm/worklet/testing/UnitTestBoundingIntervalHierarchy.cxx
View file @
a6258b63
...
...
@@ -21,6 +21,7 @@
#include <vtkm/cont/Algorithm.h>
#include <vtkm/cont/ArrayHandleConcatenate.h>
#include <vtkm/cont/BoundingIntervalHierarchy.h>
#include <vtkm/cont/BoundingIntervalHierarchy.hxx>
#include <vtkm/cont/DataSetBuilderUniform.h>
#include <vtkm/cont/Timer.h>
#include <vtkm/cont/internal/DeviceAdapterTag.h>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment