From fdaccc22db6a7fbd37dc6cc4bed227390b125ddd Mon Sep 17 00:00:00 2001 From: Kenneth Moreland Date: Wed, 19 Oct 2016 16:42:58 -0600 Subject: [PATCH] Remove exports for header-only functions/methods Change the VTKM_CONT_EXPORT to VTKM_CONT. (Likewise for EXEC and EXEC_CONT.) Remove the inline from these macros so that they can be applied to everything, including implementations in a library. Because inline is not declared in these modifies, you have to add the keyword to functions and methods where the implementation is not inlined in the class. --- docs/CodingConventions.md | 2 +- examples/dynamic_dispatcher/main.cxx | 4 +- examples/hello_world/HelloWorld.cxx | 2 +- examples/isosurface/IsosurfaceUniformGrid.cxx | 4 +- examples/multi_backend/MultiBackend.cxx | 2 +- examples/streamline/StreamLineUniformGrid.cxx | 6 +- .../tetrahedra/TetrahedralizeExplicitGrid.cxx | 4 +- .../tetrahedra/TetrahedralizeUniformGrid.cxx | 4 +- .../tetrahedra/TriangulateExplicitGrid.cxx | 4 +- .../tetrahedra/TriangulateUniformGrid.cxx | 4 +- vtkm/BinaryOperators.h | 14 +- vtkm/BinaryPredicates.h | 12 +- vtkm/Bounds.h | 32 +- vtkm/CellShape.h | 6 +- vtkm/ImplicitFunctions.h | 52 +- vtkm/ListTag.h | 4 +- vtkm/Math.h | 504 +++++++++--------- vtkm/Math.h.in | 156 +++--- vtkm/Matrix.h | 64 +-- vtkm/NewtonsMethod.h | 2 +- vtkm/Pair.h | 26 +- vtkm/Range.h | 28 +- vtkm/Transform3D.h | 26 +- vtkm/TypeTraits.h | 10 +- vtkm/Types.h | 192 +++---- vtkm/UnaryPredicates.h | 6 +- vtkm/VecRectilinearPointCoordinates.h | 22 +- vtkm/VecTraits.h | 28 +- vtkm/VecVariable.h | 28 +- vtkm/VectorAnalysis.h | 32 +- vtkm/benchmarking/BenchmarkDeviceAdapter.cxx | 90 ++-- .../benchmarking/BenchmarkFieldAlgorithms.cxx | 56 +- .../BenchmarkTopologyAlgorithms.cxx | 34 +- vtkm/benchmarking/Benchmarker.h | 16 +- vtkm/cont/ArrayHandle.h | 60 +-- vtkm/cont/ArrayHandleCartesianProduct.h | 60 +-- vtkm/cont/ArrayHandleCast.h | 4 +- vtkm/cont/ArrayHandleCompositeVector.h | 84 +-- vtkm/cont/ArrayHandleConcatenate.h | 56 +- vtkm/cont/ArrayHandleConstant.h | 6 +- vtkm/cont/ArrayHandleCounting.h | 16 +- vtkm/cont/ArrayHandleGroupVec.h | 52 +- vtkm/cont/ArrayHandleImplicit.h | 14 +- vtkm/cont/ArrayHandleIndex.h | 4 +- vtkm/cont/ArrayHandlePermutation.h | 56 +- vtkm/cont/ArrayHandleStreaming.h | 50 +- vtkm/cont/ArrayHandleTransform.h | 100 ++-- .../cont/ArrayHandleUniformPointCoordinates.h | 2 +- vtkm/cont/ArrayHandleZip.h | 56 +- vtkm/cont/ArrayPortal.h | 6 +- vtkm/cont/ArrayPortalToIterators.h | 10 +- vtkm/cont/CellSet.h | 6 +- vtkm/cont/CellSetExplicit.h | 48 +- vtkm/cont/CellSetPermutation.h | 16 +- vtkm/cont/CellSetSingleType.h | 20 +- vtkm/cont/CellSetStructured.h | 12 +- vtkm/cont/CoordinateSystem.h | 36 +- vtkm/cont/DataSet.h | 50 +- vtkm/cont/DataSetBuilderExplicit.h | 53 +- vtkm/cont/DataSetBuilderRectilinear.h | 32 +- vtkm/cont/DataSetBuilderUniform.h | 16 +- vtkm/cont/DataSetFieldAdd.h | 26 +- vtkm/cont/DeviceAdapterAlgorithm.h | 66 +-- vtkm/cont/DynamicArrayHandle.h | 62 +-- vtkm/cont/DynamicCellSet.h | 52 +- vtkm/cont/Field.h | 62 +-- vtkm/cont/RuntimeDeviceInformation.h | 4 +- vtkm/cont/Storage.h | 12 +- vtkm/cont/StorageBasic.h | 26 +- vtkm/cont/StorageImplicit.h | 32 +- vtkm/cont/Timer.h | 10 +- vtkm/cont/TryExecute.h | 20 +- vtkm/cont/arg/Transport.h | 2 +- vtkm/cont/arg/TransportTagArrayIn.h | 2 +- vtkm/cont/arg/TransportTagArrayInOut.h | 2 +- vtkm/cont/arg/TransportTagArrayOut.h | 2 +- vtkm/cont/arg/TransportTagAtomicArray.h | 2 +- vtkm/cont/arg/TransportTagCellSetIn.h | 2 +- vtkm/cont/arg/TransportTagExecObject.h | 2 +- vtkm/cont/arg/TransportTagWholeArrayIn.h | 2 +- vtkm/cont/arg/TransportTagWholeArrayInOut.h | 2 +- vtkm/cont/arg/TransportTagWholeArrayOut.h | 2 +- .../arg/testing/UnitTestTransportArrayIn.cxx | 2 +- .../testing/UnitTestTransportArrayInOut.cxx | 2 +- .../arg/testing/UnitTestTransportArrayOut.cxx | 2 +- .../testing/UnitTestTransportCellSetIn.cxx | 2 +- .../testing/UnitTestTransportExecObject.cxx | 2 +- .../testing/UnitTestTransportWholeArray.cxx | 10 +- vtkm/cont/cuda/ArrayHandleCuda.h | 58 +- .../cuda/internal/ArrayManagerExecutionCuda.h | 8 +- .../ArrayManagerExecutionThrustDevice.h | 28 +- .../internal/DeviceAdapterAlgorithmCuda.h | 16 +- .../internal/DeviceAdapterAlgorithmThrust.h | 102 ++-- vtkm/cont/cuda/internal/MakeThrustIterator.h | 12 +- vtkm/cont/cuda/internal/testing/Testing.h | 4 +- .../internal/ArrayHandleExecutionManager.h | 40 +- vtkm/cont/internal/ArrayManagerExecution.h | 18 +- .../ArrayManagerExecutionShareWithControl.h | 18 +- vtkm/cont/internal/ArrayPortalFromIterators.h | 38 +- vtkm/cont/internal/ArrayPortalShrink.h | 22 +- vtkm/cont/internal/ArrayTransfer.h | 18 +- .../internal/ConnectivityExplicitInternals.h | 12 +- .../internal/DeviceAdapterAlgorithmGeneral.h | 86 +-- vtkm/cont/internal/DynamicTransform.h | 6 +- vtkm/cont/internal/FunctorsGeneral.h | 108 ++-- vtkm/cont/internal/IteratorFromArrayPortal.h | 10 +- vtkm/cont/internal/RuntimeDeviceTracker.h | 8 +- .../internal/SimplePolymorphicContainer.h | 4 +- .../internal/ArrayManagerExecutionSerial.h | 2 +- .../internal/DeviceAdapterAlgorithmSerial.h | 34 +- .../tbb/internal/ArrayManagerExecutionTBB.h | 8 +- .../tbb/internal/DeviceAdapterAlgorithmTBB.h | 28 +- vtkm/cont/tbb/internal/FunctorsTBB.h | 46 +- vtkm/cont/testing/Testing.h | 2 +- vtkm/cont/testing/TestingArrayHandles.h | 18 +- vtkm/cont/testing/TestingComputeRange.h | 4 +- vtkm/cont/testing/TestingDataSetExplicit.h | 4 +- vtkm/cont/testing/TestingDataSetSingleType.h | 4 +- vtkm/cont/testing/TestingDeviceAdapter.h | 126 ++--- vtkm/cont/testing/TestingFancyArrayHandles.h | 40 +- .../testing/UnitTestArrayHandleImplicit.cxx | 2 +- .../UnitTestArrayHandlePermutation.cxx | 18 +- .../testing/UnitTestArrayHandleTransform.cxx | 8 +- .../UnitTestArrayPortalToIterators.cxx | 12 +- .../UnitTestDeviceAdapterAlgorithmGeneral.cxx | 6 +- .../testing/UnitTestDynamicArrayHandle.cxx | 6 +- vtkm/cont/testing/UnitTestStorageImplicit.cxx | 6 +- vtkm/cont/testing/UnitTestStorageListTag.cxx | 2 +- vtkm/cont/testing/UnitTestTryExecute.cxx | 4 +- vtkm/exec/AtomicArray.h | 8 +- vtkm/exec/CellDerivative.h | 50 +- vtkm/exec/CellInterpolate.h | 30 +- vtkm/exec/ConnectivityExplicit.h | 8 +- vtkm/exec/ConnectivityPermuted.h | 12 +- vtkm/exec/ConnectivityStructured.h | 22 +- vtkm/exec/ExecutionObjectBase.h | 2 +- vtkm/exec/ExecutionWholeArray.h | 20 +- vtkm/exec/FunctorBase.h | 6 +- vtkm/exec/Jacobian.h | 20 +- vtkm/exec/ParametricCoordinates.h | 96 ++-- vtkm/exec/arg/CellShape.h | 4 +- vtkm/exec/arg/Fetch.h | 4 +- vtkm/exec/arg/FetchTagArrayDirectIn.h | 4 +- vtkm/exec/arg/FetchTagArrayDirectInOut.h | 4 +- vtkm/exec/arg/FetchTagArrayDirectOut.h | 4 +- vtkm/exec/arg/FetchTagArrayTopologyMapIn.h | 16 +- vtkm/exec/arg/FetchTagCellSetIn.h | 4 +- vtkm/exec/arg/FetchTagExecObject.h | 4 +- vtkm/exec/arg/FromCount.h | 4 +- vtkm/exec/arg/FromIndices.h | 4 +- vtkm/exec/arg/ThreadIndices.h | 4 +- vtkm/exec/arg/ThreadIndicesBasic.h | 12 +- vtkm/exec/arg/ThreadIndicesTopologyMap.h | 46 +- vtkm/exec/arg/VisitIndex.h | 4 +- vtkm/exec/arg/WorkIndex.h | 4 +- vtkm/exec/arg/testing/ThreadIndicesTesting.h | 14 +- .../testing/UnitTestFetchArrayDirectIn.cxx | 4 +- .../testing/UnitTestFetchArrayDirectInOut.cxx | 6 +- .../testing/UnitTestFetchArrayDirectOut.cxx | 4 +- .../UnitTestFetchArrayTopologyMapIn.cxx | 8 +- .../cuda/internal/ArrayPortalFromThrust.h | 36 +- .../cuda/internal/IteratorFromArrayPortal.h | 28 +- vtkm/exec/cuda/internal/WrappedOperators.h | 50 +- vtkm/exec/internal/ErrorMessageBuffer.h | 8 +- vtkm/exec/internal/VecFromPortal.h | 18 +- vtkm/exec/internal/VecFromPortalPermute.h | 18 +- vtkm/exec/internal/WorkletInvokeFunctor.h | 6 +- .../internal/WorkletInvokeFunctorDetail.h | 40 +- .../internal/WorkletInvokeFunctorDetail.h.in | 4 +- .../testing/UnitTestVecFromPortal.cxx | 4 +- .../testing/UnitTestVecFromPortalPermute.cxx | 4 +- .../testing/UnitTestWorkletInvokeFunctor.cxx | 24 +- vtkm/filter/CellAverage.h | 4 +- vtkm/filter/CellAverage.hxx | 2 + vtkm/filter/Clip.h | 10 +- vtkm/filter/Clip.hxx | 3 + vtkm/filter/ExternalFaces.h | 6 +- vtkm/filter/ExternalFaces.hxx | 3 + vtkm/filter/FieldMetadata.h | 20 +- vtkm/filter/FilterCell.h | 6 +- vtkm/filter/FilterCell.hxx | 1 + vtkm/filter/FilterDataSet.h | 20 +- vtkm/filter/FilterDataSet.hxx | 10 +- vtkm/filter/FilterDataSetWithField.h | 30 +- vtkm/filter/FilterDataSetWithField.hxx | 11 + vtkm/filter/FilterField.h | 20 +- vtkm/filter/FilterField.hxx | 8 + vtkm/filter/Histogram.h | 12 +- vtkm/filter/Histogram.hxx | 2 + vtkm/filter/MarchingCubes.h | 18 +- vtkm/filter/MarchingCubes.hxx | 3 + vtkm/filter/PointElevation.h | 10 +- vtkm/filter/PointElevation.hxx | 5 + vtkm/filter/PolicyBase.h | 14 +- vtkm/filter/ResultBase.h | 14 +- vtkm/filter/ResultDataSet.h | 8 +- vtkm/filter/ResultField.h | 14 +- vtkm/filter/Threshold.h | 14 +- vtkm/filter/Threshold.hxx | 7 +- vtkm/filter/VertexClustering.h | 10 +- vtkm/filter/VertexClustering.hxx | 3 + .../testing/UnitTestMarchingCubesFilter.cxx | 16 +- .../ArrayPortalUniformPointCoordinates.h | 22 +- .../ConnectivityStructuredInternals.h | 138 ++--- vtkm/internal/ExportMacros.h | 14 +- vtkm/internal/FunctionInterface.h | 64 +-- vtkm/internal/FunctionInterfaceDetailPost.h | 22 +- .../internal/FunctionInterfaceDetailPost.h.in | 2 +- vtkm/internal/FunctionInterfaceDetailPre.h | 358 ++++++------- vtkm/internal/FunctionInterfaceDetailPre.h.in | 16 +- vtkm/internal/Invocation.h | 16 +- vtkm/internal/ListTagDetail.h | 20 +- vtkm/interop/TransferToOpenGL.h | 2 +- vtkm/interop/cuda/internal/TransferToOpenGL.h | 4 +- vtkm/interop/internal/BufferTypePicker.h | 18 +- vtkm/interop/internal/TransferToOpenGL.h | 8 +- vtkm/interop/testing/TestingOpenGLInterop.h | 2 +- vtkm/io/writer/VTKDataSetWriter.h | 18 +- vtkm/rendering/Actor.cxx | 6 +- vtkm/rendering/AxisAnnotation3D.h | 14 +- vtkm/rendering/BitmapFont.h | 2 +- vtkm/rendering/BoundingBoxAnnotation.h | 8 +- vtkm/rendering/Camera.h | 88 +-- vtkm/rendering/Canvas.h | 24 +- vtkm/rendering/CanvasRayTracer.cxx | 8 +- vtkm/rendering/Color.h | 16 +- vtkm/rendering/ColorBarAnnotation.h | 4 +- vtkm/rendering/Mapper.h | 1 + vtkm/rendering/MapperGL.cxx | 10 +- vtkm/rendering/MapperRayTracer.cxx | 6 +- vtkm/rendering/MapperVolume.cxx | 6 +- vtkm/rendering/MatrixHelpers.h | 8 +- vtkm/rendering/TextureGL.cxx | 4 +- vtkm/rendering/Triangulator.h | 34 +- vtkm/rendering/View.h | 26 +- vtkm/rendering/WorldAnnotator.h | 4 +- vtkm/rendering/internal/RunTriangulator.cxx | 4 +- .../raytracing/BoundingVolumeHierarchy.h | 54 +- vtkm/rendering/raytracing/Camera.h | 54 +- vtkm/rendering/raytracing/Ray.h | 18 +- vtkm/rendering/raytracing/RayTracer.h | 38 +- .../raytracing/TriangleIntersector.h | 10 +- .../raytracing/VolumeRendererStructured.h | 54 +- vtkm/rendering/raytracing/Worklets.h | 8 +- vtkm/testing/Testing.h | 38 +- vtkm/testing/TestingImplicitFunctions.h | 2 +- vtkm/testing/TestingMath.h | 112 ++-- vtkm/testing/UnitTestListTag.cxx | 4 +- vtkm/testing/UnitTestNewtonsMethod.cxx | 4 +- vtkm/testing/UnitTestTypeListTag.cxx | 2 +- vtkm/worklet/AverageByKey.h | 4 +- vtkm/worklet/CellAverage.h | 8 +- vtkm/worklet/Clip.h | 52 +- vtkm/worklet/DispatcherMapField.h | 4 +- vtkm/worklet/DispatcherMapTopology.h | 4 +- vtkm/worklet/DispatcherStreamingMapField.h | 28 +- vtkm/worklet/ExternalFaces.h | 20 +- vtkm/worklet/FieldHistogram.h | 12 +- vtkm/worklet/FieldStatistics.h | 12 +- vtkm/worklet/Gradient.h | 8 +- vtkm/worklet/KernelSplatter.h | 20 +- vtkm/worklet/Magnitude.h | 2 +- vtkm/worklet/MarchingCubes.h | 24 +- vtkm/worklet/PointElevation.h | 14 +- vtkm/worklet/ScatterCounting.h | 24 +- vtkm/worklet/ScatterIdentity.h | 10 +- vtkm/worklet/ScatterUniform.h | 18 +- vtkm/worklet/StreamLineUniformGrid.h | 10 +- vtkm/worklet/TetrahedralizeExplicitGrid.h | 10 +- vtkm/worklet/TetrahedralizeUniformGrid.h | 8 +- vtkm/worklet/Threshold.h | 12 +- vtkm/worklet/TriangulateExplicitGrid.h | 10 +- vtkm/worklet/TriangulateUniformGrid.h | 8 +- vtkm/worklet/VertexClustering.h | 32 +- vtkm/worklet/WaveletCompressor.h | 8 +- vtkm/worklet/WorkletMapTopology.h | 2 +- vtkm/worklet/internal/ClipTables.h | 8 +- vtkm/worklet/internal/DispatcherBase.h | 44 +- vtkm/worklet/internal/TriangulateTables.h | 20 +- vtkm/worklet/internal/WorkletBase.h | 4 +- .../testing/UnitTestDispatcherBase.cxx | 22 +- vtkm/worklet/splatkernels/Gaussian.h | 34 +- vtkm/worklet/splatkernels/KernelBase.h | 37 +- vtkm/worklet/splatkernels/Spline3rdOrder.h | 34 +- .../worklet/testing/UnitTestMarchingCubes.cxx | 16 +- .../testing/UnitTestScatterCounting.cxx | 10 +- .../testing/UnitTestStreamLineUniformGrid.cxx | 2 +- .../worklet/testing/UnitTestStreamingSine.cxx | 2 +- vtkm/worklet/testing/UnitTestThreshold.cxx | 4 +- .../testing/UnitTestWaveletCompressor.cxx | 10 +- .../testing/UnitTestWorkletMapField.cxx | 12 +- .../UnitTestWorkletMapFieldExecArg.cxx | 6 +- .../UnitTestWorkletMapFieldWholeArray.cxx | 12 +- .../UnitTestWorkletMapTopologyExplicit.cxx | 12 +- .../UnitTestWorkletMapTopologyUniform.cxx | 18 +- vtkm/worklet/wavelets/WaveletBase.h | 8 +- vtkm/worklet/wavelets/WaveletTransforms.h | 120 ++--- 297 files changed, 3524 insertions(+), 3455 deletions(-) diff --git a/docs/CodingConventions.md b/docs/CodingConventions.md index a0e76f3a7..9c8607011 100644 --- a/docs/CodingConventions.md +++ b/docs/CodingConventions.md @@ -120,6 +120,6 @@ a tab stop is, so it is better to not use them at all. + Use vtkm::Scalar in lieu of float or double to represent data for computation and use vtkm::Id in lieu of int or long for data structure indices. This future-proofs code against changes in precision of the architecture. The indices of vtkm::Tuple are an exception. Using int to reference vtkm::Tuple (and other related classes like vtkm::exec::CellField and vtkm::math::Matrix) indices are acceptable as it is unreasonable to make these vectors longer than the precision of int. -+ All functions and methods defined within the VTK-M toolkit should be declared with VTKM_CONT_EXPORT, VTKM_EXEC_EXPORT, or VTKM_EXEC_CONT_EXPORT. ++ All functions and methods defined within the VTK-M toolkit should be declared with VTKM_CONT, VTKM_EXEC, or VTKM_EXEC_CONT. We should note that although these conventions impose a strict statute on VTK-M coding, these rules (other than those involving licensing and copyright) are not meant to be dogmatic. Examples can be found in the existing code that break these conventions, particularly when the conventions stand in the way of readability (which is the point in having them in the first place). For example, it is often the case that it is more readable for a complicated typedef to stretch a few characters past 80 even if it pushes past the end of a display. diff --git a/examples/dynamic_dispatcher/main.cxx b/examples/dynamic_dispatcher/main.cxx index de0eaa560..80dc3ec0c 100644 --- a/examples/dynamic_dispatcher/main.cxx +++ b/examples/dynamic_dispatcher/main.cxx @@ -36,7 +36,7 @@ struct ExampleFieldWorklet : public vtkm::worklet::WorkletMapField typedef void ExecutionSignature( _1, _2, _3, _4, _5, _6 ); template - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()( const vtkm::Vec< T, 3 > & vec, const U & scalar1, const V& scalar2, @@ -51,7 +51,7 @@ struct ExampleFieldWorklet : public vtkm::worklet::WorkletMapField } template - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()( const T &, const U &, const V&, diff --git a/examples/hello_world/HelloWorld.cxx b/examples/hello_world/HelloWorld.cxx index 5808f6eeb..25778bebe 100644 --- a/examples/hello_world/HelloWorld.cxx +++ b/examples/hello_world/HelloWorld.cxx @@ -141,7 +141,7 @@ struct HelloVTKMInterop typedef void ControlSignature( FieldIn<>, FieldOut<>, FieldOut<> ); typedef void ExecutionSignature( _1, _2, _3 ); - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()( const vtkm::Vec< T, 3 > & input, vtkm::Vec & output, vtkm::Vec& color ) const diff --git a/examples/isosurface/IsosurfaceUniformGrid.cxx b/examples/isosurface/IsosurfaceUniformGrid.cxx index 144d92159..eb79d628d 100644 --- a/examples/isosurface/IsosurfaceUniformGrid.cxx +++ b/examples/isosurface/IsosurfaceUniformGrid.cxx @@ -69,11 +69,11 @@ public: const vtkm::Float32 xmin, ymin, zmin, xmax, ymax, zmax; const vtkm::Id cellsPerLayer; - VTKM_CONT_EXPORT + VTKM_CONT TangleField(const vtkm::Id3 dims, const vtkm::Float32 mins[3], const vtkm::Float32 maxs[3]) : xdim(dims[0]), ydim(dims[1]), zdim(dims[2]), xmin(mins[0]), ymin(mins[1]), zmin(mins[2]), xmax(maxs[0]), ymax(maxs[1]), zmax(maxs[2]), cellsPerLayer((xdim) * (ydim)) { }; - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(const vtkm::Id &vertexId, vtkm::Float32 &v) const { const vtkm::Id x = vertexId % (xdim); diff --git a/examples/multi_backend/MultiBackend.cxx b/examples/multi_backend/MultiBackend.cxx index 067b0d5f6..ae11178b3 100644 --- a/examples/multi_backend/MultiBackend.cxx +++ b/examples/multi_backend/MultiBackend.cxx @@ -43,7 +43,7 @@ struct GenerateSurfaceWorklet : public vtkm::worklet::WorkletMapField typedef void ExecutionSignature( _1, _2, _3 ); template - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()( const vtkm::Vec< T, 3 > & input, vtkm::Vec & output, vtkm::Vec& color ) const diff --git a/examples/streamline/StreamLineUniformGrid.cxx b/examples/streamline/StreamLineUniformGrid.cxx index 57a1f8e29..5e2cafc78 100755 --- a/examples/streamline/StreamLineUniformGrid.cxx +++ b/examples/streamline/StreamLineUniformGrid.cxx @@ -76,7 +76,7 @@ int mouse_state = 1; struct GetVertexArray { template - VTKM_CONT_EXPORT + VTKM_CONT void operator()(ArrayHandleType array) const { this->GetVertexPortal(array.GetPortalConstControl()); @@ -84,7 +84,7 @@ struct GetVertexArray private: template - VTKM_CONT_EXPORT + VTKM_CONT void GetVertexPortal(const PortalType &portal) const { for (vtkm::Id index = 0; index < portal.GetNumberOfValues(); index++) @@ -212,7 +212,7 @@ void mouseCall(int button, int state, int x, int y) namespace { template -VTKM_EXEC_CONT_EXPORT +VTKM_EXEC_CONT vtkm::Vec Normalize(vtkm::Vec v) { T magnitude = static_cast(sqrt(vtkm::dot(v, v))); diff --git a/examples/tetrahedra/TetrahedralizeExplicitGrid.cxx b/examples/tetrahedra/TetrahedralizeExplicitGrid.cxx index a85383afc..d6665c642 100644 --- a/examples/tetrahedra/TetrahedralizeExplicitGrid.cxx +++ b/examples/tetrahedra/TetrahedralizeExplicitGrid.cxx @@ -131,7 +131,7 @@ vtkm::cont::DataSet MakeTetrahedralizeExplicitDataSet() struct GetVertexArray { template - VTKM_CONT_EXPORT + VTKM_CONT void operator()(ArrayHandleType array) const { this->GetVertexPortal(array.GetPortalConstControl()); @@ -139,7 +139,7 @@ struct GetVertexArray private: template - VTKM_CONT_EXPORT + VTKM_CONT void GetVertexPortal(const PortalType &portal) const { for (vtkm::Id index = 0; index < portal.GetNumberOfValues(); index++) diff --git a/examples/tetrahedra/TetrahedralizeUniformGrid.cxx b/examples/tetrahedra/TetrahedralizeUniformGrid.cxx index 8a05e5c44..47d7f26f9 100644 --- a/examples/tetrahedra/TetrahedralizeUniformGrid.cxx +++ b/examples/tetrahedra/TetrahedralizeUniformGrid.cxx @@ -98,7 +98,7 @@ vtkm::cont::DataSet MakeTetrahedralizeTestDataSet(vtkm::Id3 dim) struct GetVertexArray { template - VTKM_CONT_EXPORT + VTKM_CONT void operator()(ArrayHandleType array) const { this->GetVertexPortal(array.GetPortalConstControl()); @@ -106,7 +106,7 @@ struct GetVertexArray private: template - VTKM_CONT_EXPORT + VTKM_CONT void GetVertexPortal(const PortalType &portal) const { for (vtkm::Id index = 0; index < portal.GetNumberOfValues(); index++) diff --git a/examples/tetrahedra/TriangulateExplicitGrid.cxx b/examples/tetrahedra/TriangulateExplicitGrid.cxx index 844fe8743..0305ac74c 100644 --- a/examples/tetrahedra/TriangulateExplicitGrid.cxx +++ b/examples/tetrahedra/TriangulateExplicitGrid.cxx @@ -133,7 +133,7 @@ vtkm::cont::DataSet MakeTriangulateExplicitDataSet() struct GetVertexArray { template - VTKM_CONT_EXPORT + VTKM_CONT void operator()(ArrayHandleType array) const { this->GetVertexPortal(array.GetPortalConstControl()); @@ -141,7 +141,7 @@ struct GetVertexArray private: template - VTKM_CONT_EXPORT + VTKM_CONT void GetVertexPortal(const PortalType &portal) const { for (vtkm::Id index = 0; index < portal.GetNumberOfValues(); index++) diff --git a/examples/tetrahedra/TriangulateUniformGrid.cxx b/examples/tetrahedra/TriangulateUniformGrid.cxx index 270cbac2a..b80a68231 100644 --- a/examples/tetrahedra/TriangulateUniformGrid.cxx +++ b/examples/tetrahedra/TriangulateUniformGrid.cxx @@ -91,7 +91,7 @@ vtkm::cont::DataSet MakeTriangulateTestDataSet(vtkm::Id2 dim) struct GetVertexArray { template - VTKM_CONT_EXPORT + VTKM_CONT void operator()(ArrayHandleType array) const { this->GetVertexPortal(array.GetPortalConstControl()); @@ -99,7 +99,7 @@ struct GetVertexArray private: template - VTKM_CONT_EXPORT + VTKM_CONT void GetVertexPortal(const PortalType &portal) const { for (vtkm::Id index = 0; index < portal.GetNumberOfValues(); index++) diff --git a/vtkm/BinaryOperators.h b/vtkm/BinaryOperators.h index b2404f57a..06c2f3af0 100644 --- a/vtkm/BinaryOperators.h +++ b/vtkm/BinaryOperators.h @@ -41,7 +41,7 @@ namespace vtkm { struct Sum { template - VTKM_EXEC_CONT_EXPORT T operator()(const T& x, const T& y) const + VTKM_EXEC_CONT T operator()(const T& x, const T& y) const { return x + y; } @@ -53,7 +53,7 @@ struct Sum struct Product { template - VTKM_EXEC_CONT_EXPORT T operator()(const T& x, const T& y) const + VTKM_EXEC_CONT T operator()(const T& x, const T& y) const { return x * y; } @@ -71,7 +71,7 @@ struct Product struct Maximum { template - VTKM_EXEC_CONT_EXPORT T operator()(const T& x, const T& y) const + VTKM_EXEC_CONT T operator()(const T& x, const T& y) const { return x < y ? y: x; } @@ -84,7 +84,7 @@ struct Maximum struct Minimum { template - VTKM_EXEC_CONT_EXPORT T operator()(const T& x, const T& y) const + VTKM_EXEC_CONT T operator()(const T& x, const T& y) const { return x < y ? x: y; } @@ -96,7 +96,7 @@ struct Minimum struct BitwiseAnd { template - VTKM_EXEC_CONT_EXPORT T operator()(const T& x, const T& y) const + VTKM_EXEC_CONT T operator()(const T& x, const T& y) const { return x & y; } @@ -108,7 +108,7 @@ struct BitwiseAnd struct BitwiseOr { template - VTKM_EXEC_CONT_EXPORT T operator()(const T& x, const T& y) const + VTKM_EXEC_CONT T operator()(const T& x, const T& y) const { return x | y; } @@ -120,7 +120,7 @@ struct BitwiseOr struct BitwiseXor { template - VTKM_EXEC_CONT_EXPORT T operator()(const T& x, const T& y) const + VTKM_EXEC_CONT T operator()(const T& x, const T& y) const { return x ^ y; } diff --git a/vtkm/BinaryPredicates.h b/vtkm/BinaryPredicates.h index 56932629a..3a3b20742 100644 --- a/vtkm/BinaryPredicates.h +++ b/vtkm/BinaryPredicates.h @@ -30,7 +30,7 @@ namespace vtkm { struct Equal { template - VTKM_EXEC_CONT_EXPORT bool operator()(const T& x, const T& y) const + VTKM_EXEC_CONT bool operator()(const T& x, const T& y) const { return x == y; } @@ -42,7 +42,7 @@ struct Equal struct NotEqual { template - VTKM_EXEC_CONT_EXPORT bool operator()(const T& x, const T& y) const + VTKM_EXEC_CONT bool operator()(const T& x, const T& y) const { return x != y; } @@ -54,7 +54,7 @@ struct NotEqual struct SortLess { template - VTKM_EXEC_CONT_EXPORT bool operator()(const T& x, const T& y) const + VTKM_EXEC_CONT bool operator()(const T& x, const T& y) const { return x < y; } @@ -67,7 +67,7 @@ struct SortLess struct SortGreater { template - VTKM_EXEC_CONT_EXPORT bool operator()(const T& x, const T& y) const + VTKM_EXEC_CONT bool operator()(const T& x, const T& y) const { return y < x; } @@ -80,7 +80,7 @@ struct SortGreater struct LogicalAnd { template - VTKM_EXEC_CONT_EXPORT bool operator()(const T& x, const T& y) const + VTKM_EXEC_CONT bool operator()(const T& x, const T& y) const { return x && y; } @@ -93,7 +93,7 @@ struct LogicalAnd struct LogicalOr { template - VTKM_EXEC_CONT_EXPORT bool operator()(const T& x, const T& y) const + VTKM_EXEC_CONT bool operator()(const T& x, const T& y) const { return x || y; } diff --git a/vtkm/Bounds.h b/vtkm/Bounds.h index 8d463a031..4410b83b9 100644 --- a/vtkm/Bounds.h +++ b/vtkm/Bounds.h @@ -41,10 +41,10 @@ struct Bounds vtkm::Range Y; vtkm::Range Z; - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT Bounds() { } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT Bounds(const vtkm::Range &xRange, const vtkm::Range &yRange, const vtkm::Range &zRange) @@ -56,7 +56,7 @@ struct Bounds typename T4, typename T5, typename T6> - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT Bounds(const T1 &minX, const T2 &maxX, const T3 &minY, const T4 &maxY, const T5 &minZ, const T6 &maxZ) @@ -69,7 +69,7 @@ struct Bounds /// ymin, ymax, zmin, zmax. /// template - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT explicit Bounds(const T bounds[6]) : X(vtkm::Range(bounds[0], bounds[1])), Y(vtkm::Range(bounds[2], bounds[3])), @@ -80,14 +80,14 @@ struct Bounds /// point. /// template - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT Bounds(const vtkm::Vec &minPoint, const vtkm::Vec &maxPoint) : X(vtkm::Range(minPoint[0], maxPoint[0])), Y(vtkm::Range(minPoint[1], maxPoint[1])), Z(vtkm::Range(minPoint[2], maxPoint[2])) { } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT const vtkm::Bounds &operator=(const vtkm::Bounds &src) { this->X = src.X; @@ -102,7 +102,7 @@ struct Bounds /// the bounds are any real region, even if a single point or it expands to /// infinity, true is returned. /// - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT bool IsNonEmpty() const { return (this->X.IsNonEmpty() && @@ -113,7 +113,7 @@ struct Bounds /// \b Determines if a point coordinate is within the bounds. /// template - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT bool Contains(const vtkm::Vec &point) const { return (this->X.Contains(point[0]) && @@ -126,7 +126,7 @@ struct Bounds /// \c Center computes the point at the middle of the bounds. If the bounds /// are empty, the results are undefined. /// - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::Vec Center() const { return vtkm::Vec(this->X.Center(), @@ -141,7 +141,7 @@ struct Bounds /// nothing is done. /// template - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT void Include(const vtkm::Vec &point) { this->X.Include(point[0]); @@ -154,7 +154,7 @@ struct Bounds /// This version of \c Include expands these bounds just enough to include /// that of another bounds. Esentially it is the union of the two bounds. /// - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT void Include(const vtkm::Bounds &bounds) { this->X.Include(bounds.X); @@ -166,7 +166,7 @@ struct Bounds /// /// This is a nondestructive form of \c Include. /// - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::Bounds Union(const vtkm::Bounds &otherBounds) const { vtkm::Bounds unionBounds(*this); @@ -176,13 +176,13 @@ struct Bounds /// \b Operator for union /// - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::Bounds operator+(const vtkm::Bounds &otherBounds) const { return this->Union(otherBounds); } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT bool operator==(const vtkm::Bounds &bounds) const { return ((this->X == bounds.X) && @@ -190,7 +190,7 @@ struct Bounds (this->Z == bounds.Z)); } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT bool operator!=(const vtkm::Bounds &bounds) const { return ((this->X != bounds.X) || @@ -203,7 +203,7 @@ struct Bounds /// Helper function for printing bounds during testing /// -VTKM_CONT_EXPORT +static inline VTKM_CONT std::ostream &operator<<(std::ostream &stream, const vtkm::Bounds &bounds) { return stream << "{ X:" << bounds.X diff --git a/vtkm/CellShape.h b/vtkm/CellShape.h index ef8d84eeb..6d258356a 100644 --- a/vtkm/CellShape.h +++ b/vtkm/CellShape.h @@ -98,7 +98,7 @@ struct CellShapeIdToTag { template<> \ struct CellShapeTagCheck : std::true_type { }; \ } \ - VTKM_EXEC_CONT_EXPORT \ + static inline VTKM_EXEC_CONT \ const char *GetCellShapeName(vtkm::CellShapeTag ## name) { \ return #name; \ } \ @@ -134,7 +134,7 @@ VTKM_DEFINE_CELL_TAG(Pyramid, CELL_SHAPE_PYRAMID); /// \c vtkmGenericCellShapeMacro to specialize on the cell type. /// struct CellShapeTagGeneric { - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT CellShapeTagGeneric(vtkm::IdComponent shape) : Id(shape) { } vtkm::IdComponent Id; @@ -163,7 +163,7 @@ struct CellShapeTagGeneric { /// /// \code{.cpp} /// template -/// VTKM_EXEC_EXPORT +/// VTKM_EXEC /// void MyCellOperation(vtkm::CellShapeTagGeneric cellShape, /// const vtkm::exec::FunctorBase &worklet) /// { diff --git a/vtkm/ImplicitFunctions.h b/vtkm/ImplicitFunctions.h index 0d64457e6..f3eef29d0 100644 --- a/vtkm/ImplicitFunctions.h +++ b/vtkm/ImplicitFunctions.h @@ -29,37 +29,37 @@ namespace vtkm { class Plane { public: - VTKM_CONT_EXPORT + VTKM_CONT Plane() : Origin(FloatDefault(0)), Normal(FloatDefault(0), FloatDefault(0), FloatDefault(1)) { } - VTKM_CONT_EXPORT + VTKM_CONT explicit Plane(const vtkm::Vec &normal) : Origin(FloatDefault(0)), Normal(normal) { } - VTKM_CONT_EXPORT + VTKM_CONT Plane(const vtkm::Vec &origin, const vtkm::Vec &normal) : Origin(origin), Normal(normal) { } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT const vtkm::Vec& GetOrigin() const { return this->Origin; } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT const vtkm::Vec& GetNormal() const { return this->Normal; } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT FloatDefault Value(FloatDefault x, FloatDefault y, FloatDefault z) const { return ((x - this->Origin[0]) * this->Normal[0]) + @@ -67,19 +67,19 @@ public: ((z - this->Origin[2]) * this->Normal[2]); } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT FloatDefault Value(const vtkm::Vec &x) const { return this->Value(x[0], x[1], x[2]); } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::Vec Gradient(FloatDefault, FloatDefault, FloatDefault) const { return this->Normal; } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::Vec Gradient(const vtkm::Vec&) const { return this->Normal; @@ -95,32 +95,32 @@ private: class Sphere { public: - VTKM_CONT_EXPORT + VTKM_CONT Sphere() : Radius(FloatDefault(0.2)), Center(FloatDefault(0)) { } - VTKM_CONT_EXPORT + VTKM_CONT explicit Sphere(FloatDefault radius) : Radius(radius), Center(FloatDefault(0)) { } - VTKM_CONT_EXPORT + VTKM_CONT Sphere(vtkm::Vec center, FloatDefault radius) : Radius(radius), Center(center) { } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT FloatDefault GetRadius() const { return this->Radius; } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT const vtkm::Vec& GetCenter() const { return this->Center; } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT FloatDefault Value(FloatDefault x, FloatDefault y, FloatDefault z) const { return ((x - this->Center[0]) * (x - this->Center[0]) + @@ -129,20 +129,20 @@ public: (this->Radius * this->Radius); } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT FloatDefault Value(const vtkm::Vec &x) const { return this->Value(x[0], x[1], x[2]); } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::Vec Gradient(FloatDefault x, FloatDefault y, FloatDefault z) const { return this->Gradient(vtkm::Vec(x, y, z)); } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::Vec Gradient(const vtkm::Vec &x) const { return FloatDefault(2) * (x - this->Center); @@ -158,23 +158,23 @@ template class ImplicitFunctionValue { public: - VTKM_CONT_EXPORT + VTKM_CONT ImplicitFunctionValue() : Function() { } - VTKM_CONT_EXPORT + VTKM_CONT explicit ImplicitFunctionValue(const ImplicitFunction &func) : Function(func) { } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT FloatDefault operator()(const vtkm::Vec x) const { return this->Function.Value(x); } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT FloatDefault operator()(FloatDefault x, FloatDefault y, FloatDefault z) const { return this->Function.Value(x, y, z); @@ -190,23 +190,23 @@ template class ImplicitFunctionGradient { public: - VTKM_CONT_EXPORT + VTKM_CONT ImplicitFunctionGradient() : Function() { } - VTKM_CONT_EXPORT + VTKM_CONT explicit ImplicitFunctionGradient(const ImplicitFunction &func) : Function(func) { } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT FloatDefault operator()(const vtkm::Vec x) const { return this->Function.Gradient(x); } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT FloatDefault operator()(FloatDefault x, FloatDefault y, FloatDefault z) const { return this->Function.Gradient(x, y, z); diff --git a/vtkm/ListTag.h b/vtkm/ListTag.h index 0c93099b5..8a110e265 100644 --- a/vtkm/ListTag.h +++ b/vtkm/ListTag.h @@ -68,7 +68,7 @@ struct ListTagJoin : detail::ListRoot { /// default instance of that type. /// template -VTKM_CONT_EXPORT +VTKM_CONT void ListForEach(Functor &f, ListTag) { VTKM_IS_LIST_TAG(ListTag); @@ -79,7 +79,7 @@ void ListForEach(Functor &f, ListTag) /// default instance of that type. /// template -VTKM_CONT_EXPORT +VTKM_CONT void ListForEach(const Functor &f, ListTag) { VTKM_IS_LIST_TAG(ListTag); diff --git a/vtkm/Math.h b/vtkm/Math.h index 472939f3b..09f819118 100644 --- a/vtkm/Math.h +++ b/vtkm/Math.h @@ -61,7 +61,7 @@ namespace vtkm { //----------------------------------------------------------------------------- /// Returns the constant 2 times Pi. /// -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float64 TwoPi() { return 6.28318530717958647692528676655900576; @@ -69,7 +69,7 @@ vtkm::Float64 TwoPi() /// Returns the constant Pi. /// -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float64 Pi() { return 3.14159265358979323846264338327950288; @@ -77,14 +77,14 @@ vtkm::Float64 Pi() /// Returns the constant Pi halves. /// -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float64 Pi_2() { return 1.57079632679489661923132169163975144; } /// Returns the constant Pi thirds. /// -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float64 Pi_3() { return 1.04719755119659774615421446109316762; @@ -92,7 +92,7 @@ vtkm::Float64 Pi_3() /// Returns the constant Pi fourths. /// -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float64 Pi_4() { return 0.78539816339744830961566084581987572; @@ -100,7 +100,7 @@ vtkm::Float64 Pi_4() /// Compute the sine of \p x. /// -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float32 Sin(vtkm::Float32 x) { #ifdef VTKM_CUDA return VTKM_CUDA_MATH_FUNCTION_32(sin)(x); @@ -108,7 +108,7 @@ vtkm::Float32 Sin(vtkm::Float32 x) { return std::sin(x); #endif } -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float64 Sin(vtkm::Float64 x) { #ifdef VTKM_CUDA return VTKM_CUDA_MATH_FUNCTION_64(sin)(x); @@ -117,7 +117,7 @@ vtkm::Float64 Sin(vtkm::Float64 x) { #endif } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec Sin(const vtkm::Vec &x) { vtkm::Vec result; for (vtkm::IdComponent index = 0; index < N; index++) @@ -127,7 +127,7 @@ vtkm::Vec Sin(const vtkm::Vec &x) { return result; } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec Sin(const vtkm::Vec &x) { return vtkm::Vec(vtkm::Sin(x[0]), vtkm::Sin(x[1]), @@ -135,14 +135,14 @@ vtkm::Vec Sin(const vtkm::Vec &x) { vtkm::Sin(x[3])); } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec Sin(const vtkm::Vec &x) { return vtkm::Vec(vtkm::Sin(x[0]), vtkm::Sin(x[1]), vtkm::Sin(x[2])); } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec Sin(const vtkm::Vec &x) { return vtkm::Vec(vtkm::Sin(x[0]), vtkm::Sin(x[1])); @@ -150,7 +150,7 @@ vtkm::Vec Sin(const vtkm::Vec &x) { /// Compute the cosine of \p x. /// -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float32 Cos(vtkm::Float32 x) { #ifdef VTKM_CUDA return VTKM_CUDA_MATH_FUNCTION_32(cos)(x); @@ -158,7 +158,7 @@ vtkm::Float32 Cos(vtkm::Float32 x) { return std::cos(x); #endif } -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float64 Cos(vtkm::Float64 x) { #ifdef VTKM_CUDA return VTKM_CUDA_MATH_FUNCTION_64(cos)(x); @@ -167,7 +167,7 @@ vtkm::Float64 Cos(vtkm::Float64 x) { #endif } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec Cos(const vtkm::Vec &x) { vtkm::Vec result; for (vtkm::IdComponent index = 0; index < N; index++) @@ -177,7 +177,7 @@ vtkm::Vec Cos(const vtkm::Vec &x) { return result; } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec Cos(const vtkm::Vec &x) { return vtkm::Vec(vtkm::Cos(x[0]), vtkm::Cos(x[1]), @@ -185,14 +185,14 @@ vtkm::Vec Cos(const vtkm::Vec &x) { vtkm::Cos(x[3])); } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec Cos(const vtkm::Vec &x) { return vtkm::Vec(vtkm::Cos(x[0]), vtkm::Cos(x[1]), vtkm::Cos(x[2])); } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec Cos(const vtkm::Vec &x) { return vtkm::Vec(vtkm::Cos(x[0]), vtkm::Cos(x[1])); @@ -200,7 +200,7 @@ vtkm::Vec Cos(const vtkm::Vec &x) { /// Compute the tangent of \p x. /// -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float32 Tan(vtkm::Float32 x) { #ifdef VTKM_CUDA return VTKM_CUDA_MATH_FUNCTION_32(tan)(x); @@ -208,7 +208,7 @@ vtkm::Float32 Tan(vtkm::Float32 x) { return std::tan(x); #endif } -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float64 Tan(vtkm::Float64 x) { #ifdef VTKM_CUDA return VTKM_CUDA_MATH_FUNCTION_64(tan)(x); @@ -217,7 +217,7 @@ vtkm::Float64 Tan(vtkm::Float64 x) { #endif } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec Tan(const vtkm::Vec &x) { vtkm::Vec result; for (vtkm::IdComponent index = 0; index < N; index++) @@ -227,7 +227,7 @@ vtkm::Vec Tan(const vtkm::Vec &x) { return result; } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec Tan(const vtkm::Vec &x) { return vtkm::Vec(vtkm::Tan(x[0]), vtkm::Tan(x[1]), @@ -235,14 +235,14 @@ vtkm::Vec Tan(const vtkm::Vec &x) { vtkm::Tan(x[3])); } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec Tan(const vtkm::Vec &x) { return vtkm::Vec(vtkm::Tan(x[0]), vtkm::Tan(x[1]), vtkm::Tan(x[2])); } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec Tan(const vtkm::Vec &x) { return vtkm::Vec(vtkm::Tan(x[0]), vtkm::Tan(x[1])); @@ -250,7 +250,7 @@ vtkm::Vec Tan(const vtkm::Vec &x) { /// Compute the arc sine of \p x. /// -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float32 ASin(vtkm::Float32 x) { #ifdef VTKM_CUDA return VTKM_CUDA_MATH_FUNCTION_32(asin)(x); @@ -258,7 +258,7 @@ vtkm::Float32 ASin(vtkm::Float32 x) { return std::asin(x); #endif } -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float64 ASin(vtkm::Float64 x) { #ifdef VTKM_CUDA return VTKM_CUDA_MATH_FUNCTION_64(asin)(x); @@ -267,7 +267,7 @@ vtkm::Float64 ASin(vtkm::Float64 x) { #endif } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec ASin(const vtkm::Vec &x) { vtkm::Vec result; for (vtkm::IdComponent index = 0; index < N; index++) @@ -277,7 +277,7 @@ vtkm::Vec ASin(const vtkm::Vec &x) { return result; } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec ASin(const vtkm::Vec &x) { return vtkm::Vec(vtkm::ASin(x[0]), vtkm::ASin(x[1]), @@ -285,14 +285,14 @@ vtkm::Vec ASin(const vtkm::Vec &x) { vtkm::ASin(x[3])); } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec ASin(const vtkm::Vec &x) { return vtkm::Vec(vtkm::ASin(x[0]), vtkm::ASin(x[1]), vtkm::ASin(x[2])); } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec ASin(const vtkm::Vec &x) { return vtkm::Vec(vtkm::ASin(x[0]), vtkm::ASin(x[1])); @@ -300,7 +300,7 @@ vtkm::Vec ASin(const vtkm::Vec &x) { /// Compute the arc cosine of \p x. /// -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float32 ACos(vtkm::Float32 x) { #ifdef VTKM_CUDA return VTKM_CUDA_MATH_FUNCTION_32(acos)(x); @@ -308,7 +308,7 @@ vtkm::Float32 ACos(vtkm::Float32 x) { return std::acos(x); #endif } -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float64 ACos(vtkm::Float64 x) { #ifdef VTKM_CUDA return VTKM_CUDA_MATH_FUNCTION_64(acos)(x); @@ -317,7 +317,7 @@ vtkm::Float64 ACos(vtkm::Float64 x) { #endif } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec ACos(const vtkm::Vec &x) { vtkm::Vec result; for (vtkm::IdComponent index = 0; index < N; index++) @@ -327,7 +327,7 @@ vtkm::Vec ACos(const vtkm::Vec &x) { return result; } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec ACos(const vtkm::Vec &x) { return vtkm::Vec(vtkm::ACos(x[0]), vtkm::ACos(x[1]), @@ -335,14 +335,14 @@ vtkm::Vec ACos(const vtkm::Vec &x) { vtkm::ACos(x[3])); } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec ACos(const vtkm::Vec &x) { return vtkm::Vec(vtkm::ACos(x[0]), vtkm::ACos(x[1]), vtkm::ACos(x[2])); } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec ACos(const vtkm::Vec &x) { return vtkm::Vec(vtkm::ACos(x[0]), vtkm::ACos(x[1])); @@ -350,7 +350,7 @@ vtkm::Vec ACos(const vtkm::Vec &x) { /// Compute the arc tangent of \p x. /// -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float32 ATan(vtkm::Float32 x) { #ifdef VTKM_CUDA return VTKM_CUDA_MATH_FUNCTION_32(atan)(x); @@ -358,7 +358,7 @@ vtkm::Float32 ATan(vtkm::Float32 x) { return std::atan(x); #endif } -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float64 ATan(vtkm::Float64 x) { #ifdef VTKM_CUDA return VTKM_CUDA_MATH_FUNCTION_64(atan)(x); @@ -367,7 +367,7 @@ vtkm::Float64 ATan(vtkm::Float64 x) { #endif } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec ATan(const vtkm::Vec &x) { vtkm::Vec result; for (vtkm::IdComponent index = 0; index < N; index++) @@ -377,7 +377,7 @@ vtkm::Vec ATan(const vtkm::Vec &x) { return result; } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec ATan(const vtkm::Vec &x) { return vtkm::Vec(vtkm::ATan(x[0]), vtkm::ATan(x[1]), @@ -385,14 +385,14 @@ vtkm::Vec ATan(const vtkm::Vec &x) { vtkm::ATan(x[3])); } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec ATan(const vtkm::Vec &x) { return vtkm::Vec(vtkm::ATan(x[0]), vtkm::ATan(x[1]), vtkm::ATan(x[2])); } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec ATan(const vtkm::Vec &x) { return vtkm::Vec(vtkm::ATan(x[0]), vtkm::ATan(x[1])); @@ -401,7 +401,7 @@ vtkm::Vec ATan(const vtkm::Vec &x) { /// Compute the arc tangent of \p x / \p y using the signs of both arguments /// to determine the quadrant of the return value. /// -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float32 ATan2(vtkm::Float32 x, vtkm::Float32 y) { #ifdef VTKM_CUDA return VTKM_CUDA_MATH_FUNCTION_32(atan2)(x,y); @@ -409,7 +409,7 @@ vtkm::Float32 ATan2(vtkm::Float32 x, vtkm::Float32 y) { return std::atan2(x,y); #endif } -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float64 ATan2(vtkm::Float64 x, vtkm::Float64 y) { #ifdef VTKM_CUDA return VTKM_CUDA_MATH_FUNCTION_64(atan2)(x,y); @@ -420,7 +420,7 @@ vtkm::Float64 ATan2(vtkm::Float64 x, vtkm::Float64 y) { /// Compute the hyperbolic sine of \p x. /// -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float32 SinH(vtkm::Float32 x) { #ifdef VTKM_CUDA return VTKM_CUDA_MATH_FUNCTION_32(sinh)(x); @@ -428,7 +428,7 @@ vtkm::Float32 SinH(vtkm::Float32 x) { return std::sinh(x); #endif } -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float64 SinH(vtkm::Float64 x) { #ifdef VTKM_CUDA return VTKM_CUDA_MATH_FUNCTION_64(sinh)(x); @@ -437,7 +437,7 @@ vtkm::Float64 SinH(vtkm::Float64 x) { #endif } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec SinH(const vtkm::Vec &x) { vtkm::Vec result; for (vtkm::IdComponent index = 0; index < N; index++) @@ -447,7 +447,7 @@ vtkm::Vec SinH(const vtkm::Vec &x) { return result; } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec SinH(const vtkm::Vec &x) { return vtkm::Vec(vtkm::SinH(x[0]), vtkm::SinH(x[1]), @@ -455,14 +455,14 @@ vtkm::Vec SinH(const vtkm::Vec &x) { vtkm::SinH(x[3])); } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec SinH(const vtkm::Vec &x) { return vtkm::Vec(vtkm::SinH(x[0]), vtkm::SinH(x[1]), vtkm::SinH(x[2])); } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec SinH(const vtkm::Vec &x) { return vtkm::Vec(vtkm::SinH(x[0]), vtkm::SinH(x[1])); @@ -470,7 +470,7 @@ vtkm::Vec SinH(const vtkm::Vec &x) { /// Compute the hyperbolic cosine of \p x. /// -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float32 CosH(vtkm::Float32 x) { #ifdef VTKM_CUDA return VTKM_CUDA_MATH_FUNCTION_32(cosh)(x); @@ -478,7 +478,7 @@ vtkm::Float32 CosH(vtkm::Float32 x) { return std::cosh(x); #endif } -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float64 CosH(vtkm::Float64 x) { #ifdef VTKM_CUDA return VTKM_CUDA_MATH_FUNCTION_64(cosh)(x); @@ -487,7 +487,7 @@ vtkm::Float64 CosH(vtkm::Float64 x) { #endif } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec CosH(const vtkm::Vec &x) { vtkm::Vec result; for (vtkm::IdComponent index = 0; index < N; index++) @@ -497,7 +497,7 @@ vtkm::Vec CosH(const vtkm::Vec &x) { return result; } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec CosH(const vtkm::Vec &x) { return vtkm::Vec(vtkm::CosH(x[0]), vtkm::CosH(x[1]), @@ -505,14 +505,14 @@ vtkm::Vec CosH(const vtkm::Vec &x) { vtkm::CosH(x[3])); } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec CosH(const vtkm::Vec &x) { return vtkm::Vec(vtkm::CosH(x[0]), vtkm::CosH(x[1]), vtkm::CosH(x[2])); } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec CosH(const vtkm::Vec &x) { return vtkm::Vec(vtkm::CosH(x[0]), vtkm::CosH(x[1])); @@ -520,7 +520,7 @@ vtkm::Vec CosH(const vtkm::Vec &x) { /// Compute the hyperbolic tangent of \p x. /// -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float32 TanH(vtkm::Float32 x) { #ifdef VTKM_CUDA return VTKM_CUDA_MATH_FUNCTION_32(tanh)(x); @@ -528,7 +528,7 @@ vtkm::Float32 TanH(vtkm::Float32 x) { return std::tanh(x); #endif } -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float64 TanH(vtkm::Float64 x) { #ifdef VTKM_CUDA return VTKM_CUDA_MATH_FUNCTION_64(tanh)(x); @@ -537,7 +537,7 @@ vtkm::Float64 TanH(vtkm::Float64 x) { #endif } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec TanH(const vtkm::Vec &x) { vtkm::Vec result; for (vtkm::IdComponent index = 0; index < N; index++) @@ -547,7 +547,7 @@ vtkm::Vec TanH(const vtkm::Vec &x) { return result; } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec TanH(const vtkm::Vec &x) { return vtkm::Vec(vtkm::TanH(x[0]), vtkm::TanH(x[1]), @@ -555,14 +555,14 @@ vtkm::Vec TanH(const vtkm::Vec &x) { vtkm::TanH(x[3])); } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec TanH(const vtkm::Vec &x) { return vtkm::Vec(vtkm::TanH(x[0]), vtkm::TanH(x[1]), vtkm::TanH(x[2])); } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec TanH(const vtkm::Vec &x) { return vtkm::Vec(vtkm::TanH(x[0]), vtkm::TanH(x[1])); @@ -570,7 +570,7 @@ vtkm::Vec TanH(const vtkm::Vec &x) { /// Compute the hyperbolic arc sine of \p x. /// -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float32 ASinH(vtkm::Float32 x) { #ifdef VTKM_CUDA return VTKM_CUDA_MATH_FUNCTION_32(asinh)(x); @@ -578,7 +578,7 @@ vtkm::Float32 ASinH(vtkm::Float32 x) { return std::asinh(x); #endif } -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float64 ASinH(vtkm::Float64 x) { #ifdef VTKM_CUDA return VTKM_CUDA_MATH_FUNCTION_64(asinh)(x); @@ -587,7 +587,7 @@ vtkm::Float64 ASinH(vtkm::Float64 x) { #endif } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec ASinH(const vtkm::Vec &x) { vtkm::Vec result; for (vtkm::IdComponent index = 0; index < N; index++) @@ -597,7 +597,7 @@ vtkm::Vec ASinH(const vtkm::Vec &x) { return result; } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec ASinH(const vtkm::Vec &x) { return vtkm::Vec(vtkm::ASinH(x[0]), vtkm::ASinH(x[1]), @@ -605,14 +605,14 @@ vtkm::Vec ASinH(const vtkm::Vec &x) { vtkm::ASinH(x[3])); } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec ASinH(const vtkm::Vec &x) { return vtkm::Vec(vtkm::ASinH(x[0]), vtkm::ASinH(x[1]), vtkm::ASinH(x[2])); } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec ASinH(const vtkm::Vec &x) { return vtkm::Vec(vtkm::ASinH(x[0]), vtkm::ASinH(x[1])); @@ -620,7 +620,7 @@ vtkm::Vec ASinH(const vtkm::Vec &x) { /// Compute the hyperbolic arc cosine of \p x. /// -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float32 ACosH(vtkm::Float32 x) { #ifdef VTKM_CUDA return VTKM_CUDA_MATH_FUNCTION_32(acosh)(x); @@ -628,7 +628,7 @@ vtkm::Float32 ACosH(vtkm::Float32 x) { return std::acosh(x); #endif } -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float64 ACosH(vtkm::Float64 x) { #ifdef VTKM_CUDA return VTKM_CUDA_MATH_FUNCTION_64(acosh)(x); @@ -637,7 +637,7 @@ vtkm::Float64 ACosH(vtkm::Float64 x) { #endif } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec ACosH(const vtkm::Vec &x) { vtkm::Vec result; for (vtkm::IdComponent index = 0; index < N; index++) @@ -647,7 +647,7 @@ vtkm::Vec ACosH(const vtkm::Vec &x) { return result; } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec ACosH(const vtkm::Vec &x) { return vtkm::Vec(vtkm::ACosH(x[0]), vtkm::ACosH(x[1]), @@ -655,14 +655,14 @@ vtkm::Vec ACosH(const vtkm::Vec &x) { vtkm::ACosH(x[3])); } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec ACosH(const vtkm::Vec &x) { return vtkm::Vec(vtkm::ACosH(x[0]), vtkm::ACosH(x[1]), vtkm::ACosH(x[2])); } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec ACosH(const vtkm::Vec &x) { return vtkm::Vec(vtkm::ACosH(x[0]), vtkm::ACosH(x[1])); @@ -670,7 +670,7 @@ vtkm::Vec ACosH(const vtkm::Vec &x) { /// Compute the hyperbolic arc tangent of \p x. /// -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float32 ATanH(vtkm::Float32 x) { #ifdef VTKM_CUDA return VTKM_CUDA_MATH_FUNCTION_32(atanh)(x); @@ -678,7 +678,7 @@ vtkm::Float32 ATanH(vtkm::Float32 x) { return std::atanh(x); #endif } -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float64 ATanH(vtkm::Float64 x) { #ifdef VTKM_CUDA return VTKM_CUDA_MATH_FUNCTION_64(atanh)(x); @@ -687,7 +687,7 @@ vtkm::Float64 ATanH(vtkm::Float64 x) { #endif } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec ATanH(const vtkm::Vec &x) { vtkm::Vec result; for (vtkm::IdComponent index = 0; index < N; index++) @@ -697,7 +697,7 @@ vtkm::Vec ATanH(const vtkm::Vec &x) { return result; } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec ATanH(const vtkm::Vec &x) { return vtkm::Vec(vtkm::ATanH(x[0]), vtkm::ATanH(x[1]), @@ -705,14 +705,14 @@ vtkm::Vec ATanH(const vtkm::Vec &x) { vtkm::ATanH(x[3])); } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec ATanH(const vtkm::Vec &x) { return vtkm::Vec(vtkm::ATanH(x[0]), vtkm::ATanH(x[1]), vtkm::ATanH(x[2])); } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec ATanH(const vtkm::Vec &x) { return vtkm::Vec(vtkm::ATanH(x[0]), vtkm::ATanH(x[1])); @@ -721,7 +721,7 @@ vtkm::Vec ATanH(const vtkm::Vec &x) { //----------------------------------------------------------------------------- /// Computes \p x raised to the power of \p y. /// -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float32 Pow(vtkm::Float32 x, vtkm::Float32 y) { #ifdef VTKM_CUDA return VTKM_CUDA_MATH_FUNCTION_32(pow)(x,y); @@ -729,7 +729,7 @@ vtkm::Float32 Pow(vtkm::Float32 x, vtkm::Float32 y) { return std::pow(x,y); #endif } -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float64 Pow(vtkm::Float64 x, vtkm::Float64 y) { #ifdef VTKM_CUDA return VTKM_CUDA_MATH_FUNCTION_64(pow)(x,y); @@ -740,7 +740,7 @@ vtkm::Float64 Pow(vtkm::Float64 x, vtkm::Float64 y) { /// Compute the square root of \p x. /// -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float32 Sqrt(vtkm::Float32 x) { #ifdef VTKM_CUDA return VTKM_CUDA_MATH_FUNCTION_32(sqrt)(x); @@ -748,7 +748,7 @@ vtkm::Float32 Sqrt(vtkm::Float32 x) { return std::sqrt(x); #endif } -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float64 Sqrt(vtkm::Float64 x) { #ifdef VTKM_CUDA return VTKM_CUDA_MATH_FUNCTION_64(sqrt)(x); @@ -757,7 +757,7 @@ vtkm::Float64 Sqrt(vtkm::Float64 x) { #endif } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec Sqrt(const vtkm::Vec &x) { vtkm::Vec result; for (vtkm::IdComponent index = 0; index < N; index++) @@ -767,7 +767,7 @@ vtkm::Vec Sqrt(const vtkm::Vec &x) { return result; } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec Sqrt(const vtkm::Vec &x) { return vtkm::Vec(vtkm::Sqrt(x[0]), vtkm::Sqrt(x[1]), @@ -775,14 +775,14 @@ vtkm::Vec Sqrt(const vtkm::Vec &x) { vtkm::Sqrt(x[3])); } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec Sqrt(const vtkm::Vec &x) { return vtkm::Vec(vtkm::Sqrt(x[0]), vtkm::Sqrt(x[1]), vtkm::Sqrt(x[2])); } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec Sqrt(const vtkm::Vec &x) { return vtkm::Vec(vtkm::Sqrt(x[0]), vtkm::Sqrt(x[1])); @@ -794,27 +794,27 @@ vtkm::Vec Sqrt(const vtkm::Vec &x) { /// should use this function whenever dividing by the square root. /// #ifdef VTKM_CUDA -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float32 RSqrt(vtkm::Float32 x) { return rsqrtf(x); } -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float64 RSqrt(vtkm::Float64 x) { return rsqrt(x); } #else // !VTKM_CUDA -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float32 RSqrt(vtkm::Float32 x) { return 1/vtkm::Sqrt(x); } -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float64 RSqrt(vtkm::Float64 x) { return 1/vtkm::Sqrt(x); } #endif // !VTKM_CUDA template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec RSqrt(const vtkm::Vec &x) { vtkm::Vec result; for (vtkm::IdComponent index = 0; index < N; index++) @@ -824,7 +824,7 @@ vtkm::Vec RSqrt(const vtkm::Vec &x) { return result; } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec RSqrt(const vtkm::Vec &x) { return vtkm::Vec(vtkm::RSqrt(x[0]), vtkm::RSqrt(x[1]), @@ -832,14 +832,14 @@ vtkm::Vec RSqrt(const vtkm::Vec &x) { vtkm::RSqrt(x[3])); } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec RSqrt(const vtkm::Vec &x) { return vtkm::Vec(vtkm::RSqrt(x[0]), vtkm::RSqrt(x[1]), vtkm::RSqrt(x[2])); } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec RSqrt(const vtkm::Vec &x) { return vtkm::Vec(vtkm::RSqrt(x[0]), vtkm::RSqrt(x[1])); @@ -847,7 +847,7 @@ vtkm::Vec RSqrt(const vtkm::Vec &x) { /// Compute the cube root of \p x. /// -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float32 Cbrt(vtkm::Float32 x) { #ifdef VTKM_CUDA return VTKM_CUDA_MATH_FUNCTION_32(cbrt)(x); @@ -855,7 +855,7 @@ vtkm::Float32 Cbrt(vtkm::Float32 x) { return std::cbrt(x); #endif } -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float64 Cbrt(vtkm::Float64 x) { #ifdef VTKM_CUDA return VTKM_CUDA_MATH_FUNCTION_64(cbrt)(x); @@ -864,7 +864,7 @@ vtkm::Float64 Cbrt(vtkm::Float64 x) { #endif } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec Cbrt(const vtkm::Vec &x) { vtkm::Vec result; for (vtkm::IdComponent index = 0; index < N; index++) @@ -874,7 +874,7 @@ vtkm::Vec Cbrt(const vtkm::Vec &x) { return result; } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec Cbrt(const vtkm::Vec &x) { return vtkm::Vec(vtkm::Cbrt(x[0]), vtkm::Cbrt(x[1]), @@ -882,14 +882,14 @@ vtkm::Vec Cbrt(const vtkm::Vec &x) { vtkm::Cbrt(x[3])); } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec Cbrt(const vtkm::Vec &x) { return vtkm::Vec(vtkm::Cbrt(x[0]), vtkm::Cbrt(x[1]), vtkm::Cbrt(x[2])); } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec Cbrt(const vtkm::Vec &x) { return vtkm::Vec(vtkm::Cbrt(x[0]), vtkm::Cbrt(x[1])); @@ -901,27 +901,27 @@ vtkm::Vec Cbrt(const vtkm::Vec &x) { /// should use this function whenever dividing by the cube root. /// #ifdef VTKM_CUDA -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float32 RCbrt(vtkm::Float32 x) { return rcbrtf(x); } -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float64 RCbrt(vtkm::Float64 x) { return rcbrt(x); } #else // !VTKM_CUDA -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float32 RCbrt(vtkm::Float32 x) { return 1/vtkm::Cbrt(x); } -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float64 RCbrt(vtkm::Float64 x) { return 1/vtkm::Cbrt(x); } #endif // !VTKM_CUDA template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec RCbrt(const vtkm::Vec &x) { vtkm::Vec result; for (vtkm::IdComponent index = 0; index < N; index++) @@ -931,7 +931,7 @@ vtkm::Vec RCbrt(const vtkm::Vec &x) { return result; } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec RCbrt(const vtkm::Vec &x) { return vtkm::Vec(vtkm::RCbrt(x[0]), vtkm::RCbrt(x[1]), @@ -939,14 +939,14 @@ vtkm::Vec RCbrt(const vtkm::Vec &x) { vtkm::RCbrt(x[3])); } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec RCbrt(const vtkm::Vec &x) { return vtkm::Vec(vtkm::RCbrt(x[0]), vtkm::RCbrt(x[1]), vtkm::RCbrt(x[2])); } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec RCbrt(const vtkm::Vec &x) { return vtkm::Vec(vtkm::RCbrt(x[0]), vtkm::RCbrt(x[1])); @@ -954,7 +954,7 @@ vtkm::Vec RCbrt(const vtkm::Vec &x) { /// Computes e**\p x, the base-e exponential of \p x. /// -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float32 Exp(vtkm::Float32 x) { #ifdef VTKM_CUDA return VTKM_CUDA_MATH_FUNCTION_32(exp)(x); @@ -962,7 +962,7 @@ vtkm::Float32 Exp(vtkm::Float32 x) { return std::exp(x); #endif } -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float64 Exp(vtkm::Float64 x) { #ifdef VTKM_CUDA return VTKM_CUDA_MATH_FUNCTION_64(exp)(x); @@ -971,7 +971,7 @@ vtkm::Float64 Exp(vtkm::Float64 x) { #endif } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec Exp(const vtkm::Vec &x) { vtkm::Vec result; for (vtkm::IdComponent index = 0; index < N; index++) @@ -981,7 +981,7 @@ vtkm::Vec Exp(const vtkm::Vec &x) { return result; } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec Exp(const vtkm::Vec &x) { return vtkm::Vec(vtkm::Exp(x[0]), vtkm::Exp(x[1]), @@ -989,14 +989,14 @@ vtkm::Vec Exp(const vtkm::Vec &x) { vtkm::Exp(x[3])); } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec Exp(const vtkm::Vec &x) { return vtkm::Vec(vtkm::Exp(x[0]), vtkm::Exp(x[1]), vtkm::Exp(x[2])); } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec Exp(const vtkm::Vec &x) { return vtkm::Vec(vtkm::Exp(x[0]), vtkm::Exp(x[1])); @@ -1004,7 +1004,7 @@ vtkm::Vec Exp(const vtkm::Vec &x) { /// Computes 2**\p x, the base-2 exponential of \p x. /// -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float32 Exp2(vtkm::Float32 x) { #ifdef VTKM_CUDA return VTKM_CUDA_MATH_FUNCTION_32(exp2)(x); @@ -1012,7 +1012,7 @@ vtkm::Float32 Exp2(vtkm::Float32 x) { return std::exp2(x); #endif } -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float64 Exp2(vtkm::Float64 x) { #ifdef VTKM_CUDA return VTKM_CUDA_MATH_FUNCTION_64(exp2)(x); @@ -1021,7 +1021,7 @@ vtkm::Float64 Exp2(vtkm::Float64 x) { #endif } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec Exp2(const vtkm::Vec &x) { vtkm::Vec result; for (vtkm::IdComponent index = 0; index < N; index++) @@ -1031,7 +1031,7 @@ vtkm::Vec Exp2(const vtkm::Vec &x) { return result; } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec Exp2(const vtkm::Vec &x) { return vtkm::Vec(vtkm::Exp2(x[0]), vtkm::Exp2(x[1]), @@ -1039,14 +1039,14 @@ vtkm::Vec Exp2(const vtkm::Vec &x) { vtkm::Exp2(x[3])); } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec Exp2(const vtkm::Vec &x) { return vtkm::Vec(vtkm::Exp2(x[0]), vtkm::Exp2(x[1]), vtkm::Exp2(x[2])); } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec Exp2(const vtkm::Vec &x) { return vtkm::Vec(vtkm::Exp2(x[0]), vtkm::Exp2(x[1])); @@ -1055,7 +1055,7 @@ vtkm::Vec Exp2(const vtkm::Vec &x) { /// Computes (e**\p x) - 1, the of base-e exponental of \p x then minus 1. The /// accuracy of this function is good even for very small values of x. /// -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float32 ExpM1(vtkm::Float32 x) { #ifdef VTKM_CUDA return VTKM_CUDA_MATH_FUNCTION_32(expm1)(x); @@ -1063,7 +1063,7 @@ vtkm::Float32 ExpM1(vtkm::Float32 x) { return std::expm1(x); #endif } -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float64 ExpM1(vtkm::Float64 x) { #ifdef VTKM_CUDA return VTKM_CUDA_MATH_FUNCTION_64(expm1)(x); @@ -1072,7 +1072,7 @@ vtkm::Float64 ExpM1(vtkm::Float64 x) { #endif } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec ExpM1(const vtkm::Vec &x) { vtkm::Vec result; for (vtkm::IdComponent index = 0; index < N; index++) @@ -1082,7 +1082,7 @@ vtkm::Vec ExpM1(const vtkm::Vec &x) { return result; } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec ExpM1(const vtkm::Vec &x) { return vtkm::Vec(vtkm::ExpM1(x[0]), vtkm::ExpM1(x[1]), @@ -1090,14 +1090,14 @@ vtkm::Vec ExpM1(const vtkm::Vec &x) { vtkm::ExpM1(x[3])); } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec ExpM1(const vtkm::Vec &x) { return vtkm::Vec(vtkm::ExpM1(x[0]), vtkm::ExpM1(x[1]), vtkm::ExpM1(x[2])); } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec ExpM1(const vtkm::Vec &x) { return vtkm::Vec(vtkm::ExpM1(x[0]), vtkm::ExpM1(x[1])); @@ -1106,27 +1106,27 @@ vtkm::Vec ExpM1(const vtkm::Vec &x) { /// Computes 10**\p x, the base-10 exponential of \p x. /// #ifdef VTKM_CUDA -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float32 Exp10(vtkm::Float32 x) { return exp10f(x); } -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float64 Exp10(vtkm::Float64 x) { return exp10(x); } #else // !VTKM_CUDA -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float32 Exp10(vtkm::Float32 x) { return vtkm::Pow(10, x);; } -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float64 Exp10(vtkm::Float64 x) { return vtkm::Pow(10, x);; } #endif // !VTKM_CUDA template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec Exp10(const vtkm::Vec &x) { vtkm::Vec result; for (vtkm::IdComponent index = 0; index < N; index++) @@ -1136,7 +1136,7 @@ vtkm::Vec Exp10(const vtkm::Vec &x) { return result; } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec Exp10(const vtkm::Vec &x) { return vtkm::Vec(vtkm::Exp10(x[0]), vtkm::Exp10(x[1]), @@ -1144,14 +1144,14 @@ vtkm::Vec Exp10(const vtkm::Vec &x) { vtkm::Exp10(x[3])); } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec Exp10(const vtkm::Vec &x) { return vtkm::Vec(vtkm::Exp10(x[0]), vtkm::Exp10(x[1]), vtkm::Exp10(x[2])); } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec Exp10(const vtkm::Vec &x) { return vtkm::Vec(vtkm::Exp10(x[0]), vtkm::Exp10(x[1])); @@ -1159,7 +1159,7 @@ vtkm::Vec Exp10(const vtkm::Vec &x) { /// Computes the natural logarithm of \p x. /// -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float32 Log(vtkm::Float32 x) { #ifdef VTKM_CUDA return VTKM_CUDA_MATH_FUNCTION_32(log)(x); @@ -1167,7 +1167,7 @@ vtkm::Float32 Log(vtkm::Float32 x) { return std::log(x); #endif } -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float64 Log(vtkm::Float64 x) { #ifdef VTKM_CUDA return VTKM_CUDA_MATH_FUNCTION_64(log)(x); @@ -1176,7 +1176,7 @@ vtkm::Float64 Log(vtkm::Float64 x) { #endif } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec Log(const vtkm::Vec &x) { vtkm::Vec result; for (vtkm::IdComponent index = 0; index < N; index++) @@ -1186,7 +1186,7 @@ vtkm::Vec Log(const vtkm::Vec &x) { return result; } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec Log(const vtkm::Vec &x) { return vtkm::Vec(vtkm::Log(x[0]), vtkm::Log(x[1]), @@ -1194,14 +1194,14 @@ vtkm::Vec Log(const vtkm::Vec &x) { vtkm::Log(x[3])); } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec Log(const vtkm::Vec &x) { return vtkm::Vec(vtkm::Log(x[0]), vtkm::Log(x[1]), vtkm::Log(x[2])); } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec Log(const vtkm::Vec &x) { return vtkm::Vec(vtkm::Log(x[0]), vtkm::Log(x[1])); @@ -1209,7 +1209,7 @@ vtkm::Vec Log(const vtkm::Vec &x) { /// Computes the logarithm base 2 of \p x. /// -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float32 Log2(vtkm::Float32 x) { #ifdef VTKM_CUDA return VTKM_CUDA_MATH_FUNCTION_32(log2)(x); @@ -1217,7 +1217,7 @@ vtkm::Float32 Log2(vtkm::Float32 x) { return std::log2(x); #endif } -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float64 Log2(vtkm::Float64 x) { #ifdef VTKM_CUDA return VTKM_CUDA_MATH_FUNCTION_64(log2)(x); @@ -1226,7 +1226,7 @@ vtkm::Float64 Log2(vtkm::Float64 x) { #endif } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec Log2(const vtkm::Vec &x) { vtkm::Vec result; for (vtkm::IdComponent index = 0; index < N; index++) @@ -1236,7 +1236,7 @@ vtkm::Vec Log2(const vtkm::Vec &x) { return result; } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec Log2(const vtkm::Vec &x) { return vtkm::Vec(vtkm::Log2(x[0]), vtkm::Log2(x[1]), @@ -1244,14 +1244,14 @@ vtkm::Vec Log2(const vtkm::Vec &x) { vtkm::Log2(x[3])); } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec Log2(const vtkm::Vec &x) { return vtkm::Vec(vtkm::Log2(x[0]), vtkm::Log2(x[1]), vtkm::Log2(x[2])); } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec Log2(const vtkm::Vec &x) { return vtkm::Vec(vtkm::Log2(x[0]), vtkm::Log2(x[1])); @@ -1259,7 +1259,7 @@ vtkm::Vec Log2(const vtkm::Vec &x) { /// Computes the logarithm base 10 of \p x. /// -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float32 Log10(vtkm::Float32 x) { #ifdef VTKM_CUDA return VTKM_CUDA_MATH_FUNCTION_32(log10)(x); @@ -1267,7 +1267,7 @@ vtkm::Float32 Log10(vtkm::Float32 x) { return std::log10(x); #endif } -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float64 Log10(vtkm::Float64 x) { #ifdef VTKM_CUDA return VTKM_CUDA_MATH_FUNCTION_64(log10)(x); @@ -1276,7 +1276,7 @@ vtkm::Float64 Log10(vtkm::Float64 x) { #endif } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec Log10(const vtkm::Vec &x) { vtkm::Vec result; for (vtkm::IdComponent index = 0; index < N; index++) @@ -1286,7 +1286,7 @@ vtkm::Vec Log10(const vtkm::Vec &x) { return result; } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec Log10(const vtkm::Vec &x) { return vtkm::Vec(vtkm::Log10(x[0]), vtkm::Log10(x[1]), @@ -1294,14 +1294,14 @@ vtkm::Vec Log10(const vtkm::Vec &x) { vtkm::Log10(x[3])); } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec Log10(const vtkm::Vec &x) { return vtkm::Vec(vtkm::Log10(x[0]), vtkm::Log10(x[1]), vtkm::Log10(x[2])); } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec Log10(const vtkm::Vec &x) { return vtkm::Vec(vtkm::Log10(x[0]), vtkm::Log10(x[1])); @@ -1309,7 +1309,7 @@ vtkm::Vec Log10(const vtkm::Vec &x) { /// Computes the value of log(1+x) accurately for very small values of x. /// -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float32 Log1P(vtkm::Float32 x) { #ifdef VTKM_CUDA return VTKM_CUDA_MATH_FUNCTION_32(log1p)(x); @@ -1317,7 +1317,7 @@ vtkm::Float32 Log1P(vtkm::Float32 x) { return std::log1p(x); #endif } -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float64 Log1P(vtkm::Float64 x) { #ifdef VTKM_CUDA return VTKM_CUDA_MATH_FUNCTION_64(log1p)(x); @@ -1326,7 +1326,7 @@ vtkm::Float64 Log1P(vtkm::Float64 x) { #endif } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec Log1P(const vtkm::Vec &x) { vtkm::Vec result; for (vtkm::IdComponent index = 0; index < N; index++) @@ -1336,7 +1336,7 @@ vtkm::Vec Log1P(const vtkm::Vec &x) { return result; } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec Log1P(const vtkm::Vec &x) { return vtkm::Vec(vtkm::Log1P(x[0]), vtkm::Log1P(x[1]), @@ -1344,14 +1344,14 @@ vtkm::Vec Log1P(const vtkm::Vec &x) { vtkm::Log1P(x[3])); } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec Log1P(const vtkm::Vec &x) { return vtkm::Vec(vtkm::Log1P(x[0]), vtkm::Log1P(x[1]), vtkm::Log1P(x[2])); } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec Log1P(const vtkm::Vec &x) { return vtkm::Vec(vtkm::Log1P(x[0]), vtkm::Log1P(x[1])); @@ -1361,19 +1361,19 @@ vtkm::Vec Log1P(const vtkm::Vec &x) { /// Returns \p x or \p y, whichever is larger. /// template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT T Max(const T &x, const T &y); #ifdef VTKM_USE_STL -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float32 Max(vtkm::Float32 x, vtkm::Float32 y) { return (std::max)(x, y); } -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float64 Max(vtkm::Float64 x, vtkm::Float64 y) { return (std::max)(x, y); } #else // !VTKM_USE_STL -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float32 Max(vtkm::Float32 x, vtkm::Float32 y) { #ifdef VTKM_CUDA return VTKM_CUDA_MATH_FUNCTION_32(fmax)(x,y); @@ -1381,7 +1381,7 @@ vtkm::Float32 Max(vtkm::Float32 x, vtkm::Float32 y) { return std::fmax(x,y); #endif } -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float64 Max(vtkm::Float64 x, vtkm::Float64 y) { #ifdef VTKM_CUDA return VTKM_CUDA_MATH_FUNCTION_64(fmax)(x,y); @@ -1394,19 +1394,19 @@ vtkm::Float64 Max(vtkm::Float64 x, vtkm::Float64 y) { /// Returns \p x or \p y, whichever is smaller. /// template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT T Min(const T &x, const T &y); #ifdef VTKM_USE_STL -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float32 Min(vtkm::Float32 x, vtkm::Float32 y) { return (std::min)(x, y); } -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float64 Min(vtkm::Float64 x, vtkm::Float64 y) { return (std::min)(x, y); } #else // !VTKM_USE_STL -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float32 Min(vtkm::Float32 x, vtkm::Float32 y) { #ifdef VTKM_CUDA return VTKM_CUDA_MATH_FUNCTION_32(fmin)(x,y); @@ -1414,7 +1414,7 @@ vtkm::Float32 Min(vtkm::Float32 x, vtkm::Float32 y) { return std::fmin(x,y); #endif } -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float64 Min(vtkm::Float64 x, vtkm::Float64 y) { #ifdef VTKM_CUDA return VTKM_CUDA_MATH_FUNCTION_64(fmin)(x,y); @@ -1427,14 +1427,14 @@ vtkm::Float64 Min(vtkm::Float64 x, vtkm::Float64 y) { namespace detail { template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT T Max(T x, T y, vtkm::TypeTraitsScalarTag) { return (x < y) ? y : x; } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT T Max(const T &x, const T &y, vtkm::TypeTraitsVectorTag) { typedef vtkm::VecTraits Traits; @@ -1450,14 +1450,14 @@ T Max(const T &x, const T &y, vtkm::TypeTraitsVectorTag) } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT T Min(T x, T y, vtkm::TypeTraitsScalarTag) { return (x < y) ? x : y; } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT T Min(const T &x, const T &y, vtkm::TypeTraitsVectorTag) { typedef vtkm::VecTraits Traits; @@ -1477,7 +1477,7 @@ T Min(const T &x, const T &y, vtkm::TypeTraitsVectorTag) /// Returns \p x or \p y, whichever is larger. /// template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT T Max(const T &x, const T &y) { return detail::Max(x, y, typename vtkm::TypeTraits::DimensionalityTag()); } @@ -1485,7 +1485,7 @@ T Max(const T &x, const T &y) { /// Returns \p x or \p y, whichever is smaller. /// template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT T Min(const T &x, const T &y) { return detail::Min(x, y, typename vtkm::TypeTraits::DimensionalityTag()); } @@ -1526,25 +1526,25 @@ struct FloatLimits { typedef vtkm::detail::IEEE754Bits32 BitsType; - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT static vtkm::Float32 Nan() { BitsType nan = {VTKM_NAN_BITS_32}; return nan.scalar; } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT static vtkm::Float32 Infinity() { BitsType inf = {VTKM_INF_BITS_32}; return inf.scalar; } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT static vtkm::Float32 NegativeInfinity() { BitsType neginf = {VTKM_NEG_INF_BITS_32}; return neginf.scalar; } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT static vtkm::Float32 Epsilon() { return VTKM_EPSILON_32; } @@ -1555,25 +1555,25 @@ struct FloatLimits< vtkm::Vec > { typedef vtkm::detail::IEEE754Bits32 BitsType; - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT static vtkm::Vec Nan() { BitsType nan = {VTKM_NAN_BITS_32}; return vtkm::Vec(nan.scalar); } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT static vtkm::Vec Infinity() { BitsType inf = {VTKM_INF_BITS_32}; return vtkm::Vec(inf.scalar); } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT static vtkm::Vec NegativeInfinity() { BitsType neginf = {VTKM_NEG_INF_BITS_32}; return vtkm::Vec(neginf.scalar); } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT static vtkm::Vec Epsilon() { return vtkm::Vec(VTKM_EPSILON_32); } @@ -1584,25 +1584,25 @@ struct FloatLimits { typedef vtkm::detail::IEEE754Bits64 BitsType; - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT static vtkm::Float64 Nan() { BitsType nan = {VTKM_NAN_BITS_64}; return nan.scalar; } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT static vtkm::Float64 Infinity() { BitsType inf = {VTKM_INF_BITS_64}; return inf.scalar; } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT static vtkm::Float64 NegativeInfinity() { BitsType neginf = {VTKM_NEG_INF_BITS_64}; return neginf.scalar; } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT static vtkm::Float64 Epsilon() { return VTKM_EPSILON_64; } @@ -1613,25 +1613,25 @@ struct FloatLimits< vtkm::Vec > { typedef vtkm::detail::IEEE754Bits64 BitsType; - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT static vtkm::Vec Nan() { BitsType nan = {VTKM_NAN_BITS_64}; return vtkm::Vec(nan.scalar); } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT static vtkm::Vec Infinity() { BitsType inf = {VTKM_INF_BITS_64}; return vtkm::Vec(inf.scalar); } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT static vtkm::Vec NegativeInfinity() { BitsType neginf = {VTKM_NEG_INF_BITS_64}; return vtkm::Vec(neginf.scalar); } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT static vtkm::Vec Epsilon() { return vtkm::Vec(VTKM_EPSILON_64); } @@ -1651,7 +1651,7 @@ struct FloatLimits< vtkm::Vec > /// Returns the representation for not-a-number (NaN). /// template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT T Nan() { return detail::FloatLimits::Nan(); @@ -1660,7 +1660,7 @@ T Nan() /// Returns the representation for infinity. /// template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT T Infinity() { return detail::FloatLimits::Infinity(); @@ -1669,7 +1669,7 @@ T Infinity() /// Returns the representation for negative infinity. /// template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT T NegativeInfinity() { return detail::FloatLimits::NegativeInfinity(); @@ -1679,7 +1679,7 @@ T NegativeInfinity() /// that is representable. /// template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT T Epsilon() { return detail::FloatLimits::Epsilon(); @@ -1690,7 +1690,7 @@ T Epsilon() /// Returns the representation for not-a-number (NaN). /// template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT T Nan() { return std::numeric_limits::quiet_NaN(); @@ -1699,7 +1699,7 @@ T Nan() /// Returns the representation for infinity. /// template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT T Infinity() { return std::numeric_limits::infinity(); @@ -1708,7 +1708,7 @@ T Infinity() /// Returns the representation for negative infinity. /// template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT T NegativeInfinity() { return -std::numeric_limits::infinity(); @@ -1718,7 +1718,7 @@ T NegativeInfinity() /// that is representable. /// template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT T Epsilon() { return std::numeric_limits::epsilon(); @@ -1727,39 +1727,39 @@ T Epsilon() /// Returns the representation for not-a-number (NaN). /// -VTKM_EXEC_CONT_EXPORT vtkm::Float32 Nan32() { +static inline VTKM_EXEC_CONT vtkm::Float32 Nan32() { return vtkm::Nan(); } -VTKM_EXEC_CONT_EXPORT vtkm::Float64 Nan64() { +static inline VTKM_EXEC_CONT vtkm::Float64 Nan64() { return vtkm::Nan(); } /// Returns the representation for infinity. /// -VTKM_EXEC_CONT_EXPORT vtkm::Float32 Infinity32() { +static inline VTKM_EXEC_CONT vtkm::Float32 Infinity32() { return vtkm::Infinity(); } -VTKM_EXEC_CONT_EXPORT vtkm::Float64 Infinity64() { +static inline VTKM_EXEC_CONT vtkm::Float64 Infinity64() { return vtkm::Infinity(); } /// Returns the representation for negative infinity. /// -VTKM_EXEC_CONT_EXPORT vtkm::Float32 NegativeInfinity32() { +static inline VTKM_EXEC_CONT vtkm::Float32 NegativeInfinity32() { return vtkm::NegativeInfinity(); } -VTKM_EXEC_CONT_EXPORT vtkm::Float64 NegativeInfinity64() { +static inline VTKM_EXEC_CONT vtkm::Float64 NegativeInfinity64() { return vtkm::NegativeInfinity(); } /// Returns the difference between 1 and the least value greater than 1 /// that is representable. /// -VTKM_EXEC_CONT_EXPORT vtkm::Float32 Epsilon32() +static inline VTKM_EXEC_CONT vtkm::Float32 Epsilon32() { return vtkm::Epsilon(); } -VTKM_EXEC_CONT_EXPORT vtkm::Float64 Epsilon64() +static inline VTKM_EXEC_CONT vtkm::Float64 Epsilon64() { return vtkm::Epsilon(); } @@ -1768,7 +1768,7 @@ VTKM_EXEC_CONT_EXPORT vtkm::Float64 Epsilon64() /// Returns true if \p x is not a number. /// template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT bool IsNan(T x) { using std::isnan; @@ -1778,7 +1778,7 @@ bool IsNan(T x) /// Returns true if \p x is positive or negative infinity. /// template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT bool IsInf(T x) { using std::isinf; @@ -1788,7 +1788,7 @@ bool IsInf(T x) /// Returns true if \p x is a normal number (not NaN or infinite). /// template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT bool IsFinite(T x) { using std::isfinite; @@ -1798,7 +1798,7 @@ bool IsFinite(T x) //----------------------------------------------------------------------------- /// Round \p x to the smallest integer value not less than x. /// -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float32 Ceil(vtkm::Float32 x) { #ifdef VTKM_CUDA return VTKM_CUDA_MATH_FUNCTION_32(ceil)(x); @@ -1806,7 +1806,7 @@ vtkm::Float32 Ceil(vtkm::Float32 x) { return std::ceil(x); #endif } -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float64 Ceil(vtkm::Float64 x) { #ifdef VTKM_CUDA return VTKM_CUDA_MATH_FUNCTION_64(ceil)(x); @@ -1815,7 +1815,7 @@ vtkm::Float64 Ceil(vtkm::Float64 x) { #endif } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec Ceil(const vtkm::Vec &x) { vtkm::Vec result; for (vtkm::IdComponent index = 0; index < N; index++) @@ -1825,7 +1825,7 @@ vtkm::Vec Ceil(const vtkm::Vec &x) { return result; } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec Ceil(const vtkm::Vec &x) { return vtkm::Vec(vtkm::Ceil(x[0]), vtkm::Ceil(x[1]), @@ -1833,14 +1833,14 @@ vtkm::Vec Ceil(const vtkm::Vec &x) { vtkm::Ceil(x[3])); } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec Ceil(const vtkm::Vec &x) { return vtkm::Vec(vtkm::Ceil(x[0]), vtkm::Ceil(x[1]), vtkm::Ceil(x[2])); } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec Ceil(const vtkm::Vec &x) { return vtkm::Vec(vtkm::Ceil(x[0]), vtkm::Ceil(x[1])); @@ -1848,7 +1848,7 @@ vtkm::Vec Ceil(const vtkm::Vec &x) { /// Round \p x to the largest integer value not greater than x. /// -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float32 Floor(vtkm::Float32 x) { #ifdef VTKM_CUDA return VTKM_CUDA_MATH_FUNCTION_32(floor)(x); @@ -1856,7 +1856,7 @@ vtkm::Float32 Floor(vtkm::Float32 x) { return std::floor(x); #endif } -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float64 Floor(vtkm::Float64 x) { #ifdef VTKM_CUDA return VTKM_CUDA_MATH_FUNCTION_64(floor)(x); @@ -1865,7 +1865,7 @@ vtkm::Float64 Floor(vtkm::Float64 x) { #endif } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec Floor(const vtkm::Vec &x) { vtkm::Vec result; for (vtkm::IdComponent index = 0; index < N; index++) @@ -1875,7 +1875,7 @@ vtkm::Vec Floor(const vtkm::Vec &x) { return result; } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec Floor(const vtkm::Vec &x) { return vtkm::Vec(vtkm::Floor(x[0]), vtkm::Floor(x[1]), @@ -1883,14 +1883,14 @@ vtkm::Vec Floor(const vtkm::Vec &x) { vtkm::Floor(x[3])); } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec Floor(const vtkm::Vec &x) { return vtkm::Vec(vtkm::Floor(x[0]), vtkm::Floor(x[1]), vtkm::Floor(x[2])); } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec Floor(const vtkm::Vec &x) { return vtkm::Vec(vtkm::Floor(x[0]), vtkm::Floor(x[1])); @@ -1898,7 +1898,7 @@ vtkm::Vec Floor(const vtkm::Vec &x) { /// Round \p x to the nearest integral value. /// -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float32 Round(vtkm::Float32 x) { #ifdef VTKM_CUDA return VTKM_CUDA_MATH_FUNCTION_32(round)(x); @@ -1906,7 +1906,7 @@ vtkm::Float32 Round(vtkm::Float32 x) { return std::round(x); #endif } -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float64 Round(vtkm::Float64 x) { #ifdef VTKM_CUDA return VTKM_CUDA_MATH_FUNCTION_64(round)(x); @@ -1915,7 +1915,7 @@ vtkm::Float64 Round(vtkm::Float64 x) { #endif } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec Round(const vtkm::Vec &x) { vtkm::Vec result; for (vtkm::IdComponent index = 0; index < N; index++) @@ -1925,7 +1925,7 @@ vtkm::Vec Round(const vtkm::Vec &x) { return result; } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec Round(const vtkm::Vec &x) { return vtkm::Vec(vtkm::Round(x[0]), vtkm::Round(x[1]), @@ -1933,14 +1933,14 @@ vtkm::Vec Round(const vtkm::Vec &x) { vtkm::Round(x[3])); } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec Round(const vtkm::Vec &x) { return vtkm::Vec(vtkm::Round(x[0]), vtkm::Round(x[1]), vtkm::Round(x[2])); } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec Round(const vtkm::Vec &x) { return vtkm::Vec(vtkm::Round(x[0]), vtkm::Round(x[1])); @@ -1952,7 +1952,7 @@ vtkm::Vec Round(const vtkm::Vec &x) { /// numerator divided by \p denominator rounded towards zero to an integer. For /// example, FMod(6.5, 2.3) returns 1.9, which is 6.5 - 2*2.3. /// -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float32 FMod(vtkm::Float32 x, vtkm::Float32 y) { #ifdef VTKM_CUDA return VTKM_CUDA_MATH_FUNCTION_32(fmod)(x,y); @@ -1960,7 +1960,7 @@ vtkm::Float32 FMod(vtkm::Float32 x, vtkm::Float32 y) { return std::fmod(x,y); #endif } -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float64 FMod(vtkm::Float64 x, vtkm::Float64 y) { #ifdef VTKM_CUDA return VTKM_CUDA_MATH_FUNCTION_64(fmod)(x,y); @@ -1977,14 +1977,14 @@ vtkm::Float64 FMod(vtkm::Float64 x, vtkm::Float64 y) { /// #ifdef VTKM_MSVC template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT T Remainder(T numerator, T denominator) { T quotient = vtkm::Round(numerator/denominator); return numerator - quotient*denominator; } #else // !VTKM_MSVC -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float32 Remainder(vtkm::Float32 x, vtkm::Float32 y) { #ifdef VTKM_CUDA return VTKM_CUDA_MATH_FUNCTION_32(remainder)(x,y); @@ -1992,7 +1992,7 @@ vtkm::Float32 Remainder(vtkm::Float32 x, vtkm::Float32 y) { return std::remainder(x,y); #endif } -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float64 Remainder(vtkm::Float64 x, vtkm::Float64 y) { #ifdef VTKM_CUDA return VTKM_CUDA_MATH_FUNCTION_64(remainder)(x,y); @@ -2007,7 +2007,7 @@ vtkm::Float64 Remainder(vtkm::Float64 x, vtkm::Float64 y) { /// get that remainder. /// template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float32 RemainderQuotient(vtkm::Float32 numerator, vtkm::Float32 denominator, QType "ient) @@ -2018,7 +2018,7 @@ vtkm::Float32 RemainderQuotient(vtkm::Float32 numerator, return result; } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float64 RemainderQuotient(vtkm::Float64 numerator, vtkm::Float64 denominator, QType "ient) @@ -2032,12 +2032,12 @@ vtkm::Float64 RemainderQuotient(vtkm::Float64 numerator, /// Gets the integral and fractional parts of \c x. The return value is the /// fractional part and \c integral is set to the integral part. /// -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float32 ModF(vtkm::Float32 x, vtkm::Float32 &integral) { return std::modf(x, &integral); } -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float64 ModF(vtkm::Float64 x, vtkm::Float64 &integral) { return std::modf(x, &integral); @@ -2047,7 +2047,7 @@ vtkm::Float64 ModF(vtkm::Float64 x, vtkm::Float64 &integral) /// Return the absolute value of \p x. That is, return \p x if it is positive or /// \p -x if it is negative. /// -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Int32 Abs(vtkm::Int32 x) { #if VTKM_SIZE_INT == 4 @@ -2056,7 +2056,7 @@ vtkm::Int32 Abs(vtkm::Int32 x) #error Unknown size of Int32. #endif } -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Int64 Abs(vtkm::Int64 x) { #if VTKM_SIZE_LONG == 8 @@ -2067,7 +2067,7 @@ vtkm::Int64 Abs(vtkm::Int64 x) #error Unknown size of Int64. #endif } -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float32 Abs(vtkm::Float32 x) { #ifdef VTKM_CUDA return VTKM_CUDA_MATH_FUNCTION_32(fabs)(x); @@ -2075,7 +2075,7 @@ vtkm::Float32 Abs(vtkm::Float32 x) { return std::fabs(x); #endif } -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float64 Abs(vtkm::Float64 x) { #ifdef VTKM_CUDA return VTKM_CUDA_MATH_FUNCTION_64(fabs)(x); @@ -2084,7 +2084,7 @@ vtkm::Float64 Abs(vtkm::Float64 x) { #endif } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec Abs(const vtkm::Vec &x) { vtkm::Vec result; for (vtkm::IdComponent index = 0; index < N; index++) @@ -2094,7 +2094,7 @@ vtkm::Vec Abs(const vtkm::Vec &x) { return result; } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec Abs(const vtkm::Vec &x) { return vtkm::Vec(vtkm::Abs(x[0]), vtkm::Abs(x[1]), @@ -2102,14 +2102,14 @@ vtkm::Vec Abs(const vtkm::Vec &x) { vtkm::Abs(x[3])); } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec Abs(const vtkm::Vec &x) { return vtkm::Vec(vtkm::Abs(x[0]), vtkm::Abs(x[1]), vtkm::Abs(x[2])); } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec Abs(const vtkm::Vec &x) { return vtkm::Vec(vtkm::Abs(x[0]), vtkm::Abs(x[1])); @@ -2117,13 +2117,13 @@ vtkm::Vec Abs(const vtkm::Vec &x) { /// Returns a nonzero value if \p x is negative. /// -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Int32 SignBit(vtkm::Float32 x) { using std::signbit; return static_cast(signbit(x)); } -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Int32 SignBit(vtkm::Float64 x) { using std::signbit; @@ -2132,11 +2132,11 @@ vtkm::Int32 SignBit(vtkm::Float64 x) { /// Returns true if \p x is less than zero, false otherwise. /// -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT bool IsNegative(vtkm::Float32 x) { return (vtkm::SignBit(x) != 0); } -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT bool IsNegative(vtkm::Float64 x) { return (vtkm::SignBit(x) != 0); } @@ -2144,7 +2144,7 @@ bool IsNegative(vtkm::Float64 x) { /// Copies the sign of \p y onto \p x. If \p y is positive, returns Abs(\p x). /// If \p y is negative, returns -Abs(\p x). /// -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float32 CopySign(vtkm::Float32 x, vtkm::Float32 y) { #ifdef VTKM_CUDA return VTKM_CUDA_MATH_FUNCTION_32(copysign)(x,y); @@ -2152,7 +2152,7 @@ vtkm::Float32 CopySign(vtkm::Float32 x, vtkm::Float32 y) { return std::copysign(x,y); #endif } -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float64 CopySign(vtkm::Float64 x, vtkm::Float64 y) { #ifdef VTKM_CUDA return VTKM_CUDA_MATH_FUNCTION_64(copysign)(x,y); @@ -2162,7 +2162,7 @@ vtkm::Float64 CopySign(vtkm::Float64 x, vtkm::Float64 y) { } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec CopySign(const vtkm::Vec &x, const vtkm::Vec &y) { vtkm::Vec result; diff --git a/vtkm/Math.h.in b/vtkm/Math.h.in index 63d0ad323..41bc1a45e 100644 --- a/vtkm/Math.h.in +++ b/vtkm/Math.h.in @@ -62,7 +62,7 @@ $# Ignore the following comment. It is meant for the generated file. $py( def unary_function(name, type, returntype, cuda_expression, std_expression): - return '''VTKM_EXEC_CONT_EXPORT + return '''static inline VTKM_EXEC_CONT {2} {0}({1} x) {{ #ifdef VTKM_CUDA return {3}; @@ -74,7 +74,7 @@ def unary_function(name, type, returntype, cuda_expression, std_expression): def unary_Vec_function(vtkmname): return '''template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec {0}(const vtkm::Vec &x) {{ vtkm::Vec result; for (vtkm::IdComponent index = 0; index < N; index++) @@ -84,7 +84,7 @@ vtkm::Vec {0}(const vtkm::Vec &x) {{ return result; }} template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec {0}(const vtkm::Vec &x) {{ return vtkm::Vec(vtkm::{0}(x[0]), vtkm::{0}(x[1]), @@ -92,14 +92,14 @@ vtkm::Vec {0}(const vtkm::Vec &x) {{ vtkm::{0}(x[3])); }} template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec {0}(const vtkm::Vec &x) {{ return vtkm::Vec(vtkm::{0}(x[0]), vtkm::{0}(x[1]), vtkm::{0}(x[2])); }} template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec {0}(const vtkm::Vec &x) {{ return vtkm::Vec(vtkm::{0}(x[0]), vtkm::{0}(x[1])); @@ -126,7 +126,7 @@ def unary_template_function_no_vec(vtkmname, expression, returntype = None, preexpression = ''): - return '''VTKM_EXEC_CONT_EXPORT + return '''static inline VTKM_EXEC_CONT {2} {0}(vtkm::Float32 x) {{ {3} return {1}; }} @@ -134,7 +134,7 @@ def unary_template_function_no_vec(vtkmname, expression, 'vtkm::Float32' if returntype == None else returntype, preexpression) + \ -'''VTKM_EXEC_CONT_EXPORT +'''static inline VTKM_EXEC_CONT {2} {0}(vtkm::Float64 x) {{ {3} return {1}; }} @@ -144,7 +144,7 @@ def unary_template_function_no_vec(vtkmname, preexpression) def binary_function(name, type, cuda_expression, std_expression): - return '''VTKM_EXEC_CONT_EXPORT + return '''static inline VTKM_EXEC_CONT {1} {0}({1} x, {1} y) {{ #ifdef VTKM_CUDA return {2}; @@ -165,11 +165,11 @@ def binary_math_function(vtkmname, sysname): 'std::' + sysname + '(x,y)') def binary_template_function(vtkmname, expression): - return '''VTKM_EXEC_CONT_EXPORT + return '''static inline VTKM_EXEC_CONT vtkm::Float32 {0}(vtkm::Float32 x, vtkm::Float32 y) {{ return {1}; }} -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float64 {0}(vtkm::Float64 x, vtkm::Float64 y) {{ return {1}; }} @@ -187,7 +187,7 @@ namespace vtkm { //----------------------------------------------------------------------------- /// Returns the constant 2 times Pi. /// -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float64 TwoPi() { return 6.28318530717958647692528676655900576; @@ -195,7 +195,7 @@ vtkm::Float64 TwoPi() /// Returns the constant Pi. /// -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float64 Pi() { return 3.14159265358979323846264338327950288; @@ -203,14 +203,14 @@ vtkm::Float64 Pi() /// Returns the constant Pi halves. /// -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float64 Pi_2() { return 1.57079632679489661923132169163975144; } /// Returns the constant Pi thirds. /// -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float64 Pi_3() { return 1.04719755119659774615421446109316762; @@ -218,7 +218,7 @@ vtkm::Float64 Pi_3() /// Returns the constant Pi fourths. /// -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float64 Pi_4() { return 0.78539816339744830961566084581987572; @@ -298,20 +298,20 @@ $unary_math_function('Sqrt', 'sqrt')\ /// should use this function whenever dividing by the square root. /// #ifdef VTKM_CUDA -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float32 RSqrt(vtkm::Float32 x) { return rsqrtf(x); } -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float64 RSqrt(vtkm::Float64 x) { return rsqrt(x); } #else // !VTKM_CUDA -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float32 RSqrt(vtkm::Float32 x) { return 1/vtkm::Sqrt(x); } -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float64 RSqrt(vtkm::Float64 x) { return 1/vtkm::Sqrt(x); } @@ -331,20 +331,20 @@ $unary_Vec_function('Cbrt')\ /// should use this function whenever dividing by the cube root. /// #ifdef VTKM_CUDA -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float32 RCbrt(vtkm::Float32 x) { return rcbrtf(x); } -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float64 RCbrt(vtkm::Float64 x) { return rcbrt(x); } #else // !VTKM_CUDA -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float32 RCbrt(vtkm::Float32 x) { return 1/vtkm::Cbrt(x); } -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float64 RCbrt(vtkm::Float64 x) { return 1/vtkm::Cbrt(x); } @@ -372,20 +372,20 @@ $unary_Vec_function('ExpM1')\ /// Computes 10**\p x, the base-10 exponential of \p x. /// #ifdef VTKM_CUDA -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float32 Exp10(vtkm::Float32 x) { return exp10f(x); } -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float64 Exp10(vtkm::Float64 x) { return exp10(x); } #else // !VTKM_CUDA -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float32 Exp10(vtkm::Float32 x) { return vtkm::Pow(10, x);; } -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float64 Exp10(vtkm::Float64 x) { return vtkm::Pow(10, x);; } @@ -417,7 +417,7 @@ $unary_Vec_function('Log1P')\ /// Returns \p x or \p y, whichever is larger. /// template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT T Max(const T &x, const T &y); #ifdef VTKM_USE_STL $binary_template_function('Max', '(std::max)(x, y)')\ @@ -430,7 +430,7 @@ $# /// Returns \p x or \p y, whichever is smaller. /// template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT T Min(const T &x, const T &y); #ifdef VTKM_USE_STL $binary_template_function('Min', '(std::min)(x, y)')\ @@ -443,14 +443,14 @@ $# namespace detail { template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT T Max(T x, T y, vtkm::TypeTraitsScalarTag) { return (x < y) ? y : x; } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT T Max(const T &x, const T &y, vtkm::TypeTraitsVectorTag) { typedef vtkm::VecTraits Traits; @@ -466,14 +466,14 @@ T Max(const T &x, const T &y, vtkm::TypeTraitsVectorTag) } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT T Min(T x, T y, vtkm::TypeTraitsScalarTag) { return (x < y) ? x : y; } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT T Min(const T &x, const T &y, vtkm::TypeTraitsVectorTag) { typedef vtkm::VecTraits Traits; @@ -493,7 +493,7 @@ T Min(const T &x, const T &y, vtkm::TypeTraitsVectorTag) /// Returns \p x or \p y, whichever is larger. /// template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT T Max(const T &x, const T &y) { return detail::Max(x, y, typename vtkm::TypeTraits::DimensionalityTag()); } @@ -501,7 +501,7 @@ T Max(const T &x, const T &y) { /// Returns \p x or \p y, whichever is smaller. /// template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT T Min(const T &x, const T &y) { return detail::Min(x, y, typename vtkm::TypeTraits::DimensionalityTag()); } @@ -542,25 +542,25 @@ struct FloatLimits { typedef vtkm::detail::IEEE754Bits32 BitsType; - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT static vtkm::Float32 Nan() { BitsType nan = {VTKM_NAN_BITS_32}; return nan.scalar; } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT static vtkm::Float32 Infinity() { BitsType inf = {VTKM_INF_BITS_32}; return inf.scalar; } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT static vtkm::Float32 NegativeInfinity() { BitsType neginf = {VTKM_NEG_INF_BITS_32}; return neginf.scalar; } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT static vtkm::Float32 Epsilon() { return VTKM_EPSILON_32; } @@ -571,25 +571,25 @@ struct FloatLimits< vtkm::Vec > { typedef vtkm::detail::IEEE754Bits32 BitsType; - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT static vtkm::Vec Nan() { BitsType nan = {VTKM_NAN_BITS_32}; return vtkm::Vec(nan.scalar); } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT static vtkm::Vec Infinity() { BitsType inf = {VTKM_INF_BITS_32}; return vtkm::Vec(inf.scalar); } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT static vtkm::Vec NegativeInfinity() { BitsType neginf = {VTKM_NEG_INF_BITS_32}; return vtkm::Vec(neginf.scalar); } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT static vtkm::Vec Epsilon() { return vtkm::Vec(VTKM_EPSILON_32); } @@ -600,25 +600,25 @@ struct FloatLimits { typedef vtkm::detail::IEEE754Bits64 BitsType; - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT static vtkm::Float64 Nan() { BitsType nan = {VTKM_NAN_BITS_64}; return nan.scalar; } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT static vtkm::Float64 Infinity() { BitsType inf = {VTKM_INF_BITS_64}; return inf.scalar; } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT static vtkm::Float64 NegativeInfinity() { BitsType neginf = {VTKM_NEG_INF_BITS_64}; return neginf.scalar; } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT static vtkm::Float64 Epsilon() { return VTKM_EPSILON_64; } @@ -629,25 +629,25 @@ struct FloatLimits< vtkm::Vec > { typedef vtkm::detail::IEEE754Bits64 BitsType; - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT static vtkm::Vec Nan() { BitsType nan = {VTKM_NAN_BITS_64}; return vtkm::Vec(nan.scalar); } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT static vtkm::Vec Infinity() { BitsType inf = {VTKM_INF_BITS_64}; return vtkm::Vec(inf.scalar); } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT static vtkm::Vec NegativeInfinity() { BitsType neginf = {VTKM_NEG_INF_BITS_64}; return vtkm::Vec(neginf.scalar); } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT static vtkm::Vec Epsilon() { return vtkm::Vec(VTKM_EPSILON_64); } @@ -667,7 +667,7 @@ struct FloatLimits< vtkm::Vec > /// Returns the representation for not-a-number (NaN). /// template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT T Nan() { return detail::FloatLimits::Nan(); @@ -676,7 +676,7 @@ T Nan() /// Returns the representation for infinity. /// template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT T Infinity() { return detail::FloatLimits::Infinity(); @@ -685,7 +685,7 @@ T Infinity() /// Returns the representation for negative infinity. /// template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT T NegativeInfinity() { return detail::FloatLimits::NegativeInfinity(); @@ -695,7 +695,7 @@ T NegativeInfinity() /// that is representable. /// template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT T Epsilon() { return detail::FloatLimits::Epsilon(); @@ -706,7 +706,7 @@ T Epsilon() /// Returns the representation for not-a-number (NaN). /// template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT T Nan() { return std::numeric_limits::quiet_NaN(); @@ -715,7 +715,7 @@ T Nan() /// Returns the representation for infinity. /// template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT T Infinity() { return std::numeric_limits::infinity(); @@ -724,7 +724,7 @@ T Infinity() /// Returns the representation for negative infinity. /// template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT T NegativeInfinity() { return -std::numeric_limits::infinity(); @@ -734,7 +734,7 @@ T NegativeInfinity() /// that is representable. /// template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT T Epsilon() { return std::numeric_limits::epsilon(); @@ -743,39 +743,39 @@ T Epsilon() /// Returns the representation for not-a-number (NaN). /// -VTKM_EXEC_CONT_EXPORT vtkm::Float32 Nan32() { +static inline VTKM_EXEC_CONT vtkm::Float32 Nan32() { return vtkm::Nan(); } -VTKM_EXEC_CONT_EXPORT vtkm::Float64 Nan64() { +static inline VTKM_EXEC_CONT vtkm::Float64 Nan64() { return vtkm::Nan(); } /// Returns the representation for infinity. /// -VTKM_EXEC_CONT_EXPORT vtkm::Float32 Infinity32() { +static inline VTKM_EXEC_CONT vtkm::Float32 Infinity32() { return vtkm::Infinity(); } -VTKM_EXEC_CONT_EXPORT vtkm::Float64 Infinity64() { +static inline VTKM_EXEC_CONT vtkm::Float64 Infinity64() { return vtkm::Infinity(); } /// Returns the representation for negative infinity. /// -VTKM_EXEC_CONT_EXPORT vtkm::Float32 NegativeInfinity32() { +static inline VTKM_EXEC_CONT vtkm::Float32 NegativeInfinity32() { return vtkm::NegativeInfinity(); } -VTKM_EXEC_CONT_EXPORT vtkm::Float64 NegativeInfinity64() { +static inline VTKM_EXEC_CONT vtkm::Float64 NegativeInfinity64() { return vtkm::NegativeInfinity(); } /// Returns the difference between 1 and the least value greater than 1 /// that is representable. /// -VTKM_EXEC_CONT_EXPORT vtkm::Float32 Epsilon32() +static inline VTKM_EXEC_CONT vtkm::Float32 Epsilon32() { return vtkm::Epsilon(); } -VTKM_EXEC_CONT_EXPORT vtkm::Float64 Epsilon64() +static inline VTKM_EXEC_CONT vtkm::Float64 Epsilon64() { return vtkm::Epsilon(); } @@ -784,7 +784,7 @@ VTKM_EXEC_CONT_EXPORT vtkm::Float64 Epsilon64() /// Returns true if \p x is not a number. /// template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT bool IsNan(T x) { using std::isnan; @@ -794,7 +794,7 @@ bool IsNan(T x) /// Returns true if \p x is positive or negative infinity. /// template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT bool IsInf(T x) { using std::isinf; @@ -804,7 +804,7 @@ bool IsInf(T x) /// Returns true if \p x is a normal number (not NaN or infinite). /// template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT bool IsFinite(T x) { using std::isfinite; @@ -842,7 +842,7 @@ $binary_math_function('FMod', 'fmod')\ /// #ifdef VTKM_MSVC template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT T Remainder(T numerator, T denominator) { T quotient = vtkm::Round(numerator/denominator); @@ -858,7 +858,7 @@ $# /// get that remainder. /// template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float32 RemainderQuotient(vtkm::Float32 numerator, vtkm::Float32 denominator, QType "ient) @@ -869,7 +869,7 @@ vtkm::Float32 RemainderQuotient(vtkm::Float32 numerator, return result; } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float64 RemainderQuotient(vtkm::Float64 numerator, vtkm::Float64 denominator, QType "ient) @@ -883,12 +883,12 @@ vtkm::Float64 RemainderQuotient(vtkm::Float64 numerator, /// Gets the integral and fractional parts of \c x. The return value is the /// fractional part and \c integral is set to the integral part. /// -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float32 ModF(vtkm::Float32 x, vtkm::Float32 &integral) { return std::modf(x, &integral); } -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Float64 ModF(vtkm::Float64 x, vtkm::Float64 &integral) { return std::modf(x, &integral); @@ -898,7 +898,7 @@ vtkm::Float64 ModF(vtkm::Float64 x, vtkm::Float64 &integral) /// Return the absolute value of \p x. That is, return \p x if it is positive or /// \p -x if it is negative. /// -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Int32 Abs(vtkm::Int32 x) { #if VTKM_SIZE_INT == 4 @@ -907,7 +907,7 @@ vtkm::Int32 Abs(vtkm::Int32 x) #error Unknown size of Int32. #endif } -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Int64 Abs(vtkm::Int64 x) { #if VTKM_SIZE_LONG == 8 @@ -940,7 +940,7 @@ $binary_math_function('CopySign', 'copysign')\ $# template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec CopySign(const vtkm::Vec &x, const vtkm::Vec &y) { vtkm::Vec result; diff --git a/vtkm/Matrix.h b/vtkm/Matrix.h index 80deaed6a..1d36156e7 100644 --- a/vtkm/Matrix.h +++ b/vtkm/Matrix.h @@ -47,17 +47,17 @@ public: static const vtkm::IdComponent NUM_ROWS = NumRow; static const vtkm::IdComponent NUM_COLUMNS = NumCol; - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT Matrix() { } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT explicit Matrix(const ComponentType &value) : Components(vtkm::Vec(value)) { } /// Brackets are used to reference a matrix like a 2D array (i.e. /// matrix[row][column]). /// - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT const vtkm::Vec & operator[](vtkm::IdComponent rowIndex) const { VTKM_ASSERT(rowIndex >= 0); @@ -68,7 +68,7 @@ public: /// Brackets are used to referens a matrix like a 2D array i.e. /// matrix[row][column]. /// - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::Vec & operator[](vtkm::IdComponent rowIndex) { VTKM_ASSERT(rowIndex >= 0); @@ -79,7 +79,7 @@ public: /// Parentheses are used to reference a matrix using mathematical tuple /// notation i.e. matrix(row,column). /// - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT const ComponentType & operator()(vtkm::IdComponent rowIndex, vtkm::IdComponent colIndex) const { VTKM_ASSERT(rowIndex >= 0); @@ -92,7 +92,7 @@ public: /// Parentheses are used to reference a matrix using mathematical tuple /// notation i.e. matrix(row,column). /// - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT ComponentType & operator()(vtkm::IdComponent rowIndex, vtkm::IdComponent colIndex) { VTKM_ASSERT(rowIndex >= 0); @@ -110,7 +110,7 @@ private: /// matrix. /// template -VTKM_EXEC_CONT_EXPORT +VTKM_EXEC_CONT const vtkm::Vec &MatrixGetRow( const vtkm::Matrix &matrix, vtkm::IdComponent rowIndex) { @@ -121,7 +121,7 @@ const vtkm::Vec &MatrixGetRow( /// matrix. Might not be as efficient as the \c MatrixGetRow function. /// template -VTKM_EXEC_CONT_EXPORT +VTKM_EXEC_CONT vtkm::Vec MatrixGetColumn( const vtkm::Matrix &matrix, vtkm::IdComponent columnIndex) { @@ -136,7 +136,7 @@ vtkm::Vec MatrixGetColumn( /// Convenience function for setting a row of a matrix. /// template -VTKM_EXEC_CONT_EXPORT +VTKM_EXEC_CONT void MatrixSetRow(vtkm::Matrix &matrix, vtkm::IdComponent rowIndex, const vtkm::Vec &rowValues) @@ -147,7 +147,7 @@ void MatrixSetRow(vtkm::Matrix &matrix, /// Convenience function for setting a column of a matrix. /// template -VTKM_EXEC_CONT_EXPORT +VTKM_EXEC_CONT void MatrixSetColumn(vtkm::Matrix &matrix, vtkm::IdComponent columnIndex, const vtkm::Vec &columnValues) @@ -164,7 +164,7 @@ template -VTKM_EXEC_CONT_EXPORT +VTKM_EXEC_CONT vtkm::Matrix MatrixMultiply( const vtkm::Matrix &leftFactor, const vtkm::Matrix &rightFactor) @@ -191,7 +191,7 @@ vtkm::Matrix MatrixMultiply( /// Standard matrix-vector multiplication. /// template -VTKM_EXEC_CONT_EXPORT +VTKM_EXEC_CONT vtkm::Vec MatrixMultiply( const vtkm::Matrix &leftFactor, const vtkm::Vec &rightFactor) @@ -208,7 +208,7 @@ vtkm::Vec MatrixMultiply( /// Standard vector-matrix multiplication /// template -VTKM_EXEC_CONT_EXPORT +VTKM_EXEC_CONT vtkm::Vec MatrixMultiply( const vtkm::Vec &leftFactor, const vtkm::Matrix &rightFactor) @@ -226,7 +226,7 @@ vtkm::Vec MatrixMultiply( /// Returns the identity matrix. /// template -VTKM_EXEC_CONT_EXPORT +VTKM_EXEC_CONT vtkm::Matrix MatrixIdentity() { vtkm::Matrix result(T(0)); @@ -240,7 +240,7 @@ vtkm::Matrix MatrixIdentity() /// Fills the given matrix with the identity matrix. /// template -VTKM_EXEC_CONT_EXPORT +VTKM_EXEC_CONT void MatrixIdentity(vtkm::Matrix &matrix) { matrix = vtkm::MatrixIdentity(); @@ -249,7 +249,7 @@ void MatrixIdentity(vtkm::Matrix &matrix) /// Returns the transpose of the given matrix. /// template -VTKM_EXEC_CONT_EXPORT +VTKM_EXEC_CONT vtkm::Matrix MatrixTranspose( const vtkm::Matrix &matrix) { @@ -274,7 +274,7 @@ namespace detail { // Used with MatrixLUPFactor. template -VTKM_EXEC_CONT_EXPORT +VTKM_EXEC_CONT void MatrixLUPFactorFindPivot(vtkm::Matrix &A, vtkm::Vec &permutation, vtkm::IdComponent topCornerIndex, @@ -318,7 +318,7 @@ void MatrixLUPFactorFindPivot(vtkm::Matrix &A, // Used with MatrixLUPFactor template -VTKM_EXEC_CONT_EXPORT +VTKM_EXEC_CONT void MatrixLUPFactorFindUpperTriangleElements(vtkm::Matrix &A, vtkm::IdComponent topCornerIndex) { @@ -376,7 +376,7 @@ void MatrixLUPFactorFindUpperTriangleElements(vtkm::Matrix &A, /// Otherwise, valid is set to false and the result is indeterminant. /// template -VTKM_EXEC_CONT_EXPORT +VTKM_EXEC_CONT void MatrixLUPFactor(vtkm::Matrix &A, vtkm::Vec &permutation, T &inversionParity, @@ -402,7 +402,7 @@ void MatrixLUPFactor(vtkm::Matrix &A, /// matrices calculated by MatrixLUPFactor from A. The x matrix is returned. /// template -VTKM_EXEC_CONT_EXPORT +VTKM_EXEC_CONT vtkm::Vec MatrixLUPSolve(const vtkm::Matrix &LU, const vtkm::Vec &permutation, @@ -448,7 +448,7 @@ MatrixLUPSolve(const vtkm::Matrix &LU, /// is set to true, false otherwise. /// template -VTKM_EXEC_CONT_EXPORT +VTKM_EXEC_CONT vtkm::Vec SolveLinearSystem(const vtkm::Matrix &A, const vtkm::Vec &b, bool &valid) @@ -467,7 +467,7 @@ vtkm::Vec SolveLinearSystem(const vtkm::Matrix &A, /// the inverse will not be correct and valid will be set to false. /// template -VTKM_EXEC_CONT_EXPORT +VTKM_EXEC_CONT vtkm::Matrix MatrixInverse(const vtkm::Matrix &A, bool &valid) { @@ -495,7 +495,7 @@ vtkm::Matrix MatrixInverse(const vtkm::Matrix &A, /// Compute the determinant of a matrix. /// template -VTKM_EXEC_CONT_EXPORT +VTKM_EXEC_CONT T MatrixDeterminant(const vtkm::Matrix &A) { // First, we will make an LUP-factorization to help us. @@ -524,21 +524,21 @@ T MatrixDeterminant(const vtkm::Matrix &A) // Specializations for common small determinants. template -VTKM_EXEC_CONT_EXPORT +VTKM_EXEC_CONT T MatrixDeterminant(const vtkm::Matrix &A) { return A(0,0); } template -VTKM_EXEC_CONT_EXPORT +VTKM_EXEC_CONT T MatrixDeterminant(const vtkm::Matrix &A) { return A(0,0)*A(1,1) - A(1,0)*A(0,1); } template -VTKM_EXEC_CONT_EXPORT +VTKM_EXEC_CONT T MatrixDeterminant(const vtkm::Matrix &A) { return A(0,0) * A(1,1) * A(2,2) + A(1,0) * A(2,1) * A(0,2) + @@ -572,26 +572,26 @@ public: typedef vtkm::VecTraitsTagMultipleComponents HasMultipleComponents; typedef vtkm::VecTraitsTagSizeStatic IsSizeStatic; - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT static vtkm::IdComponent GetNumberOfComponents(const MatrixType &) { return NUM_COMPONENTS; } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT static const ComponentType &GetComponent(const MatrixType &matrix, vtkm::IdComponent component) { vtkm::IdComponent colIndex = component % NumCol; vtkm::IdComponent rowIndex = component / NumCol; return matrix(rowIndex,colIndex); } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT static ComponentType &GetComponent(MatrixType &matrix, vtkm::IdComponent component) { vtkm::IdComponent colIndex = component % NumCol; vtkm::IdComponent rowIndex = component / NumCol; return matrix(rowIndex,colIndex); } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT static void SetComponent(MatrixType &matrix, vtkm::IdComponent component, T value) @@ -606,7 +606,7 @@ public: // Basic comparison operators. template -VTKM_EXEC_CONT_EXPORT +VTKM_EXEC_CONT bool operator==(const vtkm::Matrix &a, const vtkm::Matrix &b) { @@ -620,7 +620,7 @@ bool operator==(const vtkm::Matrix &a, return true; } template -VTKM_EXEC_CONT_EXPORT +VTKM_EXEC_CONT bool operator!=(const vtkm::Matrix &a, const vtkm::Matrix &b) { diff --git a/vtkm/NewtonsMethod.h b/vtkm/NewtonsMethod.h index 33cc8462b..e8502be76 100644 --- a/vtkm/NewtonsMethod.h +++ b/vtkm/NewtonsMethod.h @@ -40,7 +40,7 @@ template -VTKM_EXEC_CONT_EXPORT +VTKM_EXEC_CONT vtkm::Vec NewtonsMethod(JacobianFunctor jacobianEvaluator, FunctionFunctor functionEvaluator, diff --git a/vtkm/Pair.h b/vtkm/Pair.h index edf02de48..f0fab83fb 100644 --- a/vtkm/Pair.h +++ b/vtkm/Pair.h @@ -63,24 +63,24 @@ struct Pair /// SecondType second; - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT Pair() : first(), second() { } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT Pair(const FirstType &firstSrc, const SecondType &secondSrc) : first(firstSrc), second(secondSrc) { } template - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT Pair(const vtkm::Pair &src) : first(src.first), second(src.second) { } template - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT Pair(const std::pair &src) : first(src.first), second(src.second) { } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::Pair & operator=(const vtkm::Pair &src) { this->first = src.first; @@ -88,12 +88,12 @@ struct Pair return *this; } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT bool operator==(const vtkm::Pair &other) const { return ((this->first == other.first) && (this->second == other.second)); } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT bool operator!=(const vtkm::Pair &other) const { return !(*this == other); } @@ -101,7 +101,7 @@ struct Pair /// Tests ordering on the first object, and then on the second object if the /// first are equal. /// - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT bool operator<(const vtkm::Pair &other) const { return ((this->first < other.first) || (!(other.first < this->first) && (this->second < other.second))); @@ -110,7 +110,7 @@ struct Pair /// Tests ordering on the first object, and then on the second object if the /// first are equal. /// - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT bool operator>(const vtkm::Pair &other) const { return (other < *this); } @@ -118,7 +118,7 @@ struct Pair /// Tests ordering on the first object, and then on the second object if the /// first are equal. /// - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT bool operator<=(const vtkm::Pair &other) const { return !(other < *this); } @@ -126,7 +126,7 @@ struct Pair /// Tests ordering on the first object, and then on the second object if the /// first are equal. /// - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT bool operator>=(const vtkm::Pair &other) const { return !(*this < other); } @@ -136,14 +136,14 @@ struct Pair /// This is done by adding the two objects separately. /// Useful for Reduce operation on a zipped array template -VTKM_EXEC_CONT_EXPORT +VTKM_EXEC_CONT vtkm::Pair operator+(const vtkm::Pair& a, const vtkm::Pair &b) { return vtkm::Pair(a.first + b.first, a.second + b.second); } template -VTKM_EXEC_CONT_EXPORT +VTKM_EXEC_CONT vtkm::Pair make_Pair(const T1 &firstSrc, const T2 &secondSrc) { return vtkm::Pair(firstSrc, secondSrc); diff --git a/vtkm/Range.h b/vtkm/Range.h index 0dcdab73d..27a4843f8 100644 --- a/vtkm/Range.h +++ b/vtkm/Range.h @@ -41,16 +41,16 @@ struct Range vtkm::Float64 Min; vtkm::Float64 Max; - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT Range() : Min(vtkm::Infinity64()), Max(vtkm::NegativeInfinity64()) { } template - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT Range(const T1 &min, const T2 &max) : Min(static_cast(min)), Max(static_cast(max)) { } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT const vtkm::Range &operator=(const vtkm::Range &src) { this->Min = src.Min; @@ -67,7 +67,7 @@ struct Range /// \c IsNonEmpty assumes \c Min and \c Max are inclusive. That is, if they /// are equal then true is returned. /// - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT bool IsNonEmpty() const { return (this->Min <= this->Max); @@ -80,7 +80,7 @@ struct Range /// the value is exactly the min or max, true is returned. /// template - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT bool Contains(const T &value) const { return ((this->Min <= static_cast(value)) && @@ -92,7 +92,7 @@ struct Range /// \c Length computes the distance between the min and max. If the range /// is empty, 0 is returned. /// - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::Float64 Length() const { if (this->IsNonEmpty()) @@ -110,7 +110,7 @@ struct Range /// \c Center computes the middle value of the range. If the range is empty, /// NaN is returned. /// - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::Float64 Center() const { if (this->IsNonEmpty()) @@ -130,7 +130,7 @@ struct Range /// done. /// template - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT void Include(const T &value) { this->Min = vtkm::Min(this->Min, static_cast(value)); @@ -142,7 +142,7 @@ struct Range /// This version of \c Include expands this range just enough to include that /// of another range. Esentially it is the union of the two ranges. /// - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT void Include(const vtkm::Range &range) { this->Include(range.Min); @@ -153,7 +153,7 @@ struct Range /// /// This is a nondestructive form of \c Include. /// - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::Range Union(const vtkm::Range &otherRange) const { vtkm::Range unionRange(*this); @@ -163,19 +163,19 @@ struct Range /// \b Operator for union /// - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::Range operator+(const vtkm::Range &otherRange) const { return this->Union(otherRange); } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT bool operator==(const vtkm::Range &otherRange) const { return ((this->Min == otherRange.Min) && (this->Max == otherRange.Max)); } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT bool operator!=(const vtkm::Range &otherRange) const { return ((this->Min != otherRange.Min) || (this->Max != otherRange.Max)); @@ -186,7 +186,7 @@ struct Range /// Helper function for printing ranges during testing /// -VTKM_CONT_EXPORT +static inline VTKM_CONT std::ostream &operator<<(std::ostream &stream, const vtkm::Range &range) { return stream << "[" << range.Min << ".." << range.Max << "]"; diff --git a/vtkm/Transform3D.h b/vtkm/Transform3D.h index 0f64dff86..6cfd9757b 100644 --- a/vtkm/Transform3D.h +++ b/vtkm/Transform3D.h @@ -42,7 +42,7 @@ namespace vtkm { /// transformations. /// template -VTKM_EXEC_CONT_EXPORT +VTKM_EXEC_CONT vtkm::Vec Transform3DPoint(const vtkm::Matrix &matrix, const vtkm::Vec &point) { @@ -63,7 +63,7 @@ vtkm::Vec Transform3DPoint(const vtkm::Matrix &matrix, /// transformations, but requires some more computations. /// template -VTKM_EXEC_CONT_EXPORT +VTKM_EXEC_CONT vtkm::Vec Transform3DPointPerspective(const vtkm::Matrix &matrix, const vtkm::Vec &point) { @@ -82,7 +82,7 @@ vtkm::Vec Transform3DPointPerspective(const vtkm::Matrix &matrix, /// vectors do not get translated. /// template -VTKM_EXEC_CONT_EXPORT +VTKM_EXEC_CONT vtkm::Vec Transform3DVector(const vtkm::Matrix &matrix, const vtkm::Vec &vector) { @@ -100,7 +100,7 @@ vtkm::Vec Transform3DVector(const vtkm::Matrix &matrix, /// transformation matrix for those scales. /// template -VTKM_EXEC_CONT_EXPORT +VTKM_EXEC_CONT vtkm::Matrix Transform3DScale(const T &scaleX, const T &scaleY, const T &scaleZ) { @@ -118,7 +118,7 @@ Transform3DScale(const T &scaleX, const T &scaleY, const T &scaleZ) /// returns a transformation matrix for those scales. /// template -VTKM_EXEC_CONT_EXPORT +VTKM_EXEC_CONT vtkm::Matrix Transform3DScale(const vtkm::Vec &scaleVec) { return vtkm::Transform3DScale(scaleVec[0], scaleVec[1], scaleVec[2]); @@ -130,7 +130,7 @@ vtkm::Matrix Transform3DScale(const vtkm::Vec &scaleVec) /// scales. /// template -VTKM_EXEC_CONT_EXPORT +VTKM_EXEC_CONT vtkm::Matrix Transform3DScale(const T &scale) { return vtkm::Transform3DScale(scale, scale, scale); @@ -139,7 +139,7 @@ vtkm::Matrix Transform3DScale(const T &scale) /// \brief Returns a translation matrix. /// template -VTKM_EXEC_CONT_EXPORT +VTKM_EXEC_CONT vtkm::Matrix Transform3DTranslate(const T &x, const T &y, const T &z) { vtkm::Matrix translateMatrix; @@ -150,7 +150,7 @@ vtkm::Matrix Transform3DTranslate(const T &x, const T &y, const T &z) return translateMatrix; } template -VTKM_EXEC_CONT_EXPORT +VTKM_EXEC_CONT vtkm::Matrix Transform3DTranslate(const vtkm::Vec &v) { return vtkm::Transform3DTranslate(v[0], v[1], v[2]); @@ -164,7 +164,7 @@ vtkm::Matrix Transform3DTranslate(const vtkm::Vec &v) /// rotation will be counterclockwise. /// template -VTKM_EXEC_CONT_EXPORT +VTKM_EXEC_CONT vtkm::Matrix Transform3DRotate(T angleDegrees, const vtkm::Vec &axisOfRotation) { @@ -198,7 +198,7 @@ vtkm::Matrix Transform3DRotate(T angleDegrees, return matrix; } template -VTKM_EXEC_CONT_EXPORT +VTKM_EXEC_CONT vtkm::Matrix Transform3DRotate(T angleDegrees, T x, T y, T z) { return vtkm::Transform3DRotate(angleDegrees, vtkm::Vec(x,y,z)); @@ -209,7 +209,7 @@ vtkm::Matrix Transform3DRotate(T angleDegrees, T x, T y, T z) /// Returns a transformation matrix that rotates around the x axis. /// template -VTKM_EXEC_CONT_EXPORT +VTKM_EXEC_CONT vtkm::Matrix Transform3DRotateX(T angleDegrees) { return vtkm::Transform3DRotate(angleDegrees, T(1), T(0), T(0)); @@ -220,7 +220,7 @@ vtkm::Matrix Transform3DRotateX(T angleDegrees) /// Returns a transformation matrix that rotates around the y axis. /// template -VTKM_EXEC_CONT_EXPORT +VTKM_EXEC_CONT vtkm::Matrix Transform3DRotateY(T angleDegrees) { return vtkm::Transform3DRotate(angleDegrees, T(0), T(1), T(0)); @@ -231,7 +231,7 @@ vtkm::Matrix Transform3DRotateY(T angleDegrees) /// Returns a transformation matrix that rotates around the z axis. /// template -VTKM_EXEC_CONT_EXPORT +VTKM_EXEC_CONT vtkm::Matrix Transform3DRotateZ(T angleDegrees) { return vtkm::Transform3DRotate(angleDegrees, T(0), T(0), T(1)); diff --git a/vtkm/TypeTraits.h b/vtkm/TypeTraits.h index fa4bf1f32..ff11cb30b 100644 --- a/vtkm/TypeTraits.h +++ b/vtkm/TypeTraits.h @@ -72,7 +72,7 @@ public: /// also be treated as vectors. typedef TypeTraitsUnknownTag DimensionalityTag; - VTKM_EXEC_CONT_EXPORT static T ZeroInitialization() { return T(); } + VTKM_EXEC_CONT static T ZeroInitialization() { return T(); } }; // Const types should have the same traits as their non-const counterparts. @@ -85,14 +85,14 @@ struct TypeTraits : TypeTraits template<> struct TypeTraits { \ typedef TypeTraitsRealTag NumericTag; \ typedef TypeTraitsScalarTag DimensionalityTag; \ - VTKM_EXEC_CONT_EXPORT static T ZeroInitialization() { return T(); } \ + VTKM_EXEC_CONT static T ZeroInitialization() { return T(); } \ }; #define VTKM_BASIC_INTEGER_TYPE(T) \ template<> struct TypeTraits< T > { \ typedef TypeTraitsIntegerTag NumericTag; \ typedef TypeTraitsScalarTag DimensionalityTag; \ - VTKM_EXEC_CONT_EXPORT static T ZeroInitialization() \ + VTKM_EXEC_CONT static T ZeroInitialization() \ { \ typedef T ReturnType; \ return ReturnType(); \ @@ -129,7 +129,7 @@ struct TypeTraits > typedef typename vtkm::TypeTraits::NumericTag NumericTag; typedef TypeTraitsVectorTag DimensionalityTag; - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT static vtkm::Vec ZeroInitialization() { return vtkm::Vec( (T()) ); } }; @@ -142,7 +142,7 @@ struct TypeTraits > typedef TypeTraitsUnknownTag NumericTag; typedef TypeTraitsScalarTag DimensionalityTag; - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT static vtkm::Pair ZeroInitialization() { return vtkm::Pair(TypeTraits::ZeroInitialization(), diff --git a/vtkm/Types.h b/vtkm/Types.h index 54de1fd7c..c48fad868 100644 --- a/vtkm/Types.h +++ b/vtkm/Types.h @@ -182,7 +182,7 @@ template struct VecComponentWiseUnaryOperation { template - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT T operator()(const T &v, const UnaryOpType &unaryOp) const { T result; @@ -198,7 +198,7 @@ template<> struct VecComponentWiseUnaryOperation<1> { template - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT T operator()(const T &v, const UnaryOpType &unaryOp) const { return T(unaryOp(v[0])); @@ -209,7 +209,7 @@ template<> struct VecComponentWiseUnaryOperation<2> { template - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT T operator()(const T &v, const UnaryOpType &unaryOp) const { return T(unaryOp(v[0]), unaryOp(v[1])); @@ -220,7 +220,7 @@ template<> struct VecComponentWiseUnaryOperation<3> { template - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT T operator()(const T &v, const UnaryOpType &unaryOp) const { return T(unaryOp(v[0]), unaryOp(v[1]), unaryOp(v[2])); @@ -231,7 +231,7 @@ template<> struct VecComponentWiseUnaryOperation<4> { template - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT T operator()(const T &v, const UnaryOpType &unaryOp) const { return T(unaryOp(v[0]), unaryOp(v[1]), unaryOp(v[2]), unaryOp(v[3])); @@ -244,12 +244,12 @@ struct BindLeftBinaryOp // Warning: a reference. const T& LeftValue; const BinaryOpType BinaryOp; - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT BindLeftBinaryOp(const T &leftValue, BinaryOpType binaryOp = BinaryOpType()) : LeftValue(leftValue), BinaryOp(binaryOp) { } template - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT ReturnT operator()(const RightT &rightValue) const { return static_cast(this->BinaryOp(this->LeftValue, @@ -263,12 +263,12 @@ struct BindRightBinaryOp // Warning: a reference. const T& RightValue; const BinaryOpType BinaryOp; - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT BindRightBinaryOp(const T &rightValue, BinaryOpType binaryOp = BinaryOpType()) : RightValue(rightValue), BinaryOp(binaryOp) { } template - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT ReturnT operator()(const LeftT &leftValue) const { return static_cast(this->BinaryOp(static_cast(leftValue), @@ -291,7 +291,7 @@ struct BindRightBinaryOp struct Add { template - VTKM_EXEC_CONT_EXPORT T operator()(const T &a, const T &b) const + VTKM_EXEC_CONT T operator()(const T &a, const T &b) const { return T(a + b); } @@ -300,7 +300,7 @@ struct Add struct Subtract { template - VTKM_EXEC_CONT_EXPORT T operator()(const T &a, const T &b) const + VTKM_EXEC_CONT T operator()(const T &a, const T &b) const { return T(a - b); } @@ -309,7 +309,7 @@ struct Subtract struct Multiply { template - VTKM_EXEC_CONT_EXPORT T operator()(const T &a, const T &b) const + VTKM_EXEC_CONT T operator()(const T &a, const T &b) const { return T(a * b); } @@ -318,7 +318,7 @@ struct Multiply struct Divide { template - VTKM_EXEC_CONT_EXPORT T operator()(const T &a, const T &b) const + VTKM_EXEC_CONT T operator()(const T &a, const T &b) const { return T(a / b); } @@ -327,7 +327,7 @@ struct Divide struct Negate { template - VTKM_EXEC_CONT_EXPORT T operator()(const T &x) const + VTKM_EXEC_CONT T operator()(const T &x) const { return T(-x); } @@ -355,12 +355,12 @@ public: static const vtkm::IdComponent NUM_COMPONENTS = Size; protected: - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT VecBase() { } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT explicit VecBase(const ComponentType& value) { for (vtkm::IdComponent i = 0; i < Size; ++i) @@ -370,8 +370,8 @@ protected: } template - VTKM_EXEC_CONT_EXPORT VecBase( - const VecBase& src) + VTKM_EXEC_CONT + VecBase(const VecBase& src) { for (vtkm::IdComponent i = 0; i < Size; ++i) { @@ -380,14 +380,14 @@ protected: } public: - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::IdComponent GetNumberOfComponents() const { return NUM_COMPONENTS; } template - VTKM_EXEC_CONT_EXPORT void CopyInto( + VTKM_EXEC_CONT void CopyInto( vtkm::Vec& dest) const { for (vtkm::IdComponent index = 0; @@ -397,7 +397,7 @@ public: } } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT DerivedClass& operator=(const DerivedClass& src) { for (vtkm::IdComponent i = 0; i < Size; ++i) @@ -407,14 +407,14 @@ public: return *static_cast(this); } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT const ComponentType& operator[](vtkm::IdComponent idx) const { VTKM_ASSERT(idx >= 0); VTKM_ASSERT(idx < this->NUM_COMPONENTS); return this->Components[idx]; } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT ComponentType& operator[](vtkm::IdComponent idx) { VTKM_ASSERT(idx >= 0); @@ -422,7 +422,7 @@ public: return this->Components[idx]; } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT bool operator==(const DerivedClass& other) const { bool equal=true; @@ -433,7 +433,7 @@ public: return equal; } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT bool operator<(const DerivedClass& other) const { for (vtkm::IdComponent i = 0; i < NUM_COMPONENTS; ++i) @@ -452,13 +452,13 @@ public: return false; } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT bool operator!=(const DerivedClass& other) const { return !(this->operator==(other)); } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT ComponentType Dot(const DerivedClass& other) const { ComponentType result = this->Components[0] * other[0]; @@ -480,7 +480,7 @@ public: #pragma GCC diagnostic ignored "-Wconversion" #endif // gcc || clang - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT DerivedClass operator+(const DerivedClass& other) const { DerivedClass result; @@ -491,7 +491,7 @@ public: return result; } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT DerivedClass& operator+=(const DerivedClass& other) { for (vtkm::IdComponent i = 0; i < Size; ++i) @@ -501,7 +501,7 @@ public: return *static_cast(this); } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT DerivedClass operator-(const DerivedClass& other) const { DerivedClass result; @@ -512,7 +512,7 @@ public: return result; } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT DerivedClass& operator-=(const DerivedClass& other) { for (vtkm::IdComponent i = 0; i < Size; ++i) @@ -522,7 +522,7 @@ public: return *static_cast(this); } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT DerivedClass operator*(const DerivedClass& other) const { DerivedClass result; @@ -533,7 +533,7 @@ public: return result; } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT DerivedClass& operator*=(const DerivedClass& other) { for (vtkm::IdComponent i = 0; i < Size; ++i) @@ -543,7 +543,7 @@ public: return *static_cast(this); } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT DerivedClass operator/(const DerivedClass& other) const { DerivedClass result; @@ -554,7 +554,7 @@ public: return result; } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT DerivedClass& operator/=(const DerivedClass& other) { for (vtkm::IdComponent i = 0; i < Size; ++i) @@ -569,13 +569,13 @@ public: #endif // gcc || clang - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT ComponentType* GetPointer() { return this->Components; } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT const ComponentType* GetPointer() const { return this->Components; @@ -614,12 +614,12 @@ public: static const vtkm::IdComponent NUM_COMPONENTS = Size; #endif - VTKM_EXEC_CONT_EXPORT Vec() {} - VTKM_EXEC_CONT_EXPORT explicit Vec(const T& value) : Superclass(value) { } - // VTKM_EXEC_CONT_EXPORT explicit Vec(const T* values) : Superclass(values) { } + VTKM_EXEC_CONT Vec() {} + VTKM_EXEC_CONT explicit Vec(const T& value) : Superclass(value) { } + // VTKM_EXEC_CONT explicit Vec(const T* values) : Superclass(values) { } template - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT Vec(const Vec &src) : Superclass(src) { } }; @@ -636,31 +636,31 @@ public: typedef T ComponentType; static const vtkm::IdComponent NUM_COMPONENTS = 0; - VTKM_EXEC_CONT_EXPORT Vec() {} - VTKM_EXEC_CONT_EXPORT explicit Vec(const ComponentType&) { } + VTKM_EXEC_CONT Vec() {} + VTKM_EXEC_CONT explicit Vec(const ComponentType&) { } template - VTKM_EXEC_CONT_EXPORT Vec(const Vec &) { } + VTKM_EXEC_CONT Vec(const Vec &) { } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT Vec & operator=(const Vec &) { return *this; } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT ComponentType operator[](vtkm::IdComponent vtkmNotUsed(idx)) const { return ComponentType(); } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT bool operator==(const Vec &vtkmNotUsed(other)) const { return true; } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT bool operator!=(const Vec &vtkmNotUsed(other)) const { return false; @@ -675,15 +675,15 @@ class Vec : public detail::VecBase > typedef detail::VecBase > Superclass; public: - VTKM_EXEC_CONT_EXPORT Vec() {} - VTKM_EXEC_CONT_EXPORT explicit Vec(const T& value) : Superclass(value) { } + VTKM_EXEC_CONT Vec() {} + VTKM_EXEC_CONT explicit Vec(const T& value) : Superclass(value) { } template - VTKM_EXEC_CONT_EXPORT Vec(const Vec &src) : Superclass(src) { } + VTKM_EXEC_CONT Vec(const Vec &src) : Superclass(src) { } // This convenience operator removed because it was causing ambiguous // overload errors -// VTKM_EXEC_CONT_EXPORT +// VTKM_EXEC_CONT // operator T() const // { // return this->Components[0]; @@ -699,13 +699,13 @@ class Vec : public detail::VecBase > typedef detail::VecBase > Superclass; public: - VTKM_EXEC_CONT_EXPORT Vec() {} - VTKM_EXEC_CONT_EXPORT explicit Vec(const T& value) : Superclass(value) { } + VTKM_EXEC_CONT Vec() {} + VTKM_EXEC_CONT explicit Vec(const T& value) : Superclass(value) { } template - VTKM_EXEC_CONT_EXPORT Vec(const Vec &src) : Superclass(src) { } + VTKM_EXEC_CONT Vec(const Vec &src) : Superclass(src) { } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT Vec(const T &x, const T &y) { this->Components[0] = x; @@ -722,13 +722,13 @@ class Vec : public detail::VecBase > { typedef detail::VecBase > Superclass; public: - VTKM_EXEC_CONT_EXPORT Vec() {} - VTKM_EXEC_CONT_EXPORT explicit Vec(const T& value) : Superclass(value) { } + VTKM_EXEC_CONT Vec() {} + VTKM_EXEC_CONT explicit Vec(const T& value) : Superclass(value) { } template - VTKM_EXEC_CONT_EXPORT Vec(const Vec &src) : Superclass(src) { } + VTKM_EXEC_CONT Vec(const Vec &src) : Superclass(src) { } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT Vec(const T &x, const T &y, const T &z) { this->Components[0] = x; @@ -747,13 +747,13 @@ class Vec : public detail::VecBase > { typedef detail::VecBase > Superclass; public: - VTKM_EXEC_CONT_EXPORT Vec() {} - VTKM_EXEC_CONT_EXPORT explicit Vec(const T& value) : Superclass(value) { } + VTKM_EXEC_CONT Vec() {} + VTKM_EXEC_CONT explicit Vec(const T& value) : Superclass(value) { } template - VTKM_EXEC_CONT_EXPORT Vec(const Vec &src) : Superclass(src) { } + VTKM_EXEC_CONT Vec(const Vec &src) : Superclass(src) { } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT Vec(const T &x, const T &y, const T &z, const T &w) { this->Components[0] = x; @@ -781,7 +781,7 @@ struct VecOrScalar /// Initializes and returns a Vec of length 2. /// template -VTKM_EXEC_CONT_EXPORT +VTKM_EXEC_CONT vtkm::Vec make_Vec(const T &x, const T &y) { return vtkm::Vec(x, y); @@ -790,7 +790,7 @@ vtkm::Vec make_Vec(const T &x, const T &y) /// Initializes and returns a Vec of length 3. /// template -VTKM_EXEC_CONT_EXPORT +VTKM_EXEC_CONT vtkm::Vec make_Vec(const T &x, const T &y, const T &z) { return vtkm::Vec(x, y, z); @@ -799,7 +799,7 @@ vtkm::Vec make_Vec(const T &x, const T &y, const T &z) /// Initializes and returns a Vec of length 4. /// template -VTKM_EXEC_CONT_EXPORT +VTKM_EXEC_CONT vtkm::Vec make_Vec(const T &x, const T &y, const T &z, const T &w) { return vtkm::Vec(x, y, z, w); @@ -811,7 +811,8 @@ template struct Pair; template -VTKM_EXEC_CONT_EXPORT +static inline +VTKM_EXEC_CONT T dot(const vtkm::Vec &a, const vtkm::Vec &b) { T result = T(a[0] * b[0]); @@ -823,28 +824,31 @@ T dot(const vtkm::Vec &a, const vtkm::Vec &b) } template -VTKM_EXEC_CONT_EXPORT +static inline +VTKM_EXEC_CONT T dot(const vtkm::Vec &a, const vtkm::Vec &b) { return T((a[0]*b[0]) + (a[1]*b[1])); } template -VTKM_EXEC_CONT_EXPORT +static inline +VTKM_EXEC_CONT T dot(const vtkm::Vec &a, const vtkm::Vec &b) { return T((a[0]*b[0]) + (a[1]*b[1]) + (a[2]*b[2])); } template -VTKM_EXEC_CONT_EXPORT T +static inline +VTKM_EXEC_CONT T dot(const vtkm::Vec& a, const vtkm::Vec& b) { return T((a[0] * b[0]) + (a[1] * b[1]) + (a[2] * b[2]) + (a[3] * b[3])); } template -VTKM_EXEC_CONT_EXPORT T +VTKM_EXEC_CONT T ReduceSum(const vtkm::Vec& a) { T result = a[0]; @@ -856,28 +860,28 @@ ReduceSum(const vtkm::Vec& a) } template -VTKM_EXEC_CONT_EXPORT T +VTKM_EXEC_CONT T ReduceSum(const vtkm::Vec& a) { return a[0] + a[1]; } template -VTKM_EXEC_CONT_EXPORT T +VTKM_EXEC_CONT T ReduceSum(const vtkm::Vec& a) { return a[0] + a[1] + a[2]; } template -VTKM_EXEC_CONT_EXPORT T +VTKM_EXEC_CONT T ReduceSum(const vtkm::Vec& a) { return a[0] + a[1] + a[2] + a[3]; } template -VTKM_EXEC_CONT_EXPORT T +VTKM_EXEC_CONT T ReduceProduct(const vtkm::Vec& a) { T result = a[0]; @@ -889,21 +893,21 @@ ReduceProduct(const vtkm::Vec& a) } template -VTKM_EXEC_CONT_EXPORT T +VTKM_EXEC_CONT T ReduceProduct(const vtkm::Vec& a) { return a[0] * a[1]; } template -VTKM_EXEC_CONT_EXPORT T +VTKM_EXEC_CONT T ReduceProduct(const vtkm::Vec& a) { return a[0] * a[1] * a[2]; } template -VTKM_EXEC_CONT_EXPORT T +VTKM_EXEC_CONT T ReduceProduct(const vtkm::Vec& a) { return a[0] * a[1] * a[2] * a[3]; @@ -912,7 +916,8 @@ ReduceProduct(const vtkm::Vec& a) // Integer types of a width less than an integer get implicitly casted to // an integer when doing a multiplication. #define VTK_M_INTEGER_PROMOTION_SCALAR_DOT(type) \ - VTKM_EXEC_CONT_EXPORT type dot(type a, type b) \ + static inline \ + VTKM_EXEC_CONT type dot(type a, type b) \ { \ return static_cast(a * b); \ } @@ -921,7 +926,8 @@ VTK_M_INTEGER_PROMOTION_SCALAR_DOT(vtkm::UInt8) VTK_M_INTEGER_PROMOTION_SCALAR_DOT(vtkm::Int16) VTK_M_INTEGER_PROMOTION_SCALAR_DOT(vtkm::UInt16) #define VTK_M_SCALAR_DOT(type) \ - VTKM_EXEC_CONT_EXPORT type dot(type a, type b) \ + static inline \ + VTKM_EXEC_CONT type dot(type a, type b) \ { \ return a * b; \ } @@ -937,7 +943,7 @@ VTK_M_SCALAR_DOT(vtkm::Float64) // Declared outside of vtkm namespace so that the operator works with all code. template -VTKM_EXEC_CONT_EXPORT +VTKM_EXEC_CONT vtkm::Vec operator*(T scalar, const vtkm::Vec &vec) { return vtkm::internal::VecComponentWiseUnaryOperation()( @@ -946,7 +952,7 @@ vtkm::Vec operator*(T scalar, const vtkm::Vec &vec) } template -VTKM_EXEC_CONT_EXPORT +VTKM_EXEC_CONT vtkm::Vec operator*(const vtkm::Vec &vec, T scalar) { return vtkm::internal::VecComponentWiseUnaryOperation()( @@ -955,7 +961,7 @@ vtkm::Vec operator*(const vtkm::Vec &vec, T scalar) } template -VTKM_EXEC_CONT_EXPORT +VTKM_EXEC_CONT vtkm::Vec operator*(vtkm::Float64 scalar, const vtkm::Vec &vec) { @@ -967,7 +973,7 @@ operator*(vtkm::Float64 scalar, const vtkm::Vec &vec) } template -VTKM_EXEC_CONT_EXPORT +VTKM_EXEC_CONT vtkm::Vec operator*(const vtkm::Vec &vec, vtkm::Float64 scalar) { @@ -979,7 +985,7 @@ operator*(const vtkm::Vec &vec, vtkm::Float64 scalar) } template -VTKM_EXEC_CONT_EXPORT +VTKM_EXEC_CONT vtkm::Vec operator*(vtkm::Float64 scalar, const vtkm::Vec &vec) { @@ -990,7 +996,7 @@ operator*(vtkm::Float64 scalar, const vtkm::Vec &vec) } template -VTKM_EXEC_CONT_EXPORT +VTKM_EXEC_CONT vtkm::Vec operator*(const vtkm::Vec &vec, vtkm::Float64 scalar) { @@ -1001,7 +1007,7 @@ operator*(const vtkm::Vec &vec, vtkm::Float64 scalar) } template -VTKM_EXEC_CONT_EXPORT +VTKM_EXEC_CONT vtkm::Vec operator/(const vtkm::Vec &vec, T scalar) { return vtkm::internal::VecComponentWiseUnaryOperation()( @@ -1010,7 +1016,7 @@ vtkm::Vec operator/(const vtkm::Vec &vec, T scalar) } template -VTKM_EXEC_CONT_EXPORT +VTKM_EXEC_CONT vtkm::Vec operator/(const vtkm::Vec &vec, vtkm::Float64 scalar) { @@ -1022,7 +1028,7 @@ operator/(const vtkm::Vec &vec, vtkm::Float64 scalar) } template -VTKM_EXEC_CONT_EXPORT +VTKM_EXEC_CONT vtkm::Vec operator/(const vtkm::Vec &vec, vtkm::Float64 scalar) { @@ -1037,7 +1043,7 @@ operator/(const vtkm::Vec &vec, vtkm::Float64 scalar) // also allow other types like Vec >. If necessary, we could // change this implementation to be more inclusive. template -VTKM_EXEC_CONT_EXPORT +VTKM_EXEC_CONT typename std::enable_if< (std::is_floating_point::value || std::is_signed::value), vtkm::Vec @@ -1051,7 +1057,7 @@ operator-(const vtkm::Vec &x) /// Helper function for printing out vectors during testing. /// template -VTKM_CONT_EXPORT +VTKM_CONT std::ostream &operator<<(std::ostream &stream, const vtkm::Vec &vec) { stream << "["; @@ -1065,7 +1071,7 @@ std::ostream &operator<<(std::ostream &stream, const vtkm::Vec &vec) /// Helper function for printing out pairs during testing. /// template -VTKM_EXEC_CONT_EXPORT +VTKM_EXEC_CONT std::ostream &operator<<(std::ostream &stream, const vtkm::Pair &vec) { return stream << "[" << vec.first << "," << vec.second << "]"; diff --git a/vtkm/UnaryPredicates.h b/vtkm/UnaryPredicates.h index 53a203a84..fbcf72f44 100644 --- a/vtkm/UnaryPredicates.h +++ b/vtkm/UnaryPredicates.h @@ -30,7 +30,7 @@ namespace vtkm { struct IsZeroInitialized { template - VTKM_EXEC_CONT_EXPORT bool operator()(const T &x) const + VTKM_EXEC_CONT bool operator()(const T &x) const { return (x == vtkm::TypeTraits::ZeroInitialization() ); } @@ -41,7 +41,7 @@ struct IsZeroInitialized struct NotZeroInitialized { template - VTKM_EXEC_CONT_EXPORT bool operator()(const T &x) const + VTKM_EXEC_CONT bool operator()(const T &x) const { return (x != vtkm::TypeTraits::ZeroInitialization() ); } @@ -54,7 +54,7 @@ struct NotZeroInitialized struct LogicalNot { template - VTKM_EXEC_CONT_EXPORT bool operator()(const T& x) const + VTKM_EXEC_CONT bool operator()(const T& x) const { return !x; } diff --git a/vtkm/VecRectilinearPointCoordinates.h b/vtkm/VecRectilinearPointCoordinates.h index de8c8f50d..c8ab3cf3b 100644 --- a/vtkm/VecRectilinearPointCoordinates.h +++ b/vtkm/VecRectilinearPointCoordinates.h @@ -53,7 +53,7 @@ struct VecRectilinearPointCoordinatesNumComponents<3> static const vtkm::IdComponent NUM_COMPONENTS = 8; }; -VTKM_EXEC_CONSTANT_EXPORT +VTKM_EXEC_CONSTANT const vtkm::FloatDefault VecRectilinearPointCoordinatesOffsetTable[8][3] = { { 0.0f, 0.0f, 0.0f }, { 1.0f, 0.0f, 0.0f }, @@ -83,16 +83,16 @@ public: static const vtkm::IdComponent NUM_COMPONENTS = detail::VecRectilinearPointCoordinatesNumComponents::NUM_COMPONENTS; - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT VecRectilinearPointCoordinates(ComponentType origin = ComponentType(0,0,0), ComponentType spacing = ComponentType(1,1,1)) : Origin(origin), Spacing(spacing) { } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::IdComponent GetNumberOfComponents() const { return NUM_COMPONENTS; } template - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT void CopyInto(vtkm::Vec &dest) const { vtkm::IdComponent numComponents = @@ -103,7 +103,7 @@ public: } } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT ComponentType operator[](vtkm::IdComponent index) const { const vtkm::FloatDefault *offset = @@ -113,10 +113,10 @@ public: this->Origin[2] + offset[2]*this->Spacing[2]); } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT const ComponentType &GetOrigin() const { return this->Origin; } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT const ComponentType &GetSpacing() const { return this->Spacing; } private: @@ -133,7 +133,7 @@ struct TypeTraits > typedef vtkm::TypeTraitsRealTag NumericTag; typedef TypeTraitsVectorTag DimensionalityTag; - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT static vtkm::VecRectilinearPointCoordinates ZeroInitialization() { @@ -154,12 +154,12 @@ struct VecTraits > static const vtkm::IdComponent NUM_COMPONENTS = VecType::NUM_COMPONENTS; - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT static vtkm::IdComponent GetNumberOfComponents(const VecType &) { return NUM_COMPONENTS; } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT static ComponentType GetComponent(const VecType &vector, vtkm::IdComponent componentIndex) { @@ -167,7 +167,7 @@ struct VecTraits > } template - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT static void CopyInto(const VecType &src, vtkm::Vec &dest) { diff --git a/vtkm/VecTraits.h b/vtkm/VecTraits.h index 38f855044..d44e9c739 100644 --- a/vtkm/VecTraits.h +++ b/vtkm/VecTraits.h @@ -98,23 +98,23 @@ struct VecTraits /// Returns the value in a given component of the vector. /// - VTKM_EXEC_CONT_EXPORT static const ComponentType &GetComponent( + VTKM_EXEC_CONT static const ComponentType &GetComponent( const typename std::remove_const::type &vector, vtkm::IdComponent component); - VTKM_EXEC_CONT_EXPORT static ComponentType &GetComponent( + VTKM_EXEC_CONT static ComponentType &GetComponent( typename std::remove_const::type &vector, vtkm::IdComponent component); /// Changes the value in a given component of the vector. /// - VTKM_EXEC_CONT_EXPORT static void SetComponent(VecType &vector, + VTKM_EXEC_CONT static void SetComponent(VecType &vector, vtkm::IdComponent component, ComponentType value); /// Copies the components in the given vector into a given Vec object. /// template - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT static void CopyInto(const VecType &src, vtkm::Vec &dest); }; @@ -144,7 +144,7 @@ struct VecTraits > /// Number of components in the given vector. /// - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT static vtkm::IdComponent GetNumberOfComponents(const VecType &) { return NUM_COMPONENTS; } @@ -166,20 +166,20 @@ struct VecTraits > /// Returns the value in a given component of the vector. /// - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT static const ComponentType &GetComponent(const VecType &vector, vtkm::IdComponent component) { return vector[component]; } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT static ComponentType &GetComponent(VecType &vector, vtkm::IdComponent component) { return vector[component]; } /// Changes the value in a given component of the vector. /// - VTKM_EXEC_CONT_EXPORT static void SetComponent(VecType &vector, + VTKM_EXEC_CONT static void SetComponent(VecType &vector, vtkm::IdComponent component, ComponentType value) { vector[component] = value; @@ -188,7 +188,7 @@ struct VecTraits > /// Converts whatever type this vector is into the standard VTKm Tuple. /// template - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT static void CopyInto(const VecType &src, vtkm::Vec &dest) { @@ -206,30 +206,30 @@ struct VecTraitsBasic { typedef VecTraitsTagSingleComponent HasMultipleComponents; typedef vtkm::VecTraitsTagSizeStatic IsSizeStatic; - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT static vtkm::IdComponent GetNumberOfComponents(const ScalarType &) { return 1; } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT static const ComponentType &GetComponent( const ScalarType &vector, vtkm::IdComponent) { return vector; } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT static ComponentType &GetComponent(ScalarType &vector, vtkm::IdComponent) { return vector; } - VTKM_EXEC_CONT_EXPORT static void SetComponent(ScalarType &vector, + VTKM_EXEC_CONT static void SetComponent(ScalarType &vector, vtkm::IdComponent, ComponentType value) { vector = value; } template - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT static void CopyInto(const ScalarType &src, vtkm::Vec &dest) { diff --git a/vtkm/VecVariable.h b/vtkm/VecVariable.h index 64b01739b..fcf75fe69 100644 --- a/vtkm/VecVariable.h +++ b/vtkm/VecVariable.h @@ -41,11 +41,11 @@ class VecVariable public: typedef T ComponentType; - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT VecVariable() : NumComponents(0) { } template - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT VecVariable(const vtkm::VecVariable &src) : NumComponents(src.GetNumberOfComponents()) { @@ -57,7 +57,7 @@ public: } template - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT VecVariable(const vtkm::Vec &src) : NumComponents(SrcSize) { @@ -68,13 +68,13 @@ public: } } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::IdComponent GetNumberOfComponents() const { return this->NumComponents; } template - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT void CopyInto(vtkm::Vec &dest) const { vtkm::IdComponent numComponents = vtkm::Min(DestSize, this->NumComponents); @@ -84,19 +84,19 @@ public: } } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT const ComponentType &operator[](vtkm::IdComponent index) const { return this->Data[index]; } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT ComponentType &operator[](vtkm::IdComponent index) { return this->Data[index]; } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT void Append(ComponentType value) { VTKM_ASSERT(this->NumComponents < MaxSize); @@ -115,7 +115,7 @@ struct TypeTraits > typedef typename vtkm::TypeTraits::NumericTag NumericTag; typedef TypeTraitsVectorTag DimensionalityTag; - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT static vtkm::VecVariable ZeroInitialization() { return vtkm::VecVariable(); @@ -131,25 +131,25 @@ struct VecTraits > typedef vtkm::VecTraitsTagMultipleComponents HasMultipleComponents; typedef vtkm::VecTraitsTagSizeVariable IsSizeStatic; - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT static vtkm::IdComponent GetNumberOfComponents(const VecType &vector) { return vector.GetNumberOfComponents(); } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT static const ComponentType &GetComponent(const VecType &vector, vtkm::IdComponent componentIndex) { return vector[componentIndex]; } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT static ComponentType &GetComponent(VecType &vector, vtkm::IdComponent componentIndex) { return vector[componentIndex]; } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT static void SetComponent(VecType &vector, vtkm::IdComponent componentIndex, const ComponentType &value) @@ -158,7 +158,7 @@ struct VecTraits > } template - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT static void CopyInto(const VecType &src, vtkm::Vec &dest) { diff --git a/vtkm/VectorAnalysis.h b/vtkm/VectorAnalysis.h index 4fa409941..1cabe8158 100644 --- a/vtkm/VectorAnalysis.h +++ b/vtkm/VectorAnalysis.h @@ -41,7 +41,7 @@ namespace vtkm { /// extrapolates. If w=0 => v0 is returned if w=1 => v1 is returned. /// template -VTKM_EXEC_CONT_EXPORT +VTKM_EXEC_CONT ValueType Lerp(const ValueType &value0, const ValueType &value1, const WeightType &weight) @@ -49,7 +49,7 @@ ValueType Lerp(const ValueType &value0, return static_cast((WeightType(1)-weight)*value0+weight*value1); } template -VTKM_EXEC_CONT_EXPORT +VTKM_EXEC_CONT vtkm::Vec Lerp(const vtkm::Vec &value0, const vtkm::Vec &value1, const WeightType &weight) @@ -57,7 +57,7 @@ vtkm::Vec Lerp(const vtkm::Vec &value0, return (WeightType(1)-weight)*value0+weight*value1; } template -VTKM_EXEC_CONT_EXPORT +VTKM_EXEC_CONT vtkm::Vec Lerp(const vtkm::Vec &value0, const vtkm::Vec &value1, const vtkm::Vec &weight) @@ -74,7 +74,7 @@ vtkm::Vec Lerp(const vtkm::Vec &value0, /// when possible. /// template -VTKM_EXEC_CONT_EXPORT +VTKM_EXEC_CONT typename vtkm::VecTraits::ComponentType MagnitudeSquared(const T &x) { @@ -84,14 +84,14 @@ MagnitudeSquared(const T &x) // ---------------------------------------------------------------------------- namespace detail { template -VTKM_EXEC_CONT_EXPORT +VTKM_EXEC_CONT T MagnitudeTemplate(T x, vtkm::TypeTraitsScalarTag) { return vtkm::Abs(x); } template -VTKM_EXEC_CONT_EXPORT +VTKM_EXEC_CONT typename vtkm::VecTraits::ComponentType MagnitudeTemplate(const T &x, vtkm::TypeTraitsVectorTag) { @@ -108,7 +108,7 @@ MagnitudeTemplate(const T &x, vtkm::TypeTraitsVectorTag) /// actually plan to divide by the magnitude. /// template -VTKM_EXEC_CONT_EXPORT +VTKM_EXEC_CONT typename vtkm::VecTraits::ComponentType Magnitude(const T &x) { @@ -119,14 +119,14 @@ Magnitude(const T &x) // ---------------------------------------------------------------------------- namespace detail { template -VTKM_EXEC_CONT_EXPORT +VTKM_EXEC_CONT T RMagnitudeTemplate(T x, vtkm::TypeTraitsScalarTag) { return T(1)/vtkm::Abs(x); } template -VTKM_EXEC_CONT_EXPORT +VTKM_EXEC_CONT typename vtkm::VecTraits::ComponentType RMagnitudeTemplate(const T &x, vtkm::TypeTraitsVectorTag) { @@ -140,7 +140,7 @@ RMagnitudeTemplate(const T &x, vtkm::TypeTraitsVectorTag) /// as fast as MagnitudeSquared. /// template -VTKM_EXEC_CONT_EXPORT +VTKM_EXEC_CONT typename vtkm::VecTraits::ComponentType RMagnitude(const T &x) { @@ -151,14 +151,14 @@ RMagnitude(const T &x) // ---------------------------------------------------------------------------- namespace detail { template -VTKM_EXEC_CONT_EXPORT +VTKM_EXEC_CONT T NormalTemplate(T x, vtkm::TypeTraitsScalarTag) { return vtkm::CopySign(T(1), x); } template -VTKM_EXEC_CONT_EXPORT +VTKM_EXEC_CONT T NormalTemplate(const T &x, vtkm::TypeTraitsVectorTag) { return vtkm::RMagnitude(x)*x; @@ -170,7 +170,7 @@ T NormalTemplate(const T &x, vtkm::TypeTraitsVectorTag) /// The resulting vector points in the same direction but has unit length. /// template -VTKM_EXEC_CONT_EXPORT +VTKM_EXEC_CONT T Normal(const T &x) { return detail::NormalTemplate( @@ -183,7 +183,7 @@ T Normal(const T &x) /// The given vector is scaled to be unit length. /// template -VTKM_EXEC_CONT_EXPORT +VTKM_EXEC_CONT void Normalize(T &x) { x = vtkm::Normal(x); @@ -193,7 +193,7 @@ void Normalize(T &x) /// \brief Find the cross product of two vectors. /// template -VTKM_EXEC_CONT_EXPORT +VTKM_EXEC_CONT vtkm::Vec Cross(const vtkm::Vec &x, const vtkm::Vec &y) { return vtkm::Vec(x[1]*y[2] - x[2]*y[1], @@ -209,7 +209,7 @@ vtkm::Vec Cross(const vtkm::Vec &x, const vtkm::Vec &y) /// to that triangle/plane. /// template -VTKM_EXEC_CONT_EXPORT +VTKM_EXEC_CONT vtkm::Vec TriangleNormal(const vtkm::Vec &a, const vtkm::Vec &b, const vtkm::Vec &c) diff --git a/vtkm/benchmarking/BenchmarkDeviceAdapter.cxx b/vtkm/benchmarking/BenchmarkDeviceAdapter.cxx index 1978261f9..b2864833a 100644 --- a/vtkm/benchmarking/BenchmarkDeviceAdapter.cxx +++ b/vtkm/benchmarking/BenchmarkDeviceAdapter.cxx @@ -96,10 +96,10 @@ public: PortalType Output; - VTKM_CONT_EXPORT + VTKM_CONT FillTestValueKernel(PortalType out) : Output(out){} - VTKM_EXEC_EXPORT void operator()(vtkm::Id i) const { + VTKM_EXEC void operator()(vtkm::Id i) const { Output.Set(i, TestValue(i, Value())); } }; @@ -113,10 +113,10 @@ public: PortalType Output; const vtkm::Id IdScale; - VTKM_CONT_EXPORT + VTKM_CONT FillScaledTestValueKernel(vtkm::Id id_scale, PortalType out) : Output(out), IdScale(id_scale) {} - VTKM_EXEC_EXPORT void operator()(vtkm::Id i) const { + VTKM_EXEC void operator()(vtkm::Id i) const { Output.Set(i, TestValue(i * IdScale, Value())); } }; @@ -130,10 +130,10 @@ public: PortalType Output; const vtkm::Id Modulus; - VTKM_CONT_EXPORT + VTKM_CONT FillModuloTestValueKernel(vtkm::Id modulus, PortalType out) : Output(out), Modulus(modulus) {} - VTKM_EXEC_EXPORT void operator()(vtkm::Id i) const { + VTKM_EXEC void operator()(vtkm::Id i) const { Output.Set(i, TestValue(i % Modulus, Value())); } }; @@ -147,10 +147,10 @@ public: PortalType Output; const vtkm::Id Modulus; - VTKM_CONT_EXPORT + VTKM_CONT FillBinaryTestValueKernel(vtkm::Id modulus, PortalType out) : Output(out), Modulus(modulus) {} - VTKM_EXEC_EXPORT void operator()(vtkm::Id i) const { + VTKM_EXEC void operator()(vtkm::Id i) const { Output.Set(i, i % Modulus == 0 ? TestValue(vtkm::Id(1), Value()) : Value()); } }; @@ -164,13 +164,13 @@ private: ValueArrayHandle ValueHandle_dst; std::mt19937 Rng; - VTKM_CONT_EXPORT + VTKM_CONT BenchCopy(){ ValueHandle_src.PrepareForOutput(ARRAY_SIZE, DeviceAdapterTag()); ValueHandle_dst.PrepareForOutput(ARRAY_SIZE, DeviceAdapterTag()); } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Float64 operator()(){ for (vtkm::Id i = 0; i < ValueHandle_src.GetNumberOfValues(); ++i){ ValueHandle_src.GetPortalControl().Set(vtkm::Id(i), TestValue(vtkm::Id(Rng()), Value())); @@ -180,7 +180,7 @@ private: return timer.GetElapsedTime(); } - VTKM_CONT_EXPORT + VTKM_CONT std::string Description() const { std::stringstream description; description << "Copy " << ARRAY_SIZE << " values"; @@ -197,7 +197,7 @@ private: ValueArrayHandle InputHandle, ValueHandle; IdArrayHandle OutHandle; - VTKM_CONT_EXPORT + VTKM_CONT BenchLowerBounds(vtkm::Id value_percent) : N_VALS((ARRAY_SIZE * value_percent) / 100) { Algorithm::Schedule(FillTestValueKernel( @@ -206,14 +206,14 @@ private: ValueHandle.PrepareForOutput(N_VALS, DeviceAdapterTag())), N_VALS); } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Float64 operator()(){ Timer timer; Algorithm::LowerBounds(InputHandle, ValueHandle, OutHandle); return timer.GetElapsedTime(); } - VTKM_CONT_EXPORT + VTKM_CONT std::string Description() const { std::stringstream description; description << "LowerBounds on " << ARRAY_SIZE << " input and " @@ -234,20 +234,20 @@ private: ValueArrayHandle InputHandle; - VTKM_CONT_EXPORT + VTKM_CONT BenchReduce(){ Algorithm::Schedule(FillTestValueKernel( InputHandle.PrepareForOutput(ARRAY_SIZE, DeviceAdapterTag())), ARRAY_SIZE); } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Float64 operator()(){ Timer timer; Algorithm::Reduce(InputHandle, Value()); return timer.GetElapsedTime(); } - VTKM_CONT_EXPORT + VTKM_CONT std::string Description() const { std::stringstream description; description << "Reduce on " << ARRAY_SIZE << " values"; @@ -264,7 +264,7 @@ private: ValueArrayHandle ValueHandle, ValuesOut; IdArrayHandle KeyHandle, KeysOut; - VTKM_CONT_EXPORT + VTKM_CONT BenchReduceByKey(vtkm::Id key_percent) : N_KEYS((ARRAY_SIZE * key_percent) / 100) { Algorithm::Schedule(FillTestValueKernel( @@ -274,7 +274,7 @@ private: Algorithm::SortByKey(KeyHandle, ValueHandle); } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Float64 operator()(){ Timer timer; Algorithm::ReduceByKey(KeyHandle, ValueHandle, KeysOut, ValuesOut, @@ -282,7 +282,7 @@ private: return timer.GetElapsedTime(); } - VTKM_CONT_EXPORT + VTKM_CONT std::string Description() const { std::stringstream description; description << "ReduceByKey on " << ARRAY_SIZE @@ -302,20 +302,20 @@ private: typedef vtkm::cont::ArrayHandle ValueArrayHandle; ValueArrayHandle ValueHandle, OutHandle; - VTKM_CONT_EXPORT + VTKM_CONT BenchScanInclusive(){ Algorithm::Schedule(FillTestValueKernel( ValueHandle.PrepareForOutput(ARRAY_SIZE, DeviceAdapterTag())), ARRAY_SIZE); } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Float64 operator()(){ Timer timer; Algorithm::ScanInclusive(ValueHandle, OutHandle); return timer.GetElapsedTime(); } - VTKM_CONT_EXPORT + VTKM_CONT std::string Description() const { std::stringstream description; description << "ScanInclusive on " << ARRAY_SIZE << " values"; @@ -330,20 +330,20 @@ private: ValueArrayHandle ValueHandle, OutHandle; - VTKM_CONT_EXPORT + VTKM_CONT BenchScanExclusive(){ Algorithm::Schedule(FillTestValueKernel( ValueHandle.PrepareForOutput(ARRAY_SIZE, DeviceAdapterTag())), ARRAY_SIZE); } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Float64 operator()(){ Timer timer; Algorithm::ScanExclusive(ValueHandle, OutHandle); return timer.GetElapsedTime(); } - VTKM_CONT_EXPORT + VTKM_CONT std::string Description() const { std::stringstream description; description << "ScanExclusive on " << ARRAY_SIZE << " values"; @@ -359,12 +359,12 @@ private: ValueArrayHandle ValueHandle; std::mt19937 Rng; - VTKM_CONT_EXPORT + VTKM_CONT BenchSort(){ ValueHandle.PrepareForOutput(ARRAY_SIZE, DeviceAdapterTag()); } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Float64 operator()(){ for (vtkm::Id i = 0; i < ValueHandle.GetNumberOfValues(); ++i){ ValueHandle.GetPortalControl().Set(vtkm::Id(i), TestValue(vtkm::Id(Rng()), Value())); @@ -374,7 +374,7 @@ private: return timer.GetElapsedTime(); } - VTKM_CONT_EXPORT + VTKM_CONT std::string Description() const { std::stringstream description; description << "Sort on " << ARRAY_SIZE << " random values"; @@ -392,12 +392,12 @@ private: ValueArrayHandle ValueHandle; IdArrayHandle KeyHandle; - VTKM_CONT_EXPORT + VTKM_CONT BenchSortByKey(vtkm::Id percent_key) : N_KEYS((ARRAY_SIZE * percent_key) / 100){ ValueHandle.PrepareForOutput(ARRAY_SIZE, DeviceAdapterTag()); } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Float64 operator()(){ for (vtkm::Id i = 0; i < ValueHandle.GetNumberOfValues(); ++i){ ValueHandle.GetPortalControl().Set(vtkm::Id(i), TestValue(vtkm::Id(Rng()), Value())); @@ -409,7 +409,7 @@ private: return timer.GetElapsedTime(); } - VTKM_CONT_EXPORT + VTKM_CONT std::string Description() const { std::stringstream description; description << "SortByKey on " << ARRAY_SIZE @@ -432,7 +432,7 @@ private: ValueArrayHandle ValueHandle; IdArrayHandle OutHandle; - VTKM_CONT_EXPORT + VTKM_CONT BenchStreamCompact(vtkm::Id percent_valid) : N_VALID((ARRAY_SIZE * percent_valid) / 100) { vtkm::Id modulo = ARRAY_SIZE / N_VALID; @@ -440,14 +440,14 @@ private: ValueHandle.PrepareForOutput(ARRAY_SIZE, DeviceAdapterTag())), ARRAY_SIZE); } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Float64 operator()() { Timer timer; Algorithm::StreamCompact(ValueHandle, OutHandle); return timer.GetElapsedTime(); } - VTKM_CONT_EXPORT + VTKM_CONT std::string Description() const { std::stringstream description; description << "StreamCompact on " << ARRAY_SIZE << " " @@ -471,7 +471,7 @@ private: ValueArrayHandle ValueHandle; IdArrayHandle StencilHandle, OutHandle; - VTKM_CONT_EXPORT + VTKM_CONT BenchStreamCompactStencil(vtkm::Id percent_valid) : N_VALID((ARRAY_SIZE * percent_valid) / 100) { vtkm::Id modulo = ARRAY_SIZE / N_VALID; @@ -481,14 +481,14 @@ private: StencilHandle.PrepareForOutput(ARRAY_SIZE, DeviceAdapterTag())), ARRAY_SIZE); } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Float64 operator()() { Timer timer; Algorithm::StreamCompact(ValueHandle, StencilHandle, OutHandle); return timer.GetElapsedTime(); } - VTKM_CONT_EXPORT + VTKM_CONT std::string Description() const { std::stringstream description; description << "StreamCompactStencil on " << ARRAY_SIZE << " " @@ -511,11 +511,11 @@ private: const vtkm::Id N_VALID; ValueArrayHandle ValueHandle; - VTKM_CONT_EXPORT + VTKM_CONT BenchUnique(vtkm::Id percent_valid) : N_VALID((ARRAY_SIZE * percent_valid) / 100) {} - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Float64 operator()(){ Algorithm::Schedule(FillModuloTestValueKernel(N_VALID, ValueHandle.PrepareForOutput(ARRAY_SIZE, DeviceAdapterTag())), ARRAY_SIZE); @@ -525,7 +525,7 @@ private: return timer.GetElapsedTime(); } - VTKM_CONT_EXPORT + VTKM_CONT std::string Description() const { std::stringstream description; description << "Unique on " << ARRAY_SIZE << " values with " @@ -548,7 +548,7 @@ private: ValueArrayHandle InputHandle, ValueHandle; IdArrayHandle OutHandle; - VTKM_CONT_EXPORT + VTKM_CONT BenchUpperBounds(vtkm::Id percent_vals) : N_VALS((ARRAY_SIZE * percent_vals) / 100) { Algorithm::Schedule(FillTestValueKernel( @@ -557,14 +557,14 @@ private: ValueHandle.PrepareForOutput(N_VALS, DeviceAdapterTag())), N_VALS); } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Float64 operator()(){ Timer timer; Algorithm::UpperBounds(InputHandle, ValueHandle, OutHandle); return timer.GetElapsedTime(); } - VTKM_CONT_EXPORT + VTKM_CONT std::string Description() const { std::stringstream description; description << "UpperBounds on " << ARRAY_SIZE << " input and " @@ -587,7 +587,7 @@ public: vtkm::Float64, vtkm::Vec, vtkm::Vec >{}; - static VTKM_CONT_EXPORT int Run(int benchmarks){ + static VTKM_CONT int Run(int benchmarks){ std::cout << DIVIDER << "\nRunning DeviceAdapter benchmarks\n"; if (benchmarks & COPY) { diff --git a/vtkm/benchmarking/BenchmarkFieldAlgorithms.cxx b/vtkm/benchmarking/BenchmarkFieldAlgorithms.cxx index 9dd891453..7421512be 100644 --- a/vtkm/benchmarking/BenchmarkFieldAlgorithms.cxx +++ b/vtkm/benchmarking/BenchmarkFieldAlgorithms.cxx @@ -73,7 +73,7 @@ public: { } - VTKM_EXEC_EXPORT + VTKM_EXEC T CumulativeNormalDistribution(T d) const { const vtkm::Float32 A1 = 0.31938153f; @@ -98,7 +98,7 @@ public: } template - VTKM_EXEC_EXPORT void operator()(const U& sp, const V& os, const W& oy, + VTKM_EXEC void operator()(const U& sp, const V& os, const W& oy, T& callResult, T& putResult) const { const T stockPrice = static_cast(sp); @@ -129,7 +129,7 @@ public: typedef void ExecutionSignature(_1,_2); template - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(const vtkm::Vec& vec, U& result) const { result = static_cast(vtkm::Magnitude(vec)); @@ -143,7 +143,7 @@ public: typedef void ExecutionSignature(_1,_2); template - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(T input, U& output) const { output = static_cast(input * input); @@ -157,7 +157,7 @@ public: typedef void ExecutionSignature(_1,_2); template - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(T input, U& output) const { output = static_cast(vtkm::Sin(input)); @@ -171,7 +171,7 @@ public: typedef void ExecutionSignature(_1,_2); template - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(T input, U& output) const { output = static_cast(vtkm::Cos(input)); @@ -185,7 +185,7 @@ public: typedef void ExecutionSignature(_1,_2); template - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(const vtkm::Vec& vec, T& result) const { const T m = vtkm::Magnitude(vec); @@ -193,7 +193,7 @@ public: } template - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(const vtkm::Vec& , U& ) const { this->RaiseError("Mixed types unsupported."); @@ -210,7 +210,7 @@ public: template - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(const ConnectivityInVec &connectivity, const ThreadIndicesType threadIndices, const IdPairTableType &edgeIds) const @@ -243,7 +243,7 @@ public: typedef _1 InputDomain; template - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(const vtkm::Id2& low_high, const WeightType &weight, const vtkm::exec::ExecutionWholeArrayConst& inPortal, @@ -256,7 +256,7 @@ public: } template - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(const vtkm::Id2& , const WeightType &, const vtkm::exec::ExecutionWholeArrayConst& , @@ -307,7 +307,7 @@ private: std::vector strike; std::vector years; - VTKM_CONT_EXPORT + VTKM_CONT BenchBlackScholes() { std::mt19937 rng; @@ -330,7 +330,7 @@ private: this->OptionYears = vtkm::cont::make_ArrayHandle(this->years); } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Float64 operator()() { vtkm::cont::ArrayHandle callResultHandle, putResultHandle; @@ -353,7 +353,7 @@ private: virtual std::string Type() const { return std::string("Static"); } - VTKM_CONT_EXPORT + VTKM_CONT std::string Description() const { std::stringstream description; description << "BlackScholes " @@ -366,7 +366,7 @@ private: template struct BenchBlackScholesDynamic : public BenchBlackScholes { - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Float64 operator()() { ValueDynamicHandle dstocks(this->StockPrice); @@ -404,7 +404,7 @@ private: std::vector< vtkm::Vec > input; vtkm::cont::ArrayHandle< vtkm::Vec, StorageTag> InputHandle; - VTKM_CONT_EXPORT + VTKM_CONT BenchMath() { std::mt19937 rng; @@ -421,7 +421,7 @@ private: this->InputHandle = vtkm::cont::make_ArrayHandle(this->input); } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Float64 operator()() { vtkm::cont::ArrayHandle tempHandle1; @@ -439,7 +439,7 @@ private: virtual std::string Type() const { return std::string("Static"); } - VTKM_CONT_EXPORT + VTKM_CONT std::string Description() const { std::stringstream description; description << "Magnitude -> Sine -> Square -> Cosine " @@ -452,7 +452,7 @@ private: template struct BenchMathDynamic : public BenchMath { - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Float64 operator()() { using MathTypes = vtkm::ListTagBase, @@ -487,7 +487,7 @@ private: std::vector< vtkm::Vec > input; vtkm::cont::ArrayHandle< vtkm::Vec, StorageTag> InputHandle; - VTKM_CONT_EXPORT + VTKM_CONT BenchFusedMath() { std::mt19937 rng; @@ -504,7 +504,7 @@ private: this->InputHandle = vtkm::cont::make_ArrayHandle(this->input); } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Float64 operator()() { vtkm::cont::ArrayHandle result; @@ -516,7 +516,7 @@ private: virtual std::string Type() const { return std::string("Static"); } - VTKM_CONT_EXPORT + VTKM_CONT std::string Description() const { std::stringstream description; description << "Fused Magnitude -> Sine -> Square -> Cosine " @@ -529,7 +529,7 @@ private: template struct BenchFusedMathDynamic : public BenchFusedMath { - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Float64 operator()() { using MathTypes = vtkm::ListTagBase, @@ -560,7 +560,7 @@ private: vtkm::cont::ArrayHandle FieldHandle; vtkm::cont::ArrayHandle< vtkm::Id2, StorageTag> EdgePairHandle; - VTKM_CONT_EXPORT + VTKM_CONT BenchEdgeInterp() { using CT = typename vtkm::VecTraits::ComponentType; @@ -601,7 +601,7 @@ private: this->WeightHandle = vtkm::cont::make_ArrayHandle(this->weight); } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Float64 operator()() { vtkm::cont::ArrayHandle result; @@ -618,7 +618,7 @@ private: virtual std::string Type() const { return std::string("Static"); } - VTKM_CONT_EXPORT + VTKM_CONT std::string Description() const { std::stringstream description; const std::size_t size = (CUBE_SIZE-1)*(CUBE_SIZE-1)*(CUBE_SIZE-1)*12; @@ -632,7 +632,7 @@ private: template struct BenchEdgeInterpDynamic : public BenchEdgeInterp { - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Float64 operator()() { InterpDynamicHandle dfield(this->FieldHandle); @@ -660,7 +660,7 @@ private: public: - static VTKM_CONT_EXPORT int Run(int benchmarks){ + static VTKM_CONT int Run(int benchmarks){ std::cout << DIVIDER << "\nRunning Field Algorithm benchmarks\n"; if (benchmarks & BLACK_SCHOLES) { diff --git a/vtkm/benchmarking/BenchmarkTopologyAlgorithms.cxx b/vtkm/benchmarking/BenchmarkTopologyAlgorithms.cxx index 08fb61329..24e407e98 100644 --- a/vtkm/benchmarking/BenchmarkTopologyAlgorithms.cxx +++ b/vtkm/benchmarking/BenchmarkTopologyAlgorithms.cxx @@ -60,7 +60,7 @@ public: typedef _2 InputDomain; template - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(const PointValueVecType &pointValues, const vtkm::IdComponent &numPoints, OutType &average) const @@ -85,7 +85,7 @@ public: typedef _2 InputDomain; template - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(const CellVecType &cellValues, OutType &avgVal, const vtkm::IdComponent &numCellIDs) const @@ -114,14 +114,14 @@ public: T IsoValue; - VTKM_CONT_EXPORT + VTKM_CONT Classification(T isovalue) : IsoValue(isovalue) { } template - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(const FieldInType &fieldIn, vtkm::IdComponent &caseNumber) const { @@ -193,7 +193,7 @@ private: vtkm::cont::ArrayHandle< Value, StorageTag> InputHandle; std::size_t DomainSize; - VTKM_CONT_EXPORT + VTKM_CONT BenchCellToPointAvg() { NumberGenerator generator(static_cast(1.0), @@ -208,7 +208,7 @@ private: this->InputHandle = vtkm::cont::make_ArrayHandle(this->input); } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Float64 operator()() { vtkm::cont::CellSetStructured<3> cellSet; @@ -227,7 +227,7 @@ private: virtual std::string Type() const { return std::string("Static"); } - VTKM_CONT_EXPORT + VTKM_CONT std::string Description() const { std::stringstream description; @@ -241,7 +241,7 @@ private: template struct BenchCellToPointAvgDynamic : public BenchCellToPointAvg { - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Float64 operator()() { vtkm::cont::CellSetStructured<3> cellSet; @@ -273,7 +273,7 @@ private: vtkm::cont::ArrayHandle< Value, StorageTag> InputHandle; std::size_t DomainSize; - VTKM_CONT_EXPORT + VTKM_CONT BenchPointToCellAvg() { NumberGenerator generator(static_cast(1.0), @@ -288,7 +288,7 @@ private: this->InputHandle = vtkm::cont::make_ArrayHandle(this->input); } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Float64 operator()() { vtkm::cont::CellSetStructured<3> cellSet; @@ -307,7 +307,7 @@ private: virtual std::string Type() const { return std::string("Static"); } - VTKM_CONT_EXPORT + VTKM_CONT std::string Description() const { std::stringstream description; @@ -321,7 +321,7 @@ private: template struct BenchPointToCellAvgDynamic : public BenchPointToCellAvg { - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Float64 operator()() { vtkm::cont::CellSetStructured<3> cellSet; @@ -353,7 +353,7 @@ private: Value IsoValue; size_t DomainSize; - VTKM_CONT_EXPORT + VTKM_CONT BenchClassification() { NumberGenerator generator(static_cast(1.0), @@ -369,7 +369,7 @@ private: this->IsoValue = generator.next(); } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Float64 operator()() { vtkm::cont::CellSetStructured<3> cellSet; @@ -391,7 +391,7 @@ private: virtual std::string Type() const { return std::string("Static"); } - VTKM_CONT_EXPORT + VTKM_CONT std::string Description() const { std::stringstream description; @@ -404,7 +404,7 @@ private: template struct BenchClassificationDynamic : public BenchClassification { - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Float64 operator()() { vtkm::cont::CellSetStructured<3> cellSet; @@ -430,7 +430,7 @@ private: public: - static VTKM_CONT_EXPORT int Run(int benchmarks){ + static VTKM_CONT int Run(int benchmarks){ std::cout << DIVIDER << "\nRunning Topology Algorithm benchmarks\n"; if (benchmarks & CELL_TO_POINT) { diff --git a/vtkm/benchmarking/Benchmarker.h b/vtkm/benchmarking/Benchmarker.h index 6ea08f986..fea1d008a 100644 --- a/vtkm/benchmarking/Benchmarker.h +++ b/vtkm/benchmarking/Benchmarker.h @@ -41,18 +41,18 @@ * template * struct BenchSilly { * // Setup anything that doesn't need to change per run in the constructor - * VTKM_CONT_EXPORT BenchSilly(){} + * VTKM_CONT BenchSilly(){} * * // The overloaded call operator will run the operations being timed and * // return the execution time - * VTKM_CONT_EXPORT + * VTKM_CONT * vtkm::Float64 operator()(){ * return 0.05; * } * * // The benchmark must also provide a method describing itself, this is * // used when printing out run time statistics - * VTKM_CONT_EXPORT + * VTKM_CONT * std::string Description() const { * return "A silly benchmark"; * } @@ -88,7 +88,7 @@ #define VTKM_MAKE_BENCHMARK(Name, Bench, ...) \ struct MakeBench##Name { \ template \ - VTKM_CONT_EXPORT \ + VTKM_CONT \ Bench operator()(const Value vtkmNotUsed(v)) const { \ return Bench(__VA_ARGS__); \ } \ @@ -207,7 +207,7 @@ struct Benchmarker { Benchmarker() : MAX_RUNTIME(30), MAX_ITERATIONS(500){} template - VTKM_CONT_EXPORT + VTKM_CONT void operator()(Functor func) const { std::vector samples; // Do a warm-up run. If the benchmark allocates any additional memory @@ -244,11 +244,11 @@ class InternalPrintTypeAndBench { MakerFunctor Maker; public: - VTKM_CONT_EXPORT + VTKM_CONT InternalPrintTypeAndBench(MakerFunctor maker) : Maker(maker) {} template - VTKM_CONT_EXPORT + VTKM_CONT void operator()(T t) const { std::cout << "*** " << vtkm::testing::TypeName::Name() @@ -259,7 +259,7 @@ public: }; template -VTKM_CONT_EXPORT +VTKM_CONT void BenchmarkTypes(const MakerFunctor &maker, TypeList){ vtkm::ListForEach(InternalPrintTypeAndBench(maker), TypeList()); } diff --git a/vtkm/cont/ArrayHandle.h b/vtkm/cont/ArrayHandle.h index 086c3764b..45a8bfa1b 100644 --- a/vtkm/cont/ArrayHandle.h +++ b/vtkm/cont/ArrayHandle.h @@ -131,19 +131,19 @@ struct GetTypeInParentheses \ VTKM_IS_ARRAY_HANDLE(Superclass); \ \ - VTKM_CONT_EXPORT \ + VTKM_CONT \ classname() : Superclass() { } \ \ - VTKM_CONT_EXPORT \ + VTKM_CONT \ classname(const Thisclass &src) : Superclass(src) { } \ \ - VTKM_CONT_EXPORT \ + VTKM_CONT \ classname(const vtkm::cont::ArrayHandle &src) : Superclass(src) { } \ \ - VTKM_CONT_EXPORT \ + VTKM_CONT \ virtual ~classname() { } \ \ - VTKM_CONT_EXPORT \ + VTKM_CONT \ Thisclass &operator=(const Thisclass &src) \ { \ this->Superclass::operator=(src); \ @@ -247,7 +247,7 @@ public: /// Constructs an empty ArrayHandle. Typically used for output or /// intermediate arrays that will be filled by a VTKm algorithm. /// - VTKM_CONT_EXPORT ArrayHandle() : Internals(new InternalStruct) + VTKM_CONT ArrayHandle() : Internals(new InternalStruct) { this->Internals->ControlArrayValid = false; this->Internals->ExecutionArrayValid = false; @@ -260,7 +260,7 @@ public: /// with CUDA), then the automatically generated copy constructor could be /// created for all devices, and it would not be valid for all devices. /// - VTKM_CONT_EXPORT + VTKM_CONT ArrayHandle(const vtkm::cont::ArrayHandle &src) : Internals(src.Internals) { } @@ -288,7 +288,7 @@ public: /// \brief Copies an ArrayHandle /// - VTKM_CONT_EXPORT + VTKM_CONT vtkm::cont::ArrayHandle & operator=(const vtkm::cont::ArrayHandle &src) { @@ -298,7 +298,7 @@ public: /// Get the storage. /// - VTKM_CONT_EXPORT StorageType& GetStorage() + VTKM_CONT StorageType& GetStorage() { this->SyncControlArray(); if (this->Internals->ControlArrayValid) @@ -314,7 +314,7 @@ public: /// Get the storage. /// - VTKM_CONT_EXPORT const StorageType& GetStorage() const + VTKM_CONT const StorageType& GetStorage() const { this->SyncControlArray(); if (this->Internals->ControlArrayValid) @@ -330,7 +330,7 @@ public: /// Get the array portal of the control array. /// - VTKM_CONT_EXPORT PortalControl GetPortalControl() + VTKM_CONT PortalControl GetPortalControl() { this->SyncControlArray(); if (this->Internals->ControlArrayValid) @@ -350,7 +350,7 @@ public: /// Get the array portal of the control array. /// - VTKM_CONT_EXPORT PortalConstControl GetPortalConstControl() const + VTKM_CONT PortalConstControl GetPortalConstControl() const { this->SyncControlArray(); if (this->Internals->ControlArrayValid) @@ -366,7 +366,7 @@ public: /// Returns the number of entries in the array. /// - VTKM_CONT_EXPORT vtkm::Id GetNumberOfValues() const + VTKM_CONT vtkm::Id GetNumberOfValues() const { if (this->Internals->ControlArrayValid) { @@ -386,7 +386,7 @@ public: /// method can skip copying into an internally managed control array. /// template - VTKM_CONT_EXPORT void CopyInto(IteratorType dest, DeviceAdapterTag) const + VTKM_CONT void CopyInto(IteratorType dest, DeviceAdapterTag) const { using pointer_type = typename std::iterator_traits::pointer; using value_type = typename std::remove_pointer::type; @@ -434,7 +434,7 @@ public: /// ErrorControlBadValue if the allocation is not feasible (for example, the /// array storage is read-only). /// - VTKM_CONT_EXPORT + VTKM_CONT void Allocate(vtkm::Id numberOfValues) { this->ReleaseResourcesExecutionInternal(); @@ -481,7 +481,7 @@ public: /// Releases any resources being used in the execution environment (that are /// not being shared by the control environment). /// - VTKM_CONT_EXPORT void ReleaseResourcesExecution() + VTKM_CONT void ReleaseResourcesExecution() { // Save any data in the execution environment by making sure it is synced // with the control environment. @@ -492,7 +492,7 @@ public: /// Releases all resources in both the control and execution environments. /// - VTKM_CONT_EXPORT void ReleaseResources() + VTKM_CONT void ReleaseResources() { this->ReleaseResourcesExecutionInternal(); @@ -510,7 +510,7 @@ public: /// execution environment. /// template - VTKM_CONT_EXPORT + VTKM_CONT typename ExecutionTypes::PortalConst PrepareForInput(DeviceAdapterTag) const { @@ -541,7 +541,7 @@ public: /// execution environment. /// template - VTKM_CONT_EXPORT + VTKM_CONT typename ExecutionTypes::Portal PrepareForOutput(vtkm::Id numberOfValues, DeviceAdapterTag) { @@ -578,7 +578,7 @@ public: /// in the execution environment. /// template - VTKM_CONT_EXPORT + VTKM_CONT typename ExecutionTypes::Portal PrepareForInPlace(DeviceAdapterTag) { @@ -609,12 +609,12 @@ public: /// Like a pointer, two \c ArrayHandles are considered equal if they point /// to the same location in memory. /// - VTKM_CONT_EXPORT + VTKM_CONT bool operator==(const ArrayHandle &rhs) const { return (this->Internals.get() == rhs.Internals.get()); } - VTKM_CONT_EXPORT + VTKM_CONT bool operator!=(const ArrayHandle &rhs) const { return (this->Internals.get() != rhs.Internals.get()); @@ -632,7 +632,7 @@ public: bool ExecutionArrayValid; }; - VTKM_CONT_EXPORT + VTKM_CONT ArrayHandle(const std::shared_ptr& i) : Internals(i) { } @@ -643,7 +643,7 @@ public: /// method is declared const because logically the data does not. /// template - VTKM_CONT_EXPORT + VTKM_CONT void PrepareForDevice(DeviceAdapterTag) const { if (this->Internals->ExecutionArray != nullptr) @@ -688,7 +688,7 @@ public: /// Although the internal state of this class can change, the method is /// declared const because logically the data does not. /// - VTKM_CONT_EXPORT void SyncControlArray() const + VTKM_CONT void SyncControlArray() const { if (!this->Internals->ControlArrayValid) { @@ -712,7 +712,7 @@ public: } } - VTKM_CONT_EXPORT + VTKM_CONT void ReleaseResourcesExecutionInternal() { if (this->Internals->ExecutionArrayValid) @@ -728,7 +728,7 @@ public: /// A convenience function for creating an ArrayHandle from a standard C array. /// template -VTKM_CONT_EXPORT +VTKM_CONT vtkm::cont::ArrayHandle make_ArrayHandle(const T *array, vtkm::Id length) @@ -744,7 +744,7 @@ make_ArrayHandle(const T *array, /// template -VTKM_CONT_EXPORT +VTKM_CONT vtkm::cont::ArrayHandle make_ArrayHandle(const std::vector &array) { @@ -752,7 +752,7 @@ make_ArrayHandle(const std::vector &array) } template -VTKM_CONT_EXPORT +VTKM_CONT void printSummary_ArrayHandle(const vtkm::cont::ArrayHandle &array, std::ostream &out) @@ -779,7 +779,7 @@ printSummary_ArrayHandle(const vtkm::cont::ArrayHandle &array, } template -VTKM_CONT_EXPORT +VTKM_CONT void printSummary_ArrayHandle(const vtkm::cont::ArrayHandle &array, std::ostream &out) diff --git a/vtkm/cont/ArrayHandleCartesianProduct.h b/vtkm/cont/ArrayHandleCartesianProduct.h index 044218881..3d938154e 100644 --- a/vtkm/cont/ArrayHandleCartesianProduct.h +++ b/vtkm/cont/ArrayHandleCartesianProduct.h @@ -45,12 +45,12 @@ public: typedef PortalTypeThird_ PortalTypeThird; VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT ArrayPortalCartesianProduct() : PortalFirst(), PortalSecond(), PortalThird() { } //needs to be host and device so that cuda can create lvalue of these - VTKM_CONT_EXPORT + VTKM_CONT ArrayPortalCartesianProduct(const PortalTypeFirst &portalfirst, const PortalTypeSecond &portalsecond, const PortalTypeThird &portalthird) @@ -63,7 +63,7 @@ public: /// template - VTKM_CONT_EXPORT + VTKM_CONT ArrayPortalCartesianProduct(const ArrayPortalCartesianProduct &src) : PortalFirst(src.GetPortalFirst()), PortalSecond(src.GetPortalSecond()), @@ -72,7 +72,7 @@ public: VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::Id GetNumberOfValues() const { return this->PortalFirst.GetNumberOfValues() * @@ -81,7 +81,7 @@ public: } VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT ValueType Get(vtkm::Id index) const { VTKM_ASSERT(index >= 0); @@ -101,7 +101,7 @@ public: } VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT void Set(vtkm::Id index, const ValueType &value) const { VTKM_ASSERT(index >= 0); @@ -122,15 +122,15 @@ public: } VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT const PortalTypeFirst &GetFirstPortal() const { return this->PortalFirst; } VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT const PortalTypeSecond &GetSecondPortal() const { return this->PortalSecond; } VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT const PortalTypeThird &GetThirdPortal() const { return this->PortalThird; } @@ -192,17 +192,17 @@ public: typename ThirdHandleType::PortalConstControl> PortalConstType; - VTKM_CONT_EXPORT + VTKM_CONT Storage() : FirstArray(), SecondArray(), ThirdArray() { } - VTKM_CONT_EXPORT + VTKM_CONT Storage(const FirstHandleType &array1, const SecondHandleType &array2, const ThirdHandleType &array3) : FirstArray(array1), SecondArray(array2), ThirdArray(array3) { } - VTKM_CONT_EXPORT + VTKM_CONT PortalType GetPortal() { return PortalType(this->FirstArray.GetPortalControl(), @@ -210,7 +210,7 @@ public: this->ThirdArray.GetPortalControl()); } - VTKM_CONT_EXPORT + VTKM_CONT PortalConstType GetPortalConst() const { return PortalConstType(this->FirstArray.GetPortalConstControl(), @@ -218,7 +218,7 @@ public: this->ThirdArray.GetPortalConstControl()); } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Id GetNumberOfValues() const { return this->FirstArray.GetNumberOfValues() * @@ -226,38 +226,38 @@ public: this->ThirdArray.GetNumberOfValues(); } - VTKM_CONT_EXPORT + VTKM_CONT void Allocate(vtkm::Id /*numberOfValues*/) { throw vtkm::cont::ErrorControlBadAllocation("Does not make sense."); } - VTKM_CONT_EXPORT + VTKM_CONT void Shrink(vtkm::Id /*numberOfValues*/) { throw vtkm::cont::ErrorControlBadAllocation("Does not make sense."); } - VTKM_CONT_EXPORT + VTKM_CONT void ReleaseResources() { // This request is ignored since it is asking to release the resources // of the arrays, which may be used elsewhere. } - VTKM_CONT_EXPORT + VTKM_CONT const FirstHandleType &GetFirstArray() const { return this->FirstArray; } - VTKM_CONT_EXPORT + VTKM_CONT const SecondHandleType &GetSecondArray() const { return this->SecondArray; } - VTKM_CONT_EXPORT + VTKM_CONT const ThirdHandleType &GetThirdArray() const { return this->ThirdArray; @@ -300,7 +300,7 @@ public: typename ThirdHandleType::template ExecutionTypes::PortalConst > PortalConstExecution; - VTKM_CONT_EXPORT + VTKM_CONT ArrayTransfer(StorageType *storage) : FirstArray(storage->GetFirstArray()), SecondArray(storage->GetSecondArray()), @@ -308,7 +308,7 @@ public: { } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Id GetNumberOfValues() const { return this->FirstArray.GetNumberOfValues() * @@ -317,14 +317,14 @@ public: } - VTKM_CONT_EXPORT + VTKM_CONT PortalConstExecution PrepareForInput(bool vtkmNotUsed(updateData)) { return PortalConstExecution(this->FirstArray.PrepareForInput(Device()), this->SecondArray.PrepareForInput(Device()), this->ThirdArray.PrepareForInput(Device())); } - VTKM_CONT_EXPORT + VTKM_CONT PortalExecution PrepareForInPlace(bool vtkmNotUsed(updateData)) { throw vtkm::cont::ErrorControlBadAllocation( @@ -332,7 +332,7 @@ public: "sense because there is overlap in the data."); } - VTKM_CONT_EXPORT + VTKM_CONT PortalExecution PrepareForOutput(vtkm::Id vtkmNotUsed(numberOfValues)) { throw vtkm::cont::ErrorControlBadAllocation( @@ -340,7 +340,7 @@ public: "sense because there is overlap in the data."); } - VTKM_CONT_EXPORT + VTKM_CONT void RetrieveOutputData(StorageType *vtkmNotUsed(storage)) const { // Implementation of this method should be unnecessary. The internal @@ -348,13 +348,13 @@ public: // output data as necessary. } - VTKM_CONT_EXPORT + VTKM_CONT void Shrink(vtkm::Id /*numberOfValues*/) { throw vtkm::cont::ErrorControlBadAllocation("Does not make sense."); } - VTKM_CONT_EXPORT + VTKM_CONT void ReleaseResources() { this->FirstArray.ReleaseResourcesExecution(); @@ -397,7 +397,7 @@ private: typedef vtkm::cont::internal::Storage StorageType; public: - VTKM_CONT_EXPORT + VTKM_CONT ArrayHandleCartesianProduct(const FirstHandleType &firstArray, const SecondHandleType &secondArray, const ThirdHandleType &thirdArray) @@ -408,7 +408,7 @@ public: /// arrays to be zipped together. /// template -VTKM_CONT_EXPORT +VTKM_CONT vtkm::cont::ArrayHandleCartesianProduct make_ArrayHandleCartesianProduct(const FirstHandleType &first, const SecondHandleType &second, diff --git a/vtkm/cont/ArrayHandleCast.h b/vtkm/cont/ArrayHandleCast.h index e521b701e..c83f47e2a 100644 --- a/vtkm/cont/ArrayHandleCast.h +++ b/vtkm/cont/ArrayHandleCast.h @@ -32,7 +32,7 @@ namespace internal { template struct Cast { - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT ToType operator()(const FromType &val) const { return static_cast(val); @@ -75,7 +75,7 @@ public: /// ArrayHandleCast. /// template -VTKM_CONT_EXPORT +VTKM_CONT ArrayHandleCast make_ArrayHandleCast(const HandleType &handle, const T& = T()) { diff --git a/vtkm/cont/ArrayHandleCompositeVector.h b/vtkm/cont/ArrayHandleCompositeVector.h index c0714c5d9..7aa3e91ed 100644 --- a/vtkm/cont/ArrayHandleCompositeVector.h +++ b/vtkm/cont/ArrayHandleCompositeVector.h @@ -48,20 +48,20 @@ struct CompositeVectorSwizzleFunctor // Caution! This is a reference. const ComponentMapType &SourceComponents; - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT CompositeVectorSwizzleFunctor(const ComponentMapType &sourceComponents) : SourceComponents(sourceComponents) { } // Currently only supporting 1-4 components. template - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT ValueType operator()(const T1 &p1) const { return ValueType( vtkm::VecTraits::GetComponent(p1, this->SourceComponents[0])); } template - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT ValueType operator()(const T1 &p1, const T2 &p2) const { return ValueType( vtkm::VecTraits::GetComponent(p1, this->SourceComponents[0]), @@ -69,7 +69,7 @@ struct CompositeVectorSwizzleFunctor } template - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT ValueType operator()(const T1 &p1, const T2 &p2, const T3 &p3) const { return ValueType( vtkm::VecTraits::GetComponent(p1, this->SourceComponents[0]), @@ -78,7 +78,7 @@ struct CompositeVectorSwizzleFunctor } template - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT ValueType operator()(const T1 &p1, const T2 &p2, const T3 &p3, @@ -96,19 +96,19 @@ struct CompositeVectorPullValueFunctor { vtkm::Id Index; - VTKM_EXEC_EXPORT + VTKM_EXEC CompositeVectorPullValueFunctor(vtkm::Id index) : Index(index) { } // This form is to pull values out of array arguments. VTKM_SUPPRESS_EXEC_WARNINGS template - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT typename PortalType::ValueType operator()(const PortalType &portal) const { return portal.Get(this->Index); } // This form is an identity to pass the return value back. - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT const ReturnValueType &operator()(const ReturnValueType &value) const { return value; } @@ -121,7 +121,7 @@ struct CompositeVectorArrayToPortalCont { }; template - VTKM_CONT_EXPORT + VTKM_CONT typename ReturnType::type operator()(const ArrayHandleType &array, vtkm::internal::IndexTag) const { @@ -138,7 +138,7 @@ struct CompositeVectorArrayToPortalExec { }; template - VTKM_CONT_EXPORT + VTKM_CONT typename ReturnType::type operator()(const ArrayHandleType &array, vtkm::internal::IndexTag) const { @@ -185,24 +185,24 @@ public: VTKM_STATIC_ASSERT(NUM_COMPONENTS == PortalTypes::ARITY); VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT ArrayPortalCompositeVector() { } VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_CONT_EXPORT + VTKM_CONT ArrayPortalCompositeVector( const PortalTypes portals, vtkm::Vec sourceComponents) : Portals(portals), SourceComponents(sourceComponents) { } VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::Id GetNumberOfValues() const { return this->Portals.template GetParameter<1>().GetNumberOfValues(); } VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT ValueType Get(vtkm::Id index) const { // This might be inefficient because we are copying all the portals only // because they are coupled with the return value. @@ -257,10 +257,10 @@ public: typedef PortalType PortalConstType; typedef typename PortalType::ValueType ValueType; - VTKM_CONT_EXPORT + VTKM_CONT Storage() : Valid(false) { } - VTKM_CONT_EXPORT + VTKM_CONT Storage(const FunctionInterfaceWithArrays &arrays, const ComponentMapType &sourceComponents) : Arrays(arrays), SourceComponents(sourceComponents), Valid(true) @@ -269,13 +269,13 @@ public: detail::CheckArraySizeFunctor(this->GetNumberOfValues())); } - VTKM_CONT_EXPORT + VTKM_CONT PortalType GetPortal() { throw vtkm::cont::ErrorControlBadValue( "Composite vector arrays are read only."); } - VTKM_CONT_EXPORT + VTKM_CONT PortalConstType GetPortalConst() const { if (!this->Valid) { @@ -287,7 +287,7 @@ public: this->SourceComponents); } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Id GetNumberOfValues() const { if (!this->Valid) { @@ -297,7 +297,7 @@ public: return this->Arrays.template GetParameter<1>().GetNumberOfValues(); } - VTKM_CONT_EXPORT + VTKM_CONT void Allocate(vtkm::Id vtkmNotUsed(numberOfValues)) { throw vtkm::cont::ErrorControlInternal( @@ -308,13 +308,13 @@ public: "directly used."); } - VTKM_CONT_EXPORT + VTKM_CONT void Shrink(vtkm::Id vtkmNotUsed(numberOfValues)) { throw vtkm::cont::ErrorControlBadValue( "Composite vector arrays are read-only."); } - VTKM_CONT_EXPORT + VTKM_CONT void ReleaseResources() { if (this->Valid) { @@ -322,13 +322,13 @@ public: } } - VTKM_CONT_EXPORT + VTKM_CONT const FunctionInterfaceWithArrays &GetArrays() const { VTKM_ASSERT(this->Valid); return this->Arrays; } - VTKM_CONT_EXPORT + VTKM_CONT const ComponentMapType &GetSourceComponents() const { VTKM_ASSERT(this->Valid); return this->SourceComponents; @@ -369,15 +369,15 @@ public: typedef ArrayPortalCompositeVector PortalExecution; typedef ArrayPortalCompositeVector PortalConstExecution; - VTKM_CONT_EXPORT + VTKM_CONT ArrayTransfer(StorageType *storage) : Storage(storage) { } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Id GetNumberOfValues() const { return this->Storage->GetNumberOfValues(); } - VTKM_CONT_EXPORT + VTKM_CONT PortalConstExecution PrepareForInput(bool vtkmNotUsed(updateData)) const { return @@ -387,7 +387,7 @@ public: this->Storage->GetSourceComponents()); } - VTKM_CONT_EXPORT + VTKM_CONT PortalExecution PrepareForInPlace(bool vtkmNotUsed(updateData)) { // It may be the case a composite vector could be used for in place @@ -396,7 +396,7 @@ public: "Composite vector arrays cannot be used for output or in place."); } - VTKM_CONT_EXPORT + VTKM_CONT PortalExecution PrepareForOutput(vtkm::Id vtkmNotUsed(numberOfValues)) { // It may be the case a composite vector could be used for output if you @@ -406,21 +406,21 @@ public: "Composite vector arrays cannot be used for output."); } - VTKM_CONT_EXPORT + VTKM_CONT void RetrieveOutputData(StorageType *vtkmNotUsed(storage)) const { throw vtkm::cont::ErrorControlBadValue( "Composite vector arrays cannot be used for output."); } - VTKM_CONT_EXPORT + VTKM_CONT void Shrink(vtkm::Id vtkmNotUsed(numberOfValues)) { throw vtkm::cont::ErrorControlBadValue( "Composite vector arrays cannot be resized."); } - VTKM_CONT_EXPORT + VTKM_CONT void ReleaseResources() { this->Storage->ReleaseResources(); } @@ -456,7 +456,7 @@ public: (ArrayHandleCompositeVector), (typename internal::ArrayHandleCompositeVectorTraits::Superclass)); - VTKM_CONT_EXPORT + VTKM_CONT ArrayHandleCompositeVector( const vtkm::internal::FunctionInterface &arrays, const ComponentMapType &sourceComponents) @@ -468,7 +468,7 @@ public: /// signature. /// template - VTKM_CONT_EXPORT + VTKM_CONT ArrayHandleCompositeVector(const ArrayHandleType1 &array1, vtkm::IdComponent sourceComponent1) : Superclass(StorageType( @@ -477,7 +477,7 @@ public: { } template - VTKM_CONT_EXPORT + VTKM_CONT ArrayHandleCompositeVector(const ArrayHandleType1 &array1, vtkm::IdComponent sourceComponent1, const ArrayHandleType2 &array2, @@ -491,7 +491,7 @@ public: template - VTKM_CONT_EXPORT + VTKM_CONT ArrayHandleCompositeVector(const ArrayHandleType1 &array1, vtkm::IdComponent sourceComponent1, const ArrayHandleType2 &array2, @@ -509,7 +509,7 @@ public: typename ArrayHandleType2, typename ArrayHandleType3, typename ArrayHandleType4> - VTKM_CONT_EXPORT + VTKM_CONT ArrayHandleCompositeVector(const ArrayHandleType1 &array1, vtkm::IdComponent sourceComponent1, const ArrayHandleType2 &array2, @@ -608,7 +608,7 @@ public: /// Create a composite vector array from other arrays. /// template -VTKM_CONT_EXPORT +VTKM_CONT typename ArrayHandleCompositeVectorType< vtkm::cont::ArrayHandle >::type make_ArrayHandleCompositeVector( @@ -620,7 +620,7 @@ make_ArrayHandleCompositeVector( sourceComponent1); } template -VTKM_CONT_EXPORT +VTKM_CONT typename ArrayHandleCompositeVectorType::type make_ArrayHandleCompositeVector(const ArrayHandleType1 &array1, vtkm::IdComponent sourceComponent1) @@ -631,7 +631,7 @@ make_ArrayHandleCompositeVector(const ArrayHandleType1 &array1, } template -VTKM_CONT_EXPORT +VTKM_CONT typename ArrayHandleCompositeVectorType< ArrayHandleType1, ArrayHandleType2>::type make_ArrayHandleCompositeVector(const ArrayHandleType1 &array1, @@ -649,7 +649,7 @@ make_ArrayHandleCompositeVector(const ArrayHandleType1 &array1, template -VTKM_CONT_EXPORT +VTKM_CONT typename ArrayHandleCompositeVectorType< ArrayHandleType1, ArrayHandleType2, ArrayHandleType3>::type make_ArrayHandleCompositeVector(const ArrayHandleType1 &array1, @@ -673,7 +673,7 @@ template -VTKM_CONT_EXPORT +VTKM_CONT typename ArrayHandleCompositeVectorType< ArrayHandleType1, ArrayHandleType2, ArrayHandleType3, ArrayHandleType4>::type make_ArrayHandleCompositeVector(const ArrayHandleType1 &array1, diff --git a/vtkm/cont/ArrayHandleConcatenate.h b/vtkm/cont/ArrayHandleConcatenate.h index fdf03b638..8b02d2c57 100644 --- a/vtkm/cont/ArrayHandleConcatenate.h +++ b/vtkm/cont/ArrayHandleConcatenate.h @@ -34,27 +34,27 @@ class ArrayPortalConcatenate public: typedef typename PortalType1::ValueType ValueType; - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT ArrayPortalConcatenate() : portal1(), portal2() {} - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT ArrayPortalConcatenate( const PortalType1 &p1, const PortalType2 &p2 ) : portal1( p1 ), portal2( p2 ) {} // Copy constructor template< typename OtherP1, typename OtherP2 > - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT ArrayPortalConcatenate( const ArrayPortalConcatenate< OtherP1, OtherP2 > &src ) : portal1( src.GetPortal1() ), portal2( src.GetPortal2() ) {} - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::Id GetNumberOfValues() const { return this->portal1.GetNumberOfValues() + this->portal2.GetNumberOfValues() ; } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT ValueType Get( vtkm::Id index) const { if( index < this->portal1.GetNumberOfValues() ) @@ -63,7 +63,7 @@ public: return this->portal2.Get( index - this->portal1.GetNumberOfValues() ); } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT void Set( vtkm::Id index, const ValueType &value ) const { if( index < this->portal1.GetNumberOfValues() ) @@ -72,13 +72,13 @@ public: this->portal2.Set( index - this->portal1.GetNumberOfValues(), value ); } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT const PortalType1 &GetPortal1() const { return this->portal1; } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT const PortalType2 &GetPortal2() const { return this->portal2; @@ -110,14 +110,14 @@ public: typename ArrayHandleType1::PortalConstControl, typename ArrayHandleType2::PortalConstControl > PortalConstType; - VTKM_CONT_EXPORT + VTKM_CONT Storage() : valid( false ) { } - VTKM_CONT_EXPORT + VTKM_CONT Storage( const ArrayHandleType1 &a1, const ArrayHandleType2 &a2 ) : array1( a1 ), array2( a2 ), valid( true ) {}; - VTKM_CONT_EXPORT + VTKM_CONT PortalConstType GetPortalConst() const { VTKM_ASSERT( this->valid ); @@ -125,7 +125,7 @@ public: this->array2.GetPortalConstControl() ); } - VTKM_CONT_EXPORT + VTKM_CONT PortalType GetPortal() { VTKM_ASSERT( this->valid ); @@ -133,21 +133,21 @@ public: this->array2.GetPortalControl() ); } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Id GetNumberOfValues() const { VTKM_ASSERT( this->valid ); return this->array1.GetNumberOfValues() + this->array2.GetNumberOfValues(); } - VTKM_CONT_EXPORT + VTKM_CONT void Allocate( vtkm::Id vtkmNotUsed(numberOfValues) ) { throw vtkm::cont::ErrorControlInternal( "ArrayHandleConcatenate should not be allocated explicitly. " ); } - VTKM_CONT_EXPORT + VTKM_CONT void Shrink( vtkm::Id numberOfValues ) { VTKM_ASSERT( this->valid ); @@ -160,7 +160,7 @@ public: this->array2.Shrink( numberOfValues - this->array1.GetNumberOfValues() ); } - VTKM_CONT_EXPORT + VTKM_CONT void ReleaseResources( ) { VTKM_ASSERT( this->valid ); @@ -168,14 +168,14 @@ public: this->array2.ReleaseResources(); } - VTKM_CONT_EXPORT + VTKM_CONT const ArrayHandleType1 &GetArray1() const { VTKM_ASSERT( this->valid ); return this->array1; } - VTKM_CONT_EXPORT + VTKM_CONT const ArrayHandleType2 &GetArray2() const { VTKM_ASSERT( this->valid ); @@ -214,44 +214,44 @@ public: typename ArrayHandleType2::template ExecutionTypes< Device >::PortalConst > PortalConstExecution; - VTKM_CONT_EXPORT + VTKM_CONT ArrayTransfer( StorageType* storage ) : array1( storage->GetArray1() ), array2( storage->GetArray2() ) {} - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Id GetNumberOfValues() const { return this->array1.GetNumberOfValues() + this->array2.GetNumberOfValues() ; } - VTKM_CONT_EXPORT + VTKM_CONT PortalConstExecution PrepareForInput( bool vtkmNotUsed( updateData ) ) { return PortalConstExecution( this->array1.PrepareForInput( Device() ), this->array2.PrepareForInput( Device() )); } - VTKM_CONT_EXPORT + VTKM_CONT PortalExecution PrepareForInPlace( bool vtkmNotUsed( updateData ) ) { return PortalExecution( this->array1.PrepareForInPlace( Device() ), this->array2.PrepareForInPlace( Device() )); } - VTKM_CONT_EXPORT + VTKM_CONT PortalExecution PrepareForOutput( vtkm::Id vtkmNotUsed(numberOfValues) ) { throw vtkm::cont::ErrorControlInternal( "ArrayHandleConcatenate is derived and read-only. " ); } - VTKM_CONT_EXPORT + VTKM_CONT void RetrieveOutputData( StorageType* vtkmNotUsed(storage) ) const { // not need to implement } - VTKM_CONT_EXPORT + VTKM_CONT void Shrink( vtkm::Id numberOfValues ) { if( numberOfValues < this->array1.GetNumberOfValues() ) @@ -263,7 +263,7 @@ public: this->array2.Shrink( numberOfValues - this->array1.GetNumberOfValues() ); } - VTKM_CONT_EXPORT + VTKM_CONT void ReleaseResources() { this->array1.ReleaseResourcesExecution(); @@ -301,7 +301,7 @@ protected: public: - VTKM_CONT_EXPORT + VTKM_CONT ArrayHandleConcatenate( const ArrayHandleType1 &array1, const ArrayHandleType2 &array2 ) : Superclass( StorageType( array1, array2 ) ) @@ -311,7 +311,7 @@ public: template< typename ArrayHandleType1, typename ArrayHandleType2 > -VTKM_CONT_EXPORT +VTKM_CONT ArrayHandleConcatenate< ArrayHandleType1, ArrayHandleType2 > make_ArrayHandleConcatenate( const ArrayHandleType1 &array1, const ArrayHandleType2 &array2 ) diff --git a/vtkm/cont/ArrayHandleConstant.h b/vtkm/cont/ArrayHandleConstant.h index 9f346fb6d..13c466bc4 100644 --- a/vtkm/cont/ArrayHandleConstant.h +++ b/vtkm/cont/ArrayHandleConstant.h @@ -32,10 +32,10 @@ namespace detail { template struct ConstantFunctor { - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT ConstantFunctor(const ValueType &value = ValueType()) : Value(value) { } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT ValueType operator()(vtkm::Id vtkmNotUsed(index)) const { return this->Value; @@ -65,7 +65,7 @@ public: (ArrayHandleConstant), (vtkm::cont::ArrayHandleImplicit >)); - VTKM_CONT_EXPORT + VTKM_CONT ArrayHandleConstant(T value, vtkm::Id numberOfValues = 0) : Superclass(detail::ConstantFunctor(value), numberOfValues) { } }; diff --git a/vtkm/cont/ArrayHandleCounting.h b/vtkm/cont/ArrayHandleCounting.h index 0173175d4..a44985bb0 100644 --- a/vtkm/cont/ArrayHandleCounting.h +++ b/vtkm/cont/ArrayHandleCounting.h @@ -40,14 +40,14 @@ class ArrayPortalCounting public: typedef CountingValueType ValueType; - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT ArrayPortalCounting() : Start(0), Step(1), NumberOfValues(0) { } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT ArrayPortalCounting(ValueType start, ValueType step, vtkm::Id numValues) : Start(start), Step(step), @@ -55,7 +55,7 @@ public: { } template - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT ArrayPortalCounting(const ArrayPortalCounting &src) : Start(src.Start), Step(src.Step), @@ -63,7 +63,7 @@ public: { } template - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT ArrayPortalCounting &operator=( const ArrayPortalCounting &src) { @@ -73,10 +73,10 @@ public: return *this; } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::Id GetNumberOfValues() const { return this->NumberOfValues; } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT ValueType Get(vtkm::Id index) const { return ValueType(this->Start + this->Step*ValueType(static_cast(index))); @@ -118,7 +118,7 @@ public: typename internal::ArrayHandleCountingTraits::Tag >)); - VTKM_CONT_EXPORT + VTKM_CONT ArrayHandleCounting(CountingValueType start, CountingValueType step, vtkm::Id length) @@ -130,7 +130,7 @@ public: /// A convenience function for creating an ArrayHandleCounting. It takes the /// value to start counting from and and the number of times to increment. template -VTKM_CONT_EXPORT +VTKM_CONT vtkm::cont::ArrayHandleCounting make_ArrayHandleCounting(CountingValueType start, CountingValueType step, diff --git a/vtkm/cont/ArrayHandleGroupVec.h b/vtkm/cont/ArrayHandleGroupVec.h index 53edc4d72..6e9d0d490 100644 --- a/vtkm/cont/ArrayHandleGroupVec.h +++ b/vtkm/cont/ArrayHandleGroupVec.h @@ -42,11 +42,11 @@ public: typedef vtkm::Vec ValueType; VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT ArrayPortalGroupVec() : SourcePortal() { } VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT ArrayPortalGroupVec(const SourcePortalType &sourcePortal) : SourcePortal(sourcePortal) { } @@ -55,20 +55,20 @@ public: /// casting that the portals do (like the non-const to const cast). VTKM_SUPPRESS_EXEC_WARNINGS template - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT ArrayPortalGroupVec( const ArrayPortalGroupVec &src) : SourcePortal(src.GetPortal()) { } VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::Id GetNumberOfValues() const { return this->SourcePortal.GetNumberOfValues()/NUM_COMPONENTS; } VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT ValueType Get(vtkm::Id index) const { ValueType result; @@ -84,7 +84,7 @@ public: } VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT void Set(vtkm::Id index, const ValueType &value) const { vtkm::Id sourceIndex = index*NUM_COMPONENTS; @@ -98,7 +98,7 @@ public: } VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT const SourcePortalType &GetPortal() const { return this->SourcePortal; } private: @@ -136,28 +136,28 @@ public: typename SourceArrayHandleType::PortalConstControl, NUM_COMPONENTS> PortalConstType; - VTKM_CONT_EXPORT + VTKM_CONT Storage() : Valid(false) { } - VTKM_CONT_EXPORT + VTKM_CONT Storage(const SourceArrayHandleType &sourceArray) : SourceArray(sourceArray), Valid(true) { } - VTKM_CONT_EXPORT + VTKM_CONT PortalType GetPortal() { VTKM_ASSERT(this->Valid); return PortalType(this->SourceArray.GetPortalControl()); } - VTKM_CONT_EXPORT + VTKM_CONT PortalConstType GetPortalConst() const { VTKM_ASSERT(this->Valid); return PortalConstType(this->SourceArray.GetPortalConstControl()); } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Id GetNumberOfValues() const { VTKM_ASSERT(this->Valid); @@ -170,21 +170,21 @@ public: return sourceSize/NUM_COMPONENTS; } - VTKM_CONT_EXPORT + VTKM_CONT void Allocate(vtkm::Id numberOfValues) { VTKM_ASSERT(this->Valid); this->SourceArray.Allocate(numberOfValues*NUM_COMPONENTS); } - VTKM_CONT_EXPORT + VTKM_CONT void Shrink(vtkm::Id numberOfValues) { VTKM_ASSERT(this->Valid); this->SourceArray.Shrink(numberOfValues*NUM_COMPONENTS); } - VTKM_CONT_EXPORT + VTKM_CONT void ReleaseResources() { if (this->Valid) @@ -194,7 +194,7 @@ public: } // Required for later use in ArrayTransfer class - VTKM_CONT_EXPORT + VTKM_CONT const SourceArrayHandleType &GetSourceArray() const { VTKM_ASSERT(this->Valid); @@ -237,11 +237,11 @@ public: NUM_COMPONENTS> PortalConstExecution; - VTKM_CONT_EXPORT + VTKM_CONT ArrayTransfer(StorageType *storage) : SourceArray(storage->GetSourceArray()) { } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Id GetNumberOfValues() const { vtkm::Id sourceSize = this->SourceArray.GetNumberOfValues(); @@ -253,7 +253,7 @@ public: return sourceSize/NUM_COMPONENTS; } - VTKM_CONT_EXPORT + VTKM_CONT PortalConstExecution PrepareForInput(bool vtkmNotUsed(updateData)) { if (this->SourceArray.GetNumberOfValues()%NUM_COMPONENTS != 0) @@ -264,7 +264,7 @@ public: return PortalConstExecution(this->SourceArray.PrepareForInput(Device())); } - VTKM_CONT_EXPORT + VTKM_CONT PortalExecution PrepareForInPlace(bool vtkmNotUsed(updateData)) { if (this->SourceArray.GetNumberOfValues()%NUM_COMPONENTS != 0) @@ -275,14 +275,14 @@ public: return PortalExecution(this->SourceArray.PrepareForInPlace(Device())); } - VTKM_CONT_EXPORT + VTKM_CONT PortalExecution PrepareForOutput(vtkm::Id numberOfValues) { return PortalExecution(this->SourceArray.PrepareForOutput( numberOfValues*NUM_COMPONENTS, Device())); } - VTKM_CONT_EXPORT + VTKM_CONT void RetrieveOutputData(StorageType *vtkmNotUsed(storage)) const { // Implementation of this method should be unnecessary. The internal @@ -290,13 +290,13 @@ public: // necessary. } - VTKM_CONT_EXPORT + VTKM_CONT void Shrink(vtkm::Id numberOfValues) { this->SourceArray.Shrink(numberOfValues*NUM_COMPONENTS); } - VTKM_CONT_EXPORT + VTKM_CONT void ReleaseResources() { this->SourceArray.ReleaseResourcesExecution(); @@ -344,7 +344,7 @@ private: typedef vtkm::cont::internal::Storage StorageType; public: - VTKM_CONT_EXPORT + VTKM_CONT ArrayHandleGroupVec(const SourceArrayHandleType &sourceArray) : Superclass(StorageType(sourceArray)) { } }; @@ -356,7 +356,7 @@ public: /// template -VTKM_CONT_EXPORT +VTKM_CONT vtkm::cont::ArrayHandleGroupVec make_ArrayHandleGroupVec(const ArrayHandleType &array) { diff --git a/vtkm/cont/ArrayHandleImplicit.h b/vtkm/cont/ArrayHandleImplicit.h index ec52e091a..bcf1e40b6 100644 --- a/vtkm/cont/ArrayHandleImplicit.h +++ b/vtkm/cont/ArrayHandleImplicit.h @@ -46,27 +46,27 @@ public: typedef ValueType_ ValueType; typedef FunctorType_ FunctorType; - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT ArrayPortalImplicit() : Functor(), NumberOfValues(0) { } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT ArrayPortalImplicit(FunctorType f, vtkm::Id numValues) : Functor(f), NumberOfValues(numValues) { } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::Id GetNumberOfValues() const { return this->NumberOfValues; } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT ValueType Get(vtkm::Id index) const { return this->Functor(index); } typedef vtkm::cont::internal::IteratorFromArrayPortal< ArrayPortalImplicit > IteratorType; - VTKM_CONT_EXPORT + VTKM_CONT IteratorType GetIteratorBegin() const { return IteratorType(*this); @@ -112,7 +112,7 @@ public: (ArrayHandleImplicit), (typename ArrayTraits::Superclass)); - VTKM_CONT_EXPORT + VTKM_CONT ArrayHandleImplicit(FunctorType functor, vtkm::Id length) : Superclass(typename Superclass::PortalConstControl(functor,length)) { } @@ -123,7 +123,7 @@ public: /// arry. template -VTKM_CONT_EXPORT +VTKM_CONT vtkm::cont::ArrayHandleImplicit make_ArrayHandleImplicit(FunctorType functor, vtkm::Id length) { diff --git a/vtkm/cont/ArrayHandleIndex.h b/vtkm/cont/ArrayHandleIndex.h index feec7f6c7..54b3e4553 100644 --- a/vtkm/cont/ArrayHandleIndex.h +++ b/vtkm/cont/ArrayHandleIndex.h @@ -30,7 +30,7 @@ namespace cont { namespace detail { struct IndexFunctor { - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::Id operator()(vtkm::Id index) const { return index; } }; @@ -50,7 +50,7 @@ public: ArrayHandleIndex, (vtkm::cont::ArrayHandleImplicit)); - VTKM_CONT_EXPORT + VTKM_CONT ArrayHandleIndex(vtkm::Id length) : Superclass(detail::IndexFunctor(), length) { } }; diff --git a/vtkm/cont/ArrayHandlePermutation.h b/vtkm/cont/ArrayHandlePermutation.h index 84b2b33f4..0ec8f6b93 100644 --- a/vtkm/cont/ArrayHandlePermutation.h +++ b/vtkm/cont/ArrayHandlePermutation.h @@ -37,12 +37,12 @@ public: typedef typename ValuePortalType::ValueType ValueType; VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT ArrayPortalPermutation( ) : IndexPortal(), ValuePortal() { } VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT ArrayPortalPermutation( const IndexPortalType &indexPortal, const ValuePortalType &valuePortal) @@ -55,38 +55,38 @@ public: /// template VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT ArrayPortalPermutation( const ArrayPortalPermutation &src) : IndexPortal(src.GetIndexPortal()), ValuePortal(src.GetValuePortal()) { } VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::Id GetNumberOfValues() const { return this->IndexPortal.GetNumberOfValues(); } VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_EXPORT + VTKM_EXEC ValueType Get(vtkm::Id index) const { vtkm::Id permutedIndex = this->IndexPortal.Get(index); return this->ValuePortal.Get(permutedIndex); } VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_EXPORT + VTKM_EXEC void Set(vtkm::Id index, const ValueType &value) const { vtkm::Id permutedIndex = this->IndexPortal.Get(index); this->ValuePortal.Set(permutedIndex, value); } VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT const IndexPortalType &GetIndexPortal() const { return this->IndexPortal; } VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT const ValuePortalType &GetValuePortal() const { return this->ValuePortal; } private: @@ -124,56 +124,56 @@ public: typename IndexArrayType::PortalConstControl, typename ValueArrayType::PortalConstControl> PortalConstType; - VTKM_CONT_EXPORT + VTKM_CONT Storage() : Valid(false) { } - VTKM_CONT_EXPORT + VTKM_CONT Storage(const IndexArrayType &indexArray, const ValueArrayType &valueArray) : IndexArray(indexArray), ValueArray(valueArray), Valid(true) { } - VTKM_CONT_EXPORT + VTKM_CONT PortalType GetPortal() { VTKM_ASSERT(this->Valid); return PortalType(this->IndexArray.GetPortalConstControl(), this->ValueArray.GetPortalControl()); } - VTKM_CONT_EXPORT + VTKM_CONT PortalConstType GetPortalConst() const { VTKM_ASSERT(this->Valid); return PortalConstType(this->IndexArray.GetPortalConstControl(), this->ValueArray.GetPortalConstControl()); } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Id GetNumberOfValues() const { VTKM_ASSERT(this->Valid); return this->IndexArray.GetNumberOfValues(); } - VTKM_CONT_EXPORT + VTKM_CONT void Allocate(vtkm::Id vtkmNotUsed(numberOfValues)) { throw vtkm::cont::ErrorControlBadType( "ArrayHandlePermutation cannot be allocated."); } - VTKM_CONT_EXPORT + VTKM_CONT void Shrink(vtkm::Id vtkmNotUsed(numberOfValues)) { throw vtkm::cont::ErrorControlBadType( "ArrayHandlePermutation cannot shrink."); } - VTKM_CONT_EXPORT + VTKM_CONT void ReleaseResources() { // This request is ignored since it is asking to release the resources // of the delegate array, which may be used elsewhere. Should the behavior // be different? } - VTKM_CONT_EXPORT + VTKM_CONT const IndexArrayType &GetIndexArray() const { return this->IndexArray; } - VTKM_CONT_EXPORT + VTKM_CONT const ValueArrayType &GetValueArray() const { return this->ValueArray; } private: @@ -208,29 +208,29 @@ public: typename ValueArrayType::template ExecutionTypes::PortalConst> PortalConstExecution; - VTKM_CONT_EXPORT + VTKM_CONT ArrayTransfer(StorageType *storage) : IndexArray(storage->GetIndexArray()), ValueArray(storage->GetValueArray()) { } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Id GetNumberOfValues() const { return this->IndexArray.GetNumberOfValues(); } - VTKM_CONT_EXPORT + VTKM_CONT PortalConstExecution PrepareForInput(bool vtkmNotUsed(updateData)) { return PortalConstExecution(this->IndexArray.PrepareForInput(Device()), this->ValueArray.PrepareForInput(Device())); } - VTKM_CONT_EXPORT + VTKM_CONT PortalExecution PrepareForInPlace(bool vtkmNotUsed(updateData)) { return PortalExecution(this->IndexArray.PrepareForInput(Device()), this->ValueArray.PrepareForInPlace(Device())); } - VTKM_CONT_EXPORT + VTKM_CONT PortalExecution PrepareForOutput(vtkm::Id numberOfValues) { if (numberOfValues != this->GetNumberOfValues()) { @@ -256,20 +256,20 @@ public: this->ValueArray.GetNumberOfValues(), Device())); } - VTKM_CONT_EXPORT + VTKM_CONT void RetrieveOutputData(StorageType *vtkmNotUsed(storage)) const { // Implementation of this method should be unnecessary. The internal // array handles should automatically retrieve the output data as // necessary. } - VTKM_CONT_EXPORT + VTKM_CONT void Shrink(vtkm::Id vtkmNotUsed(numberOfValues)) { throw vtkm::cont::ErrorControlBadType( "ArrayHandlePermutation cannot shrink."); } - VTKM_CONT_EXPORT + VTKM_CONT void ReleaseResources() { this->IndexArray.ReleaseResourcesExecution(); this->ValueArray.ReleaseResourcesExecution(); @@ -330,7 +330,7 @@ private: StorageType; public: - VTKM_CONT_EXPORT + VTKM_CONT ArrayHandlePermutation(const IndexArrayHandleType &indexArray, const ValueArrayHandleType &valueArray) : Superclass(StorageType(indexArray, valueArray)) { } @@ -341,7 +341,7 @@ private: /// to apply to each element of the Handle. template -VTKM_CONT_EXPORT +VTKM_CONT vtkm::cont::ArrayHandlePermutation make_ArrayHandlePermutation(IndexArrayHandleType indexArray, ValueArrayHandleType valueArray) diff --git a/vtkm/cont/ArrayHandleStreaming.h b/vtkm/cont/ArrayHandleStreaming.h index 0a9a8c18c..6f724c753 100644 --- a/vtkm/cont/ArrayHandleStreaming.h +++ b/vtkm/cont/ArrayHandleStreaming.h @@ -35,11 +35,11 @@ public: typedef typename PortalType::ValueType ValueType; VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT ArrayPortalStreaming() : InputPortal(), BlockIndex(0), BlockSize(0), CurBlockSize(0) { } VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT ArrayPortalStreaming(const PortalType &inputPortal, vtkm::Id blockIndex, vtkm::Id blockSize, vtkm::Id curBlockSize) : InputPortal(inputPortal), BlockIndex(blockIndex), @@ -47,7 +47,7 @@ public: VTKM_SUPPRESS_EXEC_WARNINGS template - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT ArrayPortalStreaming(const ArrayPortalStreaming &src) : InputPortal(src.GetPortal()), BlockIndex(src.GetBlockIndex()), @@ -55,48 +55,48 @@ public: CurBlockSize(src.GetCurBlockSize()) { } VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::Id GetNumberOfValues() const { return this->CurBlockSize; } VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT ValueType Get(vtkm::Id index) const { return this->InputPortal.Get(BlockIndex*BlockSize + index); } VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT void Set(vtkm::Id index, const ValueType &value) const { this->InputPortal.Set(BlockIndex*BlockSize + index, value); } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT const PortalType &GetPortal() const { return this->InputPortal; } VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT void SetBlockSize(vtkm::Id blockSize) { BlockSize = blockSize; } VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT void SetBlockIndex(vtkm::Id blockIndex) { BlockIndex = blockIndex; } VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT void SetCurBlockSize(vtkm::Id curBlockSize) { CurBlockSize = curBlockSize; } VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::Id GetBlockSize() { return this->BlockSize; } VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::Id GetBlockIndex() { return this->BlockIndex; } VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::Id GetCurBlockSize() { return this->CurBlockSize; } private: @@ -126,60 +126,60 @@ public: typedef vtkm::cont::internal::ArrayPortalStreaming< typename ArrayHandleInputType::PortalConstControl> PortalConstType; - VTKM_CONT_EXPORT + VTKM_CONT Storage() : Valid(false) { } - VTKM_CONT_EXPORT + VTKM_CONT Storage(const ArrayHandleInputType inputArray, vtkm::Id blockSize, vtkm::Id blockIndex, vtkm::Id curBlockSize) : InputArray(inputArray), BlockSize(blockSize), BlockIndex(blockIndex), CurBlockSize(curBlockSize), Valid(true) { } - VTKM_CONT_EXPORT + VTKM_CONT PortalType GetPortal() { VTKM_ASSERT(this->Valid); return PortalType(this->InputArray.GetPortalControl(), BlockSize, BlockIndex, CurBlockSize); } - VTKM_CONT_EXPORT + VTKM_CONT PortalConstType GetPortalConst() const { VTKM_ASSERT(this->Valid); return PortalConstType(this->InputArray.GetPortalConstControl(), BlockSize, BlockIndex, CurBlockSize); } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Id GetNumberOfValues() const { VTKM_ASSERT(this->Valid); return CurBlockSize; } - VTKM_CONT_EXPORT + VTKM_CONT void Allocate(vtkm::Id numberOfValues) const { (void)numberOfValues; // Do nothing, since we only allocate a streaming array once at the beginning } - VTKM_CONT_EXPORT + VTKM_CONT void AllocateFullArray(vtkm::Id numberOfValues) { VTKM_ASSERT(this->Valid); this->InputArray.Allocate(numberOfValues); } - VTKM_CONT_EXPORT + VTKM_CONT void Shrink(vtkm::Id numberOfValues) { VTKM_ASSERT(this->Valid); this->InputArray.Shrink(numberOfValues); } - VTKM_CONT_EXPORT + VTKM_CONT void ReleaseResources() { VTKM_ASSERT(this->Valid); this->InputArray.ReleaseResources(); } - VTKM_CONT_EXPORT + VTKM_CONT const ArrayHandleInputType &GetArray() const { VTKM_ASSERT(this->Valid); return this->InputArray; @@ -218,7 +218,7 @@ private: typedef vtkm::cont::internal::Storage StorageType; public: - VTKM_CONT_EXPORT + VTKM_CONT ArrayHandleStreaming(const ArrayHandleInputType &inputArray, const vtkm::Id blockIndex, const vtkm::Id blockSize, const vtkm::Id curBlockSize) @@ -229,7 +229,7 @@ public: this->GetPortalConstControl().SetCurBlockSize(curBlockSize); } - VTKM_CONT_EXPORT + VTKM_CONT void AllocateFullArray(vtkm::Id numberOfValues) { this->ReleaseResourcesExecutionInternal(); this->Internals->ControlArray.AllocateFullArray(numberOfValues); diff --git a/vtkm/cont/ArrayHandleTransform.h b/vtkm/cont/ArrayHandleTransform.h index 53d683ef8..54870674f 100644 --- a/vtkm/cont/ArrayHandleTransform.h +++ b/vtkm/cont/ArrayHandleTransform.h @@ -58,7 +58,7 @@ public: typedef FunctorType_ FunctorType; VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT ArrayPortalTransform(const PortalType &portal = PortalType(), const FunctorType &functor = FunctorType()) : Portal(portal), Functor(functor) @@ -70,30 +70,30 @@ public: /// template VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT ArrayPortalTransform(const ArrayPortalTransform &src) : Portal(src.GetPortal()), Functor(src.GetFunctor()) { } VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::Id GetNumberOfValues() const { return this->Portal.GetNumberOfValues(); } VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT ValueType Get(vtkm::Id index) const { return this->Functor(this->Portal.Get(index)); } VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT const PortalType &GetPortal() const { return this->Portal; } VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT const FunctorType &GetFunctor() const { return this->Functor; } protected: @@ -113,7 +113,7 @@ public: typedef InverseFunctorType_ InverseFunctorType; VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT ArrayPortalTransform(const PortalType &portal = PortalType(), const FunctorType &functor = FunctorType(), const InverseFunctorType& inverseFunctor = InverseFunctorType()) @@ -122,19 +122,19 @@ public: template VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT ArrayPortalTransform(const ArrayPortalTransform &src) : Superclass(src), InverseFunctor(src.GetInverseFunctor()) { } VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT void Set(vtkm::Id index, const ValueType& value) const { return this->Portal.Set(index,this->InverseFunctor(value)); } VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT const InverseFunctorType &GetInverseFunctor() const { return this->InverseFunctor; } @@ -175,60 +175,60 @@ public: ValueType, typename ArrayHandleType::PortalConstControl, FunctorType> PortalConstType; - VTKM_CONT_EXPORT + VTKM_CONT Storage() : Valid(false) { } - VTKM_CONT_EXPORT + VTKM_CONT Storage(const ArrayHandleType &array, const FunctorType &functor = FunctorType()) : Array(array), Functor(functor), Valid(true) { } - VTKM_CONT_EXPORT + VTKM_CONT PortalType GetPortal() { VTKM_ASSERT(this->Valid); return PortalType(this->Array.GetPortalControl(), this->Functor); } - VTKM_CONT_EXPORT + VTKM_CONT PortalConstType GetPortalConst() const { VTKM_ASSERT(this->Valid); return PortalConstType(this->Array.GetPortalConstControl(), this->Functor); } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Id GetNumberOfValues() const { VTKM_ASSERT(this->Valid); return this->Array.GetNumberOfValues(); } - VTKM_CONT_EXPORT + VTKM_CONT void Allocate(vtkm::Id vtkmNotUsed(numberOfValues)) { throw vtkm::cont::ErrorControlBadType( "ArrayHandleTransform is read only. It cannot be allocated."); } - VTKM_CONT_EXPORT + VTKM_CONT void Shrink(vtkm::Id vtkmNotUsed(numberOfValues)) { throw vtkm::cont::ErrorControlBadType( "ArrayHandleTransform is read only. It cannot shrink."); } - VTKM_CONT_EXPORT + VTKM_CONT void ReleaseResources() { // This request is ignored since it is asking to release the resources // of the delegate array, which may be used elsewhere. Should the behavior // be different? } - VTKM_CONT_EXPORT + VTKM_CONT const ArrayHandleType &GetArray() const { VTKM_ASSERT(this->Valid); return this->Array; } - VTKM_CONT_EXPORT + VTKM_CONT const FunctorType &GetFunctor() const { return this->Functor; } @@ -254,16 +254,16 @@ public: typename ArrayHandleType::PortalConstControl,FunctorType,InverseFunctorType> PortalConstType; - VTKM_CONT_EXPORT + VTKM_CONT Storage() : Valid(false) { } - VTKM_CONT_EXPORT + VTKM_CONT Storage(const ArrayHandleType &array, const FunctorType &functor, const InverseFunctorType &inverseFunctor) : Array(array), Functor(functor), InverseFunctor(inverseFunctor), Valid(true) { } - VTKM_CONT_EXPORT + VTKM_CONT PortalType GetPortal() { VTKM_ASSERT(this->Valid); return PortalType(this->Array.GetPortalControl(), @@ -271,7 +271,7 @@ public: this->InverseFunctor); } - VTKM_CONT_EXPORT + VTKM_CONT PortalConstType GetPortalConst() const { VTKM_ASSERT(this->Valid); return PortalConstType(this->Array.GetPortalConstControl(), @@ -279,41 +279,41 @@ public: this->InverseFunctor); } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Id GetNumberOfValues() const { VTKM_ASSERT(this->Valid); return this->Array.GetNumberOfValues(); } - VTKM_CONT_EXPORT + VTKM_CONT void Allocate(vtkm::Id numberOfValues) { this->Array.Allocate(numberOfValues); this->Valid = true; } - VTKM_CONT_EXPORT + VTKM_CONT void Shrink(vtkm::Id numberOfValues) { this->Array.Shrink(numberOfValues); } - VTKM_CONT_EXPORT + VTKM_CONT void ReleaseResources() { this->Array.ReleaseResources(); this->Valid = false; } - VTKM_CONT_EXPORT + VTKM_CONT const ArrayHandleType &GetArray() const { VTKM_ASSERT(this->Valid); return this->Array; } - VTKM_CONT_EXPORT + VTKM_CONT const FunctorType &GetFunctor() const { return this->Functor; } - VTKM_CONT_EXPORT + VTKM_CONT const InverseFunctorType &GetInverseFunctor() const { return this->InverseFunctor; } @@ -348,34 +348,34 @@ public: typename ArrayHandleType::template ExecutionTypes::PortalConst, FunctorType> PortalConstExecution; - VTKM_CONT_EXPORT + VTKM_CONT ArrayTransfer(StorageType *storage) : Array(storage->GetArray()), Functor(storage->GetFunctor()) { } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Id GetNumberOfValues() const { return this->Array.GetNumberOfValues(); } - VTKM_CONT_EXPORT + VTKM_CONT PortalConstExecution PrepareForInput(bool vtkmNotUsed(updateData)) { return PortalConstExecution(this->Array.PrepareForInput(Device()), this->Functor); } - VTKM_CONT_EXPORT + VTKM_CONT PortalExecution PrepareForInPlace(bool &vtkmNotUsed(updateData)) { throw vtkm::cont::ErrorControlBadType( "ArrayHandleTransform read only. " "Cannot be used for in-place operations."); } - VTKM_CONT_EXPORT + VTKM_CONT PortalExecution PrepareForOutput(vtkm::Id vtkmNotUsed(numberOfValues)) { throw vtkm::cont::ErrorControlBadType( "ArrayHandleTransform read only. Cannot be used as output."); } - VTKM_CONT_EXPORT + VTKM_CONT void RetrieveOutputData(StorageType *vtkmNotUsed(storage)) const { throw vtkm::cont::ErrorControlInternal( "ArrayHandleTransform read only. " @@ -383,13 +383,13 @@ public: "data from the execution environment."); } - VTKM_CONT_EXPORT + VTKM_CONT void Shrink(vtkm::Id vtkmNotUsed(numberOfValues)) { throw vtkm::cont::ErrorControlBadType( "ArrayHandleTransform read only. Cannot shrink."); } - VTKM_CONT_EXPORT + VTKM_CONT void ReleaseResources() { this->Array.ReleaseResourcesExecution(); } @@ -427,45 +427,45 @@ public: typename ArrayHandleType::template ExecutionTypes::PortalConst, FunctorType, InverseFunctorType> PortalConstExecution; - VTKM_CONT_EXPORT + VTKM_CONT ArrayTransfer(StorageType *storage) : Array(storage->GetArray()), Functor(storage->GetFunctor()), InverseFunctor(storage->GetInverseFunctor()) { } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Id GetNumberOfValues() const { return this->Array.GetNumberOfValues(); } - VTKM_CONT_EXPORT + VTKM_CONT PortalConstExecution PrepareForInput(bool vtkmNotUsed(updateData)) { return PortalConstExecution(this->Array.PrepareForInput(Device()),this->Functor,this->InverseFunctor); } - VTKM_CONT_EXPORT + VTKM_CONT PortalExecution PrepareForInPlace(bool &vtkmNotUsed(updateData)) { return PortalExecution(this->Array.PrepareForInPlace(Device()),this->Functor,this->InverseFunctor); } - VTKM_CONT_EXPORT + VTKM_CONT PortalExecution PrepareForOutput(vtkm::Id numberOfValues) { return PortalExecution(this->Array.PrepareForOutput(numberOfValues, Device()),this->Functor,this->InverseFunctor); } - VTKM_CONT_EXPORT + VTKM_CONT void RetrieveOutputData(StorageType *vtkmNotUsed(storage)) const { // Implementation of this method should be unnecessary. The internal // array handle should automatically retrieve the output data as necessary. } - VTKM_CONT_EXPORT + VTKM_CONT void Shrink(vtkm::Id numberOfValues) { this->Array.Shrink(numberOfValues); } - VTKM_CONT_EXPORT + VTKM_CONT void ReleaseResources() { this->Array.ReleaseResourcesExecution(); } @@ -517,7 +517,7 @@ private: typedef vtkm::cont::internal::Storage StorageType; public: - VTKM_CONT_EXPORT + VTKM_CONT ArrayHandleTransform(const ArrayHandleType &handle, const FunctorType &functor = FunctorType()) : Superclass(StorageType(handle, functor)) { } @@ -528,7 +528,7 @@ public: /// to apply to each element of the Handle. template -VTKM_CONT_EXPORT +VTKM_CONT vtkm::cont::ArrayHandleTransform make_ArrayHandleTransform(HandleType handle, FunctorType functor) { @@ -568,7 +568,7 @@ private: }; template -VTKM_CONT_EXPORT +VTKM_CONT vtkm::cont::ArrayHandleTransform make_ArrayHandleTransform(HandleType handle, FunctorType functor, InverseFunctorType inverseFunctor) { diff --git a/vtkm/cont/ArrayHandleUniformPointCoordinates.h b/vtkm/cont/ArrayHandleUniformPointCoordinates.h index e37ba938a..ad32d6af5 100644 --- a/vtkm/cont/ArrayHandleUniformPointCoordinates.h +++ b/vtkm/cont/ArrayHandleUniformPointCoordinates.h @@ -50,7 +50,7 @@ private: typedef vtkm::cont::internal::Storage StorageType; public: - VTKM_CONT_EXPORT + VTKM_CONT ArrayHandleUniformPointCoordinates( vtkm::Id3 dimensions, ValueType origin = ValueType(0.0f, 0.0f, 0.0f), diff --git a/vtkm/cont/ArrayHandleZip.h b/vtkm/cont/ArrayHandleZip.h index 193cd40a8..6ced6c7ca 100644 --- a/vtkm/cont/ArrayHandleZip.h +++ b/vtkm/cont/ArrayHandleZip.h @@ -41,12 +41,12 @@ public: typedef PortalTypeSecond_ PortalTypeSecond; VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT ArrayPortalZip() : PortalFirst(), PortalSecond() { } //needs to be host and device so that cuda can create lvalue of these - VTKM_CONT_EXPORT + VTKM_CONT ArrayPortalZip(const PortalTypeFirst &portalfirst, const PortalTypeSecond &portalsecond) : PortalFirst(portalfirst), PortalSecond(portalsecond) @@ -57,31 +57,31 @@ public: /// type casting that the iterators do (like the non-const to const cast). /// template - VTKM_CONT_EXPORT + VTKM_CONT ArrayPortalZip(const ArrayPortalZip &src) : PortalFirst(src.GetFirstPortal()), PortalSecond(src.GetSecondPortal()) { } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::Id GetNumberOfValues() const { return this->PortalFirst.GetNumberOfValues(); } - VTKM_EXEC_EXPORT + VTKM_EXEC ValueType Get(vtkm::Id index) const { return vtkm::make_Pair(this->PortalFirst.Get(index), this->PortalSecond.Get(index)); } - VTKM_EXEC_EXPORT + VTKM_EXEC void Set(vtkm::Id index, const ValueType &value) const { this->PortalFirst.Set(index, value.first); this->PortalSecond.Set(index, value.second); } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT const PortalTypeFirst &GetFirstPortal() const { return this->PortalFirst; } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT const PortalTypeSecond &GetSecondPortal() const { return this->PortalSecond; } @@ -140,59 +140,59 @@ public: typename SecondHandleType::PortalConstControl> PortalConstType; - VTKM_CONT_EXPORT + VTKM_CONT Storage() : FirstArray(), SecondArray() { } - VTKM_CONT_EXPORT + VTKM_CONT Storage(const FirstHandleType &farray, const SecondHandleType &sarray) : FirstArray(farray), SecondArray(sarray) { } - VTKM_CONT_EXPORT + VTKM_CONT PortalType GetPortal() { return PortalType(this->FirstArray.GetPortalControl(), this->SecondArray.GetPortalControl()); } - VTKM_CONT_EXPORT + VTKM_CONT PortalConstType GetPortalConst() const { return PortalConstType(this->FirstArray.GetPortalConstControl(), this->SecondArray.GetPortalConstControl()); } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Id GetNumberOfValues() const { VTKM_ASSERT(this->FirstArray.GetNumberOfValues() == this->SecondArray.GetNumberOfValues()); return this->FirstArray.GetNumberOfValues(); } - VTKM_CONT_EXPORT + VTKM_CONT void Allocate(vtkm::Id numberOfValues) { this->FirstArray.Allocate(numberOfValues); this->SecondArray.Allocate(numberOfValues); } - VTKM_CONT_EXPORT + VTKM_CONT void Shrink(vtkm::Id numberOfValues) { this->FirstArray.Shrink(numberOfValues); this->SecondArray.Shrink(numberOfValues); } - VTKM_CONT_EXPORT + VTKM_CONT void ReleaseResources() { // This request is ignored since it is asking to release the resources // of the two zipped array, which may be used elsewhere. } - VTKM_CONT_EXPORT + VTKM_CONT const FirstHandleType &GetFirstArray() const { return this->FirstArray; } - VTKM_CONT_EXPORT + VTKM_CONT const SecondHandleType &GetSecondArray() const { return this->SecondArray; } @@ -230,14 +230,14 @@ public: typename SecondHandleType::template ExecutionTypes::PortalConst > PortalConstExecution; - VTKM_CONT_EXPORT + VTKM_CONT ArrayTransfer(StorageType *storage) : FirstArray(storage->GetFirstArray()), SecondArray(storage->GetSecondArray()) { } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Id GetNumberOfValues() const { VTKM_ASSERT( this->FirstArray.GetNumberOfValues() @@ -245,40 +245,40 @@ public: return this->FirstArray.GetNumberOfValues(); } - VTKM_CONT_EXPORT + VTKM_CONT PortalConstExecution PrepareForInput(bool vtkmNotUsed(updateData)) { return PortalConstExecution(this->FirstArray.PrepareForInput(Device()), this->SecondArray.PrepareForInput(Device())); } - VTKM_CONT_EXPORT + VTKM_CONT PortalExecution PrepareForInPlace(bool vtkmNotUsed(updateData)) { const vtkm::Id numberOfValues = this->GetNumberOfValues(); return PortalExecution(this->FirstArray.PrepareForOutput(numberOfValues, Device()), this->SecondArray.PrepareForOutput(numberOfValues, Device())); } - VTKM_CONT_EXPORT + VTKM_CONT PortalExecution PrepareForOutput(vtkm::Id numberOfValues) { return PortalExecution( this->FirstArray.PrepareForOutput(numberOfValues, Device()), this->SecondArray.PrepareForOutput(numberOfValues, Device()) ); } - VTKM_CONT_EXPORT + VTKM_CONT void RetrieveOutputData(StorageType *vtkmNotUsed(storage)) const { // Implementation of this method should be unnecessary. The internal // first and second array handles should automatically retrieve the // output data as necessary. } - VTKM_CONT_EXPORT + VTKM_CONT void Shrink(vtkm::Id numberOfValues) { this->FirstArray.Shrink(numberOfValues); this->SecondArray.Shrink(numberOfValues); } - VTKM_CONT_EXPORT + VTKM_CONT void ReleaseResources() { this->FirstArray.ReleaseResourcesExecution(); this->SecondArray.ReleaseResourcesExecution(); @@ -319,7 +319,7 @@ private: typedef vtkm::cont::internal::Storage StorageType; public: - VTKM_CONT_EXPORT + VTKM_CONT ArrayHandleZip(const FirstHandleType &firstArray, const SecondHandleType &secondArray) : Superclass( StorageType( firstArray, secondArray ) ) { } @@ -329,7 +329,7 @@ public: /// arrays to be zipped together. /// template -VTKM_CONT_EXPORT +VTKM_CONT vtkm::cont::ArrayHandleZip make_ArrayHandleZip(const FirstHandleType &first, const SecondHandleType &second) diff --git a/vtkm/cont/ArrayPortal.h b/vtkm/cont/ArrayPortal.h index bb16a266a..788138ec1 100644 --- a/vtkm/cont/ArrayPortal.h +++ b/vtkm/cont/ArrayPortal.h @@ -64,18 +64,18 @@ public: /// The total number of values in the array. They are index from 0 to /// GetNumberOfValues()-1. /// - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Id GetNumberOfValues() const; /// Gets a value from the array. /// - VTKM_CONT_EXPORT + VTKM_CONT ValueType Get(vtkm::Id index) const; /// Sets a value in the array. This function may not exist for an ArrayPortal /// pointing to a const array. /// - VTKM_CONT_EXPORT + VTKM_CONT void Set(vtkm::Id index, const ValueType &value) const; }; diff --git a/vtkm/cont/ArrayPortalToIterators.h b/vtkm/cont/ArrayPortalToIterators.h index 9cdecb93b..56b6c7123 100644 --- a/vtkm/cont/ArrayPortalToIterators.h +++ b/vtkm/cont/ArrayPortalToIterators.h @@ -47,7 +47,7 @@ public: /// the array portal. /// VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT ArrayPortalToIterators(const PortalType &portal) : Portal(portal) { } /// The type of the iterator. @@ -58,7 +58,7 @@ public: /// Returns an iterator pointing to the beginning of the ArrayPortal. /// VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT IteratorType GetBegin() const { return vtkm::cont::internal::make_IteratorBegin(this->Portal); } @@ -66,7 +66,7 @@ public: /// Returns an iterator pointing to one past the end of the ArrayPortal. /// VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT IteratorType GetEnd() const { return vtkm::cont::internal::make_IteratorEnd(this->Portal); } @@ -79,7 +79,7 @@ private: /// template VTKM_SUPPRESS_EXEC_WARNINGS -VTKM_EXEC_CONT_EXPORT +VTKM_EXEC_CONT typename vtkm::cont::ArrayPortalToIterators::IteratorType ArrayPortalToIteratorBegin(const PortalType &portal) { @@ -91,7 +91,7 @@ ArrayPortalToIteratorBegin(const PortalType &portal) /// template VTKM_SUPPRESS_EXEC_WARNINGS -VTKM_EXEC_CONT_EXPORT +VTKM_EXEC_CONT typename vtkm::cont::ArrayPortalToIterators::IteratorType ArrayPortalToIteratorEnd(const PortalType &portal) { diff --git a/vtkm/cont/CellSet.h b/vtkm/cont/CellSet.h index 433e9fcab..075a3606d 100644 --- a/vtkm/cont/CellSet.h +++ b/vtkm/cont/CellSet.h @@ -34,19 +34,19 @@ namespace cont { class CellSet { public: - VTKM_CONT_EXPORT + VTKM_CONT CellSet(const std::string &name) : Name(name), LogicalStructure() { } - VTKM_CONT_EXPORT + VTKM_CONT CellSet(const vtkm::cont::CellSet &src) : Name(src.Name), LogicalStructure(src.LogicalStructure) { } - VTKM_CONT_EXPORT + VTKM_CONT CellSet &operator=(const vtkm::cont::CellSet &src) { this->Name = src.Name; diff --git a/vtkm/cont/CellSetExplicit.h b/vtkm/cont/CellSetExplicit.h index dc7114a04..20584085f 100644 --- a/vtkm/cont/CellSetExplicit.h +++ b/vtkm/cont/CellSetExplicit.h @@ -105,7 +105,7 @@ public: typedef typename PointToCellConnectivityType::ConnectivityArrayType ConnectivityArrayType; typedef typename PointToCellConnectivityType::IndexOffsetArrayType IndexOffsetArrayType; - VTKM_CONT_EXPORT + VTKM_CONT CellSetExplicit(vtkm::Id numpoints = 0, const std::string &name = std::string()) : CellSet(name), @@ -115,7 +115,7 @@ public: { } - VTKM_CONT_EXPORT + VTKM_CONT CellSetExplicit(vtkm::Id numpoints) : CellSet(std::string()), ConnectivityLength(-1), @@ -124,7 +124,7 @@ public: { } - VTKM_CONT_EXPORT + VTKM_CONT CellSetExplicit(const Thisclass &src) : CellSet(src), PointToCell(src.PointToCell), @@ -134,7 +134,7 @@ public: NumberOfPoints(src.NumberOfPoints) { } - VTKM_CONT_EXPORT + VTKM_CONT Thisclass &operator=(const Thisclass &src) { this->CellSet::operator=(src); @@ -158,32 +158,32 @@ public: return this->NumberOfPoints; } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Id GetSchedulingRange(vtkm::TopologyElementTagCell) const { return this->GetNumberOfCells(); } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Id GetSchedulingRange(vtkm::TopologyElementTagPoint) const { return this->GetNumberOfPoints(); } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::IdComponent GetNumberOfPointsInCell(vtkm::Id cellIndex) const { return this->PointToCell.NumIndices.GetPortalConstControl().Get(cellIndex); } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Id GetCellShape(vtkm::Id cellIndex) const { return this->PointToCell.Shapes.GetPortalConstControl().Get(cellIndex); } template - VTKM_CONT_EXPORT + VTKM_CONT void GetIndices(vtkm::Id index, vtkm::Vec &ids) const { @@ -196,7 +196,7 @@ public: } /// First method to add cells -- one at a time. - VTKM_CONT_EXPORT + VTKM_CONT void PrepareToAddCells(vtkm::Id numShapes, vtkm::Id connectivityMaxLen) { this->PointToCell.Shapes.Allocate(numShapes); @@ -208,7 +208,7 @@ public: } template - VTKM_CONT_EXPORT + VTKM_CONT void AddCell(vtkm::UInt8 cellType, vtkm::IdComponent numVertices, const IndexableType &ids) @@ -226,7 +226,7 @@ public: this->ConnectivityLength += numVertices; } - VTKM_CONT_EXPORT + VTKM_CONT void CompleteAddingCells() { this->PointToCell.Connectivity.Shrink(ConnectivityLength); @@ -238,7 +238,7 @@ public: /// Second method to add cells -- all at once. /// Assigns the array handles to the explicit connectivity. This is /// the way you can fill the memory from another system without copying - VTKM_CONT_EXPORT + VTKM_CONT void Fill(const vtkm::cont::ArrayHandle &cellTypes, const vtkm::cont::ArrayHandle &numIndices, const vtkm::cont::ArrayHandle &connectivity, @@ -311,7 +311,7 @@ public: } template - VTKM_CONT_EXPORT + VTKM_CONT void BuildConnectivity(Device, FromTopology, ToTopology) const { typedef CellSetExplicit - VTKM_CONT_EXPORT + VTKM_CONT void CreateConnectivity(Device, vtkm::TopologyElementTagPoint, vtkm::TopologyElementTagCell) @@ -347,11 +347,11 @@ public: typedef void ExecutionSignature(_1,_2,_3,_4); typedef _1 InputDomain; - VTKM_CONT_EXPORT + VTKM_CONT ExpandIndices() {} template - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(const vtkm::Id &cellIndex, const vtkm::Id &offset, const vtkm::Id &numIndices, @@ -367,7 +367,7 @@ public: }; template - VTKM_CONT_EXPORT + VTKM_CONT void CreateConnectivity(Device, vtkm::TopologyElementTagCell, vtkm::TopologyElementTagPoint) @@ -447,7 +447,7 @@ public: } template - VTKM_CONT_EXPORT + VTKM_CONT const typename ConnectivityChooser::ShapeArrayType & GetShapesArray(FromTopology,ToTopology) const { @@ -455,7 +455,7 @@ public: } template - VTKM_CONT_EXPORT + VTKM_CONT const typename ConnectivityChooser::NumIndicesArrayType & GetNumIndicesArray(FromTopology,ToTopology) const { @@ -463,7 +463,7 @@ public: } template - VTKM_CONT_EXPORT + VTKM_CONT const typename ConnectivityChooser::ConnectivityArrayType & GetConnectivityArray(FromTopology,ToTopology) const { @@ -471,7 +471,7 @@ public: } template - VTKM_CONT_EXPORT + VTKM_CONT const typename ConnectivityChooser::IndexOffsetArrayType & GetIndexOffsetArray(FromTopology,ToTopology) const { @@ -493,14 +493,14 @@ private: // A set of overloaded methods to get the connectivity from a pair of // topology element types. #define VTKM_GET_CONNECTIVITY_METHOD(FromTopology,ToTopology,Ivar) \ - VTKM_CONT_EXPORT \ + VTKM_CONT \ const typename ConnectivityChooser< \ FromTopology,ToTopology>::ConnectivityType & \ GetConnectivity(FromTopology, ToTopology) const \ { \ return this->Ivar; \ } \ - VTKM_CONT_EXPORT \ + VTKM_CONT \ typename ConnectivityChooser< \ FromTopology,ToTopology>::ConnectivityType & \ GetConnectivity(FromTopology, ToTopology) \ diff --git a/vtkm/cont/CellSetPermutation.h b/vtkm/cont/CellSetPermutation.h index 626f831d7..1f94a51be 100644 --- a/vtkm/cont/CellSetPermutation.h +++ b/vtkm/cont/CellSetPermutation.h @@ -38,7 +38,7 @@ template< typename OriginalCellSet, typename PermutationArrayHandleType > class CellSetGeneralPermutation : public CellSet { public: - VTKM_CONT_EXPORT + VTKM_CONT CellSetGeneralPermutation(const PermutationArrayHandleType& validCellIds, const OriginalCellSet& cellset, const std::string &name) @@ -48,7 +48,7 @@ public: { } - VTKM_CONT_EXPORT + VTKM_CONT CellSetGeneralPermutation(const std::string &name) : CellSet(name), ValidCellIds(), @@ -56,20 +56,20 @@ public: { } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Id GetNumberOfCells() const { return this->ValidCellIds.GetNumberOfValues(); } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Id GetNumberOfPoints() const { return this->FullCellSet.GetNumberOfPoints(); } //This is the way you can fill the memory from another system without copying - VTKM_CONT_EXPORT + VTKM_CONT void Fill(const PermutationArrayHandleType &validCellIds, const OriginalCellSet& cellset) { @@ -78,7 +78,7 @@ public: } template - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Id GetSchedulingRange(TopologyElement) const { VTKM_IS_TOPOLOGY_ELEMENT_TAG(TopologyElement); return this->ValidCellIds.GetNumberOfValues(); @@ -135,7 +135,7 @@ class CellSetPermutation : public vtkm::cont::internal::CellSetGeneralPermutatio typedef typename vtkm::cont::internal::CellSetGeneralPermutation< OriginalCellSet, PermutationArrayHandleType> ParentType; public: - VTKM_CONT_EXPORT + VTKM_CONT CellSetPermutation(const PermutationArrayHandleType& validCellIds, const OriginalCellSet& cellset, const std::string &name = std::string()) @@ -143,7 +143,7 @@ public: { } - VTKM_CONT_EXPORT + VTKM_CONT CellSetPermutation(const std::string &name = std::string()) : ParentType(name) { diff --git a/vtkm/cont/CellSetSingleType.h b/vtkm/cont/CellSetSingleType.h index 0f9aac1ae..26a650229 100644 --- a/vtkm/cont/CellSetSingleType.h +++ b/vtkm/cont/CellSetSingleType.h @@ -55,7 +55,7 @@ class CellSetSingleType : public: template - VTKM_CONT_EXPORT + VTKM_CONT CellSetSingleType(CellShapeTag, vtkm::Id numpoints, const std::string &name = std::string()) : Superclass(numpoints, name), CellTypeAsId(CellShapeTag::Id) @@ -63,14 +63,14 @@ public: } template - VTKM_CONT_EXPORT + VTKM_CONT CellSetSingleType(CellShapeTag, const std::string &name = std::string()) : Superclass(0, name), CellTypeAsId(CellShapeTag::Id) { } - VTKM_CONT_EXPORT + VTKM_CONT CellSetSingleType(vtkm::Id numpoints, const std::string &name = std::string()) : Superclass(numpoints, name), @@ -78,19 +78,19 @@ public: { } - VTKM_CONT_EXPORT + VTKM_CONT CellSetSingleType(const std::string &name = std::string()) : Superclass(0, name), CellTypeAsId(CellShapeTagEmpty::Id) { } - VTKM_CONT_EXPORT + VTKM_CONT CellSetSingleType(const Thisclass &src) : Superclass(src), CellTypeAsId(src.CellTypeAsId) { } - VTKM_CONT_EXPORT + VTKM_CONT Thisclass &operator=(const Thisclass &src) { this->Superclass::operator=(src); @@ -101,7 +101,7 @@ public: virtual ~CellSetSingleType() { } /// First method to add cells -- one at a time. - VTKM_CONT_EXPORT + VTKM_CONT void PrepareToAddCells(vtkm::Id numShapes, vtkm::Id connectivityMaxLen) { vtkm::IdComponent numberOfPointsPerCell = this->DetermineNumberOfPoints(); @@ -124,7 +124,7 @@ public: /// Second method to add cells -- one at a time. template - VTKM_CONT_EXPORT + VTKM_CONT void AddCell(vtkm::UInt8 vtkmNotUsed(cellType), vtkm::IdComponent numVertices, const vtkm::Vec &ids) @@ -139,7 +139,7 @@ public: } /// Third and final method to add cells -- one at a time. - VTKM_CONT_EXPORT + VTKM_CONT void CompleteAddingCells() { this->PointToCell.Connectivity.Shrink(this->ConnectivityLength); @@ -149,7 +149,7 @@ public: } //This is the way you can fill the memory from another system without copying - VTKM_CONT_EXPORT + VTKM_CONT void Fill(const vtkm::cont::ArrayHandle &connectivity) { diff --git a/vtkm/cont/CellSetStructured.h b/vtkm/cont/CellSetStructured.h index 71a7d8193..7e9aa920a 100644 --- a/vtkm/cont/CellSetStructured.h +++ b/vtkm/cont/CellSetStructured.h @@ -44,18 +44,18 @@ public: typedef typename InternalsType::SchedulingRangeType SchedulingRangeType; - VTKM_CONT_EXPORT + VTKM_CONT CellSetStructured(const std::string &name = std::string()) : CellSet(name) { } - VTKM_CONT_EXPORT + VTKM_CONT CellSetStructured(const Thisclass &src) : CellSet(src), Structure(src.Structure) { } - VTKM_CONT_EXPORT + VTKM_CONT Thisclass &operator=(const Thisclass &src) { this->CellSet::operator=(src); @@ -90,21 +90,21 @@ public: return this->Structure.GetCellDimensions(); } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::IdComponent GetNumberOfPointsInCell(vtkm::Id vtkmNotUsed(cellIndex)=0) const { return this->Structure.GetNumberOfPointsInCell(); } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::IdComponent GetCellShape() const { return this->Structure.GetCellShape(); } template - VTKM_CONT_EXPORT + VTKM_CONT SchedulingRangeType GetSchedulingRange(TopologyElement) const { VTKM_IS_TOPOLOGY_ELEMENT_TAG(TopologyElement); return this->Structure.GetSchedulingRange(TopologyElement()); diff --git a/vtkm/cont/CoordinateSystem.h b/vtkm/cont/CoordinateSystem.h index 5a15db6ca..79c3ccad9 100644 --- a/vtkm/cont/CoordinateSystem.h +++ b/vtkm/cont/CoordinateSystem.h @@ -83,28 +83,28 @@ class CoordinateSystem : public vtkm::cont::Field typedef vtkm::cont::Field Superclass; public: - VTKM_CONT_EXPORT + VTKM_CONT CoordinateSystem() : Superclass() { } - VTKM_CONT_EXPORT + VTKM_CONT CoordinateSystem(std::string name, const vtkm::cont::DynamicArrayHandle &data) : Superclass(name, ASSOC_POINTS, data) { } template - VTKM_CONT_EXPORT + VTKM_CONT CoordinateSystem(std::string name, const ArrayHandle &data) : Superclass(name, ASSOC_POINTS, data) { } template - VTKM_CONT_EXPORT + VTKM_CONT CoordinateSystem(std::string name, const std::vector &data) : Superclass(name, ASSOC_POINTS, data) { } template - VTKM_CONT_EXPORT + VTKM_CONT CoordinateSystem(std::string name, const T *data, vtkm::Id numberOfValues) @@ -112,7 +112,7 @@ public: /// This constructor of coordinate system sets up a regular grid of points. /// - VTKM_CONT_EXPORT + VTKM_CONT CoordinateSystem(std::string name, vtkm::Id3 dimensions, vtkm::Vec origin @@ -125,14 +125,14 @@ public: vtkm::cont::ArrayHandleUniformPointCoordinates(dimensions, origin, spacing))) { } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::cont::DynamicArrayHandleCoordinateSystem GetData() const { return vtkm::cont::DynamicArrayHandleCoordinateSystem( this->Superclass::GetData()); } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::cont::DynamicArrayHandleCoordinateSystem GetData() { return vtkm::cont::DynamicArrayHandleCoordinateSystem( @@ -140,7 +140,7 @@ public: } template - VTKM_CONT_EXPORT + VTKM_CONT void GetRange(vtkm::Range *range, DeviceAdapterTag) const { this->Superclass::GetRange( @@ -151,7 +151,7 @@ public: } template - VTKM_CONT_EXPORT + VTKM_CONT void GetRange(vtkm::Range *range, DeviceAdapterTag, TypeList) const { this->Superclass::GetRange( @@ -162,7 +162,7 @@ public: } template - VTKM_CONT_EXPORT + VTKM_CONT void GetRange(vtkm::Range *range, DeviceAdapterTag, TypeList, StorageList) const { this->Superclass::GetRange( @@ -173,7 +173,7 @@ public: } template - VTKM_CONT_EXPORT + VTKM_CONT const vtkm::cont::ArrayHandle& GetRange(DeviceAdapterTag) const { return this->Superclass::GetRange( @@ -183,7 +183,7 @@ public: } template - VTKM_CONT_EXPORT + VTKM_CONT const vtkm::cont::ArrayHandle& GetRange(DeviceAdapterTag, TypeList) const { @@ -194,7 +194,7 @@ public: } template - VTKM_CONT_EXPORT + VTKM_CONT const vtkm::cont::ArrayHandle& GetRange(DeviceAdapterTag, TypeList, StorageList) const @@ -206,7 +206,7 @@ public: } template - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Bounds GetBounds(DeviceAdapterTag) const { VTKM_IS_DEVICE_ADAPTER_TAG(DeviceAdapterTag); @@ -217,7 +217,7 @@ public: } template - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Bounds GetBounds(DeviceAdapterTag, TypeList) const { VTKM_IS_DEVICE_ADAPTER_TAG(DeviceAdapterTag); @@ -229,7 +229,7 @@ public: } template - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Bounds GetBounds(DeviceAdapterTag, TypeList, StorageList) const { VTKM_IS_DEVICE_ADAPTER_TAG(DeviceAdapterTag); @@ -250,7 +250,7 @@ public: } - VTKM_CONT_EXPORT + VTKM_CONT virtual void PrintSummary(std::ostream &out) const { out << " Coordinate System "; diff --git a/vtkm/cont/DataSet.h b/vtkm/cont/DataSet.h index e9536b6ab..1e2e5fd62 100644 --- a/vtkm/cont/DataSet.h +++ b/vtkm/cont/DataSet.h @@ -34,12 +34,12 @@ namespace cont { class DataSet { public: - VTKM_CONT_EXPORT + VTKM_CONT DataSet() { } - VTKM_CONT_EXPORT + VTKM_CONT void Clear() { this->CoordSystems.clear(); @@ -47,13 +47,13 @@ public: this->CellSets.clear(); } - VTKM_CONT_EXPORT + VTKM_CONT void AddField(Field field) { this->Fields.push_back(field); } - VTKM_CONT_EXPORT + VTKM_CONT const vtkm::cont::Field &GetField(vtkm::Id index) const { VTKM_ASSERT((index >= 0) && @@ -61,7 +61,7 @@ public: return this->Fields[static_cast(index)]; } - VTKM_CONT_EXPORT + VTKM_CONT bool HasField( const std::string &name, vtkm::cont::Field::AssociationEnum assoc = vtkm::cont::Field::ASSOC_ANY) @@ -72,7 +72,7 @@ public: return found; } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Id GetFieldIndex( const std::string &name, vtkm::cont::Field::AssociationEnum assoc = vtkm::cont::Field::ASSOC_ANY) @@ -91,7 +91,7 @@ public: } } - VTKM_CONT_EXPORT + VTKM_CONT const vtkm::cont::Field &GetField(const std::string &name, vtkm::cont::Field::AssociationEnum assoc = vtkm::cont::Field::ASSOC_ANY) const @@ -99,13 +99,13 @@ public: return this->GetField(this->GetFieldIndex(name, assoc)); } - VTKM_CONT_EXPORT + VTKM_CONT void AddCoordinateSystem(vtkm::cont::CoordinateSystem cs) { this->CoordSystems.push_back(cs); } - VTKM_CONT_EXPORT + VTKM_CONT const vtkm::cont::CoordinateSystem & GetCoordinateSystem(vtkm::Id index=0) const { @@ -114,7 +114,7 @@ public: return this->CoordSystems[static_cast(index)]; } - VTKM_CONT_EXPORT + VTKM_CONT bool HasCoordinateSystem(const std::string &name) const { bool found; @@ -122,7 +122,7 @@ public: return found; } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Id GetCoordinateSystemIndex(const std::string &name) const { bool found; @@ -138,28 +138,28 @@ public: } } - VTKM_CONT_EXPORT + VTKM_CONT const vtkm::cont::CoordinateSystem & GetCoordinateSystem(const std::string &name) const { return this->GetCoordinateSystem(this->GetCoordinateSystemIndex(name)); } - VTKM_CONT_EXPORT + VTKM_CONT void AddCellSet(vtkm::cont::DynamicCellSet cellSet) { this->CellSets.push_back(cellSet); } template - VTKM_CONT_EXPORT + VTKM_CONT void AddCellSet(const CellSetType &cellSet) { VTKM_IS_CELL_SET(CellSetType); this->CellSets.push_back(vtkm::cont::DynamicCellSet(cellSet)); } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::cont::DynamicCellSet GetCellSet(vtkm::Id index=0) const { VTKM_ASSERT((index >= 0) && @@ -167,7 +167,7 @@ public: return this->CellSets[static_cast(index)]; } - VTKM_CONT_EXPORT + VTKM_CONT bool HasCellSet(const std::string &name) const { bool found; @@ -175,7 +175,7 @@ public: return found; } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Id GetCellSetIndex(const std::string &name) const { bool found; @@ -190,31 +190,31 @@ public: } } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::cont::DynamicCellSet GetCellSet(const std::string &name) const { return this->GetCellSet(this->GetCellSetIndex(name)); } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::IdComponent GetNumberOfCellSets() const { return static_cast(this->CellSets.size()); } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::IdComponent GetNumberOfFields() const { return static_cast(this->Fields.size()); } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::IdComponent GetNumberOfCoordinateSystems() const { return static_cast(this->CoordSystems.size()); } - VTKM_CONT_EXPORT + VTKM_CONT void PrintSummary(std::ostream &out) const { out<<"DataSet:\n"; @@ -242,7 +242,7 @@ private: std::vector Fields; std::vector CellSets; - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Id FindFieldIndex(const std::string &name, vtkm::cont::Field::AssociationEnum association, bool &found) const @@ -261,7 +261,7 @@ private: return -1; } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Id FindCoordinateSystemIndex(const std::string &name, bool &found) const { for (std::size_t index=0; index < this->CoordSystems.size(); ++index) @@ -276,7 +276,7 @@ private: return -1; } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Id FindCellSetIndex(const std::string &name, bool &found) const { for (std::size_t index=0; index < static_cast(this->GetNumberOfCellSets()); ++index) diff --git a/vtkm/cont/DataSetBuilderExplicit.h b/vtkm/cont/DataSetBuilderExplicit.h index 7694df097..c3d03c510 100644 --- a/vtkm/cont/DataSetBuilderExplicit.h +++ b/vtkm/cont/DataSetBuilderExplicit.h @@ -34,7 +34,7 @@ namespace cont { class DataSetBuilderExplicit { template - VTKM_CONT_EXPORT + VTKM_CONT static void CopyInto(const std::vector& input, vtkm::cont::ArrayHandle& output ) @@ -44,7 +44,7 @@ class DataSetBuilderExplicit ArrayPortalToIteratorBegin(output.GetPortalControl()) ); } public: - VTKM_CONT_EXPORT + VTKM_CONT DataSetBuilderExplicit() {} //Single cell explicits. @@ -52,7 +52,7 @@ public: //Zoo explicit cell template - VTKM_CONT_EXPORT + VTKM_CONT static vtkm::cont::DataSet Create(const std::vector &xVals, @@ -70,7 +70,7 @@ public: } template - VTKM_CONT_EXPORT + VTKM_CONT static vtkm::cont::DataSet Create(const std::vector &xVals, @@ -83,7 +83,7 @@ public: const std::string &cellNm="cells"); template - VTKM_CONT_EXPORT + VTKM_CONT static vtkm::cont::DataSet Create(const vtkm::cont::ArrayHandle &xVals, @@ -103,7 +103,7 @@ public: template - VTKM_CONT_EXPORT + VTKM_CONT static vtkm::cont::DataSet Create(const std::vector > &coords, @@ -114,7 +114,7 @@ public: const std::string &cellNm="cells"); template - VTKM_CONT_EXPORT + VTKM_CONT static vtkm::cont::DataSet Create(const vtkm::cont::ArrayHandle > &coords, @@ -133,7 +133,7 @@ public: } template - VTKM_CONT_EXPORT + VTKM_CONT static vtkm::cont::DataSet Create(const std::vector > &coords, @@ -143,7 +143,7 @@ public: const std::string &cellNm="cells"); template - VTKM_CONT_EXPORT + VTKM_CONT static vtkm::cont::DataSet Create(const vtkm::cont::ArrayHandle > &coords, @@ -173,7 +173,7 @@ private: const std::string &cellNm); template - VTKM_CONT_EXPORT + VTKM_CONT static vtkm::cont::DataSet BuildDataSet(const vtkm::cont::ArrayHandle > &coords, @@ -184,7 +184,7 @@ private: const std::string &cellNm); template - VTKM_CONT_EXPORT + VTKM_CONT static vtkm::cont::DataSet BuildDataSet(const vtkm::cont::ArrayHandle > &coords, @@ -195,6 +195,7 @@ private: }; template +inline VTKM_CONT vtkm::cont::DataSet DataSetBuilderExplicit::Create(const std::vector &xVals, const std::vector &yVals, @@ -226,6 +227,7 @@ DataSetBuilderExplicit::Create(const std::vector &xVals, } template +inline VTKM_CONT vtkm::cont::DataSet DataSetBuilderExplicit::BuildDataSet( const vtkm::cont::ArrayHandle &X, @@ -256,6 +258,7 @@ DataSetBuilderExplicit::BuildDataSet( } template +inline VTKM_CONT vtkm::cont::DataSet DataSetBuilderExplicit::Create(const std::vector > &coords, const std::vector &shapes, @@ -279,7 +282,7 @@ DataSetBuilderExplicit::Create(const std::vector > &coords, } template -VTKM_CONT_EXPORT +inline VTKM_CONT vtkm::cont::DataSet DataSetBuilderExplicit::BuildDataSet(const vtkm::cont::ArrayHandle > &coords, const vtkm::cont::ArrayHandle &shapes, @@ -302,6 +305,7 @@ DataSetBuilderExplicit::BuildDataSet(const vtkm::cont::ArrayHandle +inline VTKM_CONT vtkm::cont::DataSet DataSetBuilderExplicit::Create(const std::vector > &coords, CellShapeTag tag, @@ -319,7 +323,7 @@ DataSetBuilderExplicit::Create(const std::vector > &coords, } template -VTKM_CONT_EXPORT +inline VTKM_CONT vtkm::cont::DataSet DataSetBuilderExplicit::BuildDataSet(const vtkm::cont::ArrayHandle > &coords, CellShapeTag tag, @@ -342,10 +346,10 @@ DataSetBuilderExplicit::BuildDataSet(const vtkm::cont::ArrayHandle &pt) { points.push_back(pt); @@ -369,7 +373,7 @@ public: return id; } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Id AddPoint(const vtkm::Float32 &x, const vtkm::Float32 &y, const vtkm::Float32 &z=0) @@ -380,7 +384,7 @@ public: } template - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Id AddPoint(const T &x, const T &y, const T &z=0) { return AddPoint(static_cast(x), @@ -389,21 +393,21 @@ public: } template - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Id AddPoint(const vtkm::Vec &pt) { return AddPoint(static_cast >(pt)); } //Define cells. - VTKM_CONT_EXPORT + VTKM_CONT void AddCell(vtkm::UInt8 shape) { this->shapes.push_back(shape); this->numIdx.push_back(0); } - VTKM_CONT_EXPORT + VTKM_CONT void AddCell(const vtkm::UInt8 &shape, const std::vector &conn) { this->shapes.push_back(shape); @@ -411,7 +415,7 @@ public: connectivity.insert(connectivity.end(), conn.begin(), conn.end()); } - VTKM_CONT_EXPORT + VTKM_CONT void AddCell(const vtkm::UInt8 &shape, const vtkm::Id *conn, const vtkm::IdComponent &n) { this->shapes.push_back(shape); @@ -422,7 +426,7 @@ public: } } - VTKM_CONT_EXPORT + VTKM_CONT void AddCellPoint(vtkm::Id pointIndex) { VTKM_ASSERT(this->numIdx.size() > 0); @@ -439,6 +443,7 @@ private: std::vector connectivity; }; +inline VTKM_CONT vtkm::cont::DataSet DataSetBuilderExplicitIterative::Create() { diff --git a/vtkm/cont/DataSetBuilderRectilinear.h b/vtkm/cont/DataSetBuilderRectilinear.h index 8d64a45bd..f9b217f8d 100644 --- a/vtkm/cont/DataSetBuilderRectilinear.h +++ b/vtkm/cont/DataSetBuilderRectilinear.h @@ -32,7 +32,7 @@ namespace cont { class DataSetBuilderRectilinear { template - VTKM_CONT_EXPORT + VTKM_CONT static void CopyInto(const std::vector& input, vtkm::cont::ArrayHandle& output ) @@ -42,7 +42,7 @@ class DataSetBuilderRectilinear } template - VTKM_CONT_EXPORT + VTKM_CONT static void CopyInto(const vtkm::cont::ArrayHandle& input, vtkm::cont::ArrayHandle& output ) @@ -53,7 +53,7 @@ class DataSetBuilderRectilinear } template - VTKM_CONT_EXPORT + VTKM_CONT static void CopyInto(const T* input, vtkm::Id len, vtkm::cont::ArrayHandle& output ) @@ -62,12 +62,12 @@ class DataSetBuilderRectilinear vtkm::cont::make_ArrayHandle(input, len), output); } public: - VTKM_CONT_EXPORT + VTKM_CONT DataSetBuilderRectilinear() {} //1D grids. template - VTKM_CONT_EXPORT + VTKM_CONT static vtkm::cont::DataSet Create(const std::vector &xvals, @@ -79,7 +79,7 @@ public: } template - VTKM_CONT_EXPORT + VTKM_CONT static vtkm::cont::DataSet Create(vtkm::Id nx, T *xvals, @@ -91,7 +91,7 @@ public: } template - VTKM_CONT_EXPORT + VTKM_CONT static vtkm::cont::DataSet Create(const vtkm::cont::ArrayHandle &xvals, @@ -108,7 +108,7 @@ public: //2D grids. template - VTKM_CONT_EXPORT + VTKM_CONT static vtkm::cont::DataSet Create(const std::vector &xvals, const std::vector &yvals, @@ -120,7 +120,7 @@ public: } template - VTKM_CONT_EXPORT + VTKM_CONT static vtkm::cont::DataSet Create(vtkm::Id nx, vtkm::Id ny, @@ -133,7 +133,7 @@ public: } template - VTKM_CONT_EXPORT + VTKM_CONT static vtkm::cont::DataSet Create(const vtkm::cont::ArrayHandle &xvals, @@ -149,7 +149,7 @@ public: //3D grids. template - VTKM_CONT_EXPORT + VTKM_CONT static vtkm::cont::DataSet Create(vtkm::Id nx, vtkm::Id ny, vtkm::Id nz, @@ -161,7 +161,7 @@ public: } template - VTKM_CONT_EXPORT + VTKM_CONT static vtkm::cont::DataSet Create(const std::vector &xvals, @@ -174,7 +174,7 @@ public: } template - VTKM_CONT_EXPORT + VTKM_CONT static vtkm::cont::DataSet Create(const vtkm::cont::ArrayHandle &xvals, @@ -188,7 +188,7 @@ public: private: template - VTKM_CONT_EXPORT + VTKM_CONT static vtkm::cont::DataSet BuildDataSet(int dim, @@ -211,7 +211,7 @@ private: } template - VTKM_CONT_EXPORT + VTKM_CONT static vtkm::cont::DataSet BuildDataSet(int dim, vtkm::Id nx, vtkm::Id ny, vtkm::Id nz, @@ -232,7 +232,7 @@ private: } template - VTKM_CONT_EXPORT + VTKM_CONT static vtkm::cont::DataSet BuildDataSet(int dim, diff --git a/vtkm/cont/DataSetBuilderUniform.h b/vtkm/cont/DataSetBuilderUniform.h index bff916912..e75312732 100644 --- a/vtkm/cont/DataSetBuilderUniform.h +++ b/vtkm/cont/DataSetBuilderUniform.h @@ -30,12 +30,12 @@ class DataSetBuilderUniform { typedef vtkm::Vec VecType; public: - VTKM_CONT_EXPORT + VTKM_CONT DataSetBuilderUniform() {} //1D uniform grid template - VTKM_CONT_EXPORT + VTKM_CONT static vtkm::cont::DataSet Create(const vtkm::Id &dimension, @@ -51,7 +51,7 @@ public: coordNm, cellNm); } - VTKM_CONT_EXPORT + VTKM_CONT static vtkm::cont::DataSet Create(const vtkm::Id &dimension, @@ -63,7 +63,7 @@ public: //2D uniform grids. template - VTKM_CONT_EXPORT + VTKM_CONT static vtkm::cont::DataSet Create(const vtkm::Id2 &dimensions, @@ -81,7 +81,7 @@ public: coordNm, cellNm); } - VTKM_CONT_EXPORT + VTKM_CONT static vtkm::cont::DataSet Create(const vtkm::Id2 &dimensions, @@ -93,7 +93,7 @@ public: //3D uniform grids. template - VTKM_CONT_EXPORT + VTKM_CONT static vtkm::cont::DataSet Create(const vtkm::Id3 &dimensions, @@ -111,7 +111,7 @@ public: coordNm, cellNm); } - VTKM_CONT_EXPORT + VTKM_CONT static vtkm::cont::DataSet Create(const vtkm::Id3 &dimensions, @@ -122,7 +122,7 @@ public: } private: - VTKM_CONT_EXPORT + VTKM_CONT static vtkm::cont::DataSet CreateDataSet(int dim, vtkm::Id nx, vtkm::Id ny, vtkm::Id nz, diff --git a/vtkm/cont/DataSetFieldAdd.h b/vtkm/cont/DataSetFieldAdd.h index 9b95edbab..655edb236 100644 --- a/vtkm/cont/DataSetFieldAdd.h +++ b/vtkm/cont/DataSetFieldAdd.h @@ -30,11 +30,11 @@ namespace cont { class DataSetFieldAdd { public: - VTKM_CONT_EXPORT + VTKM_CONT DataSetFieldAdd() {} //Point centered fields. - VTKM_CONT_EXPORT + VTKM_CONT static void AddPointField(vtkm::cont::DataSet &dataSet, const std::string &fieldName, @@ -45,7 +45,7 @@ public: } template - VTKM_CONT_EXPORT + VTKM_CONT static void AddPointField(vtkm::cont::DataSet &dataSet, const std::string &fieldName, @@ -56,7 +56,7 @@ public: } template - VTKM_CONT_EXPORT + VTKM_CONT static void AddPointField(vtkm::cont::DataSet &dataSet, const std::string &fieldName, @@ -67,7 +67,7 @@ public: } template - VTKM_CONT_EXPORT + VTKM_CONT static void AddPointField(vtkm::cont::DataSet &dataSet, const std::string &fieldName, @@ -78,7 +78,7 @@ public: } //Cell centered field - VTKM_CONT_EXPORT + VTKM_CONT static void AddCellField(vtkm::cont::DataSet &dataSet, const std::string &fieldName, @@ -90,7 +90,7 @@ public: } template - VTKM_CONT_EXPORT + VTKM_CONT static void AddCellField(vtkm::cont::DataSet &dataSet, const std::string &fieldName, @@ -102,7 +102,7 @@ public: } template - VTKM_CONT_EXPORT + VTKM_CONT static void AddCellField(vtkm::cont::DataSet &dataSet, const std::string &fieldName, @@ -114,7 +114,7 @@ public: } template - VTKM_CONT_EXPORT + VTKM_CONT static void AddCellField(vtkm::cont::DataSet &dataSet, const std::string &fieldName, @@ -125,7 +125,7 @@ public: cellSetName, field, n)); } - VTKM_CONT_EXPORT + VTKM_CONT static void AddCellField(vtkm::cont::DataSet &dataSet, const std::string &fieldName, @@ -137,7 +137,7 @@ public: DataSetFieldAdd::AddCellField(dataSet, fieldName, field, cellSetName); } template - VTKM_CONT_EXPORT + VTKM_CONT static void AddCellField(vtkm::cont::DataSet &dataSet, const std::string &fieldName, @@ -149,7 +149,7 @@ public: DataSetFieldAdd::AddCellField(dataSet, fieldName, field, cellSetName); } template - VTKM_CONT_EXPORT + VTKM_CONT static void AddCellField(vtkm::cont::DataSet &dataSet, const std::string &fieldName, @@ -162,7 +162,7 @@ public: } template - VTKM_CONT_EXPORT + VTKM_CONT static void AddCellField(vtkm::cont::DataSet &dataSet, const std::string &fieldName, diff --git a/vtkm/cont/DeviceAdapterAlgorithm.h b/vtkm/cont/DeviceAdapterAlgorithm.h index 77ba3afd8..932cfd5e4 100644 --- a/vtkm/cont/DeviceAdapterAlgorithm.h +++ b/vtkm/cont/DeviceAdapterAlgorithm.h @@ -55,7 +55,7 @@ struct DeviceAdapterAlgorithm /// allocated we will reallocate and clear any current values. /// template - VTKM_CONT_EXPORT static void Copy(const vtkm::cont::ArrayHandle &input, + VTKM_CONT static void Copy(const vtkm::cont::ArrayHandle &input, vtkm::cont::ArrayHandle &output); /// \brief Copy the contents of a section of one ArrayHandle to another @@ -76,7 +76,7 @@ struct DeviceAdapterAlgorithm /// \arg \c input must already be sorted /// template - VTKM_CONT_EXPORT static bool CopySubRange(const vtkm::cont::ArrayHandle &input, + VTKM_CONT static bool CopySubRange(const vtkm::cont::ArrayHandle &input, vtkm::Id inputStartIndex, vtkm::Id numberOfElementsToCopy, vtkm::cont::ArrayHandle &output, @@ -92,7 +92,7 @@ struct DeviceAdapterAlgorithm /// \arg \c input must already be sorted /// template - VTKM_CONT_EXPORT static void LowerBounds( + VTKM_CONT static void LowerBounds( const vtkm::cont::ArrayHandle& input, const vtkm::cont::ArrayHandle& values, vtkm::cont::ArrayHandle& output); @@ -108,7 +108,7 @@ struct DeviceAdapterAlgorithm /// \arg \c input must already be sorted /// template - VTKM_CONT_EXPORT static void LowerBounds( + VTKM_CONT static void LowerBounds( const vtkm::cont::ArrayHandle& input, const vtkm::cont::ArrayHandle& values, vtkm::cont::ArrayHandle& output, @@ -122,7 +122,7 @@ struct DeviceAdapterAlgorithm /// arrays is limited to vtkm::Id. /// template - VTKM_CONT_EXPORT static void LowerBounds( + VTKM_CONT static void LowerBounds( const vtkm::cont::ArrayHandle& input, vtkm::cont::ArrayHandle& values_output); @@ -136,7 +136,7 @@ struct DeviceAdapterAlgorithm /// /// \return The total sum. template - VTKM_CONT_EXPORT static T Reduce( + VTKM_CONT static T Reduce( const vtkm::cont::ArrayHandle &input, T initialValue); @@ -151,7 +151,7 @@ struct DeviceAdapterAlgorithm /// /// \return The total sum. template - VTKM_CONT_EXPORT static T Reduce( + VTKM_CONT static T Reduce( const vtkm::cont::ArrayHandle &input, T initialValue, BinaryFunctor binary_functor); @@ -168,7 +168,7 @@ struct DeviceAdapterAlgorithm class CKeyIn, class CValIn, class CKeyOut, class CValOut, class BinaryFunctor > - VTKM_CONT_EXPORT static void ReduceByKey( + VTKM_CONT static void ReduceByKey( const vtkm::cont::ArrayHandle &keys, const vtkm::cont::ArrayHandle &values, vtkm::cont::ArrayHandle& keys_output, @@ -188,7 +188,7 @@ struct DeviceAdapterAlgorithm /// \return The total sum. /// template - VTKM_CONT_EXPORT static T ScanInclusive( + VTKM_CONT static T ScanInclusive( const vtkm::cont::ArrayHandle &input, vtkm::cont::ArrayHandle& output); @@ -199,7 +199,7 @@ struct DeviceAdapterAlgorithm /// \return The total sum. /// template - VTKM_CONT_EXPORT static T StreamingScanInclusive( + VTKM_CONT static T StreamingScanInclusive( const vtkm::Id numBlocks, const vtkm::cont::ArrayHandle &input, vtkm::cont::ArrayHandle& output); @@ -217,7 +217,7 @@ struct DeviceAdapterAlgorithm /// \return The total sum. /// template - VTKM_CONT_EXPORT static T ScanInclusive( + VTKM_CONT static T ScanInclusive( const vtkm::cont::ArrayHandle &input, vtkm::cont::ArrayHandle& output, BinaryFunctor binary_functor); @@ -229,7 +229,7 @@ struct DeviceAdapterAlgorithm /// \return The total sum. /// template - VTKM_CONT_EXPORT static T StreamingScanInclusive( + VTKM_CONT static T StreamingScanInclusive( const vtkm::Id numBlocks, const vtkm::cont::ArrayHandle &input, vtkm::cont::ArrayHandle& output, @@ -248,7 +248,7 @@ struct DeviceAdapterAlgorithm /// \return The total sum. /// template - VTKM_CONT_EXPORT static T ScanExclusive( + VTKM_CONT static T ScanExclusive( const vtkm::cont::ArrayHandle &input, vtkm::cont::ArrayHandle& output); @@ -270,7 +270,7 @@ struct DeviceAdapterAlgorithm /// in the range [0, \c numInstances]. /// template - VTKM_CONT_EXPORT static void Schedule(Functor functor, + VTKM_CONT static void Schedule(Functor functor, vtkm::Id numInstances); /// \brief Schedule many instances of a function to run on concurrent threads. @@ -296,7 +296,7 @@ struct DeviceAdapterAlgorithm /// rangeMax[0]*rangeMax[1]*rangeMax[2]) were called. /// template - VTKM_CONT_EXPORT static void Schedule(Functor functor, + VTKM_CONT static void Schedule(Functor functor, vtkm::Id3 rangeMax); /// \brief Unstable ascending sort of input array. @@ -305,7 +305,7 @@ struct DeviceAdapterAlgorithm /// guarantee stability /// template - VTKM_CONT_EXPORT static void Sort(vtkm::cont::ArrayHandle &values); + VTKM_CONT static void Sort(vtkm::cont::ArrayHandle &values); /// \brief Unstable ascending sort of input array. /// @@ -315,7 +315,7 @@ struct DeviceAdapterAlgorithm /// BinaryCompare should be a strict weak ordering comparison operator /// template - VTKM_CONT_EXPORT static void Sort(vtkm::cont::ArrayHandle &values, + VTKM_CONT static void Sort(vtkm::cont::ArrayHandle &values, BinaryCompare binary_compare); /// \brief Unstable ascending sort of keys and values. @@ -324,7 +324,7 @@ struct DeviceAdapterAlgorithm /// on the values of keys. /// template - VTKM_CONT_EXPORT static void SortByKey( + VTKM_CONT static void SortByKey( vtkm::cont::ArrayHandle &keys, vtkm::cont::ArrayHandle &values); @@ -336,7 +336,7 @@ struct DeviceAdapterAlgorithm /// BinaryCompare should be a strict weak ordering comparison operator /// template - VTKM_CONT_EXPORT static void SortByKey( + VTKM_CONT static void SortByKey( vtkm::cont::ArrayHandle &keys, vtkm::cont::ArrayHandle &values, BinaryCompare binary_compare) @@ -352,7 +352,7 @@ struct DeviceAdapterAlgorithm /// compaction algorithm. /// template - VTKM_CONT_EXPORT static void StreamCompact( + VTKM_CONT static void StreamCompact( const vtkm::cont::ArrayHandle &stencil, vtkm::cont::ArrayHandle &output); @@ -368,7 +368,7 @@ struct DeviceAdapterAlgorithm /// algorithm. /// template - VTKM_CONT_EXPORT static void StreamCompact( + VTKM_CONT static void StreamCompact( const vtkm::cont::ArrayHandle &input, const vtkm::cont::ArrayHandle &stencil, vtkm::cont::ArrayHandle &output); @@ -386,7 +386,7 @@ struct DeviceAdapterAlgorithm /// template - VTKM_CONT_EXPORT static void StreamCompact( + VTKM_CONT static void StreamCompact( const vtkm::cont::ArrayHandle &input, const vtkm::cont::ArrayHandle &stencil, vtkm::cont::ArrayHandle &output, @@ -396,7 +396,7 @@ struct DeviceAdapterAlgorithm /// /// Waits for any asynchronous operations running on the device to complete. /// - VTKM_CONT_EXPORT static void Synchronize(); + VTKM_CONT static void Synchronize(); /// \brief Reduce an array to only the unique values it contains /// @@ -406,7 +406,7 @@ struct DeviceAdapterAlgorithm /// be modified by this operation. /// template - VTKM_CONT_EXPORT static void Unique( + VTKM_CONT static void Unique( vtkm::cont::ArrayHandle& values); /// \brief Reduce an array to only the unique values it contains @@ -420,7 +420,7 @@ struct DeviceAdapterAlgorithm /// is unique. The predicate must return true if the two items are the same. /// template - VTKM_CONT_EXPORT static void Unique( + VTKM_CONT static void Unique( vtkm::cont::ArrayHandle& values, BinaryCompare binary_compare); @@ -434,7 +434,7 @@ struct DeviceAdapterAlgorithm /// \arg \c input must already be sorted /// template - VTKM_CONT_EXPORT static void UpperBounds( + VTKM_CONT static void UpperBounds( const vtkm::cont::ArrayHandle& input, const vtkm::cont::ArrayHandle& values, vtkm::cont::ArrayHandle& output); @@ -450,7 +450,7 @@ struct DeviceAdapterAlgorithm /// \arg \c input must already be sorted /// template - VTKM_CONT_EXPORT static void UpperBounds( + VTKM_CONT static void UpperBounds( const vtkm::cont::ArrayHandle& input, const vtkm::cont::ArrayHandle& values, vtkm::cont::ArrayHandle& output, @@ -464,7 +464,7 @@ struct DeviceAdapterAlgorithm /// of the arrays is limited to vtkm::Id. /// template - VTKM_CONT_EXPORT static void UpperBounds( + VTKM_CONT static void UpperBounds( const vtkm::cont::ArrayHandle& input, vtkm::cont::ArrayHandle& values_output); }; @@ -486,7 +486,7 @@ public: /// When a timer is constructed, all threads are synchronized and the /// current time is marked so that GetElapsedTime returns the number of /// seconds elapsed since the construction. - VTKM_CONT_EXPORT DeviceAdapterTimerImplementation() + VTKM_CONT DeviceAdapterTimerImplementation() { this->Reset(); } @@ -495,7 +495,7 @@ public: /// number of seconds elapsed since the call to this. This method /// synchronizes all asynchronous operations. /// - VTKM_CONT_EXPORT void Reset() + VTKM_CONT void Reset() { this->StartTime = this->GetCurrentTime(); } @@ -506,7 +506,7 @@ public: /// number of times to get the progressive time. This method synchronizes all /// asynchronous operations. /// - VTKM_CONT_EXPORT vtkm::Float64 GetElapsedTime() + VTKM_CONT vtkm::Float64 GetElapsedTime() { TimeStamp currentTime = this->GetCurrentTime(); @@ -525,7 +525,7 @@ public: }; TimeStamp StartTime; - VTKM_CONT_EXPORT TimeStamp GetCurrentTime() + VTKM_CONT TimeStamp GetCurrentTime() { vtkm::cont::DeviceAdapterAlgorithm ::Synchronize(); @@ -566,7 +566,7 @@ public: /// The default implementation is to return the value of /// vtkm::cont::DeviceAdapterTraits::Valid /// - VTKM_CONT_EXPORT bool Exists() const + VTKM_CONT bool Exists() const { typedef vtkm::cont::DeviceAdapterTraits DeviceAdapterTraits; return DeviceAdapterTraits::Valid; diff --git a/vtkm/cont/DynamicArrayHandle.h b/vtkm/cont/DynamicArrayHandle.h index 0820e0f95..a014881f0 100644 --- a/vtkm/cont/DynamicArrayHandle.h +++ b/vtkm/cont/DynamicArrayHandle.h @@ -70,10 +70,10 @@ struct PolymorphicArrayHandleContainer ArrayHandleType Array; - VTKM_CONT_EXPORT + VTKM_CONT PolymorphicArrayHandleContainer() : Array() { } - VTKM_CONT_EXPORT + VTKM_CONT PolymorphicArrayHandleContainer(const ArrayHandleType &array) : Array(array) { } @@ -107,7 +107,7 @@ struct PolymorphicArrayHandleContainer // class to get at the internals for the copy constructor. struct DynamicArrayHandleCopyHelper { template - VTKM_CONT_EXPORT + VTKM_CONT static const std::shared_ptr& GetArrayHandleContainer(const vtkm::cont::DynamicArrayHandleBase &src) @@ -120,7 +120,7 @@ struct DynamicArrayHandleCopyHelper { // PolymorphicArrayHandleContainerBase to the given type of ArrayHandle. If the // conversion cannot be done, nullptr is returned. template -VTKM_CONT_EXPORT +VTKM_CONT vtkm::cont::ArrayHandle * DynamicArrayHandleTryCast( vtkm::cont::detail::PolymorphicArrayHandleContainerBase *arrayContainer) @@ -140,7 +140,7 @@ DynamicArrayHandleTryCast( } template -VTKM_CONT_EXPORT +VTKM_CONT vtkm::cont::ArrayHandle * DynamicArrayHandleTryCast( const std::shared_ptr& arrayContainer) @@ -187,33 +187,33 @@ template class DynamicArrayHandleBase { public: - VTKM_CONT_EXPORT + VTKM_CONT DynamicArrayHandleBase() { } template - VTKM_CONT_EXPORT + VTKM_CONT DynamicArrayHandleBase(const vtkm::cont::ArrayHandle &array) : ArrayContainer(new vtkm::cont::detail::PolymorphicArrayHandleContainer< Type,Storage>(array)) { } - VTKM_CONT_EXPORT + VTKM_CONT DynamicArrayHandleBase( const DynamicArrayHandleBase &src) : ArrayContainer(src.ArrayContainer) { } template - VTKM_CONT_EXPORT + VTKM_CONT explicit DynamicArrayHandleBase( const DynamicArrayHandleBase &src) : ArrayContainer( detail::DynamicArrayHandleCopyHelper::GetArrayHandleContainer(src)) { } - VTKM_CONT_EXPORT + VTKM_CONT ~DynamicArrayHandleBase() { } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::cont::DynamicArrayHandleBase & operator=(const vtkm::cont::DynamicArrayHandleBase &src) { @@ -225,7 +225,7 @@ public: /// storage. /// template - VTKM_CONT_EXPORT + VTKM_CONT bool IsTypeAndStorage() const { return ( detail::DynamicArrayHandleTryCast(this->ArrayContainer) @@ -235,7 +235,7 @@ public: /// Returns true if this array matches the array handle type passed in. /// template - VTKM_CONT_EXPORT + VTKM_CONT bool IsType() { VTKM_IS_ARRAY_HANDLE(ArrayHandleType); @@ -248,7 +248,7 @@ public: /// type as the object given. /// template - VTKM_CONT_EXPORT + VTKM_CONT bool IsSameType(const ArrayHandleType &) { VTKM_IS_ARRAY_HANDLE(ArrayHandleType); @@ -261,7 +261,7 @@ public: /// /// template - VTKM_CONT_EXPORT + VTKM_CONT vtkm::cont::ArrayHandle CastToTypeStorage() const { vtkm::cont::ArrayHandle *downcastArray = @@ -281,7 +281,7 @@ public: /// to check if the cast can happen. /// template - VTKM_CONT_EXPORT + VTKM_CONT ArrayHandleType Cast() const { VTKM_IS_ARRAY_HANDLE(ArrayHandleType); typedef typename ArrayHandleType::ValueType ValueType; @@ -301,7 +301,7 @@ public: /// in the data in one array will be reflected in the other. /// template - VTKM_CONT_EXPORT + VTKM_CONT void CopyTo(ArrayHandleType &array) const { VTKM_IS_ARRAY_HANDLE(ArrayHandleType); array = this->Cast(); @@ -315,7 +315,7 @@ public: /// constraints. /// template - VTKM_CONT_EXPORT + VTKM_CONT DynamicArrayHandleBase ResetTypeList(NewTypeList = NewTypeList()) const { VTKM_IS_LIST_TAG(NewTypeList); @@ -330,7 +330,7 @@ public: /// using an array of particular constraints. /// template - VTKM_CONT_EXPORT + VTKM_CONT DynamicArrayHandleBase ResetStorageList(NewStorageList = NewStorageList()) const { VTKM_IS_LIST_TAG(NewStorageList); @@ -344,7 +344,7 @@ public: /// types and traits. /// template - VTKM_CONT_EXPORT + VTKM_CONT DynamicArrayHandleBase ResetTypeAndStorageLists(NewTypeList = NewTypeList(), NewStorageList = NewStorageList()) const { @@ -361,7 +361,7 @@ public: /// respectively. /// template - VTKM_CONT_EXPORT + VTKM_CONT void CastAndCall(const Functor &f) const; /// \brief Create a new array of the same type as this array. @@ -370,7 +370,7 @@ public: /// returns a new dynamic array handle for it. This method is convenient when /// creating output arrays that should be the same type as some input array. /// - VTKM_CONT_EXPORT + VTKM_CONT DynamicArrayHandleBase NewInstance() const { DynamicArrayHandleBase newArray; @@ -384,7 +384,7 @@ public: /// each value of the array. The number of components is determined by /// the \c VecTraits::NUM_COMPONENTS trait class. /// - VTKM_CONT_EXPORT + VTKM_CONT vtkm::IdComponent GetNumberOfComponents() const { return this->ArrayContainer->GetNumberOfComponents(); @@ -392,13 +392,13 @@ public: /// \brief Get the number of values in the array. /// - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Id GetNumberOfValues() const { return this->ArrayContainer->GetNumberOfValues(); } - VTKM_CONT_EXPORT + VTKM_CONT virtual void PrintSummary(std::ostream &out) const { this->ArrayContainer->PrintSummary(out); @@ -423,13 +423,13 @@ struct DynamicArrayHandleTryStorage { const Functor &Function; bool FoundCast; - VTKM_CONT_EXPORT + VTKM_CONT DynamicArrayHandleTryStorage(const DynamicArrayHandle &array, const Functor &f) : Array(&array), Function(f), FoundCast(false) { } template - VTKM_CONT_EXPORT + VTKM_CONT void operator()(Storage) { this->DoCast(Storage(), typename vtkm::cont::internal::IsValidArrayHandle::type()); @@ -460,12 +460,12 @@ struct DynamicArrayHandleTryType { const Functor &Function; bool FoundCast; - VTKM_CONT_EXPORT + VTKM_CONT DynamicArrayHandleTryType(const DynamicArrayHandle &array, const Functor &f) : Array(&array), Function(f), FoundCast(false) { } template - VTKM_CONT_EXPORT + VTKM_CONT void operator()(Type) { if (this->FoundCast) { return; } typedef DynamicArrayHandleTryStorage TryStorageType; @@ -484,7 +484,7 @@ struct DynamicArrayHandleTryType { template template -VTKM_CONT_EXPORT +VTKM_CONT void DynamicArrayHandleBase:: CastAndCall(const Functor &f) const { @@ -512,7 +512,7 @@ void DynamicArrayHandleBase:: template<> template -VTKM_CONT_EXPORT +VTKM_CONT void DynamicArrayHandleBase:: CastAndCall(const Functor &f) const diff --git a/vtkm/cont/DynamicCellSet.h b/vtkm/cont/DynamicCellSet.h index 27cd30017..050c5bdda 100644 --- a/vtkm/cont/DynamicCellSet.h +++ b/vtkm/cont/DynamicCellSet.h @@ -43,7 +43,7 @@ namespace detail { // get at the internals for the copy constructor. struct DynamicCellSetCopyHelper { template - VTKM_CONT_EXPORT + VTKM_CONT static const std::shared_ptr& GetCellSetContainer(const vtkm::cont::DynamicCellSetBase &src) @@ -56,7 +56,7 @@ struct DynamicCellSetCopyHelper { // SimplePolymorphicContainerBase to the given subclass of CellSet. If the // conversion cannot be done, nullptr is returned. template -VTKM_CONT_EXPORT +VTKM_CONT CellSetType * DynamicCellSetTryCast( vtkm::cont::internal::SimplePolymorphicContainerBase *cellSetContainer) @@ -76,7 +76,7 @@ DynamicCellSetTryCast( } template -VTKM_CONT_EXPORT +VTKM_CONT CellSetType * DynamicCellSetTryCast( const std::shared_ptr& cellSetContainer) @@ -120,11 +120,11 @@ class DynamicCellSetBase { VTKM_IS_LIST_TAG(CellSetList); public: - VTKM_CONT_EXPORT + VTKM_CONT DynamicCellSetBase() { } template - VTKM_CONT_EXPORT + VTKM_CONT DynamicCellSetBase(const CellSetType &cellSet) : CellSetContainer( new vtkm::cont::internal::SimplePolymorphicContainer( @@ -133,22 +133,22 @@ public: VTKM_IS_CELL_SET(CellSetType); } - VTKM_CONT_EXPORT + VTKM_CONT DynamicCellSetBase(const DynamicCellSetBase &src) : CellSetContainer(src.CellSetContainer) { } template - VTKM_CONT_EXPORT + VTKM_CONT explicit DynamicCellSetBase(const DynamicCellSetBase &src) : CellSetContainer( detail::DynamicCellSetCopyHelper::GetCellSetContainer(src)) { } - VTKM_CONT_EXPORT + VTKM_CONT ~DynamicCellSetBase() { } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::cont::DynamicCellSetBase & operator=(const vtkm::cont::DynamicCellSetBase &src) { @@ -159,7 +159,7 @@ public: /// Returns true if this cell set is of the provided type. /// template - VTKM_CONT_EXPORT + VTKM_CONT bool IsType() const { return (detail::DynamicCellSetTryCast(this->CellSetContainer) != nullptr); @@ -169,14 +169,14 @@ public: /// object provided. /// template - VTKM_CONT_EXPORT + VTKM_CONT bool IsSameType(const CellSetType &) const { return this->IsType(); } /// Returns the contained cell set as the abstract \c CellSet type. /// - VTKM_CONT_EXPORT + VTKM_CONT const vtkm::cont::CellSet &CastToBase() const { return *reinterpret_cast( this->CellSetContainer->GetVoidPointer()); @@ -187,7 +187,7 @@ public: /// the cast can happen. /// template - VTKM_CONT_EXPORT + VTKM_CONT CellSetType &Cast() const { CellSetType *cellSetPointer = detail::DynamicCellSetTryCast(this->CellSetContainer); @@ -207,7 +207,7 @@ public: /// copied. /// template - VTKM_CONT_EXPORT + VTKM_CONT void CopyTo(CellSetType &cellSet) const { cellSet = this->Cast(); } @@ -220,7 +220,7 @@ public: /// when using a cell set of particular constraints. /// template - VTKM_CONT_EXPORT + VTKM_CONT DynamicCellSetBase ResetCellSetList(NewCellSetList = NewCellSetList()) const { VTKM_IS_LIST_TAG(NewCellSetList); @@ -235,7 +235,7 @@ public: /// behavior from \c CastAndCall. /// template - VTKM_CONT_EXPORT + VTKM_CONT void CastAndCall(const Functor &f) const; /// \brief Create a new cell set of the same type as this cell set. @@ -245,7 +245,7 @@ public: /// creating output data sets that should be the same type as some input cell /// set. /// - VTKM_CONT_EXPORT + VTKM_CONT DynamicCellSetBase NewInstance() const { DynamicCellSetBase newCellSet; @@ -253,37 +253,37 @@ public: return newCellSet; } - VTKM_CONT_EXPORT + VTKM_CONT virtual std::string GetName() const { return this->CastToBase().GetName(); } - VTKM_CONT_EXPORT + VTKM_CONT virtual vtkm::Id GetNumberOfCells() const { return this->CastToBase().GetNumberOfCells(); } - VTKM_CONT_EXPORT + VTKM_CONT virtual vtkm::Id GetNumberOfFaces() const { return this->CastToBase().GetNumberOfFaces(); } - VTKM_CONT_EXPORT + VTKM_CONT virtual vtkm::Id GetNumberOfEdges() const { return this->CastToBase().GetNumberOfEdges(); } - VTKM_CONT_EXPORT + VTKM_CONT virtual vtkm::Id GetNumberOfPoints() const { return this->CastToBase().GetNumberOfPoints(); } - VTKM_CONT_EXPORT + VTKM_CONT virtual void PrintSummary(std::ostream& stream) const { return this->CastToBase().PrintSummary(stream); @@ -306,14 +306,14 @@ struct DynamicCellSetTryCellSet const Functor &Function; bool FoundCast; - VTKM_CONT_EXPORT + VTKM_CONT DynamicCellSetTryCellSet( vtkm::cont::internal::SimplePolymorphicContainerBase *cellSetContainer, const Functor &f) : CellSetContainer(cellSetContainer), Function(f), FoundCast(false) { } template - VTKM_CONT_EXPORT + VTKM_CONT void operator()(CellSetType) { if (!this->FoundCast) { @@ -332,7 +332,7 @@ struct DynamicCellSetTryCellSet template template -VTKM_CONT_EXPORT +VTKM_CONT void DynamicCellSetBase::CastAndCall(const Functor &f) const { typedef detail::DynamicCellSetTryCellSet TryCellSetType; diff --git a/vtkm/cont/Field.h b/vtkm/cont/Field.h index 1162a8eb6..79c5b24a9 100644 --- a/vtkm/cont/Field.h +++ b/vtkm/cont/Field.h @@ -41,14 +41,14 @@ namespace internal { struct RangeMin { template - VTKM_EXEC_EXPORT + VTKM_EXEC T operator()(const T& a, const T& b)const { return vtkm::Min(a,b); } }; struct RangeMax { template - VTKM_EXEC_EXPORT + VTKM_EXEC T operator()(const T& a, const T& b)const { return vtkm::Max(a,b); } }; @@ -133,7 +133,7 @@ public: }; /// constructors for points / whole mesh - VTKM_CONT_EXPORT + VTKM_CONT Field(std::string name, AssociationEnum association, const vtkm::cont::DynamicArrayHandle &data) @@ -150,7 +150,7 @@ public: } template - VTKM_CONT_EXPORT + VTKM_CONT Field(std::string name, AssociationEnum association, const ArrayHandle &data) @@ -167,7 +167,7 @@ public: } template - VTKM_CONT_EXPORT + VTKM_CONT Field(std::string name, AssociationEnum association, const std::vector &data) @@ -184,7 +184,7 @@ public: } template - VTKM_CONT_EXPORT + VTKM_CONT Field(std::string name, AssociationEnum association, const T *data, @@ -202,7 +202,7 @@ public: } /// constructors for cell set associations - VTKM_CONT_EXPORT + VTKM_CONT Field(std::string name, AssociationEnum association, const std::string& cellSetName, @@ -219,7 +219,7 @@ public: } template - VTKM_CONT_EXPORT + VTKM_CONT Field(std::string name, AssociationEnum association, const std::string& cellSetName, @@ -236,7 +236,7 @@ public: } template - VTKM_CONT_EXPORT + VTKM_CONT Field(std::string name, AssociationEnum association, const std::string& cellSetName, @@ -253,7 +253,7 @@ public: } template - VTKM_CONT_EXPORT + VTKM_CONT Field(std::string name, AssociationEnum association, const std::string& cellSetName, @@ -271,7 +271,7 @@ public: } /// constructors for logical dimension associations - VTKM_CONT_EXPORT + VTKM_CONT Field(std::string name, AssociationEnum association, vtkm::IdComponent logicalDim, @@ -288,7 +288,7 @@ public: } template - VTKM_CONT_EXPORT + VTKM_CONT Field(std::string name, AssociationEnum association, vtkm::IdComponent logicalDim, @@ -304,7 +304,7 @@ public: } template - VTKM_CONT_EXPORT + VTKM_CONT Field(std::string name, AssociationEnum association, vtkm::IdComponent logicalDim, @@ -320,7 +320,7 @@ public: } template - VTKM_CONT_EXPORT + VTKM_CONT Field(std::string name, AssociationEnum association, vtkm::IdComponent logicalDim, @@ -335,7 +335,7 @@ public: CopyData(data, nvals); } - VTKM_CONT_EXPORT + VTKM_CONT Field() : Name(), Association(ASSOC_ANY), @@ -348,32 +348,32 @@ public: //Generate an empty field } - VTKM_CONT_EXPORT + VTKM_CONT const std::string &GetName() const { return this->Name; } - VTKM_CONT_EXPORT + VTKM_CONT AssociationEnum GetAssociation() const { return this->Association; } - VTKM_CONT_EXPORT + VTKM_CONT std::string GetAssocCellSet() const { return this->AssocCellSetName; } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::IdComponent GetAssocLogicalDim() const { return this->AssocLogicalDim; } template - VTKM_CONT_EXPORT + VTKM_CONT const vtkm::cont::ArrayHandle& GetRange(DeviceAdapterTag, TypeList, StorageList) const @@ -389,7 +389,7 @@ public: } template - VTKM_CONT_EXPORT + VTKM_CONT void GetRange(vtkm::Range *range, DeviceAdapterTag, TypeList, @@ -405,7 +405,7 @@ public: } template - VTKM_CONT_EXPORT + VTKM_CONT const vtkm::cont::ArrayHandle& GetRange(DeviceAdapterTag, TypeList) const { @@ -415,7 +415,7 @@ public: } template - VTKM_CONT_EXPORT + VTKM_CONT void GetRange(vtkm::Range *range, DeviceAdapterTag, TypeList) const { this->GetRange(range, @@ -425,7 +425,7 @@ public: } template - VTKM_CONT_EXPORT + VTKM_CONT const vtkm::cont::ArrayHandle& GetRange(DeviceAdapterTag) const { return this->GetRange(DeviceAdapterTag(), @@ -434,7 +434,7 @@ public: } template - VTKM_CONT_EXPORT + VTKM_CONT void GetRange(vtkm::Range *range, DeviceAdapterTag) const { this->GetRange(range, @@ -443,13 +443,13 @@ public: VTKM_DEFAULT_STORAGE_LIST_TAG()); } - VTKM_CONT_EXPORT + VTKM_CONT const vtkm::cont::DynamicArrayHandle &GetData() const { return this->Data; } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::cont::DynamicArrayHandle &GetData() { this->ModifiedFlag = true; @@ -457,14 +457,14 @@ public: } template - VTKM_CONT_EXPORT + VTKM_CONT void SetData(const vtkm::cont::ArrayHandle &newdata) { this->Data = newdata; this->ModifiedFlag = true; } - VTKM_CONT_EXPORT + VTKM_CONT void SetData(const vtkm::cont::DynamicArrayHandle &newdata) { this->Data = newdata; @@ -472,7 +472,7 @@ public: } template - VTKM_CONT_EXPORT + VTKM_CONT void CopyData(const T *ptr, vtkm::Id nvals) { //allocate main memory using an array handle @@ -489,7 +489,7 @@ public: this->ModifiedFlag = true; } - VTKM_CONT_EXPORT + VTKM_CONT virtual void PrintSummary(std::ostream &out) const { out<<" "<Name; diff --git a/vtkm/cont/RuntimeDeviceInformation.h b/vtkm/cont/RuntimeDeviceInformation.h index 6c3924961..268194da4 100644 --- a/vtkm/cont/RuntimeDeviceInformation.h +++ b/vtkm/cont/RuntimeDeviceInformation.h @@ -35,13 +35,13 @@ template class RuntimeDeviceInformation { public: - VTKM_CONT_EXPORT + VTKM_CONT RuntimeDeviceInformation() : RuntimeImplementation() { } /// Returns true if the given device adapter is supported on the current /// machine. /// - VTKM_CONT_EXPORT + VTKM_CONT bool Exists() const { return this->RuntimeImplementation.Exists(); diff --git a/vtkm/cont/Storage.h b/vtkm/cont/Storage.h index b2d197cef..aea85163a 100644 --- a/vtkm/cont/Storage.h +++ b/vtkm/cont/Storage.h @@ -115,16 +115,16 @@ public: /// Returns a portal to the array. /// - VTKM_CONT_EXPORT + VTKM_CONT PortalType GetPortal(); /// Returns a portal to the array with immutable values. /// - VTKM_CONT_EXPORT + VTKM_CONT PortalConstType GetPortalConst() const; /// Retuns the number of entries allocated in the array. - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Id GetNumberOfValues() const; /// \brief Allocates an array large enough to hold the given number of values. @@ -135,7 +135,7 @@ public: /// ErrorControlBadValue if the allocation is not feasible (for example, the /// array storage is read-only). /// - VTKM_CONT_EXPORT + VTKM_CONT void Allocate(vtkm::Id numberOfValues); /// \brief Reduces the size of the array without changing its values. @@ -146,7 +146,7 @@ public: /// \c numberOfValues must be equal or less than the preexisting size /// (returned from GetNumberOfValues). That is, this method can only be used /// to shorten the array, not lengthen. - VTKM_CONT_EXPORT + VTKM_CONT void Shrink(vtkm::Id numberOfValues); /// \brief Frees any resources (i.e. memory) stored in this array. @@ -154,7 +154,7 @@ public: /// After calling this method GetNumberOfValues will return 0. The /// resources should also be released when the Storage class is /// destroyed. - VTKM_CONT_EXPORT + VTKM_CONT void ReleaseResources(); }; #endif // VTKM_DOXYGEN_ONLY diff --git a/vtkm/cont/StorageBasic.h b/vtkm/cont/StorageBasic.h index 3ae6fa990..e2ea527f5 100755 --- a/vtkm/cont/StorageBasic.h +++ b/vtkm/cont/StorageBasic.h @@ -176,7 +176,7 @@ public: public: - VTKM_CONT_EXPORT + VTKM_CONT Storage(const ValueType *array = nullptr, vtkm::Id numberOfValues = 0) : Array(const_cast(array)), NumberOfValues(numberOfValues), @@ -186,13 +186,13 @@ public: { } - VTKM_CONT_EXPORT + VTKM_CONT ~Storage() { this->ReleaseResources(); } - VTKM_CONT_EXPORT + VTKM_CONT Storage(const Storage &src) : Array(src.Array), NumberOfValues(src.NumberOfValues), @@ -208,7 +208,7 @@ public: } } - VTKM_CONT_EXPORT + VTKM_CONT Storage &operator=(const Storage &src) { if (src.DeallocateOnRelease) @@ -228,7 +228,7 @@ public: return *this; } - VTKM_CONT_EXPORT + VTKM_CONT void ReleaseResources() { if (this->NumberOfValues > 0) @@ -250,7 +250,7 @@ public: } } - VTKM_CONT_EXPORT + VTKM_CONT void Allocate(vtkm::Id numberOfValues) { if (numberOfValues <= this->AllocatedSize) @@ -295,13 +295,13 @@ public: this->UserProvidedMemory = false; } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Id GetNumberOfValues() const { return this->NumberOfValues; } - VTKM_CONT_EXPORT + VTKM_CONT void Shrink(vtkm::Id numberOfValues) { if (numberOfValues > this->GetNumberOfValues()) @@ -313,13 +313,13 @@ public: this->NumberOfValues = numberOfValues; } - VTKM_CONT_EXPORT + VTKM_CONT PortalType GetPortal() { return PortalType(this->Array, this->Array + this->NumberOfValues); } - VTKM_CONT_EXPORT + VTKM_CONT PortalConstType GetPortalConst() const { return PortalConstType(this->Array, this->Array + this->NumberOfValues); @@ -331,12 +331,12 @@ public: /// memory associated with this array still belongs to the Storage (i.e. /// Storage will eventually deallocate the array). /// - VTKM_CONT_EXPORT + VTKM_CONT ValueType *GetArray() { return this->Array; } - VTKM_CONT_EXPORT + VTKM_CONT const ValueType *GetArray() const { return this->Array; @@ -351,7 +351,7 @@ public: /// a VTK-m object around. Obviously the caller becomes responsible for /// destroying the memory. /// - VTKM_CONT_EXPORT + VTKM_CONT ValueType *StealArray() { ValueType *saveArray = this->Array; diff --git a/vtkm/cont/StorageImplicit.h b/vtkm/cont/StorageImplicit.h index 64b75cb26..aec40826b 100644 --- a/vtkm/cont/StorageImplicit.h +++ b/vtkm/cont/StorageImplicit.h @@ -66,37 +66,37 @@ public: typedef void *IteratorType; }; - VTKM_CONT_EXPORT + VTKM_CONT Storage(const PortalConstType &portal = PortalConstType()) : Portal(portal) { } // All these methods do nothing but raise errors. - VTKM_CONT_EXPORT + VTKM_CONT PortalType GetPortal() { throw vtkm::cont::ErrorControlBadValue("Implicit arrays are read-only."); } - VTKM_CONT_EXPORT + VTKM_CONT PortalConstType GetPortalConst() const { return this->Portal; } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Id GetNumberOfValues() const { return this->Portal.GetNumberOfValues(); } - VTKM_CONT_EXPORT + VTKM_CONT void Allocate(vtkm::Id vtkmNotUsed(numberOfValues)) { throw vtkm::cont::ErrorControlBadValue("Implicit arrays are read-only."); } - VTKM_CONT_EXPORT + VTKM_CONT void Shrink(vtkm::Id vtkmNotUsed(numberOfValues)) { throw vtkm::cont::ErrorControlBadValue("Implicit arrays are read-only."); } - VTKM_CONT_EXPORT + VTKM_CONT void ReleaseResources() { } @@ -120,35 +120,35 @@ public: typedef PortalControl PortalExecution; typedef PortalConstControl PortalConstExecution; - VTKM_CONT_EXPORT + VTKM_CONT ArrayTransfer(StorageType *storage) : Storage(storage) { } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Id GetNumberOfValues() const { return this->Storage->GetNumberOfValues(); } - VTKM_CONT_EXPORT + VTKM_CONT PortalConstExecution PrepareForInput(bool vtkmNotUsed(updateData)) { return this->Storage->GetPortalConst(); } - VTKM_CONT_EXPORT + VTKM_CONT PortalExecution PrepareForInPlace(bool vtkmNotUsed(updateData)) { throw vtkm::cont::ErrorControlBadValue( "Implicit arrays cannot be used for output or in place."); } - VTKM_CONT_EXPORT + VTKM_CONT PortalExecution PrepareForOutput(vtkm::Id vtkmNotUsed(numberOfValues)) { throw vtkm::cont::ErrorControlBadValue( "Implicit arrays cannot be used for output."); } - VTKM_CONT_EXPORT + VTKM_CONT void RetrieveOutputData(StorageType *vtkmNotUsed(controlArray)) const { throw vtkm::cont::ErrorControlBadValue( @@ -156,7 +156,7 @@ public: } template - VTKM_CONT_EXPORT void CopyInto(IteratorTypeControl dest) const + VTKM_CONT void CopyInto(IteratorTypeControl dest) const { typedef typename StorageType::PortalConstType PortalType; PortalType portal = this->Storage->GetPortalConst(); @@ -166,13 +166,13 @@ public: dest); } - VTKM_CONT_EXPORT + VTKM_CONT void Shrink(vtkm::Id vtkmNotUsed(numberOfValues)) { throw vtkm::cont::ErrorControlBadValue("Implicit arrays cannot be resized."); } - VTKM_CONT_EXPORT + VTKM_CONT void ReleaseResources() { } private: diff --git a/vtkm/cont/Timer.h b/vtkm/cont/Timer.h index 75f65dbef..e92269f23 100644 --- a/vtkm/cont/Timer.h +++ b/vtkm/cont/Timer.h @@ -40,14 +40,14 @@ public: /// When a timer is constructed, all threads are synchronized and the /// current time is marked so that GetElapsedTime returns the number of /// seconds elapsed since the construction. - VTKM_CONT_EXPORT + VTKM_CONT Timer() : TimerImplementation() { } /// Resets the timer. All further calls to GetElapsedTime will report the /// number of seconds elapsed since the call to this. This method /// synchronizes all asynchronous operations. /// - VTKM_CONT_EXPORT + VTKM_CONT void Reset() { this->TimerImplementation.Reset(); @@ -59,7 +59,7 @@ public: /// number of times to get the progressive time. This method synchronizes all /// asynchronous operations. /// - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Float64 GetElapsedTime() { return this->TimerImplementation.GetElapsedTime(); @@ -67,8 +67,8 @@ public: private: /// Some timers are ill-defined when copied, so disallow that for all timers. - VTKM_CONT_EXPORT Timer(const Timer &); // Not implemented. - VTKM_CONT_EXPORT void operator=(const Timer &); // Not implemented. + VTKM_CONT Timer(const Timer &); // Not implemented. + VTKM_CONT void operator=(const Timer &); // Not implemented. vtkm::cont::DeviceAdapterTimerImplementation TimerImplementation; diff --git a/vtkm/cont/TryExecute.h b/vtkm/cont/TryExecute.h index f8f242506..300f3c04d 100644 --- a/vtkm/cont/TryExecute.h +++ b/vtkm/cont/TryExecute.h @@ -38,7 +38,7 @@ struct TryExecuteRunIfValid; template struct TryExecuteRunIfValid { - VTKM_CONT_EXPORT + VTKM_CONT static bool Run(Functor &, vtkm::cont::internal::RuntimeDeviceTracker &) { return false; } @@ -49,7 +49,7 @@ struct TryExecuteRunIfValid { VTKM_IS_DEVICE_ADAPTER_TAG(Device); - VTKM_CONT_EXPORT + VTKM_CONT static bool Run(Functor &functor, vtkm::cont::internal::RuntimeDeviceTracker &tracker) { @@ -108,13 +108,13 @@ struct TryExecuteImpl bool Success; - VTKM_CONT_EXPORT + VTKM_CONT TryExecuteImpl(FunctorType &functor, vtkm::cont::internal::RuntimeDeviceTracker &tracker) : Functor(functor), Tracker(tracker), Success(false) { } template - VTKM_CONT_EXPORT + VTKM_CONT bool operator()(Device) { if (!this->Success) @@ -154,7 +154,7 @@ struct TryExecuteImpl /// is used. /// template -VTKM_CONT_EXPORT +VTKM_CONT bool TryExecute(const Functor &functor, vtkm::cont::internal::RuntimeDeviceTracker &tracker, DeviceList) @@ -164,7 +164,7 @@ bool TryExecute(const Functor &functor, return internals.Success; } template -VTKM_CONT_EXPORT +VTKM_CONT bool TryExecute(Functor &functor, vtkm::cont::internal::RuntimeDeviceTracker &tracker, DeviceList) @@ -174,28 +174,28 @@ bool TryExecute(Functor &functor, return internals.Success; } template -VTKM_CONT_EXPORT +VTKM_CONT bool TryExecute(const Functor &functor, DeviceList) { vtkm::cont::internal::RuntimeDeviceTracker tracker; return vtkm::cont::TryExecute(functor, tracker, DeviceList()); } template -VTKM_CONT_EXPORT +VTKM_CONT bool TryExecute(Functor &functor, DeviceList) { vtkm::cont::internal::RuntimeDeviceTracker tracker; return vtkm::cont::TryExecute(functor, tracker, DeviceList()); } template -VTKM_CONT_EXPORT +VTKM_CONT bool TryExecute(const Functor &functor) { return vtkm::cont::TryExecute(functor, VTKM_DEFAULT_DEVICE_ADAPTER_LIST_TAG()); } template -VTKM_CONT_EXPORT +VTKM_CONT bool TryExecute(Functor &functor) { return vtkm::cont::TryExecute(functor, diff --git a/vtkm/cont/arg/Transport.h b/vtkm/cont/arg/Transport.h index e9687b068..879dda784 100644 --- a/vtkm/cont/arg/Transport.h +++ b/vtkm/cont/arg/Transport.h @@ -65,7 +65,7 @@ struct Transport /// operator also has a second argument that is the size of the dispatch that /// can be used, for example, to allocate data for an output array. /// - VTKM_CONT_EXPORT + VTKM_CONT ExecObjectType operator()(const ContObjectType contData, vtkm::Id size) const; }; #else // VTKM_DOXYGEN_ONLY diff --git a/vtkm/cont/arg/TransportTagArrayIn.h b/vtkm/cont/arg/TransportTagArrayIn.h index 06601806a..ba78e58a4 100644 --- a/vtkm/cont/arg/TransportTagArrayIn.h +++ b/vtkm/cont/arg/TransportTagArrayIn.h @@ -45,7 +45,7 @@ struct Transport typedef typename ContObjectType::template ExecutionTypes::PortalConst ExecObjectType; - VTKM_CONT_EXPORT + VTKM_CONT ExecObjectType operator()(const ContObjectType &object, vtkm::Id) const { // TODO: Throw an exception if object.GetNumberOfValues() does not equal diff --git a/vtkm/cont/arg/TransportTagArrayInOut.h b/vtkm/cont/arg/TransportTagArrayInOut.h index f6c961fc7..c1481e6b3 100644 --- a/vtkm/cont/arg/TransportTagArrayInOut.h +++ b/vtkm/cont/arg/TransportTagArrayInOut.h @@ -48,7 +48,7 @@ struct Transport::Portal ExecObjectType; - VTKM_CONT_EXPORT + VTKM_CONT ExecObjectType operator()(ContObjectType object, vtkm::Id size) const { if (object.GetNumberOfValues() != size) diff --git a/vtkm/cont/arg/TransportTagArrayOut.h b/vtkm/cont/arg/TransportTagArrayOut.h index 1766c63bc..dc2027c32 100644 --- a/vtkm/cont/arg/TransportTagArrayOut.h +++ b/vtkm/cont/arg/TransportTagArrayOut.h @@ -47,7 +47,7 @@ struct Transport typedef typename ContObjectType::template ExecutionTypes::Portal ExecObjectType; - VTKM_CONT_EXPORT + VTKM_CONT ExecObjectType operator()(ContObjectType object, vtkm::Id size) const { return object.PrepareForOutput(size, Device()); diff --git a/vtkm/cont/arg/TransportTagAtomicArray.h b/vtkm/cont/arg/TransportTagAtomicArray.h index 957aa3819..56d44e69f 100644 --- a/vtkm/cont/arg/TransportTagAtomicArray.h +++ b/vtkm/cont/arg/TransportTagAtomicArray.h @@ -51,7 +51,7 @@ struct Transport< { typedef vtkm::exec::AtomicArray ExecObjectType; - VTKM_CONT_EXPORT + VTKM_CONT ExecObjectType operator()( vtkm::cont::ArrayHandle array, vtkm::Id) const diff --git a/vtkm/cont/arg/TransportTagCellSetIn.h b/vtkm/cont/arg/TransportTagCellSetIn.h index 078944896..527046f68 100644 --- a/vtkm/cont/arg/TransportTagCellSetIn.h +++ b/vtkm/cont/arg/TransportTagCellSetIn.h @@ -50,7 +50,7 @@ struct Transport Device,FromTopology,ToTopology> ::ExecObjectType ExecObjectType; - VTKM_CONT_EXPORT + VTKM_CONT ExecObjectType operator()(const ContObjectType &object, vtkm::Id) const { //create CUDA version of connectivity array. diff --git a/vtkm/cont/arg/TransportTagExecObject.h b/vtkm/cont/arg/TransportTagExecObject.h index 142632524..b68ae3357 100644 --- a/vtkm/cont/arg/TransportTagExecObject.h +++ b/vtkm/cont/arg/TransportTagExecObject.h @@ -50,7 +50,7 @@ struct Transport typedef ContObjectType ExecObjectType; - VTKM_CONT_EXPORT + VTKM_CONT ExecObjectType operator()(const ContObjectType &object, vtkm::Id) const { return object; diff --git a/vtkm/cont/arg/TransportTagWholeArrayIn.h b/vtkm/cont/arg/TransportTagWholeArrayIn.h index b08283a4e..1313039f5 100644 --- a/vtkm/cont/arg/TransportTagWholeArrayIn.h +++ b/vtkm/cont/arg/TransportTagWholeArrayIn.h @@ -56,7 +56,7 @@ struct Transport< typedef vtkm::exec::ExecutionWholeArrayConst ExecObjectType; - VTKM_CONT_EXPORT + VTKM_CONT ExecObjectType operator()(ContObjectType array, vtkm::Id) const { // Note: we ignore the size of the domain because the randomly accessed diff --git a/vtkm/cont/arg/TransportTagWholeArrayInOut.h b/vtkm/cont/arg/TransportTagWholeArrayInOut.h index e72d64873..1916cd3ca 100644 --- a/vtkm/cont/arg/TransportTagWholeArrayInOut.h +++ b/vtkm/cont/arg/TransportTagWholeArrayInOut.h @@ -58,7 +58,7 @@ struct Transport< typedef vtkm::exec::ExecutionWholeArray ExecObjectType; - VTKM_CONT_EXPORT + VTKM_CONT ExecObjectType operator()(ContObjectType array, vtkm::Id) const { // Note: we ignore the size of the domain because the randomly accessed diff --git a/vtkm/cont/arg/TransportTagWholeArrayOut.h b/vtkm/cont/arg/TransportTagWholeArrayOut.h index 7efe8d233..d6064a9e6 100644 --- a/vtkm/cont/arg/TransportTagWholeArrayOut.h +++ b/vtkm/cont/arg/TransportTagWholeArrayOut.h @@ -58,7 +58,7 @@ struct Transport< typedef vtkm::exec::ExecutionWholeArray ExecObjectType; - VTKM_CONT_EXPORT + VTKM_CONT ExecObjectType operator()(ContObjectType array, vtkm::Id) const { // Note: we ignore the size of the domain because the randomly accessed diff --git a/vtkm/cont/arg/testing/UnitTestTransportArrayIn.cxx b/vtkm/cont/arg/testing/UnitTestTransportArrayIn.cxx index e162f9305..b500ed6d8 100644 --- a/vtkm/cont/arg/testing/UnitTestTransportArrayIn.cxx +++ b/vtkm/cont/arg/testing/UnitTestTransportArrayIn.cxx @@ -36,7 +36,7 @@ struct TestKernel : public vtkm::exec::FunctorBase { PortalType Portal; - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(vtkm::Id index) const { typedef typename PortalType::ValueType ValueType; diff --git a/vtkm/cont/arg/testing/UnitTestTransportArrayInOut.cxx b/vtkm/cont/arg/testing/UnitTestTransportArrayInOut.cxx index 84cd3dab3..c8d81d941 100644 --- a/vtkm/cont/arg/testing/UnitTestTransportArrayInOut.cxx +++ b/vtkm/cont/arg/testing/UnitTestTransportArrayInOut.cxx @@ -36,7 +36,7 @@ struct TestKernel : public vtkm::exec::FunctorBase { PortalType Portal; - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(vtkm::Id index) const { typedef typename PortalType::ValueType ValueType; diff --git a/vtkm/cont/arg/testing/UnitTestTransportArrayOut.cxx b/vtkm/cont/arg/testing/UnitTestTransportArrayOut.cxx index 9592f09b6..67df70f15 100644 --- a/vtkm/cont/arg/testing/UnitTestTransportArrayOut.cxx +++ b/vtkm/cont/arg/testing/UnitTestTransportArrayOut.cxx @@ -36,7 +36,7 @@ struct TestKernel : public vtkm::exec::FunctorBase { PortalType Portal; - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(vtkm::Id index) const { typedef typename PortalType::ValueType ValueType; diff --git a/vtkm/cont/arg/testing/UnitTestTransportCellSetIn.cxx b/vtkm/cont/arg/testing/UnitTestTransportCellSetIn.cxx index 1ca25c40f..355baca53 100644 --- a/vtkm/cont/arg/testing/UnitTestTransportCellSetIn.cxx +++ b/vtkm/cont/arg/testing/UnitTestTransportCellSetIn.cxx @@ -37,7 +37,7 @@ struct TestKernel : public vtkm::exec::FunctorBase { CellSetInType CellSet; - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(vtkm::Id) const { if (this->CellSet.GetNumberOfElements() != 2) diff --git a/vtkm/cont/arg/testing/UnitTestTransportExecObject.cxx b/vtkm/cont/arg/testing/UnitTestTransportExecObject.cxx index 170fe15bd..e703983ee 100644 --- a/vtkm/cont/arg/testing/UnitTestTransportExecObject.cxx +++ b/vtkm/cont/arg/testing/UnitTestTransportExecObject.cxx @@ -40,7 +40,7 @@ struct TestKernel : public vtkm::exec::FunctorBase { TestExecutionObject Object; - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(vtkm::Id) const { if (this->Object.Number != EXPECTED_NUMBER) diff --git a/vtkm/cont/arg/testing/UnitTestTransportWholeArray.cxx b/vtkm/cont/arg/testing/UnitTestTransportWholeArray.cxx index 987c001a4..991f72c98 100644 --- a/vtkm/cont/arg/testing/UnitTestTransportWholeArray.cxx +++ b/vtkm/cont/arg/testing/UnitTestTransportWholeArray.cxx @@ -42,7 +42,7 @@ struct TestOutKernel : public vtkm::exec::FunctorBase { PortalType Portal; - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(vtkm::Id index) const { if (this->Portal.GetNumberOfValues() != ARRAY_SIZE) @@ -59,7 +59,7 @@ struct TestInKernel : public vtkm::exec::FunctorBase { PortalType Portal; - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(vtkm::Id index) const { if (this->Portal.GetNumberOfValues() != ARRAY_SIZE) @@ -79,7 +79,7 @@ struct TestInOutKernel : public vtkm::exec::FunctorBase { PortalType Portal; - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(vtkm::Id index) const { if (this->Portal.GetNumberOfValues() != ARRAY_SIZE) @@ -94,13 +94,13 @@ struct TestInOutKernel : public vtkm::exec::FunctorBase template struct TestAtomicKernel : public vtkm::exec::FunctorBase { - VTKM_CONT_EXPORT + VTKM_CONT TestAtomicKernel(const AtomicType &atomicArray) : AtomicArray(atomicArray) { } AtomicType AtomicArray; - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(vtkm::Id index) const { typedef typename AtomicType::ValueType ValueType; diff --git a/vtkm/cont/cuda/ArrayHandleCuda.h b/vtkm/cont/cuda/ArrayHandleCuda.h index e3d0696c6..d5b6fe2f3 100644 --- a/vtkm/cont/cuda/ArrayHandleCuda.h +++ b/vtkm/cont/cuda/ArrayHandleCuda.h @@ -59,35 +59,35 @@ public: typedef T ValueType; typedef thrust::system::cuda::pointer DevicePointer; - VTKM_CONT_EXPORT + VTKM_CONT ArrayPortalCuda() : Data(), NumberOfValues(0) { } - VTKM_CONT_EXPORT + VTKM_CONT ArrayPortalCuda(ValueType* d, vtkm::Id numberOfValues) : Data(d), NumberOfValues(numberOfValues) { } - VTKM_CONT_EXPORT + VTKM_CONT ArrayPortalCuda(const DevicePointer& ptr, vtkm::Id numberOfValues) : Data(ptr), NumberOfValues(numberOfValues) { } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Id GetNumberOfValues() const { return NumberOfValues; } - VTKM_CONT_EXPORT + VTKM_CONT ValueType Get(vtkm::Id index) const { throw vtkm::cont::ErrorControlBadType( "ArrayHandleCuda only provides access to the device pointer."); } - VTKM_CONT_EXPORT + VTKM_CONT DevicePointer GetDevicePointer() const { return Data; @@ -115,36 +115,36 @@ public: typedef vtkm::cont::cuda::internal::ArrayPortalCuda PortalType; typedef vtkm::cont::cuda::internal::ArrayPortalCuda PortalConstType; - VTKM_CONT_EXPORT + VTKM_CONT Storage(): Data(), NumberOfValues(0), IsOwner(true) { } - VTKM_CONT_EXPORT + VTKM_CONT Storage(ValueType* d, vtkm::Id numberOfValues): Data(d), NumberOfValues(numberOfValues), IsOwner(false) { } - VTKM_CONT_EXPORT + VTKM_CONT PortalType GetPortal() { return PortalType(this->Data,this->NumberOfValues); } - VTKM_CONT_EXPORT + VTKM_CONT PortalConstType GetPortalConst() const { return PortalConstType(this->Data,this->NumberOfValues); } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Id GetNumberOfValues() const { return this->NumberOfValues; } - VTKM_CONT_EXPORT + VTKM_CONT void Allocate(vtkm::Id size) { if (!this->OwnsResources()) @@ -157,7 +157,7 @@ public: this->NumberOfValues = size; } - VTKM_CONT_EXPORT + VTKM_CONT void Shrink(vtkm::Id numberOfValues) { VTKM_ASSERT(numberOfValues <= this->GetNumberOfValues()); @@ -167,7 +167,7 @@ public: this->ReleaseResources(); } - VTKM_CONT_EXPORT + VTKM_CONT void ReleaseResources() { if (!this->OwnsResources()) @@ -181,13 +181,13 @@ public: } } - VTKM_CONT_EXPORT + VTKM_CONT DevicePointer GetDevicePointer() const { return this->Data; } - VTKM_CONT_EXPORT + VTKM_CONT bool OwnsResources() const { return this->IsOwner; @@ -226,18 +226,18 @@ public: typedef vtkm::exec::cuda::internal::ArrayPortalFromThrust< T > PortalType; typedef vtkm::exec::cuda::internal::ConstArrayPortalFromThrust< const T > PortalConstType; - VTKM_CONT_EXPORT + VTKM_CONT ArrayManagerExecutionThrustDevice(StorageType *storage) : Storage(storage) { } - VTKM_CONT_EXPORT + VTKM_CONT ~ArrayManagerExecutionThrustDevice() { } /// Returns the size of the array. /// - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Id GetNumberOfValues() const { return this->Storage->GetNumberOfValues(); @@ -245,7 +245,7 @@ public: /// Since memory is already on the device, there is nothing to prepare /// - VTKM_CONT_EXPORT + VTKM_CONT PortalConstType PrepareForInput(bool) { return PortalConstType(this->Storage->GetDevicePointer(), @@ -255,7 +255,7 @@ public: /// Since memory is already on the device, there is nothing to prepare /// - VTKM_CONT_EXPORT + VTKM_CONT PortalType PrepareForInPlace(bool) { return PortalType(this->Storage->GetDevicePointer(), @@ -265,7 +265,7 @@ public: /// Allocates the array to the given size. /// - VTKM_CONT_EXPORT + VTKM_CONT PortalType PrepareForOutput(vtkm::Id numberOfValues) { if (this->Storage->GetNumberOfValues()) @@ -279,19 +279,19 @@ public: /// Since output data stays on the device, there is nothing to retrieve /// - VTKM_CONT_EXPORT + VTKM_CONT void RetrieveOutputData(StorageType*) const { } /// Resizes the device vector. /// - VTKM_CONT_EXPORT void Shrink(vtkm::Id numberOfValues) + VTKM_CONT void Shrink(vtkm::Id numberOfValues) { this->Storage->Shrink(static_cast(numberOfValues)); } /// Releases storage resources, if the storage owns them - VTKM_CONT_EXPORT void ReleaseResources() + VTKM_CONT void ReleaseResources() { if (this->Storage->OwnsResources()) this->Storage->ReleaseResources(); @@ -334,7 +334,7 @@ public: vtkm::cont::cuda::StorageTagCuda >)); - VTKM_CONT_EXPORT + VTKM_CONT ArrayHandleCuda(T *start,vtkm::Id length) :Superclass( vtkm::cont::internal::Storage(start, length)) { @@ -345,7 +345,7 @@ public: /// A convenience function for creating an ArrayHandle from a Cuda pointer. /// template -VTKM_CONT_EXPORT vtkm::cont::ArrayHandle +VTKM_CONT vtkm::cont::ArrayHandle make_ArrayHandleCuda(T *array,vtkm::Id length) { typedef vtkm::cont::cuda::StorageTagCuda StorageTag; @@ -354,7 +354,7 @@ make_ArrayHandleCuda(T *array,vtkm::Id length) } template -VTKM_CONT_EXPORT +VTKM_CONT void printSummary_ArrayHandle(const vtkm::cont::ArrayHandle &array, @@ -376,7 +376,7 @@ template class ArrayHandle : public vtkm::cont::ArrayHandleCuda { public: - VTKM_CONT_EXPORT + VTKM_CONT ArrayHandle(T *start,vtkm::Id length) : vtkm::cont::ArrayHandleCuda(start, length) { diff --git a/vtkm/cont/cuda/internal/ArrayManagerExecutionCuda.h b/vtkm/cont/cuda/internal/ArrayManagerExecutionCuda.h index 0c4ce2c21..7ee2ea07d 100644 --- a/vtkm/cont/cuda/internal/ArrayManagerExecutionCuda.h +++ b/vtkm/cont/cuda/internal/ArrayManagerExecutionCuda.h @@ -47,11 +47,11 @@ public: typedef typename Superclass::PortalConstType PortalConstType; typedef typename Superclass::StorageType StorageType; - VTKM_CONT_EXPORT + VTKM_CONT ArrayManagerExecution(StorageType *storage) : Superclass(storage) { } - VTKM_CONT_EXPORT + VTKM_CONT PortalConstType PrepareForInput(bool updateData) { try @@ -72,7 +72,7 @@ public: } } - VTKM_CONT_EXPORT + VTKM_CONT PortalType PrepareForInPlace(bool updateData) { try @@ -93,7 +93,7 @@ public: } } - VTKM_CONT_EXPORT + VTKM_CONT PortalType PrepareForOutput(vtkm::Id numberOfValues) { try diff --git a/vtkm/cont/cuda/internal/ArrayManagerExecutionThrustDevice.h b/vtkm/cont/cuda/internal/ArrayManagerExecutionThrustDevice.h index 5144416a8..ae8c86ce5 100644 --- a/vtkm/cont/cuda/internal/ArrayManagerExecutionThrustDevice.h +++ b/vtkm/cont/cuda/internal/ArrayManagerExecutionThrustDevice.h @@ -76,14 +76,14 @@ public: typedef vtkm::exec::cuda::internal::ArrayPortalFromThrust< T > PortalType; typedef vtkm::exec::cuda::internal::ConstArrayPortalFromThrust< T > PortalConstType; - VTKM_CONT_EXPORT + VTKM_CONT ArrayManagerExecutionThrustDevice(StorageType *storage) : Storage(storage), Array() { } - VTKM_CONT_EXPORT + VTKM_CONT ~ArrayManagerExecutionThrustDevice() { this->ReleaseResources(); @@ -91,7 +91,7 @@ public: /// Returns the size of the array. /// - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Id GetNumberOfValues() const { return static_cast(this->Array.size()); } @@ -99,7 +99,7 @@ public: /// Allocates the appropriate size of the array and copies the given data /// into the array. /// - VTKM_CONT_EXPORT + VTKM_CONT PortalConstType PrepareForInput(bool updateData) { if (updateData) @@ -118,7 +118,7 @@ public: /// Workaround for nvcc 7.5 compiler warning bug. template - VTKM_CONT_EXPORT + VTKM_CONT PortalConstType _PrepareForInput(bool updateData) { return this->PrepareForInput(updateData); @@ -127,7 +127,7 @@ public: /// Allocates the appropriate size of the array and copies the given data /// into the array. /// - VTKM_CONT_EXPORT + VTKM_CONT PortalType PrepareForInPlace(bool updateData) { if (updateData) @@ -145,7 +145,7 @@ public: /// Workaround for nvcc 7.5 compiler warning bug. template - VTKM_CONT_EXPORT + VTKM_CONT PortalType _PrepareForInPlace(bool updateData) { return this->PrepareForInPlace(updateData); @@ -153,7 +153,7 @@ public: /// Allocates the array to the given size. /// - VTKM_CONT_EXPORT + VTKM_CONT PortalType PrepareForOutput(vtkm::Id numberOfValues) { if (numberOfValues > this->GetNumberOfValues()) @@ -178,7 +178,7 @@ public: /// Workaround for nvcc 7.5 compiler warning bug. template - VTKM_CONT_EXPORT + VTKM_CONT PortalType _PrepareForOutput(vtkm::Id numberOfValues) { return this->PrepareForOutput(numberOfValues); @@ -187,7 +187,7 @@ public: /// Allocates enough space in \c storage and copies the data in the /// device vector into it. /// - VTKM_CONT_EXPORT + VTKM_CONT void RetrieveOutputData(StorageType *storage) const { storage->Allocate(static_cast(this->Array.size())); @@ -209,7 +209,7 @@ public: /// thrust can generally handle iterators for a device as well. /// template - VTKM_CONT_EXPORT void CopyInto(IteratorTypeControl dest) const + VTKM_CONT void CopyInto(IteratorTypeControl dest) const { ::thrust::copy( this->Array.data(), @@ -219,7 +219,7 @@ public: /// Resizes the device vector. /// - VTKM_CONT_EXPORT void Shrink(vtkm::Id numberOfValues) + VTKM_CONT void Shrink(vtkm::Id numberOfValues) { // The operation will succeed even if this assertion fails, but this // is still supposed to be a precondition to Shrink. @@ -231,7 +231,7 @@ public: /// Frees all memory. /// - VTKM_CONT_EXPORT void ReleaseResources() + VTKM_CONT void ReleaseResources() { this->Array.clear(); this->Array.shrink_to_fit(); @@ -249,7 +249,7 @@ private: ::thrust::system::cuda::vector > Array; - VTKM_CONT_EXPORT + VTKM_CONT void CopyToExecution() { try diff --git a/vtkm/cont/cuda/internal/DeviceAdapterAlgorithmCuda.h b/vtkm/cont/cuda/internal/DeviceAdapterAlgorithmCuda.h index 22a65e65c..8589835bb 100644 --- a/vtkm/cont/cuda/internal/DeviceAdapterAlgorithmCuda.h +++ b/vtkm/cont/cuda/internal/DeviceAdapterAlgorithmCuda.h @@ -60,7 +60,7 @@ struct DeviceAdapterAlgorithm vtkm::cont::DeviceAdapterTagCuda> { - VTKM_CONT_EXPORT static void Synchronize() + VTKM_CONT static void Synchronize() { VTKM_CUDA_CALL(cudaDeviceSynchronize()); } @@ -73,25 +73,25 @@ template<> class DeviceAdapterTimerImplementation { public: - VTKM_CONT_EXPORT DeviceAdapterTimerImplementation() + VTKM_CONT DeviceAdapterTimerImplementation() { VTKM_CUDA_CALL(cudaEventCreate(&this->StartEvent)); VTKM_CUDA_CALL(cudaEventCreate(&this->EndEvent)); this->Reset(); } - VTKM_CONT_EXPORT ~DeviceAdapterTimerImplementation() + VTKM_CONT ~DeviceAdapterTimerImplementation() { VTKM_CUDA_CALL(cudaEventDestroy(this->StartEvent)); VTKM_CUDA_CALL(cudaEventDestroy(this->EndEvent)); } - VTKM_CONT_EXPORT void Reset() + VTKM_CONT void Reset() { VTKM_CUDA_CALL(cudaEventRecord(this->StartEvent, 0)); VTKM_CUDA_CALL(cudaEventSynchronize(this->StartEvent)); } - VTKM_CONT_EXPORT vtkm::Float64 GetElapsedTime() + VTKM_CONT vtkm::Float64 GetElapsedTime() { VTKM_CUDA_CALL(cudaEventRecord(this->EndEvent, 0)); VTKM_CUDA_CALL(cudaEventSynchronize(this->EndEvent)); @@ -124,7 +124,7 @@ template<> class DeviceAdapterRuntimeDetector { public: - VTKM_CONT_EXPORT DeviceAdapterRuntimeDetector(): + VTKM_CONT DeviceAdapterRuntimeDetector(): NumberOfDevices(0), HighestArchSupported(0) { @@ -174,7 +174,7 @@ public: /// Only returns true if we have at-least one CUDA capable device of SM_20 or /// greater ( fermi ). /// - VTKM_CONT_EXPORT bool Exists() const + VTKM_CONT bool Exists() const { // return this->NumberOfDevices > 0 && this->HighestArchSupported >= 20; @@ -191,7 +191,7 @@ template class DeviceAdapterAtomicArrayImplementation { public: - VTKM_CONT_EXPORT + VTKM_CONT DeviceAdapterAtomicArrayImplementation( vtkm::cont::ArrayHandle handle): Portal( handle.PrepareForInPlace( vtkm::cont::DeviceAdapterTagCuda()) ) diff --git a/vtkm/cont/cuda/internal/DeviceAdapterAlgorithmThrust.h b/vtkm/cont/cuda/internal/DeviceAdapterAlgorithmThrust.h index 9774075e4..0861740ab 100644 --- a/vtkm/cont/cuda/internal/DeviceAdapterAlgorithmThrust.h +++ b/vtkm/cont/cuda/internal/DeviceAdapterAlgorithmThrust.h @@ -287,7 +287,7 @@ struct DeviceAdapterAlgorithmThrust : vtkm::cont::internal::DeviceAdapterAlgorit private: #endif template - VTKM_CONT_EXPORT static void CopyPortal(const InputPortal &input, + VTKM_CONT static void CopyPortal(const InputPortal &input, const OutputPortal &output) { try @@ -304,7 +304,7 @@ private: } template - VTKM_CONT_EXPORT static void CopySubRangePortal(const InputPortal &input, + VTKM_CONT static void CopySubRangePortal(const InputPortal &input, vtkm::Id inputOffset, vtkm::Id size, const OutputPortal &output, @@ -324,7 +324,7 @@ private: } template - VTKM_CONT_EXPORT static void LowerBoundsPortal(const InputPortal &input, + VTKM_CONT static void LowerBoundsPortal(const InputPortal &input, const ValuesPortal &values, const OutputPortal &output) { @@ -333,7 +333,7 @@ private: } template - VTKM_CONT_EXPORT static + VTKM_CONT static void LowerBoundsPortal(const InputPortal &input, const OutputPortal &values_output) { @@ -344,7 +344,7 @@ private: template - VTKM_CONT_EXPORT static void LowerBoundsPortal(const InputPortal &input, + VTKM_CONT static void LowerBoundsPortal(const InputPortal &input, const ValuesPortal &values, const OutputPortal &output, BinaryCompare binary_compare) @@ -370,7 +370,7 @@ private: } template - VTKM_CONT_EXPORT static + VTKM_CONT static typename InputPortal::ValueType ReducePortal(const InputPortal &input, typename InputPortal::ValueType initialValue) { @@ -381,7 +381,7 @@ private: } template - VTKM_CONT_EXPORT static + VTKM_CONT static typename InputPortal::ValueType ReducePortal(const InputPortal &input, typename InputPortal::ValueType initialValue, BinaryFunctor binary_functor) @@ -409,7 +409,7 @@ private: template - VTKM_CONT_EXPORT static + VTKM_CONT static vtkm::Id ReduceByKeyPortal(const KeysPortal &keys, const ValuesPortal& values, const KeysOutputPortal &keys_output, @@ -454,7 +454,7 @@ private: } template - VTKM_CONT_EXPORT static + VTKM_CONT static typename InputPortal::ValueType ScanExclusivePortal(const InputPortal &input, const OutputPortal &output) { @@ -468,7 +468,7 @@ private: } template - VTKM_CONT_EXPORT static + VTKM_CONT static typename InputPortal::ValueType ScanExclusivePortal(const InputPortal &input, const OutputPortal &output, BinaryFunctor binaryOp, @@ -520,7 +520,7 @@ private: } template - VTKM_CONT_EXPORT static + VTKM_CONT static typename InputPortal::ValueType ScanInclusivePortal(const InputPortal &input, const OutputPortal &output) { @@ -529,7 +529,7 @@ private: } template - VTKM_CONT_EXPORT static + VTKM_CONT static typename InputPortal::ValueType ScanInclusivePortal(const InputPortal &input, const OutputPortal &output, BinaryFunctor binary_functor) @@ -561,14 +561,14 @@ private: } template - VTKM_CONT_EXPORT static void SortPortal(const ValuesPortal &values) + VTKM_CONT static void SortPortal(const ValuesPortal &values) { typedef typename ValuesPortal::ValueType ValueType; SortPortal(values, ::thrust::less()); } template - VTKM_CONT_EXPORT static void SortPortal(const ValuesPortal &values, + VTKM_CONT static void SortPortal(const ValuesPortal &values, BinaryCompare binary_compare) { typedef typename ValuesPortal::ValueType ValueType; @@ -589,7 +589,7 @@ private: template - VTKM_CONT_EXPORT static void SortByKeyPortal(const KeysPortal &keys, + VTKM_CONT static void SortByKeyPortal(const KeysPortal &keys, const ValuesPortal &values) { typedef typename KeysPortal::ValueType ValueType; @@ -597,7 +597,7 @@ private: } template - VTKM_CONT_EXPORT static void SortByKeyPortal(const KeysPortal &keys, + VTKM_CONT static void SortByKeyPortal(const KeysPortal &keys, const ValuesPortal &values, BinaryCompare binary_compare) { @@ -622,7 +622,7 @@ private: class StencilPortal, class OutputPortal, class UnaryPredicate> - VTKM_CONT_EXPORT static + VTKM_CONT static vtkm::Id CopyIfPortal(ValueIterator valuesBegin, ValueIterator valuesEnd, StencilPortal stencil, @@ -662,7 +662,7 @@ private: class StencilPortal, class OutputPortal, class UnaryPredicate> - VTKM_CONT_EXPORT static + VTKM_CONT static vtkm::Id CopyIfPortal(ValuePortal values, StencilPortal stencil, OutputPortal output, @@ -676,7 +676,7 @@ private: } template - VTKM_CONT_EXPORT static + VTKM_CONT static vtkm::Id UniquePortal(const ValuesPortal values) { typedef typename detail::IteratorTraits::IteratorType @@ -697,7 +697,7 @@ private: } template - VTKM_CONT_EXPORT static + VTKM_CONT static vtkm::Id UniquePortal(const ValuesPortal values, BinaryCompare binary_compare) { typedef typename detail::IteratorTraits::IteratorType @@ -723,7 +723,7 @@ private: } template - VTKM_CONT_EXPORT static + VTKM_CONT static void UpperBoundsPortal(const InputPortal &input, const ValuesPortal &values, const OutputPortal &output) @@ -745,7 +745,7 @@ private: template - VTKM_CONT_EXPORT static void UpperBoundsPortal(const InputPortal &input, + VTKM_CONT static void UpperBoundsPortal(const InputPortal &input, const ValuesPortal &values, const OutputPortal &output, BinaryCompare binary_compare) @@ -771,7 +771,7 @@ private: } template - VTKM_CONT_EXPORT static + VTKM_CONT static void UpperBoundsPortal(const InputPortal &input, const OutputPortal &values_output) { @@ -794,7 +794,7 @@ private: public: template - VTKM_CONT_EXPORT static void Copy( + VTKM_CONT static void Copy( const vtkm::cont::ArrayHandle &input, vtkm::cont::ArrayHandle &output) { @@ -804,7 +804,7 @@ public: } template - VTKM_CONT_EXPORT static bool CopySubRange( + VTKM_CONT static bool CopySubRange( const vtkm::cont::ArrayHandle &input, vtkm::Id inputStartIndex, vtkm::Id numberOfElementsToCopy, @@ -852,7 +852,7 @@ public: } template - VTKM_CONT_EXPORT static void LowerBounds( + VTKM_CONT static void LowerBounds( const vtkm::cont::ArrayHandle& input, const vtkm::cont::ArrayHandle& values, vtkm::cont::ArrayHandle& output) @@ -864,7 +864,7 @@ public: } template - VTKM_CONT_EXPORT static void LowerBounds( + VTKM_CONT static void LowerBounds( const vtkm::cont::ArrayHandle& input, const vtkm::cont::ArrayHandle& values, vtkm::cont::ArrayHandle& output, @@ -878,7 +878,7 @@ public: } template - VTKM_CONT_EXPORT static void LowerBounds( + VTKM_CONT static void LowerBounds( const vtkm::cont::ArrayHandle &input, vtkm::cont::ArrayHandle &values_output) { @@ -887,7 +887,7 @@ public: } template - VTKM_CONT_EXPORT static T Reduce( + VTKM_CONT static T Reduce( const vtkm::cont::ArrayHandle &input, T initialValue) { @@ -901,7 +901,7 @@ public: } template - VTKM_CONT_EXPORT static T Reduce( + VTKM_CONT static T Reduce( const vtkm::cont::ArrayHandle &input, T initialValue, BinaryFunctor binary_functor) @@ -918,7 +918,7 @@ public: template - VTKM_CONT_EXPORT static void ReduceByKey( + VTKM_CONT static void ReduceByKey( const vtkm::cont::ArrayHandle &keys, const vtkm::cont::ArrayHandle &values, vtkm::cont::ArrayHandle &keys_output, @@ -944,7 +944,7 @@ public: } template - VTKM_CONT_EXPORT static T ScanExclusive( + VTKM_CONT static T ScanExclusive( const vtkm::cont::ArrayHandle &input, vtkm::cont::ArrayHandle& output) { @@ -965,7 +965,7 @@ public: } template - VTKM_CONT_EXPORT static T ScanExclusive( + VTKM_CONT static T ScanExclusive( const vtkm::cont::ArrayHandle &input, vtkm::cont::ArrayHandle& output, BinaryFunctor binary_functor, @@ -991,7 +991,7 @@ public: } template - VTKM_CONT_EXPORT static T ScanInclusive( + VTKM_CONT static T ScanInclusive( const vtkm::cont::ArrayHandle &input, vtkm::cont::ArrayHandle& output) { @@ -1012,7 +1012,7 @@ public: } template - VTKM_CONT_EXPORT static T ScanInclusive( + VTKM_CONT static T ScanInclusive( const vtkm::cont::ArrayHandle &input, vtkm::cont::ArrayHandle& output, BinaryFunctor binary_functor) @@ -1041,7 +1041,7 @@ private: #endif // we use cuda pinned memory to reduce the amount of synchronization // and mem copies between the host and device. - VTKM_CONT_EXPORT + VTKM_CONT static char* GetPinnedErrorArray(vtkm::Id &arraySize, char** hostPointer) { const vtkm::Id ERROR_ARRAY_SIZE = 1024; @@ -1065,7 +1065,7 @@ private: // we query cuda for the max blocks per grid for 1D scheduling // and cache the values in static variables - VTKM_CONT_EXPORT + VTKM_CONT static vtkm::Vec GetMaxGridOfThreadBlocks() { static bool gridQueryInit = false; @@ -1104,7 +1104,7 @@ private: public: template - VTKM_CONT_EXPORT static void Schedule(Functor functor, vtkm::Id numInstances) + VTKM_CONT static void Schedule(Functor functor, vtkm::Id numInstances) { //since the memory is pinned we can access it safely on the host //without a memcpy @@ -1162,7 +1162,7 @@ public: } template - VTKM_CONT_EXPORT + VTKM_CONT static void Schedule(Functor functor, const vtkm::Id3& rangeMax) { //since the memory is pinned we can access it safely on the host @@ -1221,14 +1221,14 @@ public: } template - VTKM_CONT_EXPORT static void Sort( + VTKM_CONT static void Sort( vtkm::cont::ArrayHandle& values) { SortPortal(values.PrepareForInPlace(DeviceAdapterTag())); } template - VTKM_CONT_EXPORT static void Sort( + VTKM_CONT static void Sort( vtkm::cont::ArrayHandle& values, BinaryCompare binary_compare) { @@ -1237,7 +1237,7 @@ public: template - VTKM_CONT_EXPORT static void SortByKey( + VTKM_CONT static void SortByKey( vtkm::cont::ArrayHandle& keys, vtkm::cont::ArrayHandle& values) { @@ -1248,7 +1248,7 @@ public: template - VTKM_CONT_EXPORT static void SortByKey( + VTKM_CONT static void SortByKey( vtkm::cont::ArrayHandle& keys, vtkm::cont::ArrayHandle& values, BinaryCompare binary_compare) @@ -1260,7 +1260,7 @@ public: template - VTKM_CONT_EXPORT static void StreamCompact( + VTKM_CONT static void StreamCompact( const vtkm::cont::ArrayHandle& stencil, vtkm::cont::ArrayHandle& output) { @@ -1278,7 +1278,7 @@ public: class SIn, class SStencil, class SOut> - VTKM_CONT_EXPORT static void StreamCompact( + VTKM_CONT static void StreamCompact( const vtkm::cont::ArrayHandle& input, const vtkm::cont::ArrayHandle& stencil, vtkm::cont::ArrayHandle& output) @@ -1297,7 +1297,7 @@ public: class SStencil, class SOut, class UnaryPredicate> - VTKM_CONT_EXPORT static void StreamCompact( + VTKM_CONT static void StreamCompact( const vtkm::cont::ArrayHandle& input, const vtkm::cont::ArrayHandle& stencil, vtkm::cont::ArrayHandle& output, @@ -1312,7 +1312,7 @@ public: } template - VTKM_CONT_EXPORT static void Unique( + VTKM_CONT static void Unique( vtkm::cont::ArrayHandle &values) { vtkm::Id newSize = UniquePortal(values.PrepareForInPlace(DeviceAdapterTag())); @@ -1321,7 +1321,7 @@ public: } template - VTKM_CONT_EXPORT static void Unique( + VTKM_CONT static void Unique( vtkm::cont::ArrayHandle &values, BinaryCompare binary_compare) { @@ -1331,7 +1331,7 @@ public: } template - VTKM_CONT_EXPORT static void UpperBounds( + VTKM_CONT static void UpperBounds( const vtkm::cont::ArrayHandle& input, const vtkm::cont::ArrayHandle& values, vtkm::cont::ArrayHandle& output) @@ -1343,7 +1343,7 @@ public: } template - VTKM_CONT_EXPORT static void UpperBounds( + VTKM_CONT static void UpperBounds( const vtkm::cont::ArrayHandle& input, const vtkm::cont::ArrayHandle& values, vtkm::cont::ArrayHandle& output, @@ -1357,7 +1357,7 @@ public: } template - VTKM_CONT_EXPORT static void UpperBounds( + VTKM_CONT static void UpperBounds( const vtkm::cont::ArrayHandle &input, vtkm::cont::ArrayHandle &values_output) { diff --git a/vtkm/cont/cuda/internal/MakeThrustIterator.h b/vtkm/cont/cuda/internal/MakeThrustIterator.h index 21769f9c4..f64fe0989 100644 --- a/vtkm/cont/cuda/internal/MakeThrustIterator.h +++ b/vtkm/cont/cuda/internal/MakeThrustIterator.h @@ -86,7 +86,7 @@ struct IteratorTraits }; template -VTKM_CONT_EXPORT +VTKM_CONT typename IteratorTraits::IteratorType MakeIteratorBegin(PortalType portal, detail::ThrustIteratorFromArrayPortalTag) { @@ -94,7 +94,7 @@ MakeIteratorBegin(PortalType portal, detail::ThrustIteratorFromArrayPortalTag) } template -VTKM_CONT_EXPORT +VTKM_CONT typename IteratorTraits::IteratorType MakeIteratorBegin(PortalType portal, detail::ThrustIteratorDevicePtrTag) { @@ -103,7 +103,7 @@ MakeIteratorBegin(PortalType portal, detail::ThrustIteratorDevicePtrTag) } template -VTKM_CONT_EXPORT +VTKM_CONT typename IteratorTraits::IteratorType MakeIteratorEnd(PortalType portal, detail::ThrustIteratorFromArrayPortalTag) { @@ -115,7 +115,7 @@ MakeIteratorEnd(PortalType portal, detail::ThrustIteratorFromArrayPortalTag) } template -VTKM_CONT_EXPORT +VTKM_CONT typename IteratorTraits::IteratorType MakeIteratorEnd(PortalType portal, detail::ThrustIteratorDevicePtrTag) { @@ -128,7 +128,7 @@ MakeIteratorEnd(PortalType portal, detail::ThrustIteratorDevicePtrTag) template -VTKM_CONT_EXPORT +VTKM_CONT typename detail::IteratorTraits::IteratorType IteratorBegin(PortalType portal) { @@ -137,7 +137,7 @@ IteratorBegin(PortalType portal) } template -VTKM_CONT_EXPORT +VTKM_CONT typename detail::IteratorTraits::IteratorType IteratorEnd(PortalType portal) { diff --git a/vtkm/cont/cuda/internal/testing/Testing.h b/vtkm/cont/cuda/internal/testing/Testing.h index ed0d3d5f6..0912fb299 100644 --- a/vtkm/cont/cuda/internal/testing/Testing.h +++ b/vtkm/cont/cuda/internal/testing/Testing.h @@ -32,7 +32,7 @@ namespace internal { struct Testing { public: - static VTKM_CONT_EXPORT int CheckCudaBeforeExit(int result) + static VTKM_CONT int CheckCudaBeforeExit(int result) { cudaError_t cudaError = cudaPeekAtLastError(); if (cudaError != cudaSuccess) @@ -49,7 +49,7 @@ public: } template - static VTKM_CONT_EXPORT int Run(Func function) + static VTKM_CONT int Run(Func function) { int result = vtkm::cont::testing::Testing::Run(function); return CheckCudaBeforeExit(result); diff --git a/vtkm/cont/internal/ArrayHandleExecutionManager.h b/vtkm/cont/internal/ArrayHandleExecutionManager.h index 8c2d1883a..83227b356 100644 --- a/vtkm/cont/internal/ArrayHandleExecutionManager.h +++ b/vtkm/cont/internal/ArrayHandleExecutionManager.h @@ -59,13 +59,13 @@ public: typedef typename StorageType::PortalType PortalControl; typedef typename StorageType::PortalConstType PortalConstControl; - VTKM_CONT_EXPORT + VTKM_CONT virtual ~ArrayHandleExecutionManagerBase() { } /// Returns the number of values stored in the array. Results are undefined /// if data has not been loaded or allocated. /// - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Id GetNumberOfValues() const { return this->GetNumberOfValuesImpl(); } @@ -77,7 +77,7 @@ public: /// Returns a constant array portal valid in the execution environment. /// template - VTKM_CONT_EXPORT + VTKM_CONT typename ExecutionTypes::PortalConst PrepareForInput(bool updateData, DeviceAdapter) { this->VerifyDeviceAdapter(DeviceAdapter()); @@ -94,7 +94,7 @@ public: /// Returns a read-write array portal valid in the execution environment. /// template - VTKM_CONT_EXPORT + VTKM_CONT typename ExecutionTypes::Portal PrepareForInPlace(bool updateData, DeviceAdapter) { this->VerifyDeviceAdapter(DeviceAdapter()); @@ -112,7 +112,7 @@ public: /// Returns a writable array portal valid in the execution environment. /// template - VTKM_CONT_EXPORT + VTKM_CONT typename ExecutionTypes::Portal PrepareForOutput(vtkm::Id numberOfValues, DeviceAdapter) { this->VerifyDeviceAdapter(DeviceAdapter()); @@ -129,7 +129,7 @@ public: /// operation. This method should only be called after PrepareForOutput is /// called. /// - VTKM_CONT_EXPORT + VTKM_CONT void RetrieveOutputData(StorageType *storage) const { this->RetrieveOutputDataImpl(storage); } @@ -143,7 +143,7 @@ public: /// (returned from GetNumberOfValues). That is, this method can only be used /// to shorten the array, not lengthen. /// - VTKM_CONT_EXPORT + VTKM_CONT void Shrink(vtkm::Id numberOfValues) { this->ShrinkImpl(numberOfValues); } @@ -151,13 +151,13 @@ public: /// Frees any resources (i.e. memory) allocated for the exeuction /// environment, if any. /// - VTKM_CONT_EXPORT + VTKM_CONT void ReleaseResources() { this->ReleaseResourcesImpl(); } template - VTKM_CONT_EXPORT + VTKM_CONT bool IsDeviceAdapter(DeviceAdapter) const { return this->IsDeviceAdapterImpl( @@ -187,7 +187,7 @@ protected: private: template - VTKM_CONT_EXPORT + VTKM_CONT void VerifyDeviceAdapter(DeviceAdapter device) const { if (!this->IsDeviceAdapter(device)) @@ -222,63 +222,63 @@ public: typedef typename ArrayTransferType::PortalExecution PortalExecution; typedef typename ArrayTransferType::PortalConstExecution PortalConstExecution; - VTKM_CONT_EXPORT + VTKM_CONT ArrayHandleExecutionManager(StorageType *storage) : Transfer(storage) { } template - VTKM_CONT_EXPORT void CopyInto(IteratorTypeControl dest) const + VTKM_CONT void CopyInto(IteratorTypeControl dest) const { this->Transfer.CopyInto(dest); } protected: - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Id GetNumberOfValuesImpl() const { return this->Transfer.GetNumberOfValues(); } - VTKM_CONT_EXPORT + VTKM_CONT void PrepareForInputImpl(bool updateData, void *portalExecutionVoid) { PortalConstExecution portal = this->Transfer.PrepareForInput(updateData); *reinterpret_cast(portalExecutionVoid) = portal; } - VTKM_CONT_EXPORT + VTKM_CONT void PrepareForInPlaceImpl(bool updateData, void *portalExecutionVoid) { PortalExecution portal = this->Transfer.PrepareForInPlace(updateData); *reinterpret_cast(portalExecutionVoid) = portal; } - VTKM_CONT_EXPORT + VTKM_CONT void PrepareForOutputImpl(vtkm::Id numberOfValues, void *portalExecutionVoid) { PortalExecution portal = this->Transfer.PrepareForOutput(numberOfValues); *reinterpret_cast(portalExecutionVoid) = portal; } - VTKM_CONT_EXPORT + VTKM_CONT void RetrieveOutputDataImpl(StorageType *storage) const { this->Transfer.RetrieveOutputData(storage); } - VTKM_CONT_EXPORT + VTKM_CONT void ShrinkImpl(Id numberOfValues) { this->Transfer.Shrink(numberOfValues); } - VTKM_CONT_EXPORT + VTKM_CONT void ReleaseResourcesImpl() { this->Transfer.ReleaseResources(); } - VTKM_CONT_EXPORT + VTKM_CONT bool IsDeviceAdapterImpl(const DeviceAdapterId &id) const { return id == vtkm::cont::DeviceAdapterTraits::GetId(); diff --git a/vtkm/cont/internal/ArrayManagerExecution.h b/vtkm/cont/internal/ArrayManagerExecution.h index f8fb08ddd..bb6d4db3f 100644 --- a/vtkm/cont/internal/ArrayManagerExecution.h +++ b/vtkm/cont/internal/ArrayManagerExecution.h @@ -76,13 +76,13 @@ public: /// objects should be avoided (copy references or pointers only). The /// reference can also, of course, be ignored. /// - VTKM_CONT_EXPORT + VTKM_CONT ArrayManagerExecution(vtkm::cont::internal::Storage &storage); /// Returns the number of values stored in the array. Results are undefined /// if data has not been loaded or allocated. /// - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Id GetNumberOfValues() const; /// Prepares the data for use as input in the execution environment. If the @@ -91,7 +91,7 @@ public: /// /// Returns a constant array portal valid in the execution environment. /// - VTKM_CONT_EXPORT + VTKM_CONT PortalConstExecution PrepareForInput(bool updateData); /// Prepares the data for use as both input and output in the execution @@ -100,7 +100,7 @@ public: /// /// Returns a read-write array portal valid in the execution environment. /// - VTKM_CONT_EXPORT + VTKM_CONT PortalExecution LoadDataForInPlace(bool updateData); /// Allocates an array in the execution environment of the specified size. If @@ -110,7 +110,7 @@ public: /// /// Returns a writable array portal valid in the execution environment. /// - VTKM_CONT_EXPORT + VTKM_CONT PortalExecution PrepareForOutput(vtkm::Id numberOfValues); /// Allocates data in the given Storage and copies data held in the execution @@ -120,7 +120,7 @@ public: /// operation. This method should only be called after PrepareForOutput is /// called. /// - VTKM_CONT_EXPORT + VTKM_CONT void RetrieveOutputData( vtkm::cont::internal::Storage* storage) const; @@ -131,7 +131,7 @@ public: /// and exeuction have seperate memory spaces). /// template - VTKM_CONT_EXPORT void CopyInto(IteratorTypeControl dest) const; + VTKM_CONT void CopyInto(IteratorTypeControl dest) const; /// \brief Reduces the size of the array without changing its values. /// @@ -142,13 +142,13 @@ public: /// (returned from GetNumberOfValues). That is, this method can only be used /// to shorten the array, not lengthen. /// - VTKM_CONT_EXPORT + VTKM_CONT void Shrink(vtkm::Id numberOfValues); /// Frees any resources (i.e. memory) allocated for the exeuction /// environment, if any. /// - VTKM_CONT_EXPORT + VTKM_CONT void ReleaseResources(); }; #else // VTKM_DOXGEN_ONLY diff --git a/vtkm/cont/internal/ArrayManagerExecutionShareWithControl.h b/vtkm/cont/internal/ArrayManagerExecutionShareWithControl.h index 6cb4d0ef1..20dd71901 100644 --- a/vtkm/cont/internal/ArrayManagerExecutionShareWithControl.h +++ b/vtkm/cont/internal/ArrayManagerExecutionShareWithControl.h @@ -45,13 +45,13 @@ public: typedef typename StorageType::PortalType PortalType; typedef typename StorageType::PortalConstType PortalConstType; - VTKM_CONT_EXPORT + VTKM_CONT ArrayManagerExecutionShareWithControl(StorageType *storage) : Storage(storage) { } /// Returns the size of the storage. /// - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Id GetNumberOfValues() const { return this->Storage->GetNumberOfValues(); @@ -59,7 +59,7 @@ public: /// Returns the constant portal from the storage. /// - VTKM_CONT_EXPORT + VTKM_CONT PortalConstType PrepareForInput(bool vtkmNotUsed(uploadData)) const { return this->Storage->GetPortalConst(); @@ -67,7 +67,7 @@ public: /// Returns the read-write portal from the storage. /// - VTKM_CONT_EXPORT + VTKM_CONT PortalType PrepareForInPlace(bool vtkmNotUsed(uploadData)) { return this->Storage->GetPortal(); @@ -75,7 +75,7 @@ public: /// Allocates data in the storage and return the portal to that. /// - VTKM_CONT_EXPORT + VTKM_CONT PortalType PrepareForOutput(vtkm::Id numberOfValues) { this->Storage->Allocate(numberOfValues); @@ -86,7 +86,7 @@ public: /// this class's portals should already be written to the given \c /// controlArray (under correct operation). /// - VTKM_CONT_EXPORT + VTKM_CONT void RetrieveOutputData(StorageType *storage) const { (void)storage; @@ -97,7 +97,7 @@ public: /// iterator. /// template - VTKM_CONT_EXPORT void CopyInto(IteratorTypeControl dest) const + VTKM_CONT void CopyInto(IteratorTypeControl dest) const { typedef typename StorageType::PortalConstType::IteratorType IteratorType; IteratorType beginIterator = @@ -109,7 +109,7 @@ public: /// Shrinks the storage. /// - VTKM_CONT_EXPORT + VTKM_CONT void Shrink(vtkm::Id numberOfValues) { this->Storage->Shrink(numberOfValues); @@ -117,7 +117,7 @@ public: /// A no-op. /// - VTKM_CONT_EXPORT + VTKM_CONT void ReleaseResources() { } private: diff --git a/vtkm/cont/internal/ArrayPortalFromIterators.h b/vtkm/cont/internal/ArrayPortalFromIterators.h index 22beab389..c7a30340a 100755 --- a/vtkm/cont/internal/ArrayPortalFromIterators.h +++ b/vtkm/cont/internal/ArrayPortalFromIterators.h @@ -51,11 +51,11 @@ public: typedef IteratorT IteratorType; VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_CONT_EXPORT + VTKM_CONT ArrayPortalFromIterators() { } VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_CONT_EXPORT + VTKM_CONT ArrayPortalFromIterators(IteratorT begin, IteratorT end) : BeginIterator(begin) { @@ -78,34 +78,34 @@ public: /// type casting that the iterators do (like the non-const to const cast). /// template - VTKM_CONT_EXPORT + VTKM_CONT ArrayPortalFromIterators(const ArrayPortalFromIterators &src) : BeginIterator(src.GetIteratorBegin()), NumberOfValues(src.GetNumberOfValues()) { } VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::Id GetNumberOfValues() const { return this->NumberOfValues; } VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT ValueType Get(vtkm::Id index) const { return *this->IteratorAt(index); } VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT void Set(vtkm::Id index, const ValueType& value) const { *(this->BeginIterator + index) = value; } VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT IteratorT GetIteratorBegin() const { return this->BeginIterator; } @@ -115,7 +115,7 @@ private: vtkm::Id NumberOfValues; VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT IteratorT IteratorAt(vtkm::Id index) const { VTKM_ASSERT(index >= 0); @@ -135,11 +135,11 @@ public: typedef IteratorT IteratorType; VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_CONT_EXPORT + VTKM_CONT ArrayPortalFromIterators() { } VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_CONT_EXPORT + VTKM_CONT ArrayPortalFromIterators(IteratorT begin, IteratorT end) : BeginIterator(begin) { @@ -162,27 +162,27 @@ public: /// type casting that the iterators do (like the non-const to const cast). /// template - VTKM_CONT_EXPORT + VTKM_CONT ArrayPortalFromIterators(const ArrayPortalFromIterators &src) : BeginIterator(src.GetIteratorBegin()), NumberOfValues(src.GetNumberOfValues()) { } VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::Id GetNumberOfValues() const { return this->NumberOfValues; } VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT ValueType Get(vtkm::Id index) const { return *this->IteratorAt(index); } VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT IteratorT GetIteratorBegin() const { return this->BeginIterator; } @@ -192,7 +192,7 @@ private: vtkm::Id NumberOfValues; VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT IteratorT IteratorAt(vtkm::Id index) const { VTKM_ASSERT(index >= 0); @@ -224,7 +224,7 @@ public: typedef _IteratorType IteratorType; VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT ArrayPortalToIterators(const PortalType &portal) : Iterator(portal.GetIteratorBegin()), NumberOfValues(portal.GetNumberOfValues()) @@ -237,7 +237,7 @@ public: typedef stdext::checked_array_iterator<_IteratorType> IteratorType; VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT ArrayPortalToIterators(const PortalType &portal) : Iterator(portal.GetIteratorBegin(), static_cast(portal.GetNumberOfValues())), @@ -247,11 +247,11 @@ public: #endif // VTKM_MSVC VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT IteratorType GetBegin() const { return this->Iterator; } VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT IteratorType GetEnd() const { IteratorType iterator = this->Iterator; typedef typename std::iterator_traits::difference_type diff --git a/vtkm/cont/internal/ArrayPortalShrink.h b/vtkm/cont/internal/ArrayPortalShrink.h index cec91f8ab..ae389cab5 100644 --- a/vtkm/cont/internal/ArrayPortalShrink.h +++ b/vtkm/cont/internal/ArrayPortalShrink.h @@ -42,14 +42,14 @@ public: typedef typename DelegatePortalType::ValueType ValueType; - VTKM_CONT_EXPORT ArrayPortalShrink() : NumberOfValues(0) { } + VTKM_CONT ArrayPortalShrink() : NumberOfValues(0) { } - VTKM_CONT_EXPORT ArrayPortalShrink(const DelegatePortalType &delegatePortal) + VTKM_CONT ArrayPortalShrink(const DelegatePortalType &delegatePortal) : DelegatePortal(delegatePortal), NumberOfValues(delegatePortal.GetNumberOfValues()) { } - VTKM_CONT_EXPORT ArrayPortalShrink(const DelegatePortalType &delegatePortal, + VTKM_CONT ArrayPortalShrink(const DelegatePortalType &delegatePortal, vtkm::Id numberOfValues) : DelegatePortal(delegatePortal), NumberOfValues(numberOfValues) { @@ -61,16 +61,16 @@ public: /// the delegates can do (like the non-const to const cast). /// template - VTKM_CONT_EXPORT + VTKM_CONT ArrayPortalShrink(const ArrayPortalShrink &src) : DelegatePortal(src.GetDelegatePortal()), NumberOfValues(src.GetNumberOfValues()) { } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Id GetNumberOfValues() const { return this->NumberOfValues; } - VTKM_CONT_EXPORT + VTKM_CONT ValueType Get(vtkm::Id index) const { VTKM_ASSERT(index >= 0); @@ -78,7 +78,7 @@ public: return this->DelegatePortal.Get(index); } - VTKM_CONT_EXPORT + VTKM_CONT void Set(vtkm::Id index, const ValueType& value) const { VTKM_ASSERT(index >= 0); @@ -89,7 +89,7 @@ public: /// Special method in this ArrayPortal that allows you to shrink the /// (exposed) array. /// - VTKM_CONT_EXPORT + VTKM_CONT void Shrink(vtkm::Id numberOfValues) { VTKM_ASSERT(numberOfValues < this->GetNumberOfValues()); @@ -125,7 +125,7 @@ class ArrayPortalToIterators< public: VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT ArrayPortalToIterators(const PortalType &portal) : DelegateIterators(portal.GetDelegatePortal()), NumberOfValues(portal.GetNumberOfValues()) @@ -134,13 +134,13 @@ public: typedef typename DelegateArrayPortalToIterators::IteratorType IteratorType; VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT IteratorType GetBegin() const { return this->DelegateIterators.GetBegin(); } VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT IteratorType GetEnd() const { IteratorType iterator = this->GetBegin(); std::advance(iterator, this->NumberOfValues); diff --git a/vtkm/cont/internal/ArrayTransfer.h b/vtkm/cont/internal/ArrayTransfer.h index e11327266..8354c97c5 100644 --- a/vtkm/cont/internal/ArrayTransfer.h +++ b/vtkm/cont/internal/ArrayTransfer.h @@ -66,13 +66,13 @@ public: typedef typename ArrayManagerType::PortalType PortalExecution; typedef typename ArrayManagerType::PortalConstType PortalConstExecution; - VTKM_CONT_EXPORT + VTKM_CONT ArrayTransfer(StorageType *storage) : ArrayManager(storage) { } /// Returns the number of values stored in the array. Results are undefined /// if data has not been loaded or allocated. /// - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Id GetNumberOfValues() const { return this->ArrayManager.GetNumberOfValues(); @@ -84,7 +84,7 @@ public: /// /// Returns a constant array portal valid in the execution environment. /// - VTKM_CONT_EXPORT + VTKM_CONT PortalConstExecution PrepareForInput(bool updateData) { return this->ArrayManager.PrepareForInput(updateData); @@ -97,7 +97,7 @@ public: /// /// Returns a read-write array portal valid in the execution environment. /// - VTKM_CONT_EXPORT + VTKM_CONT PortalExecution PrepareForInPlace(bool updateData) { return this->ArrayManager.PrepareForInPlace(updateData); @@ -110,7 +110,7 @@ public: /// /// Returns a writable array portal valid in the execution environment. /// - VTKM_CONT_EXPORT + VTKM_CONT PortalExecution PrepareForOutput(vtkm::Id numberOfValues) { return this->ArrayManager.PrepareForOutput(numberOfValues); @@ -123,7 +123,7 @@ public: /// operation. This method should only be called after PrepareForOutput is /// called. /// - VTKM_CONT_EXPORT + VTKM_CONT void RetrieveOutputData(StorageType *storage) const { this->ArrayManager.RetrieveOutputData(storage); @@ -136,7 +136,7 @@ public: /// and exeuction have seperate memory spaces). /// template - VTKM_CONT_EXPORT void CopyInto(IteratorTypeControl dest) const + VTKM_CONT void CopyInto(IteratorTypeControl dest) const { this->ArrayManager.CopyInto(dest); } @@ -150,7 +150,7 @@ public: /// (returned from GetNumberOfValues). That is, this method can only be used /// to shorten the array, not lengthen. /// - VTKM_CONT_EXPORT + VTKM_CONT void Shrink(vtkm::Id numberOfValues) { this->ArrayManager.Shrink(numberOfValues); @@ -159,7 +159,7 @@ public: /// Frees any resources (i.e. memory) allocated for the exeuction /// environment, if any. /// - VTKM_CONT_EXPORT + VTKM_CONT void ReleaseResources() { this->ArrayManager.ReleaseResources(); diff --git a/vtkm/cont/internal/ConnectivityExplicitInternals.h b/vtkm/cont/internal/ConnectivityExplicitInternals.h index 1cf6b954e..73ae03960 100644 --- a/vtkm/cont/internal/ConnectivityExplicitInternals.h +++ b/vtkm/cont/internal/ConnectivityExplicitInternals.h @@ -96,16 +96,16 @@ struct ConnectivityExplicitInternals bool ElementsValid; mutable bool IndexOffsetsValid; - VTKM_CONT_EXPORT + VTKM_CONT ConnectivityExplicitInternals() : ElementsValid(false), IndexOffsetsValid(false) { } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Id GetNumberOfElements() const { return this->Shapes.GetNumberOfValues(); } - VTKM_CONT_EXPORT + VTKM_CONT void ReleaseResourcesExecution() { this->Shapes.ReleaseResourcesExecution(); this->NumIndices.ReleaseResourcesExecution(); @@ -114,7 +114,7 @@ struct ConnectivityExplicitInternals } template - VTKM_CONT_EXPORT + VTKM_CONT void BuildIndexOffsets(Device) const { VTKM_ASSERT(this->ElementsValid); @@ -128,7 +128,7 @@ struct ConnectivityExplicitInternals } } - VTKM_CONT_EXPORT + VTKM_CONT void BuildIndexOffsets(vtkm::cont::DeviceAdapterTagError) const { if (!this->IndexOffsetsValid) @@ -138,7 +138,7 @@ struct ConnectivityExplicitInternals } } - VTKM_CONT_EXPORT + VTKM_CONT void PrintSummary(std::ostream &out) const { out <<" Shapes: "; diff --git a/vtkm/cont/internal/DeviceAdapterAlgorithmGeneral.h b/vtkm/cont/internal/DeviceAdapterAlgorithmGeneral.h index e2d9ed7a3..e12b4fe3a 100644 --- a/vtkm/cont/internal/DeviceAdapterAlgorithmGeneral.h +++ b/vtkm/cont/internal/DeviceAdapterAlgorithmGeneral.h @@ -65,20 +65,20 @@ namespace internal { /// DeviceAdapterTagFoo> /// { /// template -/// VTKM_CONT_EXPORT static void Schedule(Functor functor, +/// VTKM_CONT static void Schedule(Functor functor, /// vtkm::Id numInstances) /// { /// ... /// } /// /// template -/// VTKM_CONT_EXPORT static void Schedule(Functor functor, +/// VTKM_CONT static void Schedule(Functor functor, /// vtkm::Id3 maxRange) /// { /// ... /// } /// -/// VTKM_CONT_EXPORT static void Synchronize() +/// VTKM_CONT static void Synchronize() /// { /// ... /// } @@ -102,7 +102,7 @@ struct DeviceAdapterAlgorithmGeneral // implementations to provide one. private: template - VTKM_CONT_EXPORT + VTKM_CONT static T GetExecutionValue(const vtkm::cont::ArrayHandle &input, vtkm::Id index) { @@ -129,7 +129,7 @@ public: //-------------------------------------------------------------------------- // Copy template - VTKM_CONT_EXPORT static void Copy(const vtkm::cont::ArrayHandle &input, + VTKM_CONT static void Copy(const vtkm::cont::ArrayHandle &input, vtkm::cont::ArrayHandle &output) { typedef CopyKernel< @@ -146,7 +146,7 @@ public: //-------------------------------------------------------------------------- // CopySubRange template - VTKM_CONT_EXPORT static bool CopySubRange(const vtkm::cont::ArrayHandle &input, + VTKM_CONT static bool CopySubRange(const vtkm::cont::ArrayHandle &input, vtkm::Id inputStartIndex, vtkm::Id numberOfElementsToCopy, vtkm::cont::ArrayHandle &output, @@ -201,7 +201,7 @@ public: //-------------------------------------------------------------------------- // Lower Bounds template - VTKM_CONT_EXPORT static void LowerBounds( + VTKM_CONT static void LowerBounds( const vtkm::cont::ArrayHandle &input, const vtkm::cont::ArrayHandle &values, vtkm::cont::ArrayHandle &output) @@ -220,7 +220,7 @@ public: } template - VTKM_CONT_EXPORT static void LowerBounds( + VTKM_CONT static void LowerBounds( const vtkm::cont::ArrayHandle &input, const vtkm::cont::ArrayHandle &values, vtkm::cont::ArrayHandle &output, @@ -242,7 +242,7 @@ public: } template - VTKM_CONT_EXPORT static void LowerBounds( + VTKM_CONT static void LowerBounds( const vtkm::cont::ArrayHandle &input, vtkm::cont::ArrayHandle &values_output) { @@ -255,14 +255,14 @@ public: //-------------------------------------------------------------------------- // Reduce template - VTKM_CONT_EXPORT static T Reduce( + VTKM_CONT static T Reduce( const vtkm::cont::ArrayHandle &input, T initialValue) { return DerivedAlgorithm::Reduce(input, initialValue,vtkm::Add()); } template - VTKM_CONT_EXPORT static T Reduce( + VTKM_CONT static T Reduce( const vtkm::cont::ArrayHandle &input, T initialValue, BinaryFunctor binary_functor) @@ -309,7 +309,7 @@ public: //-------------------------------------------------------------------------- // Streaming Reduce template - VTKM_CONT_EXPORT static T StreamingReduce( + VTKM_CONT static T StreamingReduce( const vtkm::Id numBlocks, const vtkm::cont::ArrayHandle& input, T initialValue) @@ -318,7 +318,7 @@ public: } template - VTKM_CONT_EXPORT static T StreamingReduce( + VTKM_CONT static T StreamingReduce( const vtkm::Id numBlocks, const vtkm::cont::ArrayHandle& input, T initialValue, @@ -351,7 +351,7 @@ public: // Reduce By Key template - VTKM_CONT_EXPORT static void ReduceByKey( + VTKM_CONT static void ReduceByKey( const vtkm::cont::ArrayHandle &keys, const vtkm::cont::ArrayHandle &values, vtkm::cont::ArrayHandle &keys_output, @@ -434,7 +434,7 @@ public: //-------------------------------------------------------------------------- // Scan Exclusive template - VTKM_CONT_EXPORT static T ScanExclusive( + VTKM_CONT static T ScanExclusive( const vtkm::cont::ArrayHandle& input, vtkm::cont::ArrayHandle& output, BinaryFunctor binaryFunctor, @@ -470,7 +470,7 @@ public: } template - VTKM_CONT_EXPORT static T ScanExclusive( + VTKM_CONT static T ScanExclusive( const vtkm::cont::ArrayHandle& input, vtkm::cont::ArrayHandle& output) { @@ -481,7 +481,7 @@ public: //-------------------------------------------------------------------------- // Streaming exclusive scan template - VTKM_CONT_EXPORT static T StreamingScanExclusive( + VTKM_CONT static T StreamingScanExclusive( const vtkm::Id numBlocks, const vtkm::cont::ArrayHandle& input, vtkm::cont::ArrayHandle& output) @@ -494,7 +494,7 @@ public: } template - VTKM_CONT_EXPORT static T StreamingScanExclusive( + VTKM_CONT static T StreamingScanExclusive( const vtkm::Id numBlocks, const vtkm::cont::ArrayHandle& input, vtkm::cont::ArrayHandle& output, @@ -538,7 +538,7 @@ public: //-------------------------------------------------------------------------- // Scan Inclusive template - VTKM_CONT_EXPORT static T ScanInclusive( + VTKM_CONT static T ScanInclusive( const vtkm::cont::ArrayHandle &input, vtkm::cont::ArrayHandle& output) { @@ -548,7 +548,7 @@ public: } template - VTKM_CONT_EXPORT static T ScanInclusive( + VTKM_CONT static T ScanInclusive( const vtkm::cont::ArrayHandle &input, vtkm::cont::ArrayHandle& output, BinaryFunctor binary_functor) @@ -589,7 +589,7 @@ public: //-------------------------------------------------------------------------- // Sort template - VTKM_CONT_EXPORT static void Sort( + VTKM_CONT static void Sort( vtkm::cont::ArrayHandle &values, BinaryCompare binary_compare) { @@ -624,7 +624,7 @@ public: } template - VTKM_CONT_EXPORT static void Sort( + VTKM_CONT static void Sort( vtkm::cont::ArrayHandle &values) { DerivedAlgorithm::Sort(values, DefaultCompareFunctor()); @@ -635,7 +635,7 @@ public: public: template - VTKM_CONT_EXPORT static void SortByKey( + VTKM_CONT static void SortByKey( vtkm::cont::ArrayHandle &keys, vtkm::cont::ArrayHandle &values) { @@ -652,7 +652,7 @@ public: } template - VTKM_CONT_EXPORT static void SortByKey( + VTKM_CONT static void SortByKey( vtkm::cont::ArrayHandle &keys, vtkm::cont::ArrayHandle &values, BinaryCompare binary_compare) @@ -674,7 +674,7 @@ public: // Stream Compact template - VTKM_CONT_EXPORT static void StreamCompact( + VTKM_CONT static void StreamCompact( const vtkm::cont::ArrayHandle& input, const vtkm::cont::ArrayHandle& stencil, vtkm::cont::ArrayHandle& output, @@ -732,7 +732,7 @@ public: } template - VTKM_CONT_EXPORT static void StreamCompact( + VTKM_CONT static void StreamCompact( const vtkm::cont::ArrayHandle& input, const vtkm::cont::ArrayHandle& stencil, vtkm::cont::ArrayHandle& output) @@ -742,7 +742,7 @@ template } template - VTKM_CONT_EXPORT static void StreamCompact( + VTKM_CONT static void StreamCompact( const vtkm::cont::ArrayHandle &stencil, vtkm::cont::ArrayHandle &output) { @@ -753,14 +753,14 @@ template //-------------------------------------------------------------------------- // Unique template - VTKM_CONT_EXPORT static void Unique( + VTKM_CONT static void Unique( vtkm::cont::ArrayHandle &values) { Unique(values, std::equal_to()); } template - VTKM_CONT_EXPORT static void Unique( + VTKM_CONT static void Unique( vtkm::cont::ArrayHandle &values, BinaryCompare binary_compare) { @@ -793,7 +793,7 @@ template //-------------------------------------------------------------------------- // Upper bounds template - VTKM_CONT_EXPORT static void UpperBounds( + VTKM_CONT static void UpperBounds( const vtkm::cont::ArrayHandle &input, const vtkm::cont::ArrayHandle &values, vtkm::cont::ArrayHandle &output) @@ -812,7 +812,7 @@ template } template - VTKM_CONT_EXPORT static void UpperBounds( + VTKM_CONT static void UpperBounds( const vtkm::cont::ArrayHandle &input, const vtkm::cont::ArrayHandle &values, vtkm::cont::ArrayHandle &output, @@ -834,7 +834,7 @@ template } template - VTKM_CONT_EXPORT static void UpperBounds( + VTKM_CONT static void UpperBounds( const vtkm::cont::ArrayHandle &input, vtkm::cont::ArrayHandle &values_output) { @@ -863,14 +863,14 @@ template class DeviceAdapterAtomicArrayImplementation { public: - VTKM_CONT_EXPORT + VTKM_CONT DeviceAdapterAtomicArrayImplementation( vtkm::cont::ArrayHandle handle): Iterators( IteratorsType( handle.PrepareForInPlace(DeviceTag()) ) ) { } - VTKM_EXEC_EXPORT + VTKM_EXEC T Add(vtkm::Id index, const T& value) const { T* lockedValue; @@ -886,7 +886,7 @@ public: #endif } - VTKM_EXEC_EXPORT + VTKM_EXEC T CompareAndSwap(vtkm::Id index, const T& newValue, const T& oldValue) const { T* lockedValue; @@ -909,25 +909,25 @@ private: IteratorsType Iterators; #if defined(VTKM_MSVC) //MSVC atomics - VTKM_EXEC_EXPORT + VTKM_EXEC vtkm::Int32 vtkmAtomicAdd(vtkm::Int32 *address, const vtkm::Int32 &value) const { return InterlockedExchangeAdd(reinterpret_cast(address),value); } - VTKM_EXEC_EXPORT + VTKM_EXEC vtkm::Int64 vtkmAtomicAdd(vtkm::Int64 *address, const vtkm::Int64 &value) const { return InterlockedExchangeAdd64(reinterpret_cast(address),value); } - VTKM_EXEC_EXPORT + VTKM_EXEC vtkm::Int32 vtkmCompareAndSwap(vtkm::Int32 *address, const vtkm::Int32 &newValue, const vtkm::Int32 &oldValue) const { return InterlockedCompareExchange(reinterpret_cast(address),newValue,oldValue); } - VTKM_EXEC_EXPORT + VTKM_EXEC vtkm::Int64 vtkmCompareAndSwap(vtkm::Int64 *address,const vtkm::Int64 &newValue, const vtkm::Int64 &oldValue) const { return InterlockedCompareExchange64(reinterpret_cast(address),newValue, oldValue); @@ -935,25 +935,25 @@ private: #else //gcc built-in atomics - VTKM_EXEC_EXPORT + VTKM_EXEC vtkm::Int32 vtkmAtomicAdd(vtkm::Int32 *address, const vtkm::Int32 &value) const { return __sync_fetch_and_add(address,value); } - VTKM_EXEC_EXPORT + VTKM_EXEC vtkm::Int64 vtkmAtomicAdd(vtkm::Int64 *address, const vtkm::Int64 &value) const { return __sync_fetch_and_add(address,value); } - VTKM_EXEC_EXPORT + VTKM_EXEC vtkm::Int32 vtkmCompareAndSwap(vtkm::Int32 *address, const vtkm::Int32 &newValue, const vtkm::Int32 &oldValue) const { return __sync_val_compare_and_swap(address,oldValue, newValue); } - VTKM_EXEC_EXPORT + VTKM_EXEC vtkm::Int64 vtkmCompareAndSwap(vtkm::Int64 *address,const vtkm::Int64 &newValue, const vtkm::Int64 &oldValue) const { return __sync_val_compare_and_swap(address,oldValue,newValue); diff --git a/vtkm/cont/internal/DynamicTransform.h b/vtkm/cont/internal/DynamicTransform.h index 5fe7ee2ed..630eb5c02 100644 --- a/vtkm/cont/internal/DynamicTransform.h +++ b/vtkm/cont/internal/DynamicTransform.h @@ -86,7 +86,7 @@ struct DynamicTransform template - VTKM_CONT_EXPORT + VTKM_CONT void operator()(const InputType &input, const ContinueFunctor &continueFunc, vtkm::internal::IndexTag) const @@ -99,7 +99,7 @@ struct DynamicTransform private: template - VTKM_CONT_EXPORT + VTKM_CONT void DoTransform(const InputType &input, const ContinueFunctor &continueFunc, vtkm::cont::internal::DynamicTransformTagStatic) const @@ -108,7 +108,7 @@ private: } template - VTKM_CONT_EXPORT + VTKM_CONT void DoTransform(const InputType &dynamicInput, const ContinueFunctor &continueFunc, vtkm::cont::internal::DynamicTransformTagCastAndCall) const diff --git a/vtkm/cont/internal/FunctorsGeneral.h b/vtkm/cont/internal/FunctorsGeneral.h index c5cbe03ae..a79368048 100644 --- a/vtkm/cont/internal/FunctorsGeneral.h +++ b/vtkm/cont/internal/FunctorsGeneral.h @@ -42,19 +42,19 @@ struct WrappedBinaryOperator { Function m_f; - VTKM_CONT_EXPORT + VTKM_CONT WrappedBinaryOperator(const Function &f) : m_f(f) {} template - VTKM_CONT_EXPORT ResultType operator()(const Argument1 &x, const Argument2 &y) const + VTKM_CONT ResultType operator()(const Argument1 &x, const Argument2 &y) const { return m_f(x, y); } template - VTKM_CONT_EXPORT ResultType operator()( + VTKM_CONT ResultType operator()( const detail::IteratorFromArrayPortalValue &x, const detail::IteratorFromArrayPortalValue &y) const { @@ -66,7 +66,7 @@ struct WrappedBinaryOperator } template - VTKM_CONT_EXPORT ResultType operator()( + VTKM_CONT ResultType operator()( const Argument1 &x, const detail::IteratorFromArrayPortalValue &y) const { @@ -76,7 +76,7 @@ struct WrappedBinaryOperator } template - VTKM_CONT_EXPORT ResultType operator()( + VTKM_CONT ResultType operator()( const detail::IteratorFromArrayPortalValue &x, const Argument2 &y) const { @@ -92,7 +92,7 @@ struct DefaultCompareFunctor { template - VTKM_EXEC_EXPORT + VTKM_EXEC bool operator()(const T& first, const T& second) const { return first < second; @@ -107,7 +107,7 @@ struct KeyCompare explicit KeyCompare(BinaryCompare c): CompareFunctor(c) {} VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_EXPORT + VTKM_EXEC bool operator()(const vtkm::Pair& a, const vtkm::Pair& b) const { return CompareFunctor(a.first,b.first); @@ -125,7 +125,7 @@ struct ReduceKernel : vtkm::exec::FunctorBase BinaryFunctor BinaryOperator; vtkm::Id PortalLength; - VTKM_CONT_EXPORT + VTKM_CONT ReduceKernel() : Portal(), BinaryOperator(), @@ -133,7 +133,7 @@ struct ReduceKernel : vtkm::exec::FunctorBase { } - VTKM_CONT_EXPORT + VTKM_CONT ReduceKernel(const PortalConstType &portal, BinaryFunctor binary_functor) : Portal(portal), BinaryOperator(binary_functor), @@ -141,7 +141,7 @@ struct ReduceKernel : vtkm::exec::FunctorBase { } VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_EXPORT + VTKM_EXEC T operator()(vtkm::Id index) const { const vtkm::Id reduceWidth = 16; @@ -189,7 +189,7 @@ struct ReduceStencilGeneration : vtkm::exec::FunctorBase InputPortalType Input; KeyStatePortalType KeyState; - VTKM_CONT_EXPORT + VTKM_CONT ReduceStencilGeneration(const InputPortalType &input, const KeyStatePortalType &kstate) : Input(input), @@ -197,7 +197,7 @@ struct ReduceStencilGeneration : vtkm::exec::FunctorBase { } VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(vtkm::Id centerIndex) const { typedef typename InputPortalType::ValueType ValueType; @@ -295,7 +295,7 @@ struct CopyKernel vtkm::Id InputOffset; vtkm::Id OutputOffset; - VTKM_CONT_EXPORT + VTKM_CONT CopyKernel(InputPortalType inputPortal, OutputPortalType outputPortal, vtkm::Id inputOffset = 0, @@ -307,7 +307,7 @@ struct CopyKernel { } VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT void operator()(vtkm::Id index) const { typedef typename OutputPortalType::ValueType ValueType; @@ -317,7 +317,7 @@ struct CopyKernel this->InputPortal.Get(index + this->InputOffset)) ); } - VTKM_CONT_EXPORT + VTKM_CONT void SetErrorMessageBuffer(const vtkm::exec::internal::ErrorMessageBuffer &) { } }; @@ -329,7 +329,7 @@ struct LowerBoundsKernel ValuesPortalType ValuesPortal; OutputPortalType OutputPortal; - VTKM_CONT_EXPORT + VTKM_CONT LowerBoundsKernel(InputPortalType inputPortal, ValuesPortalType valuesPortal, OutputPortalType outputPortal) @@ -338,12 +338,12 @@ struct LowerBoundsKernel OutputPortal(outputPortal) { } VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(vtkm::Id index) const { // This method assumes that (1) InputPortalType can return working // iterators in the execution environment and that (2) methods not - // specified with VTKM_EXEC_EXPORT (such as the STL algorithms) can be + // specified with VTKM_EXEC (such as the STL algorithms) can be // called from the execution environment. Neither one of these is // necessarily true, but it is true for the current uses of this general // function and I don't want to compete with STL if I don't have to. @@ -362,7 +362,7 @@ struct LowerBoundsKernel this->OutputPortal.Set(index, resultIndex); } - VTKM_CONT_EXPORT + VTKM_CONT void SetErrorMessageBuffer(const vtkm::exec::internal::ErrorMessageBuffer &) { } }; @@ -376,7 +376,7 @@ struct LowerBoundsComparisonKernel OutputPortalType OutputPortal; BinaryCompare CompareFunctor; - VTKM_CONT_EXPORT + VTKM_CONT LowerBoundsComparisonKernel(InputPortalType inputPortal, ValuesPortalType valuesPortal, OutputPortalType outputPortal, @@ -387,12 +387,12 @@ struct LowerBoundsComparisonKernel CompareFunctor(binary_compare) { } VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(vtkm::Id index) const { // This method assumes that (1) InputPortalType can return working // iterators in the execution environment and that (2) methods not - // specified with VTKM_EXEC_EXPORT (such as the STL algorithms) can be + // specified with VTKM_EXEC (such as the STL algorithms) can be // called from the execution environment. Neither one of these is // necessarily true, but it is true for the current uses of this general // function and I don't want to compete with STL if I don't have to. @@ -412,7 +412,7 @@ struct LowerBoundsComparisonKernel this->OutputPortal.Set(index, resultIndex); } - VTKM_CONT_EXPORT + VTKM_CONT void SetErrorMessageBuffer(const vtkm::exec::internal::ErrorMessageBuffer &) { } }; @@ -425,18 +425,18 @@ struct SetConstantKernel PortalType Portal; ValueType Value; - VTKM_CONT_EXPORT + VTKM_CONT SetConstantKernel(const PortalType &portal, ValueType value) : Portal(portal), Value(value) { } VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(vtkm::Id index) const { this->Portal.Set(index, this->Value); } - VTKM_CONT_EXPORT + VTKM_CONT void SetErrorMessageBuffer(const vtkm::exec::internal::ErrorMessageBuffer &) { } }; @@ -448,14 +448,14 @@ struct BitonicSortMergeKernel : vtkm::exec::FunctorBase BinaryCompare Compare; vtkm::Id GroupSize; - VTKM_CONT_EXPORT + VTKM_CONT BitonicSortMergeKernel(const PortalType &portal, const BinaryCompare &compare, vtkm::Id groupSize) : Portal(portal), Compare(compare), GroupSize(groupSize) { } VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(vtkm::Id index) const { typedef typename PortalType::ValueType ValueType; @@ -487,14 +487,14 @@ struct BitonicSortCrossoverKernel : vtkm::exec::FunctorBase BinaryCompare Compare; vtkm::Id GroupSize; - VTKM_CONT_EXPORT + VTKM_CONT BitonicSortCrossoverKernel(const PortalType &portal, const BinaryCompare &compare, vtkm::Id groupSize) : Portal(portal), Compare(compare), GroupSize(groupSize) { } VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(vtkm::Id index) const { typedef typename PortalType::ValueType ValueType; @@ -529,7 +529,7 @@ struct StencilToIndexFlagKernel OutputPortalType OutputPortal; UnaryPredicate Predicate; - VTKM_CONT_EXPORT + VTKM_CONT StencilToIndexFlagKernel(StencilPortalType stencilPortal, OutputPortalType outputPortal, UnaryPredicate unary_predicate) @@ -538,14 +538,14 @@ struct StencilToIndexFlagKernel Predicate(unary_predicate) { } VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(vtkm::Id index) const { StencilValueType value = this->StencilPortal.Get(index); this->OutputPortal.Set(index, this->Predicate(value) ? 1 : 0); } - VTKM_CONT_EXPORT + VTKM_CONT void SetErrorMessageBuffer(const vtkm::exec::internal::ErrorMessageBuffer &) { } }; @@ -563,7 +563,7 @@ struct CopyIfKernel OutputPortalType OutputPortal; PredicateOperator Predicate; - VTKM_CONT_EXPORT + VTKM_CONT CopyIfKernel(InputPortalType inputPortal, StencilPortalType stencilPortal, IndexPortalType indexPortal, @@ -576,7 +576,7 @@ struct CopyIfKernel Predicate(unary_predicate) { } VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(vtkm::Id index) const { typedef typename StencilPortalType::ValueType StencilValueType; @@ -592,7 +592,7 @@ struct CopyIfKernel } } - VTKM_CONT_EXPORT + VTKM_CONT void SetErrorMessageBuffer(const vtkm::exec::internal::ErrorMessageBuffer &) { } }; @@ -603,13 +603,13 @@ struct ClassifyUniqueKernel InputPortalType InputPortal; StencilPortalType StencilPortal; - VTKM_CONT_EXPORT + VTKM_CONT ClassifyUniqueKernel(InputPortalType inputPortal, StencilPortalType stencilPortal) : InputPortal(inputPortal), StencilPortal(stencilPortal) { } VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(vtkm::Id index) const { typedef typename StencilPortalType::ValueType ValueType; @@ -626,7 +626,7 @@ struct ClassifyUniqueKernel } } - VTKM_CONT_EXPORT + VTKM_CONT void SetErrorMessageBuffer(const vtkm::exec::internal::ErrorMessageBuffer &) { } }; @@ -638,7 +638,7 @@ struct ClassifyUniqueComparisonKernel StencilPortalType StencilPortal; BinaryCompare CompareFunctor; - VTKM_CONT_EXPORT + VTKM_CONT ClassifyUniqueComparisonKernel(InputPortalType inputPortal, StencilPortalType stencilPortal, BinaryCompare binary_compare): @@ -647,7 +647,7 @@ struct ClassifyUniqueComparisonKernel CompareFunctor(binary_compare) { } VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(vtkm::Id index) const { typedef typename StencilPortalType::ValueType ValueType; @@ -666,7 +666,7 @@ struct ClassifyUniqueComparisonKernel } } - VTKM_CONT_EXPORT + VTKM_CONT void SetErrorMessageBuffer(const vtkm::exec::internal::ErrorMessageBuffer &) { } }; @@ -678,7 +678,7 @@ struct UpperBoundsKernel ValuesPortalType ValuesPortal; OutputPortalType OutputPortal; - VTKM_CONT_EXPORT + VTKM_CONT UpperBoundsKernel(InputPortalType inputPortal, ValuesPortalType valuesPortal, OutputPortalType outputPortal) @@ -687,12 +687,12 @@ struct UpperBoundsKernel OutputPortal(outputPortal) { } VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(vtkm::Id index) const { // This method assumes that (1) InputPortalType can return working // iterators in the execution environment and that (2) methods not - // specified with VTKM_EXEC_EXPORT (such as the STL algorithms) can be + // specified with VTKM_EXEC (such as the STL algorithms) can be // called from the execution environment. Neither one of these is // necessarily true, but it is true for the current uses of this general // function and I don't want to compete with STL if I don't have to. @@ -711,7 +711,7 @@ struct UpperBoundsKernel this->OutputPortal.Set(index, resultIndex); } - VTKM_CONT_EXPORT + VTKM_CONT void SetErrorMessageBuffer(const vtkm::exec::internal::ErrorMessageBuffer &) { } }; @@ -725,7 +725,7 @@ struct UpperBoundsKernelComparisonKernel OutputPortalType OutputPortal; BinaryCompare CompareFunctor; - VTKM_CONT_EXPORT + VTKM_CONT UpperBoundsKernelComparisonKernel(InputPortalType inputPortal, ValuesPortalType valuesPortal, OutputPortalType outputPortal, @@ -736,12 +736,12 @@ struct UpperBoundsKernelComparisonKernel CompareFunctor(binary_compare) { } VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(vtkm::Id index) const { // This method assumes that (1) InputPortalType can return working // iterators in the execution environment and that (2) methods not - // specified with VTKM_EXEC_EXPORT (such as the STL algorithms) can be + // specified with VTKM_EXEC (such as the STL algorithms) can be // called from the execution environment. Neither one of these is // necessarily true, but it is true for the current uses of this general // function and I don't want to compete with STL if I don't have to. @@ -761,7 +761,7 @@ struct UpperBoundsKernelComparisonKernel this->OutputPortal.Set(index, resultIndex); } - VTKM_CONT_EXPORT + VTKM_CONT void SetErrorMessageBuffer(const vtkm::exec::internal::ErrorMessageBuffer &) { } }; @@ -776,7 +776,7 @@ struct InclusiveToExclusiveKernel : vtkm::exec::FunctorBase BinaryFunctor BinaryOperator; ValueType InitialValue; - VTKM_CONT_EXPORT + VTKM_CONT InclusiveToExclusiveKernel(const InPortalType &inPortal, const OutPortalType &outPortal, BinaryFunctor &binaryOperator, @@ -788,7 +788,7 @@ struct InclusiveToExclusiveKernel : vtkm::exec::FunctorBase { } VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(vtkm::Id index) const { ValueType result = (index == 0) ? this->InitialValue : @@ -806,7 +806,7 @@ struct ScanKernel : vtkm::exec::FunctorBase vtkm::Id Offset; vtkm::Id Distance; - VTKM_CONT_EXPORT + VTKM_CONT ScanKernel(const PortalType &portal, BinaryFunctor binary_functor, vtkm::Id stride, vtkm::Id offset) : Portal(portal), @@ -817,7 +817,7 @@ struct ScanKernel : vtkm::exec::FunctorBase { } VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(vtkm::Id index) const { typedef typename PortalType::ValueType ValueType; diff --git a/vtkm/cont/internal/IteratorFromArrayPortal.h b/vtkm/cont/internal/IteratorFromArrayPortal.h index c9961c4f7..ea82ef1f1 100644 --- a/vtkm/cont/internal/IteratorFromArrayPortal.h +++ b/vtkm/cont/internal/IteratorFromArrayPortal.h @@ -34,11 +34,11 @@ struct IteratorFromArrayPortalValue { typedef typename ArrayPortalType::ValueType ValueType; - VTKM_CONT_EXPORT + VTKM_CONT IteratorFromArrayPortalValue(const ArrayPortalType &portal, vtkm::Id index) : Portal(portal), Index(index) { } - VTKM_CONT_EXPORT + VTKM_CONT void Swap( IteratorFromArrayPortalValue &rhs ) throw() { //we need use the explicit type not a proxy temp object @@ -49,7 +49,7 @@ struct IteratorFromArrayPortalValue rhs = aValue; } - VTKM_CONT_EXPORT + VTKM_CONT IteratorFromArrayPortalValue &operator=( const IteratorFromArrayPortalValue &rhs) { @@ -57,14 +57,14 @@ struct IteratorFromArrayPortalValue return *this; } - VTKM_CONT_EXPORT + VTKM_CONT ValueType operator=(const ValueType& value) { this->Portal.Set(this->Index, value); return value; } - VTKM_CONT_EXPORT + VTKM_CONT operator ValueType(void) const { return this->Portal.Get(this->Index); diff --git a/vtkm/cont/internal/RuntimeDeviceTracker.h b/vtkm/cont/internal/RuntimeDeviceTracker.h index 770d72a2d..3e3886ba2 100644 --- a/vtkm/cont/internal/RuntimeDeviceTracker.h +++ b/vtkm/cont/internal/RuntimeDeviceTracker.h @@ -44,7 +44,7 @@ namespace internal { class RuntimeDeviceTracker { public: - VTKM_CONT_EXPORT + VTKM_CONT RuntimeDeviceTracker() { this->Reset(); @@ -54,7 +54,7 @@ public: /// machine. /// template - VTKM_CONT_EXPORT + VTKM_CONT bool CanRunOn(DeviceAdapterTag) const { typedef vtkm::cont::DeviceAdapterTraits Traits; @@ -65,7 +65,7 @@ public: ///as being unusable for all future invocations of the instance of the filter. /// template - VTKM_CONT_EXPORT + VTKM_CONT void ReportAllocationFailure(DeviceAdapterTag, const vtkm::cont::ErrorControlBadAllocation&) { @@ -76,7 +76,7 @@ public: ///Reset the tracker to its default state. /// Will discard any updates caused by reported failures. /// - VTKM_CONT_EXPORT + VTKM_CONT void Reset() { std::memset(this->RuntimeValid, 0, sizeof(bool)*8 ); diff --git a/vtkm/cont/internal/SimplePolymorphicContainer.h b/vtkm/cont/internal/SimplePolymorphicContainer.h index 7bc5ece24..63f29be00 100644 --- a/vtkm/cont/internal/SimplePolymorphicContainer.h +++ b/vtkm/cont/internal/SimplePolymorphicContainer.h @@ -53,10 +53,10 @@ struct SimplePolymorphicContainer : public SimplePolymorphicContainerBase { T Item; - VTKM_CONT_EXPORT + VTKM_CONT SimplePolymorphicContainer() : Item() { } - VTKM_CONT_EXPORT + VTKM_CONT SimplePolymorphicContainer(const T &src) : Item(src) { } virtual std::shared_ptr NewInstance() const diff --git a/vtkm/cont/serial/internal/ArrayManagerExecutionSerial.h b/vtkm/cont/serial/internal/ArrayManagerExecutionSerial.h index b606614ed..28c47be8c 100644 --- a/vtkm/cont/serial/internal/ArrayManagerExecutionSerial.h +++ b/vtkm/cont/serial/internal/ArrayManagerExecutionSerial.h @@ -40,7 +40,7 @@ public: typedef typename Superclass::PortalType PortalType; typedef typename Superclass::PortalConstType PortalConstType; - VTKM_CONT_EXPORT + VTKM_CONT ArrayManagerExecution(typename Superclass::StorageType *storage) : Superclass(storage) { } }; diff --git a/vtkm/cont/serial/internal/DeviceAdapterAlgorithmSerial.h b/vtkm/cont/serial/internal/DeviceAdapterAlgorithmSerial.h index c21da89eb..675a9aa82 100644 --- a/vtkm/cont/serial/internal/DeviceAdapterAlgorithmSerial.h +++ b/vtkm/cont/serial/internal/DeviceAdapterAlgorithmSerial.h @@ -50,14 +50,14 @@ private: public: template - VTKM_CONT_EXPORT static T Reduce( + VTKM_CONT static T Reduce( const vtkm::cont::ArrayHandle &input, T initialValue) { return Reduce(input, initialValue,vtkm::Add()); } template - VTKM_CONT_EXPORT static T Reduce( + VTKM_CONT static T Reduce( const vtkm::cont::ArrayHandle &input, T initialValue, BinaryFunctor binary_functor) @@ -75,7 +75,7 @@ public: template - VTKM_CONT_EXPORT static void ReduceByKey( + VTKM_CONT static void ReduceByKey( const vtkm::cont::ArrayHandle &keys, const vtkm::cont::ArrayHandle &values, vtkm::cont::ArrayHandle &keys_output, @@ -136,7 +136,7 @@ public: } template - VTKM_CONT_EXPORT static T ScanInclusive( + VTKM_CONT static T ScanInclusive( const vtkm::cont::ArrayHandle &input, vtkm::cont::ArrayHandle& output) { @@ -161,7 +161,7 @@ public: } template - VTKM_CONT_EXPORT static T ScanInclusive( + VTKM_CONT static T ScanInclusive( const vtkm::cont::ArrayHandle &input, vtkm::cont::ArrayHandle& output, BinaryFunctor binary_functor) @@ -191,7 +191,7 @@ public: } template - VTKM_CONT_EXPORT static T ScanExclusive( + VTKM_CONT static T ScanExclusive( const vtkm::cont::ArrayHandle &input, vtkm::cont::ArrayHandle& output, BinaryFunctor binaryFunctor, @@ -235,7 +235,7 @@ public: } template - VTKM_CONT_EXPORT static T ScanExclusive( + VTKM_CONT static T ScanExclusive( const vtkm::cont::ArrayHandle &input, vtkm::cont::ArrayHandle& output) { @@ -254,7 +254,7 @@ private: //needed for when calling from schedule on a range template - VTKM_EXEC_EXPORT void operator()(const T& index) const + VTKM_EXEC void operator()(const T& index) const { this->Functor(index); } @@ -265,7 +265,7 @@ private: public: template - VTKM_CONT_EXPORT static void Schedule(Functor functor, vtkm::Id numInstances) + VTKM_CONT static void Schedule(Functor functor, vtkm::Id numInstances) { const vtkm::Id MESSAGE_SIZE = 1024; char errorString[MESSAGE_SIZE]; @@ -293,7 +293,7 @@ VTKM_VECTORIZATION_IN_LOOP } template - VTKM_CONT_EXPORT + VTKM_CONT static void Schedule(Functor functor, vtkm::Id3 rangeMax) { const vtkm::Id MESSAGE_SIZE = 1024; @@ -326,7 +326,7 @@ VTKM_VECTORIZATION_IN_LOOP private: template - VTKM_CONT_EXPORT static void Scatter( + VTKM_CONT static void Scatter( vtkm::cont::ArrayHandle &values, vtkm::cont::ArrayHandle &index, vtkm::cont::ArrayHandle &values_out @@ -355,7 +355,7 @@ private: private: /// Reorder the value array along with the sorting algorithm template - VTKM_CONT_EXPORT static void SortByKeyDirect( + VTKM_CONT static void SortByKeyDirect( vtkm::cont::ArrayHandle &keys, vtkm::cont::ArrayHandle &values, BinaryCompare binary_compare) @@ -375,7 +375,7 @@ private: public: template - VTKM_CONT_EXPORT static void SortByKey( + VTKM_CONT static void SortByKey( vtkm::cont::ArrayHandle &keys, vtkm::cont::ArrayHandle &values) { @@ -383,7 +383,7 @@ public: } template - VTKM_CONT_EXPORT static void SortByKey( + VTKM_CONT static void SortByKey( vtkm::cont::ArrayHandle &keys, vtkm::cont::ArrayHandle &values, const BinaryCompare &binary_compare) @@ -411,13 +411,13 @@ public: } template - VTKM_CONT_EXPORT static void Sort(vtkm::cont::ArrayHandle& values) + VTKM_CONT static void Sort(vtkm::cont::ArrayHandle& values) { Sort(values, std::less()); } template - VTKM_CONT_EXPORT static void Sort(vtkm::cont::ArrayHandle& values, + VTKM_CONT static void Sort(vtkm::cont::ArrayHandle& values, BinaryCompare binary_compare) { typedef typename vtkm::cont::ArrayHandle @@ -431,7 +431,7 @@ public: std::sort(iterators.GetBegin(), iterators.GetEnd(), wrappedCompare); } - VTKM_CONT_EXPORT static void Synchronize() + VTKM_CONT static void Synchronize() { // Nothing to do. This device is serial and has no asynchronous operations. } diff --git a/vtkm/cont/tbb/internal/ArrayManagerExecutionTBB.h b/vtkm/cont/tbb/internal/ArrayManagerExecutionTBB.h index ff3a45dbf..c931fb419 100644 --- a/vtkm/cont/tbb/internal/ArrayManagerExecutionTBB.h +++ b/vtkm/cont/tbb/internal/ArrayManagerExecutionTBB.h @@ -46,23 +46,23 @@ public: typedef typename Superclass::PortalConstType PortalConstType; typedef typename Superclass::StorageType StorageType; - VTKM_CONT_EXPORT + VTKM_CONT ArrayManagerExecution(StorageType *storage) : Superclass(storage) { } - VTKM_CONT_EXPORT + VTKM_CONT PortalConstType PrepareForInput(bool updateData) { return this->Superclass::PrepareForInput(updateData); } - VTKM_CONT_EXPORT + VTKM_CONT PortalType PrepareForInPlace(bool updateData) { return this->Superclass::PrepareForInPlace(updateData); } - VTKM_CONT_EXPORT + VTKM_CONT PortalType PrepareForOutput(vtkm::Id numberOfValues) { return this->Superclass::PrepareForOutput(numberOfValues); diff --git a/vtkm/cont/tbb/internal/DeviceAdapterAlgorithmTBB.h b/vtkm/cont/tbb/internal/DeviceAdapterAlgorithmTBB.h index 0f0f9413e..650a4e0ff 100644 --- a/vtkm/cont/tbb/internal/DeviceAdapterAlgorithmTBB.h +++ b/vtkm/cont/tbb/internal/DeviceAdapterAlgorithmTBB.h @@ -87,7 +87,7 @@ struct DeviceAdapterAlgorithm : { public: template - VTKM_CONT_EXPORT static T ScanInclusive( + VTKM_CONT static T ScanInclusive( const vtkm::cont::ArrayHandle &input, vtkm::cont::ArrayHandle &output) { @@ -98,7 +98,7 @@ public: } template - VTKM_CONT_EXPORT static T ScanInclusive( + VTKM_CONT static T ScanInclusive( const vtkm::cont::ArrayHandle &input, vtkm::cont::ArrayHandle &output, BinaryFunctor binary_functor) @@ -110,7 +110,7 @@ public: } template - VTKM_CONT_EXPORT static T ScanExclusive( + VTKM_CONT static T ScanExclusive( const vtkm::cont::ArrayHandle &input, vtkm::cont::ArrayHandle &output) { @@ -122,7 +122,7 @@ public: } template - VTKM_CONT_EXPORT static T ScanExclusive( + VTKM_CONT static T ScanExclusive( const vtkm::cont::ArrayHandle &input, vtkm::cont::ArrayHandle &output, BinaryFunctor binary_functor, @@ -135,7 +135,7 @@ public: } template - VTKM_CONT_EXPORT + VTKM_CONT static void Schedule(FunctorType functor, vtkm::Id numInstances) { const vtkm::Id MESSAGE_SIZE = 1024; @@ -158,7 +158,7 @@ public: } template - VTKM_CONT_EXPORT + VTKM_CONT static void Schedule(FunctorType functor, vtkm::Id3 rangeMax) { @@ -187,7 +187,7 @@ public: } template - VTKM_CONT_EXPORT static void Sort( + VTKM_CONT static void Sort( vtkm::cont::ArrayHandle &values) { //this is required to get sort to work with zip handles @@ -196,7 +196,7 @@ public: } template - VTKM_CONT_EXPORT static void Sort( + VTKM_CONT static void Sort( vtkm::cont::ArrayHandle &values, BinaryCompare binary_compare) { typedef typename vtkm::cont::ArrayHandle::template @@ -214,7 +214,7 @@ public: } template - VTKM_CONT_EXPORT static void SortByKey( + VTKM_CONT static void SortByKey( vtkm::cont::ArrayHandle &keys, vtkm::cont::ArrayHandle &values) { @@ -224,7 +224,7 @@ public: template - VTKM_CONT_EXPORT static void SortByKey( + VTKM_CONT static void SortByKey( vtkm::cont::ArrayHandle& keys, vtkm::cont::ArrayHandle& values, Compare comp) @@ -265,7 +265,7 @@ public: } } - VTKM_CONT_EXPORT static void Synchronize() + VTKM_CONT static void Synchronize() { // Nothing to do. This device schedules all of its operations using a // split/join paradigm. This means that the if the control threaad is @@ -281,17 +281,17 @@ template<> class DeviceAdapterTimerImplementation { public: - VTKM_CONT_EXPORT DeviceAdapterTimerImplementation() + VTKM_CONT DeviceAdapterTimerImplementation() { this->Reset(); } - VTKM_CONT_EXPORT void Reset() + VTKM_CONT void Reset() { vtkm::cont::DeviceAdapterAlgorithm< vtkm::cont::DeviceAdapterTagTBB>::Synchronize(); this->StartTime = ::tbb::tick_count::now(); } - VTKM_CONT_EXPORT vtkm::Float64 GetElapsedTime() + VTKM_CONT vtkm::Float64 GetElapsedTime() { vtkm::cont::DeviceAdapterAlgorithm< vtkm::cont::DeviceAdapterTagTBB>::Synchronize(); diff --git a/vtkm/cont/tbb/internal/FunctorsTBB.h b/vtkm/cont/tbb/internal/FunctorsTBB.h index 75ccc5cfa..936659689 100644 --- a/vtkm/cont/tbb/internal/FunctorsTBB.h +++ b/vtkm/cont/tbb/internal/FunctorsTBB.h @@ -83,7 +83,7 @@ struct ScanInclusiveBody OutputPortalType OutputPortal; BinaryOperationType BinaryOperation; - VTKM_CONT_EXPORT + VTKM_CONT ScanInclusiveBody(const InputPortalType &inputPortal, const OutputPortalType &outputPortal, BinaryOperationType binaryOperation) @@ -94,7 +94,7 @@ struct ScanInclusiveBody BinaryOperation(binaryOperation) { } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT ScanInclusiveBody(const ScanInclusiveBody &body, ::tbb::split) : Sum( vtkm::TypeTraits::ZeroInitialization() ), FirstCall(true), @@ -103,7 +103,7 @@ struct ScanInclusiveBody BinaryOperation(body.BinaryOperation) { } VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(const ::tbb::blocked_range &range, ::tbb::pre_scan_tag) { typedef vtkm::cont::ArrayPortalToIterators @@ -125,7 +125,7 @@ struct ScanInclusiveBody } VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(const ::tbb::blocked_range &range, ::tbb::final_scan_tag) { typedef vtkm::cont::ArrayPortalToIterators @@ -154,14 +154,14 @@ struct ScanInclusiveBody } VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT void reverse_join(const ScanInclusiveBody &left) { this->Sum = this->BinaryOperation(left.Sum, this->Sum); } VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT void assign(const ScanInclusiveBody &src) { this->Sum = src.Sum; @@ -182,7 +182,7 @@ struct ScanExclusiveBody OutputPortalType OutputPortal; BinaryOperationType BinaryOperation; - VTKM_CONT_EXPORT + VTKM_CONT ScanExclusiveBody(const InputPortalType &inputPortal, const OutputPortalType &outputPortal, BinaryOperationType binaryOperation, @@ -194,7 +194,7 @@ struct ScanExclusiveBody BinaryOperation(binaryOperation) { } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT ScanExclusiveBody(const ScanExclusiveBody &body, ::tbb::split) : Sum(body.InitialValue), InitialValue(body.InitialValue), @@ -204,7 +204,7 @@ struct ScanExclusiveBody { } VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(const ::tbb::blocked_range &range, ::tbb::pre_scan_tag) { typedef vtkm::cont::ArrayPortalToIterators @@ -223,7 +223,7 @@ struct ScanExclusiveBody } VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(const ::tbb::blocked_range &range, ::tbb::final_scan_tag) { typedef vtkm::cont::ArrayPortalToIterators @@ -253,14 +253,14 @@ struct ScanExclusiveBody } VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT void reverse_join(const ScanExclusiveBody &left) { this->Sum = this->BinaryOperation(left.Sum, this->Sum); } VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT void assign(const ScanExclusiveBody &src) { this->Sum = src.Sum; @@ -270,7 +270,7 @@ struct ScanExclusiveBody template VTKM_SUPPRESS_EXEC_WARNINGS -VTKM_CONT_EXPORT static +VTKM_CONT static typename std::remove_reference::type ScanInclusivePortals(InputPortalType inputPortal, OutputPortalType outputPortal, @@ -295,7 +295,7 @@ ScanInclusivePortals(InputPortalType inputPortal, template VTKM_SUPPRESS_EXEC_WARNINGS -VTKM_CONT_EXPORT static +VTKM_CONT static typename std::remove_reference::type ScanExclusivePortals(InputPortalType inputPortal, OutputPortalType outputPortal, @@ -326,18 +326,18 @@ template class ScheduleKernel { public: - VTKM_CONT_EXPORT ScheduleKernel(const FunctorType &functor) + VTKM_CONT ScheduleKernel(const FunctorType &functor) : Functor(functor) { } - VTKM_CONT_EXPORT void SetErrorMessageBuffer( + VTKM_CONT void SetErrorMessageBuffer( const vtkm::exec::internal::ErrorMessageBuffer &errorMessage) { this->ErrorMessage = errorMessage; this->Functor.SetErrorMessageBuffer(errorMessage); } - VTKM_CONT_EXPORT + VTKM_CONT void operator()(const ::tbb::blocked_range &range) const { // The TBB device adapter causes array classes to be shared between // control and execution environment. This means that it is possible for @@ -376,20 +376,20 @@ template class ScheduleKernelId3 { public: - VTKM_CONT_EXPORT ScheduleKernelId3(const FunctorType &functor, + VTKM_CONT ScheduleKernelId3(const FunctorType &functor, const vtkm::Id3& dims) : Functor(functor), Dims(dims) { } - VTKM_CONT_EXPORT void SetErrorMessageBuffer( + VTKM_CONT void SetErrorMessageBuffer( const vtkm::exec::internal::ErrorMessageBuffer &errorMessage) { this->ErrorMessage = errorMessage; this->Functor.SetErrorMessageBuffer(errorMessage); } - VTKM_CONT_EXPORT + VTKM_CONT void operator()(const ::tbb::blocked_range3d &range) const { try { @@ -430,7 +430,7 @@ template &range) const { // The TBB device adapter causes array classes to be shared between @@ -477,7 +477,7 @@ template VTKM_SUPPRESS_EXEC_WARNINGS -VTKM_CONT_EXPORT static void ScatterPortal(InputPortalType inputPortal, +VTKM_CONT static void ScatterPortal(InputPortalType inputPortal, IndexPortalType indexPortal, OutputPortalType outputPortal) { diff --git a/vtkm/cont/testing/Testing.h b/vtkm/cont/testing/Testing.h index 39484b416..f3b1c834d 100644 --- a/vtkm/cont/testing/Testing.h +++ b/vtkm/cont/testing/Testing.h @@ -32,7 +32,7 @@ struct Testing { public: template - static VTKM_CONT_EXPORT int Run(Func function) + static VTKM_CONT int Run(Func function) { try { diff --git a/vtkm/cont/testing/TestingArrayHandles.h b/vtkm/cont/testing/TestingArrayHandles.h index 952f6bc89..7f1f8d6b3 100644 --- a/vtkm/cont/testing/TestingArrayHandles.h +++ b/vtkm/cont/testing/TestingArrayHandles.h @@ -80,7 +80,7 @@ struct TestingArrayHandles typedef _2 ExecutionSignature(_1); template - VTKM_EXEC_EXPORT + VTKM_EXEC ValueType operator()(const ValueType &inValue) const { return inValue; } @@ -90,10 +90,10 @@ struct TestingArrayHandles struct AssignTestValue : public vtkm::exec::FunctorBase { ExecutionPortalType Portal; - VTKM_CONT_EXPORT + VTKM_CONT AssignTestValue(ExecutionPortalType p): Portal(p) {} - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(vtkm::Id index) const { this->Portal.Set(index, TestValue(index, T()) ); @@ -104,10 +104,10 @@ struct TestingArrayHandles struct InplaceFunctor : public vtkm::exec::FunctorBase { ExecutionPortalType Portal; - VTKM_CONT_EXPORT + VTKM_CONT InplaceFunctor(ExecutionPortalType p): Portal(p) {} - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(vtkm::Id index) const { this->Portal.Set(index, T(this->Portal.Get(index) + T(1))); @@ -124,7 +124,7 @@ private: struct VerifyEmptyArrays { template - VTKM_CONT_EXPORT void operator()(T) const + VTKM_CONT void operator()(T) const { std::cout << "Try operations on empty arrays." << std::endl; // After each operation, reinitialize array in case something gets @@ -150,7 +150,7 @@ private: struct VerifyUserAllocatedHandle { template - VTKM_CONT_EXPORT void operator()(T) const + VTKM_CONT void operator()(T) const { std::vector buffer(ARRAY_SIZE); for (vtkm::Id index = 0; index < ARRAY_SIZE; index++) @@ -269,7 +269,7 @@ private: struct VerifyVTKMAllocatedHandle { template - VTKM_CONT_EXPORT void operator()(T) const + VTKM_CONT void operator()(T) const { vtkm::cont::ArrayHandle arrayHandle; @@ -345,7 +345,7 @@ private: }; public: - static VTKM_CONT_EXPORT int Run() + static VTKM_CONT int Run() { return vtkm::cont::testing::Testing::Run(TryArrayHandleType()); } diff --git a/vtkm/cont/testing/TestingComputeRange.h b/vtkm/cont/testing/TestingComputeRange.h index e5c51a1c2..6acd4b6af 100644 --- a/vtkm/cont/testing/TestingComputeRange.h +++ b/vtkm/cont/testing/TestingComputeRange.h @@ -117,7 +117,7 @@ private: struct TestAll { - VTKM_CONT_EXPORT void operator()() const + VTKM_CONT void operator()() const { std::cout << "Testing (Int32, 1)..." << std::endl; TestingComputeRange::TestScalarField(); @@ -152,7 +152,7 @@ private: }; public: - static VTKM_CONT_EXPORT int Run() + static VTKM_CONT int Run() { return vtkm::cont::testing::Testing::Run(TestAll()); } diff --git a/vtkm/cont/testing/TestingDataSetExplicit.h b/vtkm/cont/testing/TestingDataSetExplicit.h index 367c49520..4b8938c12 100644 --- a/vtkm/cont/testing/TestingDataSetExplicit.h +++ b/vtkm/cont/testing/TestingDataSetExplicit.h @@ -177,14 +177,14 @@ private: struct TestAll { - VTKM_CONT_EXPORT void operator()() const + VTKM_CONT void operator()() const { TestingDataSetExplicit::TestDataSet_Explicit(); } }; public: - static VTKM_CONT_EXPORT int Run() + static VTKM_CONT int Run() { return vtkm::cont::testing::Testing::Run(TestAll()); } diff --git a/vtkm/cont/testing/TestingDataSetSingleType.h b/vtkm/cont/testing/TestingDataSetSingleType.h index 0ce020c2e..e84088b36 100644 --- a/vtkm/cont/testing/TestingDataSetSingleType.h +++ b/vtkm/cont/testing/TestingDataSetSingleType.h @@ -160,14 +160,14 @@ private: struct TestAll { - VTKM_CONT_EXPORT void operator()() const + VTKM_CONT void operator()() const { TestingDataSetSingleType::TestDataSet_SingleType(); } }; public: - static VTKM_CONT_EXPORT int Run() + static VTKM_CONT int Run() { return vtkm::cont::testing::Testing::Run(TestAll()); } diff --git a/vtkm/cont/testing/TestingDeviceAdapter.h b/vtkm/cont/testing/TestingDeviceAdapter.h index 5607be07d..190032e2f 100644 --- a/vtkm/cont/testing/TestingDeviceAdapter.h +++ b/vtkm/cont/testing/TestingDeviceAdapter.h @@ -62,7 +62,7 @@ namespace comparison { struct MaxValue { template - VTKM_EXEC_CONT_EXPORT T operator()(const T& a,const T& b) const + VTKM_EXEC_CONT T operator()(const T& a,const T& b) const { return (a > b) ? a : b; } @@ -110,19 +110,19 @@ public: struct CopyArrayKernel { - VTKM_CONT_EXPORT + VTKM_CONT CopyArrayKernel(const IdPortalConstType &input, const IdPortalType &output) : InputArray(input), OutputArray(output) { } - VTKM_EXEC_EXPORT void operator()( + VTKM_EXEC void operator()( vtkm::Id index, const vtkm::exec::internal::ErrorMessageBuffer &) const { this->OutputArray.Set(index, this->InputArray.Get(index)); } - VTKM_CONT_EXPORT void SetErrorMessageBuffer( + VTKM_CONT void SetErrorMessageBuffer( const vtkm::exec::internal::ErrorMessageBuffer &) { } IdPortalConstType InputArray; @@ -131,19 +131,19 @@ public: struct ClearArrayKernel { - VTKM_CONT_EXPORT + VTKM_CONT ClearArrayKernel(const IdPortalType &array) : Array(array), Dims() { } - VTKM_CONT_EXPORT + VTKM_CONT ClearArrayKernel(const IdPortalType &array, const vtkm::Id3& dims) : Array(array), Dims(dims) { } - VTKM_EXEC_EXPORT void operator()(vtkm::Id index) const + VTKM_EXEC void operator()(vtkm::Id index) const { this->Array.Set(index, OFFSET); } - VTKM_EXEC_EXPORT void operator()(vtkm::Id3 index) const + VTKM_EXEC void operator()(vtkm::Id3 index) const { //convert from id3 to id vtkm::Id flatIndex = @@ -151,7 +151,7 @@ public: this->operator()(flatIndex); } - VTKM_CONT_EXPORT void SetErrorMessageBuffer( + VTKM_CONT void SetErrorMessageBuffer( const vtkm::exec::internal::ErrorMessageBuffer &) { } IdPortalType Array; @@ -165,7 +165,7 @@ public: // typedef void ExecutionSignature(_1); template - VTKM_EXEC_EXPORT void operator()(T& value) const + VTKM_EXEC void operator()(T& value) const { value = OFFSET; } @@ -173,20 +173,20 @@ public: struct AddArrayKernel { - VTKM_CONT_EXPORT + VTKM_CONT AddArrayKernel(const IdPortalType &array) : Array(array), Dims() { } - VTKM_CONT_EXPORT + VTKM_CONT AddArrayKernel(const IdPortalType &array, const vtkm::Id3& dims) : Array(array), Dims(dims) { } - VTKM_EXEC_EXPORT void operator()(vtkm::Id index) const + VTKM_EXEC void operator()(vtkm::Id index) const { this->Array.Set(index, this->Array.Get(index) + index); } - VTKM_EXEC_EXPORT void operator()(vtkm::Id3 index) const + VTKM_EXEC void operator()(vtkm::Id3 index) const { //convert from id3 to id vtkm::Id flatIndex = @@ -194,7 +194,7 @@ public: this->operator()(flatIndex); } - VTKM_CONT_EXPORT void SetErrorMessageBuffer( + VTKM_CONT void SetErrorMessageBuffer( const vtkm::exec::internal::ErrorMessageBuffer &) { } IdPortalType Array; @@ -203,7 +203,7 @@ public: struct OneErrorKernel { - VTKM_EXEC_EXPORT void operator()(vtkm::Id index) const + VTKM_EXEC void operator()(vtkm::Id index) const { if (index == ARRAY_SIZE/2) { @@ -211,7 +211,7 @@ public: } } - VTKM_CONT_EXPORT void SetErrorMessageBuffer( + VTKM_CONT void SetErrorMessageBuffer( const vtkm::exec::internal::ErrorMessageBuffer &errorMessage) { this->ErrorMessage = errorMessage; @@ -222,12 +222,12 @@ public: struct AllErrorKernel { - VTKM_EXEC_EXPORT void operator()(vtkm::Id vtkmNotUsed(index)) const + VTKM_EXEC void operator()(vtkm::Id vtkmNotUsed(index)) const { this->ErrorMessage.RaiseError(ERROR_MESSAGE); } - VTKM_CONT_EXPORT void SetErrorMessageBuffer( + VTKM_CONT void SetErrorMessageBuffer( const vtkm::exec::internal::ErrorMessageBuffer &errorMessage) { this->ErrorMessage = errorMessage; @@ -238,15 +238,15 @@ public: struct OffsetPlusIndexKernel { - VTKM_CONT_EXPORT + VTKM_CONT OffsetPlusIndexKernel(const IdPortalType &array) : Array(array) { } - VTKM_EXEC_EXPORT void operator()(vtkm::Id index) const + VTKM_EXEC void operator()(vtkm::Id index) const { this->Array.Set(index, OFFSET + index); } - VTKM_CONT_EXPORT void SetErrorMessageBuffer( + VTKM_CONT void SetErrorMessageBuffer( const vtkm::exec::internal::ErrorMessageBuffer &) { } IdPortalType Array; @@ -254,15 +254,15 @@ public: struct MarkOddNumbersKernel { - VTKM_CONT_EXPORT + VTKM_CONT MarkOddNumbersKernel(const IdPortalType &array) : Array(array) { } - VTKM_EXEC_EXPORT void operator()(vtkm::Id index) const + VTKM_EXEC void operator()(vtkm::Id index) const { this->Array.Set(index, index%2); } - VTKM_CONT_EXPORT void SetErrorMessageBuffer( + VTKM_CONT void SetErrorMessageBuffer( const vtkm::exec::internal::ErrorMessageBuffer &) { } IdPortalType Array; @@ -271,7 +271,7 @@ public: struct FuseAll { template - VTKM_EXEC_EXPORT bool operator()(const T&, const T&) const + VTKM_EXEC bool operator()(const T&, const T&) const { //binary predicates for unique return true if they are the same return true; @@ -281,18 +281,18 @@ public: template struct AtomicKernel { - VTKM_CONT_EXPORT + VTKM_CONT AtomicKernel(const vtkm::exec::AtomicArray &array) : AArray(array) { } - VTKM_EXEC_EXPORT void operator()(vtkm::Id index) const + VTKM_EXEC void operator()(vtkm::Id index) const { T value = (T) index; this->AArray.Add(0, value); } - VTKM_CONT_EXPORT void SetErrorMessageBuffer( + VTKM_CONT void SetErrorMessageBuffer( const vtkm::exec::internal::ErrorMessageBuffer &) { } vtkm::exec::AtomicArray AArray; @@ -301,12 +301,12 @@ public: template struct AtomicCASKernel { - VTKM_CONT_EXPORT + VTKM_CONT AtomicCASKernel(const vtkm::exec::AtomicArray &array) : AArray(array) { } - VTKM_EXEC_EXPORT void operator()(vtkm::Id index) const + VTKM_EXEC void operator()(vtkm::Id index) const { T value = (T) index; //Get the old value from the array with a no-op @@ -322,7 +322,7 @@ public: } - VTKM_CONT_EXPORT void SetErrorMessageBuffer( + VTKM_CONT void SetErrorMessageBuffer( const vtkm::exec::internal::ErrorMessageBuffer &) { } vtkm::exec::AtomicArray AArray; @@ -331,7 +331,7 @@ public: private: - static VTKM_CONT_EXPORT void TestDeviceAdapterTag() + static VTKM_CONT void TestDeviceAdapterTag() { std::cout << "-------------------------------------------" << std::endl; std::cout << "Testing device adapter tag" << std::endl; @@ -355,7 +355,7 @@ private: // in the execution environment. It tests to make sure data gets to the array // and back, but it is possible that the data is not available in the // execution environment. - static VTKM_CONT_EXPORT void TestArrayManagerExecution() + static VTKM_CONT void TestArrayManagerExecution() { std::cout << "-------------------------------------------" << std::endl; std::cout << "Testing ArrayManagerExecution" << std::endl; @@ -415,7 +415,7 @@ private: } } - static VTKM_CONT_EXPORT void TestOutOfMemory() + static VTKM_CONT void TestOutOfMemory() { // Only test out of memory with 64 bit ids. If there are 32 bit ids on // a 64 bit OS (common), it is simply too hard to get a reliable allocation @@ -449,7 +449,7 @@ private: #endif } - VTKM_CONT_EXPORT + VTKM_CONT static void TestTimer() { std::cout << "-------------------------------------------" << std::endl; @@ -477,7 +477,7 @@ private: "Timer counted too far or system really busy."); } - VTKM_CONT_EXPORT + VTKM_CONT static void TestRuntime() { std::cout << "-------------------------------------------" << std::endl; @@ -489,7 +489,7 @@ private: VTKM_TEST_ASSERT(valid_runtime, "runtime detection failed for device"); } - static VTKM_CONT_EXPORT void TestAlgorithmSchedule() + static VTKM_CONT void TestAlgorithmSchedule() { std::cout << "-------------------------------------------" << std::endl; std::cout << "Testing single value Scheduling with vtkm::Id" << std::endl; @@ -607,7 +607,7 @@ private: } //release memory } - static VTKM_CONT_EXPORT void TestStreamCompact() + static VTKM_CONT void TestStreamCompact() { std::cout << "-------------------------------------------" << std::endl; std::cout << "Testing Stream Compact" << std::endl; @@ -636,7 +636,7 @@ private: } } - static VTKM_CONT_EXPORT void TestStreamCompactWithStencil() + static VTKM_CONT void TestStreamCompactWithStencil() { std::cout << "-------------------------------------------" << std::endl; std::cout << "Testing Stream Compact with stencil" << std::endl; @@ -667,7 +667,7 @@ private: } } - static VTKM_CONT_EXPORT void TestOrderedUniqueValues() + static VTKM_CONT void TestOrderedUniqueValues() { std::cout << "-------------------------------------------------" << std::endl; std::cout << "Testing Sort, Unique, LowerBounds and UpperBounds" << std::endl; @@ -768,7 +768,7 @@ private: VTKM_TEST_ASSERT(randomData[5] == 4, "Got bad value - UpperBound"); } - static VTKM_CONT_EXPORT void TestSort() + static VTKM_CONT void TestSort() { std::cout << "-------------------------------------------------" << std::endl; std::cout << "Sort" << std::endl; @@ -793,7 +793,7 @@ private: } } - static VTKM_CONT_EXPORT void TestSortWithComparisonObject() + static VTKM_CONT void TestSortWithComparisonObject() { std::cout << "-------------------------------------------------" << std::endl; std::cout << "Sort with comparison object" << std::endl; @@ -833,7 +833,7 @@ private: } } - static VTKM_CONT_EXPORT void TestSortWithFancyArrays() + static VTKM_CONT void TestSortWithFancyArrays() { std::cout << "-------------------------------------------------" << std::endl; std::cout << "Sort of a ArrayHandleZip" << std::endl; @@ -889,7 +889,7 @@ private: } } - static VTKM_CONT_EXPORT void TestSortByKey() + static VTKM_CONT void TestSortByKey() { std::cout << "-------------------------------------------------" << std::endl; std::cout << "Sort by keys" << std::endl; @@ -956,7 +956,7 @@ private: } } - static VTKM_CONT_EXPORT void TestLowerBoundsWithComparisonObject() + static VTKM_CONT void TestLowerBoundsWithComparisonObject() { std::cout << "-------------------------------------------------" << std::endl; std::cout << "Testing LowerBounds with comparison object" << std::endl; @@ -994,7 +994,7 @@ private: } - static VTKM_CONT_EXPORT void TestUpperBoundsWithComparisonObject() + static VTKM_CONT void TestUpperBoundsWithComparisonObject() { std::cout << "-------------------------------------------------" << std::endl; std::cout << "Testing UpperBounds with comparison object" << std::endl; @@ -1031,7 +1031,7 @@ private: } } - static VTKM_CONT_EXPORT void TestUniqueWithComparisonObject() + static VTKM_CONT void TestUniqueWithComparisonObject() { std::cout << "-------------------------------------------------" << std::endl; std::cout << "Testing Unique with comparison object" << std::endl; @@ -1056,7 +1056,7 @@ private: VTKM_TEST_ASSERT(value == OFFSET, "Got bad unique value"); } - static VTKM_CONT_EXPORT void TestReduce() + static VTKM_CONT void TestReduce() { std::cout << "-------------------------------------------" << std::endl; std::cout << "Testing Reduce" << std::endl; @@ -1083,7 +1083,7 @@ private: "Got different sums from Reduce and ScanInclusive"); } - static VTKM_CONT_EXPORT void TestReduceWithComparisonObject() + static VTKM_CONT void TestReduceWithComparisonObject() { std::cout << "-------------------------------------------" << std::endl; std::cout << "Testing Reduce with comparison object " << std::endl; @@ -1107,7 +1107,7 @@ private: "Got bad value from Reduce with comparison object"); } - static VTKM_CONT_EXPORT void TestReduceWithFancyArrays() + static VTKM_CONT void TestReduceWithFancyArrays() { std::cout << "-------------------------------------------" << std::endl; std::cout << "Testing Reduce with ArrayHandleZip" << std::endl; @@ -1167,7 +1167,7 @@ private: } - static VTKM_CONT_EXPORT void TestReduceByKey() + static VTKM_CONT void TestReduceByKey() { std::cout << "-------------------------------------------" << std::endl; std::cout << "Testing Reduce By Key" << std::endl; @@ -1258,7 +1258,7 @@ private: } } - static VTKM_CONT_EXPORT void TestReduceByKeyWithFancyArrays() + static VTKM_CONT void TestReduceByKeyWithFancyArrays() { std::cout << "-------------------------------------------" << std::endl; std::cout << "Testing Reduce By Key with Fancy Arrays" << std::endl; @@ -1322,7 +1322,7 @@ private: } } - static VTKM_CONT_EXPORT void TestScanInclusive() + static VTKM_CONT void TestScanInclusive() { std::cout << "-------------------------------------------" << std::endl; std::cout << "Testing Inclusive Scan" << std::endl; @@ -1413,7 +1413,7 @@ private: } - static VTKM_CONT_EXPORT void TestScanInclusiveWithComparisonObject() + static VTKM_CONT void TestScanInclusiveWithComparisonObject() { std::cout << "-------------------------------------------" << std::endl; std::cout << "Testing Inclusive Scan with comparison object " << std::endl; @@ -1461,7 +1461,7 @@ private: } - static VTKM_CONT_EXPORT void TestScanExclusive() + static VTKM_CONT void TestScanExclusive() { std::cout << "-------------------------------------------" << std::endl; std::cout << "Testing Exclusive Scan" << std::endl; @@ -1557,7 +1557,7 @@ private: } } - static VTKM_CONT_EXPORT void TestErrorExecution() + static VTKM_CONT void TestErrorExecution() { std::cout << "-------------------------------------------" << std::endl; std::cout << "Testing Exceptions in Execution Environment" << std::endl; @@ -1611,7 +1611,7 @@ private: }; template - static VTKM_CONT_EXPORT void TestCopyArrays() + static VTKM_CONT void TestCopyArrays() { T testData[ARRAY_SIZE]; for(vtkm::Id i=0; i < ARRAY_SIZE; ++i) @@ -1733,7 +1733,7 @@ private: } - static VTKM_CONT_EXPORT void TestCopyArraysMany() + static VTKM_CONT void TestCopyArraysMany() { std::cout << "-------------------------------------------------" << std::endl; std::cout << "Testing Copy to same array type" << std::endl; @@ -1761,7 +1761,7 @@ private: TestCopyArrays(); } - static VTKM_CONT_EXPORT void TestCopyArraysInDiffTypes() + static VTKM_CONT void TestCopyArraysInDiffTypes() { std::cout << "-------------------------------------------------" << std::endl; std::cout << "Testing Copy to a different array type" << std::endl; @@ -1785,7 +1785,7 @@ private: } - static VTKM_CONT_EXPORT void TestAtomicArray() + static VTKM_CONT void TestAtomicArray() { vtkm::Int32 atomicCount = 0; for(vtkm::Int32 i = 0; i < ARRAY_SIZE; i++) atomicCount += i; @@ -1849,7 +1849,7 @@ private: struct TestAll { - VTKM_CONT_EXPORT void operator()() const + VTKM_CONT void operator()() const { std::cout << "Doing DeviceAdapter tests" << std::endl; TestArrayManagerExecution(); @@ -1900,7 +1900,7 @@ public: /// all members and classes required for driving vtkm algorithms. Returns an /// error code that can be returned from the main function of a test. /// - static VTKM_CONT_EXPORT int Run() + static VTKM_CONT int Run() { return vtkm::cont::testing::Testing::Run(TestAll()); } diff --git a/vtkm/cont/testing/TestingFancyArrayHandles.h b/vtkm/cont/testing/TestingFancyArrayHandles.h index 5496a2fb1..df0b4a648 100644 --- a/vtkm/cont/testing/TestingFancyArrayHandles.h +++ b/vtkm/cont/testing/TestingFancyArrayHandles.h @@ -49,7 +49,7 @@ namespace fancy_array_detail template struct IndexSquared { - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT ValueType operator()(vtkm::Id index) const { typedef typename vtkm::VecTraits::ComponentType ComponentType; @@ -61,7 +61,7 @@ template struct ValueSquared { template - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT ValueType operator()(U u) const { return vtkm::dot(u, u); } }; @@ -75,7 +75,7 @@ struct ValueScale { } template - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT ValueType operator()(const ValueType &v) const { typedef vtkm::VecTraits Traits; @@ -118,7 +118,7 @@ public: typedef _2 ExecutionSignature(_1); template - VTKM_EXEC_EXPORT + VTKM_EXEC ValueType operator()(const ValueType &inValue) const { return inValue; } @@ -130,7 +130,7 @@ private: struct TestCompositeAsInput { template< typename ValueType > - VTKM_CONT_EXPORT void operator()(const ValueType vtkmNotUsed(v)) const + VTKM_CONT void operator()(const ValueType vtkmNotUsed(v)) const { //hard-coded to make a vtkm::Vec composite vector //for each ValueType. @@ -175,7 +175,7 @@ private: struct TestConstantAsInput { template< typename ValueType > - VTKM_CONT_EXPORT void operator()(const ValueType vtkmNotUsed(v)) const + VTKM_CONT void operator()(const ValueType vtkmNotUsed(v)) const { const ValueType value = TestValue(43, ValueType()); @@ -202,7 +202,7 @@ private: struct TestCountingAsInput { template< typename ValueType > - VTKM_CONT_EXPORT void operator()(const ValueType vtkmNotUsed(v)) const + VTKM_CONT void operator()(const ValueType vtkmNotUsed(v)) const { typedef typename vtkm::VecTraits::ComponentType ComponentType; @@ -238,7 +238,7 @@ private: struct TestImplicitAsInput { template< typename ValueType> - VTKM_CONT_EXPORT void operator()(const ValueType vtkmNotUsed(v)) const + VTKM_CONT void operator()(const ValueType vtkmNotUsed(v)) const { const vtkm::Id length = ARRAY_SIZE; typedef ::fancy_array_detail::IndexSquared FunctorType; @@ -269,7 +269,7 @@ private: struct TestConcatenateAsInput { template< typename ValueType> - VTKM_CONT_EXPORT void operator()(const ValueType vtkmNotUsed(v)) const + VTKM_CONT void operator()(const ValueType vtkmNotUsed(v)) const { const vtkm::Id length = ARRAY_SIZE; @@ -333,7 +333,7 @@ private: struct TestPermutationAsInput { template< typename ValueType> - VTKM_CONT_EXPORT void operator()(const ValueType vtkmNotUsed(v)) const + VTKM_CONT void operator()(const ValueType vtkmNotUsed(v)) const { const vtkm::Id length = ARRAY_SIZE; @@ -390,7 +390,7 @@ private: struct TestTransformAsInput { template< typename ValueType> - VTKM_CONT_EXPORT void operator()(const ValueType vtkmNotUsed(v)) const + VTKM_CONT void operator()(const ValueType vtkmNotUsed(v)) const { typedef fancy_array_detail::ValueScale FunctorType; @@ -434,7 +434,7 @@ private: struct TestCountingTransformAsInput { template< typename ValueType> - VTKM_CONT_EXPORT void operator()(const ValueType vtkmNotUsed(v)) const + VTKM_CONT void operator()(const ValueType vtkmNotUsed(v)) const { typedef typename vtkm::VecTraits::ComponentType ComponentType; typedef ComponentType OutputValueType; @@ -485,7 +485,7 @@ private: struct TestCastAsInput { template - VTKM_CONT_EXPORT + VTKM_CONT void operator()(CastToType vtkmNotUsed(type)) const { typedef vtkm::cont::ArrayHandleIndex InputArrayType; @@ -515,7 +515,7 @@ private: struct TestGroupVecAsInput { template - VTKM_CONT_EXPORT + VTKM_CONT void operator()(ComponentType) const { typedef vtkm::Vec ValueType; @@ -566,7 +566,7 @@ private: struct TestGroupVecAsOutput { template - VTKM_CONT_EXPORT + VTKM_CONT void operator()(ComponentType) const { typedef vtkm::Vec ValueType; @@ -618,7 +618,7 @@ private: struct TestZipAsInput { template< typename KeyType, typename ValueType > - VTKM_CONT_EXPORT + VTKM_CONT void operator()(vtkm::Pair vtkmNotUsed(pair)) const { typedef vtkm::Pair< KeyType, ValueType > PairType; @@ -665,7 +665,7 @@ private: struct TestPermutationAsOutput { template< typename ValueType> - VTKM_CONT_EXPORT void operator()(const ValueType vtkmNotUsed(v)) const + VTKM_CONT void operator()(const ValueType vtkmNotUsed(v)) const { const vtkm::Id length = ARRAY_SIZE; @@ -711,7 +711,7 @@ private: struct TestZipAsOutput { template< typename KeyType, typename ValueType > - VTKM_CONT_EXPORT + VTKM_CONT void operator()(vtkm::Pair vtkmNotUsed(pair)) const { typedef vtkm::Pair< KeyType, ValueType > PairType; @@ -782,7 +782,7 @@ private: struct TestAll { - VTKM_CONT_EXPORT void operator()() const + VTKM_CONT void operator()() const { std::cout << "Doing FancyArrayHandle tests" << std::endl; @@ -889,7 +889,7 @@ private: /// all the fancy array handles that vtkm supports. Returns an /// error code that can be returned from the main function of a test. /// - static VTKM_CONT_EXPORT int Run() + static VTKM_CONT int Run() { return vtkm::cont::testing::Testing::Run(TestAll()); } diff --git a/vtkm/cont/testing/UnitTestArrayHandleImplicit.cxx b/vtkm/cont/testing/UnitTestArrayHandleImplicit.cxx index f3ba6c11f..3332baf7b 100644 --- a/vtkm/cont/testing/UnitTestArrayHandleImplicit.cxx +++ b/vtkm/cont/testing/UnitTestArrayHandleImplicit.cxx @@ -35,7 +35,7 @@ const vtkm::Id ARRAY_SIZE = 10; template struct IndexSquared { - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT ValueType operator()(vtkm::Id i) const { typedef typename vtkm::VecTraits::ComponentType ComponentType; diff --git a/vtkm/cont/testing/UnitTestArrayHandlePermutation.cxx b/vtkm/cont/testing/UnitTestArrayHandlePermutation.cxx index c540c30a1..093790dfc 100644 --- a/vtkm/cont/testing/UnitTestArrayHandlePermutation.cxx +++ b/vtkm/cont/testing/UnitTestArrayHandlePermutation.cxx @@ -38,7 +38,7 @@ namespace { const vtkm::Id ARRAY_SIZE = 10; struct DoubleIndexFunctor { - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::Id operator()(vtkm::Id index) const { return 2*index; } @@ -52,7 +52,7 @@ struct CheckPermutationFunctor : vtkm::exec::FunctorBase { PermutedPortalType PermutedPortal; - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(vtkm::Id index) const { typedef typename PermutedPortalType::ValueType T; T value = this->PermutedPortal.Get(index); @@ -68,7 +68,7 @@ struct CheckPermutationFunctor : vtkm::exec::FunctorBase template -VTKM_CONT_EXPORT +VTKM_CONT CheckPermutationFunctor< typename PermutedArrayHandleType::template ExecutionTypes::PortalConst> make_CheckPermutationFunctor(const PermutedArrayHandleType &permutedArray, @@ -85,7 +85,7 @@ struct InPlacePermutationFunctor : vtkm::exec::FunctorBase { PermutedPortalType PermutedPortal; - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(vtkm::Id index) const { typedef typename PermutedPortalType::ValueType T; T value = this->PermutedPortal.Get(index); @@ -98,7 +98,7 @@ struct InPlacePermutationFunctor : vtkm::exec::FunctorBase template -VTKM_CONT_EXPORT +VTKM_CONT InPlacePermutationFunctor< typename PermutedArrayHandleType::template ExecutionTypes::Portal> make_InPlacePermutationFunctor(PermutedArrayHandleType &permutedArray, @@ -111,7 +111,7 @@ make_InPlacePermutationFunctor(PermutedArrayHandleType &permutedArray, } template -VTKM_CONT_EXPORT +VTKM_CONT void CheckInPlaceResult(PortalType portal) { typedef typename PortalType::ValueType T; @@ -143,7 +143,7 @@ struct OutputPermutationFunctor : vtkm::exec::FunctorBase { PermutedPortalType PermutedPortal; - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(vtkm::Id index) const { typedef typename PermutedPortalType::ValueType T; this->PermutedPortal.Set(index, TestValue(static_cast(index), T())); @@ -152,7 +152,7 @@ struct OutputPermutationFunctor : vtkm::exec::FunctorBase template -VTKM_CONT_EXPORT +VTKM_CONT OutputPermutationFunctor< typename PermutedArrayHandleType::template ExecutionTypes::Portal> make_OutputPermutationFunctor(PermutedArrayHandleType &permutedArray, @@ -165,7 +165,7 @@ make_OutputPermutationFunctor(PermutedArrayHandleType &permutedArray, } template -VTKM_CONT_EXPORT +VTKM_CONT void CheckOutputResult(PortalType portal) { typedef typename PortalType::ValueType T; diff --git a/vtkm/cont/testing/UnitTestArrayHandleTransform.cxx b/vtkm/cont/testing/UnitTestArrayHandleTransform.cxx index a75a5cb4a..26c11dcb6 100644 --- a/vtkm/cont/testing/UnitTestArrayHandleTransform.cxx +++ b/vtkm/cont/testing/UnitTestArrayHandleTransform.cxx @@ -40,7 +40,7 @@ template struct MySquare { template - VTKM_EXEC_EXPORT + VTKM_EXEC ValueType operator()(U u) const { return vtkm::dot(u, u); } }; @@ -51,7 +51,7 @@ struct CheckTransformFunctor : vtkm::exec::FunctorBase OriginalPortalType OriginalPortal; TransformedPortalType TransformedPortal; - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(vtkm::Id index) const { typedef typename TransformedPortalType::ValueType T; typename OriginalPortalType::ValueType original = @@ -66,7 +66,7 @@ struct CheckTransformFunctor : vtkm::exec::FunctorBase template -VTKM_CONT_EXPORT +VTKM_CONT CheckTransformFunctor< typename OriginalArrayHandleType::template ExecutionTypes::PortalConst, typename TransformedArrayHandleType::template ExecutionTypes::PortalConst> @@ -83,7 +83,7 @@ make_CheckTransformFunctor(const OriginalArrayHandleType &originalArray, } template -VTKM_CONT_EXPORT +VTKM_CONT void CheckControlPortals(const OriginalArrayHandleType &originalArray, const TransformedArrayHandleType &transformedArray) { diff --git a/vtkm/cont/testing/UnitTestArrayPortalToIterators.cxx b/vtkm/cont/testing/UnitTestArrayPortalToIterators.cxx index b224a899f..4192cfecd 100644 --- a/vtkm/cont/testing/UnitTestArrayPortalToIterators.cxx +++ b/vtkm/cont/testing/UnitTestArrayPortalToIterators.cxx @@ -44,13 +44,13 @@ struct TemplatedTests public: typedef T ValueType; - VTKM_CONT_EXPORT + VTKM_CONT ReadOnlyArrayPortal(ComponentType value) : Value(value) { } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Id GetNumberOfValues() const { return ARRAY_SIZE; } - VTKM_CONT_EXPORT + VTKM_CONT ValueType Get(vtkm::Id index) const { return ExpectedValue(index, this->Value); } private: @@ -62,13 +62,13 @@ struct TemplatedTests public: typedef T ValueType; - VTKM_CONT_EXPORT + VTKM_CONT WriteOnlyArrayPortal(ComponentType value) : Value(value) { } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Id GetNumberOfValues() const { return ARRAY_SIZE; } - VTKM_CONT_EXPORT + VTKM_CONT void Set(vtkm::Id index, const ValueType &value) const { VTKM_TEST_ASSERT(value == ExpectedValue(index, this->Value), "Set unexpected value in array portal."); diff --git a/vtkm/cont/testing/UnitTestDeviceAdapterAlgorithmGeneral.cxx b/vtkm/cont/testing/UnitTestDeviceAdapterAlgorithmGeneral.cxx index b4f7eb8d9..9d14f0bf8 100644 --- a/vtkm/cont/testing/UnitTestDeviceAdapterAlgorithmGeneral.cxx +++ b/vtkm/cont/testing/UnitTestDeviceAdapterAlgorithmGeneral.cxx @@ -56,20 +56,20 @@ private: public: template - VTKM_CONT_EXPORT static void Schedule(Functor functor, + VTKM_CONT static void Schedule(Functor functor, vtkm::Id numInstances) { Algorithm::Schedule(functor, numInstances); } template - VTKM_CONT_EXPORT static void Schedule(Functor functor, + VTKM_CONT static void Schedule(Functor functor, vtkm::Id3 rangeMax) { Algorithm::Schedule(functor, rangeMax); } - VTKM_CONT_EXPORT static void Synchronize() + VTKM_CONT static void Synchronize() { Algorithm::Synchronize(); } diff --git a/vtkm/cont/testing/UnitTestDynamicArrayHandle.cxx b/vtkm/cont/testing/UnitTestDynamicArrayHandle.cxx index ec27e47a5..c82b26b9b 100644 --- a/vtkm/cont/testing/UnitTestDynamicArrayHandle.cxx +++ b/vtkm/cont/testing/UnitTestDynamicArrayHandle.cxx @@ -69,10 +69,10 @@ struct UnusualPortal { typedef T ValueType; - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::Id GetNumberOfValues() const { return ARRAY_SIZE; } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT ValueType Get(vtkm::Id index) const { return TestValue(index, ValueType()); } @@ -85,7 +85,7 @@ class ArrayHandleWithUnusualStorage typedef vtkm::cont::ArrayHandle > > Superclass; public: - VTKM_CONT_EXPORT + VTKM_CONT ArrayHandleWithUnusualStorage() : Superclass(typename Superclass::PortalConstControl()) { } }; diff --git a/vtkm/cont/testing/UnitTestStorageImplicit.cxx b/vtkm/cont/testing/UnitTestStorageImplicit.cxx index 7221e1cf8..c4d9ba8e5 100644 --- a/vtkm/cont/testing/UnitTestStorageImplicit.cxx +++ b/vtkm/cont/testing/UnitTestStorageImplicit.cxx @@ -39,16 +39,16 @@ struct TestImplicitStorage ValueType Temp; - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT TestImplicitStorage(): Temp(1) { } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::Id GetNumberOfValues() const { return 1; } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT ValueType Get(vtkm::Id vtkmNotUsed(index)) const { return Temp; diff --git a/vtkm/cont/testing/UnitTestStorageListTag.cxx b/vtkm/cont/testing/UnitTestStorageListTag.cxx index 4caf966e8..29cbfbf96 100644 --- a/vtkm/cont/testing/UnitTestStorageListTag.cxx +++ b/vtkm/cont/testing/UnitTestStorageListTag.cxx @@ -37,7 +37,7 @@ struct TestFunctor std::vector FoundTypes; template - VTKM_CONT_EXPORT + VTKM_CONT void operator()(T) { this->FoundTypes.push_back(GetTypeId(T())); } diff --git a/vtkm/cont/testing/UnitTestTryExecute.cxx b/vtkm/cont/testing/UnitTestTryExecute.cxx index f6fd178fc..4b9edc1fb 100644 --- a/vtkm/cont/testing/UnitTestTryExecute.cxx +++ b/vtkm/cont/testing/UnitTestTryExecute.cxx @@ -38,14 +38,14 @@ struct TryExecuteTestFunctor vtkm::cont::ArrayHandle InArray; vtkm::cont::ArrayHandle OutArray; - VTKM_CONT_EXPORT + VTKM_CONT TryExecuteTestFunctor(vtkm::cont::ArrayHandle inArray, vtkm::cont::ArrayHandle outArray) : NumCalls(0), InArray(inArray), OutArray(outArray) { } template - VTKM_CONT_EXPORT + VTKM_CONT bool operator()(Device) { typedef vtkm::cont::DeviceAdapterAlgorithm Algorithm; diff --git a/vtkm/exec/AtomicArray.h b/vtkm/exec/AtomicArray.h index d485c80d3..b5ba204ba 100644 --- a/vtkm/exec/AtomicArray.h +++ b/vtkm/exec/AtomicArray.h @@ -52,19 +52,19 @@ class AtomicArray : public vtkm::exec::ExecutionObjectBase public: typedef T ValueType; - VTKM_CONT_EXPORT + VTKM_CONT AtomicArray() : AtomicImplementation(vtkm::cont::make_ArrayHandle((T*)NULL, 0)) { } template - VTKM_CONT_EXPORT + VTKM_CONT AtomicArray(vtkm::cont::ArrayHandle handle): AtomicImplementation( handle ) { } - VTKM_EXEC_EXPORT + VTKM_EXEC T Add(vtkm::Id index, const T& value) const { return this->AtomicImplementation.Add(index,value); @@ -75,7 +75,7 @@ public: // the index is equal to oldValue, then newValue is written to the index. // The operation was successful if return value is equal to oldValue // - VTKM_EXEC_EXPORT + VTKM_EXEC T CompareAndSwap(vtkm::Id index, const T& newValue, const T& oldValue) const { return this->AtomicImplementation.CompareAndSwap(index,newValue, oldValue); diff --git a/vtkm/exec/CellDerivative.h b/vtkm/exec/CellDerivative.h index ebe2f8ff2..b410d97c6 100644 --- a/vtkm/exec/CellDerivative.h +++ b/vtkm/exec/CellDerivative.h @@ -49,7 +49,7 @@ namespace { // vector [ds/du, ds/dv, ds/dw]. template -VTKM_EXEC_EXPORT +VTKM_EXEC vtkm::Vec ParametricDerivative(const FieldVecType &field, const vtkm::Vec &pcoords, @@ -75,7 +75,7 @@ ParametricDerivative(const FieldVecType &field, template -VTKM_EXEC_EXPORT +VTKM_EXEC vtkm::Vec ParametricDerivative(const FieldVecType &field, const vtkm::Vec &pcoords, @@ -102,7 +102,7 @@ ParametricDerivative(const FieldVecType &field, template -VTKM_EXEC_EXPORT +VTKM_EXEC vtkm::Vec ParametricDerivative(const FieldVecType &field, const vtkm::Vec &pcoords, @@ -135,7 +135,7 @@ ParametricDerivative(const FieldVecType &field, template -VTKM_EXEC_EXPORT +VTKM_EXEC vtkm::Vec ParametricDerivative(const FieldVecType &field, const vtkm::Vec &pcoords, @@ -163,7 +163,7 @@ ParametricDerivative(const FieldVecType &field, // implement it. template -VTKM_EXEC_EXPORT +VTKM_EXEC vtkm::Vec ParametricDerivative(const FieldVecType &field, const vtkm::Vec &pcoords, @@ -213,7 +213,7 @@ template -VTKM_EXEC_EXPORT +VTKM_EXEC vtkm::Vec CellDerivativeFor3DCell(const FieldVecType &field, const WorldCoordType &wCoords, @@ -258,7 +258,7 @@ template -VTKM_EXEC_EXPORT +VTKM_EXEC vtkm::Vec CellDerivativeFor2DCell(const FieldVecType &field, const WorldCoordType &wCoords, @@ -317,7 +317,7 @@ CellDerivativeFor2DCell(const FieldVecType &field, template -VTKM_EXEC_EXPORT +VTKM_EXEC vtkm::Vec CellDerivative(const FieldVecType &pointFieldValues, const WorldCoordType &worldCoordinateValues, @@ -345,7 +345,7 @@ CellDerivative(const FieldVecType &pointFieldValues, template -VTKM_EXEC_EXPORT +VTKM_EXEC vtkm::Vec CellDerivative(const FieldVecType &, const WorldCoordType &, @@ -361,7 +361,7 @@ CellDerivative(const FieldVecType &, template -VTKM_EXEC_EXPORT +VTKM_EXEC vtkm::Vec CellDerivative(const FieldVecType &field, const WorldCoordType &wCoords, @@ -382,7 +382,7 @@ CellDerivative(const FieldVecType &field, template -VTKM_EXEC_EXPORT +VTKM_EXEC vtkm::Vec CellDerivative(const FieldVecType &field, const WorldCoordType &wCoords, @@ -409,7 +409,7 @@ CellDerivative(const FieldVecType &field, template -VTKM_EXEC_EXPORT +VTKM_EXEC vtkm::Vec CellDerivative(const FieldVecType &field, const vtkm::VecRectilinearPointCoordinates<1> &wCoords, @@ -427,7 +427,7 @@ CellDerivative(const FieldVecType &field, //----------------------------------------------------------------------------- template -VTKM_EXEC_EXPORT +VTKM_EXEC vtkm::Vec TriangleDerivative(const vtkm::Vec &field, const vtkm::Vec &wCoords) @@ -489,7 +489,7 @@ TriangleDerivative(const vtkm::Vec &field, template -VTKM_EXEC_EXPORT +VTKM_EXEC vtkm::Vec CellDerivative(const FieldVecType &inputField, const WorldCoordType &wCoords, @@ -509,7 +509,7 @@ CellDerivative(const FieldVecType &inputField, //----------------------------------------------------------------------------- template -VTKM_EXEC_EXPORT void +VTKM_EXEC void PolygonComputeIndices(const vtkm::Vec& pcoords, vtkm::IdComponent numPoints, vtkm::IdComponent& firstPointIndex, vtkm::IdComponent& secondPointIndex) @@ -543,7 +543,7 @@ PolygonComputeIndices(const vtkm::Vec& pcoords, //----------------------------------------------------------------------------- template -VTKM_EXEC_EXPORT +VTKM_EXEC vtkm::Vec PolygonDerivative(const FieldVecType &field, const WorldCoordType &wCoords, @@ -594,7 +594,7 @@ PolygonDerivative(const FieldVecType &field, template -VTKM_EXEC_EXPORT +VTKM_EXEC vtkm::Vec CellDerivative(const FieldVecType &field, const WorldCoordType &wCoords, @@ -640,7 +640,7 @@ CellDerivative(const FieldVecType &field, template -VTKM_EXEC_EXPORT +VTKM_EXEC vtkm::Vec CellDerivative(const FieldVecType &inputField, const WorldCoordType &wCoords, @@ -662,7 +662,7 @@ CellDerivative(const FieldVecType &inputField, template -VTKM_EXEC_EXPORT +VTKM_EXEC vtkm::Vec CellDerivative(const FieldVecType &field, const vtkm::VecRectilinearPointCoordinates<2> &wCoords, @@ -692,7 +692,7 @@ CellDerivative(const FieldVecType &field, //----------------------------------------------------------------------------- template -VTKM_EXEC_EXPORT +VTKM_EXEC vtkm::Vec TetraDerivative(const vtkm::Vec &field, const vtkm::Vec &wCoords) @@ -753,7 +753,7 @@ TetraDerivative(const vtkm::Vec &field, template -VTKM_EXEC_EXPORT +VTKM_EXEC vtkm::Vec CellDerivative(const FieldVecType &inputField, const WorldCoordType &wCoords, @@ -775,7 +775,7 @@ CellDerivative(const FieldVecType &inputField, template -VTKM_EXEC_EXPORT +VTKM_EXEC vtkm::Vec CellDerivative(const FieldVecType &inputField, const WorldCoordType &wCoords, @@ -797,7 +797,7 @@ CellDerivative(const FieldVecType &inputField, template -VTKM_EXEC_EXPORT +VTKM_EXEC vtkm::Vec CellDerivative(const FieldVecType &field, const vtkm::VecRectilinearPointCoordinates<3> &wCoords, @@ -832,7 +832,7 @@ CellDerivative(const FieldVecType &field, template -VTKM_EXEC_EXPORT +VTKM_EXEC vtkm::Vec CellDerivative(const FieldVecType &inputField, const WorldCoordType &wCoords, @@ -857,7 +857,7 @@ CellDerivative(const FieldVecType &inputField, template -VTKM_EXEC_EXPORT +VTKM_EXEC vtkm::Vec CellDerivative(const FieldVecType &inputField, const WorldCoordType &wCoords, diff --git a/vtkm/exec/CellInterpolate.h b/vtkm/exec/CellInterpolate.h index 54fc3f15a..d2e032da3 100644 --- a/vtkm/exec/CellInterpolate.h +++ b/vtkm/exec/CellInterpolate.h @@ -36,7 +36,7 @@ namespace internal { // moved to this header file because it is required to interpolate in a // polygon, which is divided into triangles. template -VTKM_EXEC_EXPORT +VTKM_EXEC typename WorldCoordVector::ComponentType ReverseInterpolateTriangle( const WorldCoordVector &pointWCoords, @@ -134,7 +134,7 @@ ReverseInterpolateTriangle( /// template -VTKM_EXEC_EXPORT +VTKM_EXEC typename FieldVecType::ComponentType CellInterpolate(const FieldVecType &pointFieldValues, const vtkm::Vec ¶metricCoords, @@ -159,7 +159,7 @@ CellInterpolate(const FieldVecType &pointFieldValues, //----------------------------------------------------------------------------- template -VTKM_EXEC_EXPORT +VTKM_EXEC typename FieldVecType::ComponentType CellInterpolate(const FieldVecType &, const vtkm::Vec &, @@ -173,7 +173,7 @@ CellInterpolate(const FieldVecType &, //----------------------------------------------------------------------------- template -VTKM_EXEC_EXPORT +VTKM_EXEC typename FieldVecType::ComponentType CellInterpolate(const FieldVecType &pointFieldValues, const vtkm::Vec, @@ -187,7 +187,7 @@ CellInterpolate(const FieldVecType &pointFieldValues, //----------------------------------------------------------------------------- template -VTKM_EXEC_EXPORT +VTKM_EXEC typename FieldVecType::ComponentType CellInterpolate(const FieldVecType &pointFieldValues, const vtkm::Vec ¶metricCoords, @@ -201,7 +201,7 @@ CellInterpolate(const FieldVecType &pointFieldValues, } template -VTKM_EXEC_EXPORT +VTKM_EXEC vtkm::Vec CellInterpolate(const vtkm::VecRectilinearPointCoordinates<1> &field, const vtkm::Vec &pcoords, @@ -221,7 +221,7 @@ CellInterpolate(const vtkm::VecRectilinearPointCoordinates<1> &field, //----------------------------------------------------------------------------- template -VTKM_EXEC_EXPORT +VTKM_EXEC typename FieldVecType::ComponentType CellInterpolate(const FieldVecType &field, const vtkm::Vec &pcoords, @@ -238,7 +238,7 @@ CellInterpolate(const FieldVecType &field, //----------------------------------------------------------------------------- template -VTKM_EXEC_EXPORT +VTKM_EXEC typename FieldVecType::ComponentType CellInterpolate(const FieldVecType &field, const vtkm::Vec &pcoords, @@ -333,7 +333,7 @@ CellInterpolate(const FieldVecType &field, //----------------------------------------------------------------------------- template -VTKM_EXEC_EXPORT +VTKM_EXEC typename FieldVecType::ComponentType CellInterpolate(const FieldVecType &field, const vtkm::Vec &pcoords, @@ -351,7 +351,7 @@ CellInterpolate(const FieldVecType &field, } template -VTKM_EXEC_EXPORT +VTKM_EXEC vtkm::Vec CellInterpolate(const vtkm::VecRectilinearPointCoordinates<2> &field, const vtkm::Vec &pcoords, @@ -371,7 +371,7 @@ CellInterpolate(const vtkm::VecRectilinearPointCoordinates<2> &field, //----------------------------------------------------------------------------- template -VTKM_EXEC_EXPORT +VTKM_EXEC typename FieldVecType::ComponentType CellInterpolate(const FieldVecType &field, const vtkm::Vec &pcoords, @@ -389,7 +389,7 @@ CellInterpolate(const FieldVecType &field, //----------------------------------------------------------------------------- template -VTKM_EXEC_EXPORT +VTKM_EXEC typename FieldVecType::ComponentType CellInterpolate(const FieldVecType &field, const vtkm::Vec &pcoords, @@ -412,7 +412,7 @@ CellInterpolate(const FieldVecType &field, } template -VTKM_EXEC_EXPORT +VTKM_EXEC vtkm::Vec CellInterpolate(const vtkm::VecRectilinearPointCoordinates<3> &field, const vtkm::Vec &pcoords, @@ -430,7 +430,7 @@ CellInterpolate(const vtkm::VecRectilinearPointCoordinates<3> &field, //----------------------------------------------------------------------------- template -VTKM_EXEC_EXPORT +VTKM_EXEC typename FieldVecType::ComponentType CellInterpolate(const FieldVecType &field, const vtkm::Vec &pcoords, @@ -455,7 +455,7 @@ CellInterpolate(const FieldVecType &field, //----------------------------------------------------------------------------- template -VTKM_EXEC_EXPORT +VTKM_EXEC typename FieldVecType::ComponentType CellInterpolate(const FieldVecType &field, const vtkm::Vec &pcoords, diff --git a/vtkm/exec/ConnectivityExplicit.h b/vtkm/exec/ConnectivityExplicit.h index dde238662..0f4ec2636 100644 --- a/vtkm/exec/ConnectivityExplicit.h +++ b/vtkm/exec/ConnectivityExplicit.h @@ -51,13 +51,13 @@ public: } - VTKM_EXEC_EXPORT + VTKM_EXEC vtkm::Id GetNumberOfElements() const { return this->Shapes.GetNumberOfValues(); } - VTKM_EXEC_EXPORT + VTKM_EXEC vtkm::IdComponent GetNumberOfIndices(vtkm::Id index) const { return static_cast(this->NumIndices.Get(index)); @@ -65,7 +65,7 @@ public: typedef vtkm::CellShapeTagGeneric CellShapeTag; - VTKM_EXEC_EXPORT + VTKM_EXEC CellShapeTag GetCellShape(vtkm::Id index) const { // Likewise, should Shapes be vtkm::Id or something smaller? @@ -80,7 +80,7 @@ public: /// loads the indices lazily out of the connectivity array. This prevents /// us from having to know the number of indices at compile time. /// - VTKM_EXEC_EXPORT + VTKM_EXEC IndicesType GetIndices(vtkm::Id index) const { vtkm::Id offset = this->IndexOffset.Get(index); diff --git a/vtkm/exec/ConnectivityPermuted.h b/vtkm/exec/ConnectivityPermuted.h index 45bd042b4..13b7e0b46 100644 --- a/vtkm/exec/ConnectivityPermuted.h +++ b/vtkm/exec/ConnectivityPermuted.h @@ -36,7 +36,7 @@ class ConnectivityPermuted public: typedef vtkm::Id SchedulingRangeType; - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT ConnectivityPermuted(): Portal(), Connectivity() @@ -44,7 +44,7 @@ public: } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT ConnectivityPermuted(const PermutationPortal& portal, const OriginalConnectivity &src): Portal(portal), @@ -52,14 +52,14 @@ public: { } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT ConnectivityPermuted(const ConnectivityPermuted &src): Portal(src.Portal), Connectivity(src.Connectivity) { } - VTKM_EXEC_EXPORT + VTKM_EXEC vtkm::IdComponent GetNumberOfIndices(vtkm::Id index) const { return this->Connectivity.GetNumberOfIndices( this->Portal.Get(index) ); } @@ -67,7 +67,7 @@ public: typedef typename OriginalConnectivity::CellShapeTag CellShapeTag; - VTKM_EXEC_EXPORT + VTKM_EXEC CellShapeTag GetCellShape(vtkm::Id index) const { vtkm::Id pIndex = this->Portal.Get(index); return this->Connectivity.GetCellShape( pIndex ); @@ -75,7 +75,7 @@ public: typedef typename OriginalConnectivity::IndicesType IndicesType; - VTKM_EXEC_EXPORT + VTKM_EXEC IndicesType GetIndices(vtkm::Id index) const { return this->Connectivity.GetIndices( this->Portal.Get(index) ); diff --git a/vtkm/exec/ConnectivityStructured.h b/vtkm/exec/ConnectivityStructured.h index 215ddddda..76ff964c1 100644 --- a/vtkm/exec/ConnectivityStructured.h +++ b/vtkm/exec/ConnectivityStructured.h @@ -45,27 +45,27 @@ class ConnectivityStructured public: typedef typename InternalsType::SchedulingRangeType SchedulingRangeType; - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT ConnectivityStructured(): Internals() { } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT ConnectivityStructured(const InternalsType &src): Internals(src) { } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT ConnectivityStructured(const ConnectivityStructured &src): Internals(src.Internals) { } template - VTKM_EXEC_EXPORT + VTKM_EXEC vtkm::IdComponent GetNumberOfIndices(const IndexType &index) const { return Helper::GetNumberOfIndices(this->Internals, index); } @@ -73,7 +73,7 @@ public: // This needs some thought. What does cell shape mean when the to topology // is not a cell? typedef typename InternalsType::CellShapeTag CellShapeTag; - VTKM_EXEC_EXPORT + VTKM_EXEC CellShapeTag GetCellShape(vtkm::Id) const { return CellShapeTag(); } @@ -81,41 +81,41 @@ public: typedef typename Helper::IndicesType IndicesType; template - VTKM_EXEC_EXPORT + VTKM_EXEC IndicesType GetIndices(const IndexType &index) const { return Helper::GetIndices(this->Internals, index); } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT SchedulingRangeType FlatToLogicalFromIndex(vtkm::Id flatFromIndex) const { return Helper::FlatToLogicalFromIndex(this->Internals, flatFromIndex); } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::Id LogicalToFlatFromIndex( const SchedulingRangeType &logicalFromIndex) const { return Helper::LogicalToFlatFromIndex(this->Internals, logicalFromIndex); } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT SchedulingRangeType FlatToLogicalToIndex(vtkm::Id flatToIndex) const { return Helper::FlatToLogicalToIndex(this->Internals, flatToIndex); } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::Id LogicalToFlatToIndex( const SchedulingRangeType &logicalToIndex) const { return Helper::LogicalToFlatToIndex(this->Internals, logicalToIndex); } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::Vec GetPointDimensions() const { return this->Internals.GetPointDimensions(); diff --git a/vtkm/exec/ExecutionObjectBase.h b/vtkm/exec/ExecutionObjectBase.h index f64d619a5..b6f1d561f 100644 --- a/vtkm/exec/ExecutionObjectBase.h +++ b/vtkm/exec/ExecutionObjectBase.h @@ -26,7 +26,7 @@ namespace exec { /// Base \c ExecutionObjectBase for execution objects to inherit from so that /// you can use an arbitrary object as a parameter in an execution environment /// function. Any method you want to use on the execution side must have the -/// VTKM_EXEC_EXPORT modifier. +/// VTKM_EXEC modifier. /// class ExecutionObjectBase { diff --git a/vtkm/exec/ExecutionWholeArray.h b/vtkm/exec/ExecutionWholeArray.h index 2ef35bb85..727158e5a 100644 --- a/vtkm/exec/ExecutionWholeArray.h +++ b/vtkm/exec/ExecutionWholeArray.h @@ -42,19 +42,19 @@ class ExecutionWholeArray : public vtkm::exec::ExecutionObjectBase typedef typename HandleType::template ExecutionTypes::Portal PortalType; public: - VTKM_CONT_EXPORT + VTKM_CONT ExecutionWholeArray( ): Portal( ) { } - VTKM_CONT_EXPORT + VTKM_CONT ExecutionWholeArray( HandleType& handle ): Portal( handle.PrepareForInPlace( DeviceAdapterTag()) ) { } - VTKM_CONT_EXPORT + VTKM_CONT ExecutionWholeArray( HandleType& handle, vtkm::Id length ): Portal( handle.PrepareForOutput( length, DeviceAdapterTag()) ) @@ -63,13 +63,13 @@ public: typedef typename PortalType::ValueType ValueType; - VTKM_EXEC_EXPORT + VTKM_EXEC vtkm::Id GetNumberOfValues() const { return this->Portal.GetNumberOfValues(); } - VTKM_EXEC_EXPORT + VTKM_EXEC T Get(vtkm::Id index) const { return this->Portal.Get(index); } - VTKM_EXEC_EXPORT + VTKM_EXEC void Set(vtkm::Id index, const T& t) const { this->Portal.Set(index, t); } private: @@ -91,13 +91,13 @@ class ExecutionWholeArrayConst : public vtkm::exec::ExecutionObjectBase typedef typename HandleType::template ExecutionTypes::PortalConst PortalType; public: - VTKM_CONT_EXPORT + VTKM_CONT ExecutionWholeArrayConst( ): Portal( ) { } - VTKM_CONT_EXPORT + VTKM_CONT ExecutionWholeArrayConst( const HandleType& handle): Portal( handle.PrepareForInput( DeviceAdapterTag() ) ) { @@ -105,10 +105,10 @@ public: typedef typename PortalType::ValueType ValueType; - VTKM_EXEC_EXPORT + VTKM_EXEC vtkm::Id GetNumberOfValues() const { return this->Portal.GetNumberOfValues(); } - VTKM_EXEC_EXPORT + VTKM_EXEC T Get(vtkm::Id index) const { return this->Portal.Get(index); } private: diff --git a/vtkm/exec/FunctorBase.h b/vtkm/exec/FunctorBase.h index 2346879ff..f4402565b 100644 --- a/vtkm/exec/FunctorBase.h +++ b/vtkm/exec/FunctorBase.h @@ -37,10 +37,10 @@ namespace exec { class FunctorBase { public: - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT FunctorBase(): ErrorMessage() { } - VTKM_EXEC_EXPORT + VTKM_EXEC void RaiseError(const char *message) const { this->ErrorMessage.RaiseError(message); @@ -50,7 +50,7 @@ public: /// errors. This is supposed to be set by the dispatcher. This method may be /// replaced as the execution semantics change. /// - VTKM_CONT_EXPORT + VTKM_CONT void SetErrorMessageBuffer( const vtkm::exec::internal::ErrorMessageBuffer &buffer) { diff --git a/vtkm/exec/Jacobian.h b/vtkm/exec/Jacobian.h index d319a35be..7d39ce919 100644 --- a/vtkm/exec/Jacobian.h +++ b/vtkm/exec/Jacobian.h @@ -40,7 +40,7 @@ struct Space2D Vec3 Basis0; Vec3 Basis1; - VTKM_EXEC_EXPORT + VTKM_EXEC Space2D(const Vec3 &origin, const Vec3 &pointFirst, const Vec3 &pointLast) { this->Origin = origin; @@ -51,13 +51,13 @@ struct Space2D this->Basis1 = vtkm::Normal(vtkm::Cross(this->Basis0, n)); } - VTKM_EXEC_EXPORT + VTKM_EXEC Vec2 ConvertCoordToSpace(const Vec3 coord) const { Vec3 vec = coord - this->Origin; return Vec2(vtkm::dot(vec, this->Basis0), vtkm::dot(vec, this->Basis1)); } - VTKM_EXEC_EXPORT + VTKM_EXEC Vec3 ConvertVecFromSpace(const Vec2 vec) const { return vec[0]*this->Basis0 + vec[1]*this->Basis1; } @@ -66,7 +66,7 @@ struct Space2D // Given a series of point values for a wedge, return a new series of point // for a hexahedron that has the same interpolation within the wedge. template -VTKM_EXEC_EXPORT +VTKM_EXEC vtkm::Vec PermuteWedgeToHex(const FieldVecType &field) { @@ -87,7 +87,7 @@ PermuteWedgeToHex(const FieldVecType &field) // Given a series of point values for a pyramid, return a new series of point // for a hexahedron that has the same interpolation within the pyramid. template -VTKM_EXEC_EXPORT +VTKM_EXEC vtkm::Vec PermutePyramidToHex(const FieldVecType &field) { @@ -187,7 +187,7 @@ PermutePyramidToHex(const FieldVecType &field) template -VTKM_EXEC_EXPORT +VTKM_EXEC void JacobianFor3DCell(const WorldCoordType &wCoords, const vtkm::Vec &pcoords, vtkm::Matrix &jacobian, @@ -203,7 +203,7 @@ void JacobianFor3DCell(const WorldCoordType &wCoords, template -VTKM_EXEC_EXPORT +VTKM_EXEC void JacobianFor3DCell(const WorldCoordType &wCoords, const vtkm::Vec &pcoords, vtkm::Matrix &jacobian, @@ -227,7 +227,7 @@ void JacobianFor3DCell(const WorldCoordType &wCoords, template -VTKM_EXEC_EXPORT +VTKM_EXEC void JacobianFor3DCell(const WorldCoordType &wCoords, const vtkm::Vec &pcoords, vtkm::Matrix &jacobian, @@ -263,7 +263,7 @@ void JacobianFor3DCell(const WorldCoordType &wCoords, template -VTKM_EXEC_EXPORT +VTKM_EXEC void JacobianFor2DCell(const WorldCoordType &wCoords, const vtkm::Vec &pcoords, const vtkm::exec::internal::Space2D &space, @@ -286,7 +286,7 @@ void JacobianFor2DCell(const WorldCoordType &wCoords, template -VTKM_EXEC_EXPORT +VTKM_EXEC void JacobianFor2DCell(const WorldCoordType &wCoords, const vtkm::Vec &pcoords, const vtkm::exec::internal::Space2D &space, diff --git a/vtkm/exec/ParametricCoordinates.h b/vtkm/exec/ParametricCoordinates.h index 812d80435..e9962e25a 100644 --- a/vtkm/exec/ParametricCoordinates.h +++ b/vtkm/exec/ParametricCoordinates.h @@ -35,7 +35,7 @@ namespace exec { //----------------------------------------------------------------------------- template -VTKM_EXEC_EXPORT +static inline VTKM_EXEC void ParametricCoordinatesCenter(vtkm::IdComponent numPoints, vtkm::Vec &pcoords, vtkm::CellShapeTagEmpty, @@ -49,7 +49,7 @@ void ParametricCoordinatesCenter(vtkm::IdComponent numPoints, } template -VTKM_EXEC_EXPORT +static inline VTKM_EXEC void ParametricCoordinatesCenter(vtkm::IdComponent numPoints, vtkm::Vec &pcoords, vtkm::CellShapeTagVertex, @@ -63,7 +63,7 @@ void ParametricCoordinatesCenter(vtkm::IdComponent numPoints, } template -VTKM_EXEC_EXPORT +static inline VTKM_EXEC void ParametricCoordinatesCenter(vtkm::IdComponent numPoints, vtkm::Vec &pcoords, vtkm::CellShapeTagLine, @@ -77,7 +77,7 @@ void ParametricCoordinatesCenter(vtkm::IdComponent numPoints, } template -VTKM_EXEC_EXPORT +static inline VTKM_EXEC void ParametricCoordinatesCenter(vtkm::IdComponent numPoints, vtkm::Vec &pcoords, vtkm::CellShapeTagTriangle, @@ -91,7 +91,7 @@ void ParametricCoordinatesCenter(vtkm::IdComponent numPoints, } template -VTKM_EXEC_EXPORT +static inline VTKM_EXEC void ParametricCoordinatesCenter(vtkm::IdComponent numPoints, vtkm::Vec &pcoords, vtkm::CellShapeTagPolygon, @@ -121,7 +121,7 @@ void ParametricCoordinatesCenter(vtkm::IdComponent numPoints, } template -VTKM_EXEC_EXPORT +static inline VTKM_EXEC void ParametricCoordinatesCenter(vtkm::IdComponent numPoints, vtkm::Vec &pcoords, vtkm::CellShapeTagQuad, @@ -135,7 +135,7 @@ void ParametricCoordinatesCenter(vtkm::IdComponent numPoints, } template -VTKM_EXEC_EXPORT +static inline VTKM_EXEC void ParametricCoordinatesCenter(vtkm::IdComponent numPoints, vtkm::Vec &pcoords, vtkm::CellShapeTagTetra, @@ -149,7 +149,7 @@ void ParametricCoordinatesCenter(vtkm::IdComponent numPoints, } template -VTKM_EXEC_EXPORT +static inline VTKM_EXEC void ParametricCoordinatesCenter(vtkm::IdComponent numPoints, vtkm::Vec &pcoords, vtkm::CellShapeTagHexahedron, @@ -163,7 +163,7 @@ void ParametricCoordinatesCenter(vtkm::IdComponent numPoints, } template -VTKM_EXEC_EXPORT +static inline VTKM_EXEC void ParametricCoordinatesCenter(vtkm::IdComponent numPoints, vtkm::Vec &pcoords, vtkm::CellShapeTagWedge, @@ -177,7 +177,7 @@ void ParametricCoordinatesCenter(vtkm::IdComponent numPoints, } template -VTKM_EXEC_EXPORT +static inline VTKM_EXEC void ParametricCoordinatesCenter(vtkm::IdComponent numPoints, vtkm::Vec &pcoords, vtkm::CellShapeTagPyramid, @@ -195,7 +195,7 @@ void ParametricCoordinatesCenter(vtkm::IdComponent numPoints, /// of points. /// template -VTKM_EXEC_EXPORT +static inline VTKM_EXEC void ParametricCoordinatesCenter(vtkm::IdComponent numPoints, vtkm::Vec &pcoords, vtkm::CellShapeTagGeneric shape, @@ -218,7 +218,7 @@ void ParametricCoordinatesCenter(vtkm::IdComponent numPoints, /// of points. /// template -VTKM_EXEC_EXPORT +static inline VTKM_EXEC vtkm::Vec ParametricCoordinatesCenter(vtkm::IdComponent numPoints, CellShapeTag shape, @@ -231,7 +231,7 @@ ParametricCoordinatesCenter(vtkm::IdComponent numPoints, //----------------------------------------------------------------------------- template -VTKM_EXEC_EXPORT +static inline VTKM_EXEC void ParametricCoordinatesPoint(vtkm::IdComponent, vtkm::IdComponent, vtkm::Vec &pcoords, @@ -243,7 +243,7 @@ void ParametricCoordinatesPoint(vtkm::IdComponent, } template -VTKM_EXEC_EXPORT +static inline VTKM_EXEC void ParametricCoordinatesPoint(vtkm::IdComponent numPoints, vtkm::IdComponent pointIndex, vtkm::Vec &pcoords, @@ -260,7 +260,7 @@ void ParametricCoordinatesPoint(vtkm::IdComponent numPoints, } template -VTKM_EXEC_EXPORT +static inline VTKM_EXEC void ParametricCoordinatesPoint(vtkm::IdComponent numPoints, vtkm::IdComponent pointIndex, vtkm::Vec &pcoords, @@ -277,7 +277,7 @@ void ParametricCoordinatesPoint(vtkm::IdComponent numPoints, } template -VTKM_EXEC_EXPORT +static inline VTKM_EXEC void ParametricCoordinatesPoint(vtkm::IdComponent numPoints, vtkm::IdComponent pointIndex, vtkm::Vec &pcoords, @@ -298,7 +298,7 @@ void ParametricCoordinatesPoint(vtkm::IdComponent numPoints, } template -VTKM_EXEC_EXPORT +static inline VTKM_EXEC void ParametricCoordinatesPoint(vtkm::IdComponent numPoints, vtkm::IdComponent pointIndex, vtkm::Vec &pcoords, @@ -351,7 +351,7 @@ void ParametricCoordinatesPoint(vtkm::IdComponent numPoints, } template -VTKM_EXEC_EXPORT +static inline VTKM_EXEC void ParametricCoordinatesPoint(vtkm::IdComponent numPoints, vtkm::IdComponent pointIndex, vtkm::Vec &pcoords, @@ -373,7 +373,7 @@ void ParametricCoordinatesPoint(vtkm::IdComponent numPoints, } template -VTKM_EXEC_EXPORT +static inline VTKM_EXEC void ParametricCoordinatesPoint(vtkm::IdComponent numPoints, vtkm::IdComponent pointIndex, vtkm::Vec &pcoords, @@ -394,7 +394,7 @@ void ParametricCoordinatesPoint(vtkm::IdComponent numPoints, } template -VTKM_EXEC_EXPORT +static inline VTKM_EXEC void ParametricCoordinatesPoint(vtkm::IdComponent numPoints, vtkm::IdComponent pointIndex, vtkm::Vec &pcoords, @@ -419,7 +419,7 @@ void ParametricCoordinatesPoint(vtkm::IdComponent numPoints, } template -VTKM_EXEC_EXPORT +static inline VTKM_EXEC void ParametricCoordinatesPoint(vtkm::IdComponent numPoints, vtkm::IdComponent pointIndex, vtkm::Vec &pcoords, @@ -442,7 +442,7 @@ void ParametricCoordinatesPoint(vtkm::IdComponent numPoints, } template -VTKM_EXEC_EXPORT +static inline VTKM_EXEC void ParametricCoordinatesPoint(vtkm::IdComponent numPoints, vtkm::IdComponent pointIndex, vtkm::Vec &pcoords, @@ -468,7 +468,7 @@ void ParametricCoordinatesPoint(vtkm::IdComponent numPoints, /// the given number of points. /// template -VTKM_EXEC_EXPORT +static inline VTKM_EXEC void ParametricCoordinatesPoint(vtkm::IdComponent numPoints, vtkm::IdComponent pointIndex, vtkm::Vec &pcoords, @@ -493,7 +493,7 @@ void ParametricCoordinatesPoint(vtkm::IdComponent numPoints, /// the given number of points. /// template -VTKM_EXEC_EXPORT +static inline VTKM_EXEC vtkm::Vec ParametricCoordinatesPoint(vtkm::IdComponent numPoints, vtkm::IdComponent pointIndex, @@ -507,7 +507,7 @@ ParametricCoordinatesPoint(vtkm::IdComponent numPoints, //----------------------------------------------------------------------------- template -VTKM_EXEC_EXPORT +static inline VTKM_EXEC typename WorldCoordVector::ComponentType ParametricCoordinatesToWorldCoordinates( const WorldCoordVector &pointWCoords, @@ -534,14 +534,14 @@ class JacobianFunctorQuad const SpaceType *Space; public: - VTKM_EXEC_EXPORT + VTKM_EXEC JacobianFunctorQuad( const WorldCoordVector *pointWCoords, const SpaceType *space) : PointWCoords(pointWCoords), Space(space) { } - VTKM_EXEC_EXPORT + VTKM_EXEC Matrix2x2 operator()(const Vector2 &pcoords) const { Matrix2x2 jacobian; @@ -568,7 +568,7 @@ class CoordinatesFunctorQuad const vtkm::exec::FunctorBase *Worklet; public: - VTKM_EXEC_EXPORT + VTKM_EXEC CoordinatesFunctorQuad( const WorldCoordVector *pointWCoords, const SpaceType *space, @@ -576,7 +576,7 @@ public: : PointWCoords(pointWCoords), Space(space), Worklet(worklet) { } - VTKM_EXEC_EXPORT + VTKM_EXEC Vector2 operator()(Vector2 pcoords) const { Vector3 pcoords3D(pcoords[0], pcoords[1], 0); Vector3 wcoords = @@ -596,13 +596,13 @@ class JacobianFunctor3DCell const WorldCoordVector *PointWCoords; public: - VTKM_EXEC_EXPORT + VTKM_EXEC JacobianFunctor3DCell( const WorldCoordVector *pointWCoords) : PointWCoords(pointWCoords) { } - VTKM_EXEC_EXPORT + VTKM_EXEC Matrix3x3 operator()(const Vector3 &pcoords) const { Matrix3x3 jacobian; @@ -624,13 +624,13 @@ class CoordinatesFunctor3DCell const vtkm::exec::FunctorBase *Worklet; public: - VTKM_EXEC_EXPORT + VTKM_EXEC CoordinatesFunctor3DCell(const WorldCoordVector *pointWCoords, const vtkm::exec::FunctorBase *worklet) : PointWCoords(pointWCoords), Worklet(worklet) { } - VTKM_EXEC_EXPORT + VTKM_EXEC Vector3 operator()(Vector3 pcoords) const { return vtkm::exec::ParametricCoordinatesToWorldCoordinates( @@ -639,7 +639,7 @@ public: }; template -VTKM_EXEC_EXPORT +static inline VTKM_EXEC typename WorldCoordVector::ComponentType WorldCoordinatesToParametricCoordinates3D( const WorldCoordVector &pointWCoords, @@ -659,7 +659,7 @@ WorldCoordinatesToParametricCoordinates3D( //----------------------------------------------------------------------------- template -VTKM_EXEC_EXPORT +static inline VTKM_EXEC typename WorldCoordVector::ComponentType WorldCoordinatesToParametricCoordinates( const WorldCoordVector &pointWCoords, @@ -684,7 +684,7 @@ WorldCoordinatesToParametricCoordinates( } template -VTKM_EXEC_EXPORT +static inline VTKM_EXEC typename WorldCoordVector::ComponentType WorldCoordinatesToParametricCoordinates( const WorldCoordVector &, @@ -697,7 +697,7 @@ WorldCoordinatesToParametricCoordinates( } template -VTKM_EXEC_EXPORT +static inline VTKM_EXEC typename WorldCoordVector::ComponentType WorldCoordinatesToParametricCoordinates( const WorldCoordVector &pointWCoords, @@ -711,7 +711,7 @@ WorldCoordinatesToParametricCoordinates( } template -VTKM_EXEC_EXPORT +static inline VTKM_EXEC typename WorldCoordVector::ComponentType WorldCoordinatesToParametricCoordinates( const WorldCoordVector &pointWCoords, @@ -740,7 +740,7 @@ WorldCoordinatesToParametricCoordinates( return Vector3(numerator/denominator, 0, 0); } -VTKM_EXEC_EXPORT +static inline VTKM_EXEC vtkm::Vec WorldCoordinatesToParametricCoordinates( const vtkm::VecRectilinearPointCoordinates<1> &pointWCoords, @@ -752,7 +752,7 @@ WorldCoordinatesToParametricCoordinates( } template -VTKM_EXEC_EXPORT +static inline VTKM_EXEC typename WorldCoordVector::ComponentType WorldCoordinatesToParametricCoordinates( const WorldCoordVector &pointWCoords, @@ -765,7 +765,7 @@ WorldCoordinatesToParametricCoordinates( } template -VTKM_EXEC_EXPORT +static inline VTKM_EXEC typename WorldCoordVector::ComponentType WorldCoordinatesToParametricCoordinates( const WorldCoordVector &pointWCoords, @@ -901,7 +901,7 @@ WorldCoordinatesToParametricCoordinates( } template -VTKM_EXEC_EXPORT +static inline VTKM_EXEC typename WorldCoordVector::ComponentType WorldCoordinatesToParametricCoordinates( const WorldCoordVector &pointWCoords, @@ -930,7 +930,7 @@ WorldCoordinatesToParametricCoordinates( return Vector3(pcoords[0], pcoords[1], 0); } -VTKM_EXEC_EXPORT +static inline VTKM_EXEC vtkm::Vec WorldCoordinatesToParametricCoordinates( const vtkm::VecRectilinearPointCoordinates<2> &pointWCoords, @@ -942,7 +942,7 @@ WorldCoordinatesToParametricCoordinates( } template -VTKM_EXEC_EXPORT +static inline VTKM_EXEC typename WorldCoordVector::ComponentType WorldCoordinatesToParametricCoordinates( const WorldCoordVector &pointWCoords, @@ -998,7 +998,7 @@ WorldCoordinatesToParametricCoordinates( template -VTKM_EXEC_EXPORT +static inline VTKM_EXEC typename WorldCoordVector::ComponentType WorldCoordinatesToParametricCoordinates( const WorldCoordVector &pointWCoords, @@ -1012,7 +1012,7 @@ WorldCoordinatesToParametricCoordinates( pointWCoords, wcoords, vtkm::CellShapeTagHexahedron(), worklet); } -VTKM_EXEC_EXPORT +static inline VTKM_EXEC vtkm::Vec WorldCoordinatesToParametricCoordinates( const vtkm::VecRectilinearPointCoordinates<3> &pointWCoords, @@ -1024,7 +1024,7 @@ WorldCoordinatesToParametricCoordinates( } template -VTKM_EXEC_EXPORT +static inline VTKM_EXEC typename WorldCoordVector::ComponentType WorldCoordinatesToParametricCoordinates( const WorldCoordVector &pointWCoords, @@ -1040,7 +1040,7 @@ WorldCoordinatesToParametricCoordinates( template -VTKM_EXEC_EXPORT +static inline VTKM_EXEC typename WorldCoordVector::ComponentType WorldCoordinatesToParametricCoordinates( const WorldCoordVector &pointWCoords, diff --git a/vtkm/exec/arg/CellShape.h b/vtkm/exec/arg/CellShape.h index 5a9d1e5a8..2c1f7c666 100644 --- a/vtkm/exec/arg/CellShape.h +++ b/vtkm/exec/arg/CellShape.h @@ -57,13 +57,13 @@ struct Fetch ValueType; VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_EXPORT + VTKM_EXEC static ValueType Load(const ThreadIndicesType &indices, const FieldExecObjectType &field) { @@ -84,7 +84,7 @@ struct FetchArrayTopologyMapInImplementation } }; -VTKM_EXEC_EXPORT +static inline VTKM_EXEC vtkm::VecRectilinearPointCoordinates<1> make_VecRectilinearPointCoordinates( const vtkm::Vec &origin, @@ -98,7 +98,7 @@ make_VecRectilinearPointCoordinates( return vtkm::VecRectilinearPointCoordinates<1>(offsetOrigin, spacing); } -VTKM_EXEC_EXPORT +static inline VTKM_EXEC vtkm::VecRectilinearPointCoordinates<1> make_VecRectilinearPointCoordinates( const vtkm::Vec &origin, @@ -109,7 +109,7 @@ make_VecRectilinearPointCoordinates( origin, spacing, vtkm::Vec(logicalId)); } -VTKM_EXEC_EXPORT +static inline VTKM_EXEC vtkm::VecRectilinearPointCoordinates<2> make_VecRectilinearPointCoordinates( const vtkm::Vec &origin, @@ -123,7 +123,7 @@ make_VecRectilinearPointCoordinates( return vtkm::VecRectilinearPointCoordinates<2>(offsetOrigin, spacing); } -VTKM_EXEC_EXPORT +static inline VTKM_EXEC vtkm::VecRectilinearPointCoordinates<3> make_VecRectilinearPointCoordinates( const vtkm::Vec &origin, @@ -154,7 +154,7 @@ struct FetchArrayTopologyMapInImplementation< typedef vtkm::VecRectilinearPointCoordinates ValueType; VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_EXPORT + VTKM_EXEC static ValueType Load( const ThreadIndicesType &indices, const vtkm::internal::ArrayPortalUniformPointCoordinates &field) @@ -186,14 +186,14 @@ struct Fetch< typedef typename Implementation::ValueType ValueType; VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_EXPORT + VTKM_EXEC ValueType Load(const ThreadIndicesType &indices, const ExecObjectType &field) const { return Implementation::Load(indices, field); } - VTKM_EXEC_EXPORT + VTKM_EXEC void Store(const ThreadIndicesType &, const ExecObjectType &, const ValueType &) const diff --git a/vtkm/exec/arg/FetchTagCellSetIn.h b/vtkm/exec/arg/FetchTagCellSetIn.h index b8392c8c7..e768c0ca5 100644 --- a/vtkm/exec/arg/FetchTagCellSetIn.h +++ b/vtkm/exec/arg/FetchTagCellSetIn.h @@ -51,13 +51,13 @@ struct Fetch< typedef typename ThreadIndicesType::CellShapeTag ValueType; VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_EXPORT + VTKM_EXEC ValueType Load(const ThreadIndicesType &indices, const ExecObjectType &) const { return indices.GetCellShape(); } - VTKM_EXEC_EXPORT + VTKM_EXEC void Store(const ThreadIndicesType &, const ExecObjectType &, const ValueType &) const diff --git a/vtkm/exec/arg/FetchTagExecObject.h b/vtkm/exec/arg/FetchTagExecObject.h index c59d40cc9..c3e35759b 100644 --- a/vtkm/exec/arg/FetchTagExecObject.h +++ b/vtkm/exec/arg/FetchTagExecObject.h @@ -58,14 +58,14 @@ struct Fetch< typedef ExecObjectType ValueType; VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_EXPORT + VTKM_EXEC ValueType Load(const ThreadIndicesType &vtkmNotUsed(indices), const ExecObjectType &execObject) const { return execObject; } - VTKM_EXEC_EXPORT + VTKM_EXEC void Store(const ThreadIndicesType &, const ExecObjectType &, const ValueType &) const diff --git a/vtkm/exec/arg/FromCount.h b/vtkm/exec/arg/FromCount.h index cdb643b8f..65f10a4f2 100644 --- a/vtkm/exec/arg/FromCount.h +++ b/vtkm/exec/arg/FromCount.h @@ -63,13 +63,13 @@ struct FetchInputIndex; } /// \brief The 3D index into the input domain. @@ -69,7 +69,7 @@ public: /// indexing is just one dimensional, the result will have the index in the /// first component with the remaining components set to 0. /// - VTKM_EXEC_EXPORT + VTKM_EXEC vtkm::Id3 GetInputIndex3D() const { return vtkm::Id3(this->GetInputIndex(), 0, 0); @@ -81,7 +81,7 @@ public: /// this thread is creating. This is the typical index used during /// Fetch::Store. /// - VTKM_EXEC_EXPORT + VTKM_EXEC vtkm::Id GetOutputIndex() const { return this->OutputIndex; } /// \brief The visit index. @@ -89,13 +89,13 @@ public: /// When multiple output indices have the same input index, they are /// distinguished using the visit index. /// - VTKM_EXEC_EXPORT + VTKM_EXEC vtkm::IdComponent GetVisitIndex() const { return this->VisitIndex; } /// \brief The global index (for streaming). /// /// Global index (for streaming) - VTKM_EXEC_EXPORT + VTKM_EXEC vtkm::Id GetGlobalIndex() const { return (this->GlobalThreadIndexOffset + this->OutputIndex); } private: diff --git a/vtkm/exec/arg/ThreadIndicesTopologyMap.h b/vtkm/exec/arg/ThreadIndicesTopologyMap.h index 60e9119e8..483d5fe14 100644 --- a/vtkm/exec/arg/ThreadIndicesTopologyMap.h +++ b/vtkm/exec/arg/ThreadIndicesTopologyMap.h @@ -37,14 +37,14 @@ namespace detail { template struct CellShapeInitializer { - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT static CellShapeTag GetDefault() { return CellShapeTag(); } }; template<> struct CellShapeInitializer { - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT static vtkm::CellShapeTagGeneric GetDefault() { return vtkm::CellShapeTagGeneric(vtkm::CELL_SHAPE_EMPTY); @@ -74,7 +74,7 @@ public: VTKM_SUPPRESS_EXEC_WARNINGS template - VTKM_EXEC_EXPORT + VTKM_EXEC ThreadIndicesTopologyMap(vtkm::Id threadIndex, const OutToInArrayType& inToOut, const VisitArrayType& visit, @@ -100,7 +100,7 @@ public: /// but can be several "from" element. This method returns a Vec-like object /// containing the indices to the "from" elements. /// - VTKM_EXEC_EXPORT + VTKM_EXEC const IndicesFromType &GetIndicesFrom() const { return this->IndicesFrom; } /// \brief The input indices of the "from" elements in pointer form. @@ -112,7 +112,7 @@ public: /// instead. However, care should be taken to make sure that this object does /// not go out of scope, at which time the returned pointer becomes invalid. /// - VTKM_EXEC_EXPORT + VTKM_EXEC const IndicesFromType *GetIndicesFromPointer() const { return &this->IndicesFrom; @@ -125,7 +125,7 @@ public: /// index, it defines the meaning of the indices, so we put it here. (That /// and this class is the only convenient place to store it.) /// - VTKM_EXEC_EXPORT + VTKM_EXEC CellShapeTag GetCellShape() const { return this->CellShape; } private: @@ -136,34 +136,34 @@ private: namespace detail { // Helper function to increase an index to 3D. -VTKM_EXEC_EXPORT +static inline VTKM_EXEC vtkm::Id3 InflateTo3D(vtkm::Id3 index) { return index; } -VTKM_EXEC_EXPORT +static inline VTKM_EXEC vtkm::Id3 InflateTo3D(vtkm::Id2 index) { return vtkm::Id3(index[0], index[1], 0); } -VTKM_EXEC_EXPORT +static inline VTKM_EXEC vtkm::Id3 InflateTo3D(vtkm::Vec index) { return vtkm::Id3(index[0], 0, 0); } -VTKM_EXEC_EXPORT +static inline VTKM_EXEC vtkm::Id3 InflateTo3D(vtkm::Id index) { return vtkm::Id3(index, 0, 0); } -VTKM_EXEC_EXPORT +static inline VTKM_EXEC vtkm::Id3 Deflate(const vtkm::Id3& index, vtkm::Id3) { return index; } -VTKM_EXEC_EXPORT +static inline VTKM_EXEC vtkm::Id2 Deflate(const vtkm::Id3& index, vtkm::Id2) { return vtkm::Id2(index[0], index[1]); @@ -188,7 +188,7 @@ public: typedef typename ConnectivityType::SchedulingRangeType LogicalIndexType; template - VTKM_EXEC_EXPORT + VTKM_EXEC ThreadIndicesTopologyMap(vtkm::Id threadIndex, const OutToInArrayType& inToOut, const VisitArrayType& visit, @@ -206,7 +206,7 @@ public: } template - VTKM_EXEC_EXPORT + VTKM_EXEC ThreadIndicesTopologyMap(const vtkm::Id3& threadIndex, const OutToInArrayType&, const VisitArrayType& visit, @@ -234,7 +234,7 @@ public: /// This is similar to \c GetIndex3D except the Vec size matches the actual /// dimensions of the data. /// - VTKM_EXEC_EXPORT + VTKM_EXEC LogicalIndexType GetIndexLogical() const { return this->LogicalIndex; @@ -246,7 +246,7 @@ public: /// this thread is being invoked for. This is the typical index used during /// fetches. /// - VTKM_EXEC_EXPORT + VTKM_EXEC vtkm::Id GetInputIndex() const { return this->InputIndex; @@ -257,7 +257,7 @@ public: /// Overloads the implementation in the base class to return the 3D index /// for the input. /// - VTKM_EXEC_EXPORT + VTKM_EXEC vtkm::Id3 GetInputIndex3D() const { return detail::InflateTo3D(this->GetIndexLogical()); @@ -269,7 +269,7 @@ public: /// this thread is creating. This is the typical index used during /// Fetch::Store. /// - VTKM_EXEC_EXPORT + VTKM_EXEC vtkm::Id GetOutputIndex() const { return this->OutputIndex; @@ -280,13 +280,13 @@ public: /// When multiple output indices have the same input index, they are /// distinguished using the visit index. /// - VTKM_EXEC_EXPORT + VTKM_EXEC vtkm::IdComponent GetVisitIndex() const { return this->VisitIndex; } - VTKM_EXEC_EXPORT + VTKM_EXEC vtkm::Id GetGlobalIndex() const { return (this->GlobalThreadIndexOffset + this->OutputIndex); @@ -299,7 +299,7 @@ public: /// but can be several "from" element. This method returns a Vec-like object /// containing the indices to the "from" elements. /// - VTKM_EXEC_EXPORT + VTKM_EXEC const IndicesFromType &GetIndicesFrom() const { return this->IndicesFrom; } /// \brief The input indices of the "from" elements in pointer form. @@ -311,7 +311,7 @@ public: /// instead. However, care should be taken to make sure that this object does /// not go out of scope, at which time the returned pointer becomes invalid. /// - VTKM_EXEC_EXPORT + VTKM_EXEC const IndicesFromType *GetIndicesFromPointer() const { return &this->IndicesFrom; @@ -324,7 +324,7 @@ public: /// index, it defines the meaning of the indices, so we put it here. (That /// and this class is the only convenient place to store it.) /// - VTKM_EXEC_EXPORT + VTKM_EXEC CellShapeTag GetCellShape() const { return this->CellShape; } private: diff --git a/vtkm/exec/arg/VisitIndex.h b/vtkm/exec/arg/VisitIndex.h index a59f63139..5481c1d69 100644 --- a/vtkm/exec/arg/VisitIndex.h +++ b/vtkm/exec/arg/VisitIndex.h @@ -64,14 +64,14 @@ struct FetchInputIndex; } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::Id3 GetInputIndex3D() const { return vtkm::Id3(this->GetInputIndex(), 0, 0); } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::Id GetOutputIndex() const { return this->OutputIndex; } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::IdComponent GetVisitIndex() const { return this->VisitIndex; } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::Id GetGlobalIndex() const { return this->OutputIndex; } private: diff --git a/vtkm/exec/arg/testing/UnitTestFetchArrayDirectIn.cxx b/vtkm/exec/arg/testing/UnitTestFetchArrayDirectIn.cxx index cbb1a8392..e57d93401 100644 --- a/vtkm/exec/arg/testing/UnitTestFetchArrayDirectIn.cxx +++ b/vtkm/exec/arg/testing/UnitTestFetchArrayDirectIn.cxx @@ -33,10 +33,10 @@ struct TestPortal { typedef T ValueType; - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::Id GetNumberOfValues() const { return ARRAY_SIZE; } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT ValueType Get(vtkm::Id index) const { VTKM_TEST_ASSERT(index >= 0, "Bad portal index."); VTKM_TEST_ASSERT(index < this->GetNumberOfValues(), "Bad portal index."); diff --git a/vtkm/exec/arg/testing/UnitTestFetchArrayDirectInOut.cxx b/vtkm/exec/arg/testing/UnitTestFetchArrayDirectInOut.cxx index 5d7f2b5a1..296a89080 100644 --- a/vtkm/exec/arg/testing/UnitTestFetchArrayDirectInOut.cxx +++ b/vtkm/exec/arg/testing/UnitTestFetchArrayDirectInOut.cxx @@ -35,17 +35,17 @@ struct TestPortal { typedef T ValueType; - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::Id GetNumberOfValues() const { return ARRAY_SIZE; } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT ValueType Get(vtkm::Id index) const { VTKM_TEST_ASSERT(index >= 0, "Bad portal index."); VTKM_TEST_ASSERT(index < this->GetNumberOfValues(), "Bad portal index."); return TestValue(index, ValueType()); } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT void Set(vtkm::Id index, const ValueType &value) const { VTKM_TEST_ASSERT(index >= 0, "Bad portal index."); VTKM_TEST_ASSERT(index < this->GetNumberOfValues(), "Bad portal index."); diff --git a/vtkm/exec/arg/testing/UnitTestFetchArrayDirectOut.cxx b/vtkm/exec/arg/testing/UnitTestFetchArrayDirectOut.cxx index 8c62091ef..30ae6f91b 100644 --- a/vtkm/exec/arg/testing/UnitTestFetchArrayDirectOut.cxx +++ b/vtkm/exec/arg/testing/UnitTestFetchArrayDirectOut.cxx @@ -35,10 +35,10 @@ struct TestPortal { typedef T ValueType; - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::Id GetNumberOfValues() const { return ARRAY_SIZE; } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT void Set(vtkm::Id index, const ValueType &value) const { VTKM_TEST_ASSERT(index >= 0, "Bad portal index."); VTKM_TEST_ASSERT(index < this->GetNumberOfValues(), "Bad portal index."); diff --git a/vtkm/exec/arg/testing/UnitTestFetchArrayTopologyMapIn.cxx b/vtkm/exec/arg/testing/UnitTestFetchArrayTopologyMapIn.cxx index 3c3ea2252..0373d669c 100644 --- a/vtkm/exec/arg/testing/UnitTestFetchArrayTopologyMapIn.cxx +++ b/vtkm/exec/arg/testing/UnitTestFetchArrayTopologyMapIn.cxx @@ -36,10 +36,10 @@ struct TestPortal { typedef T ValueType; - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::Id GetNumberOfValues() const { return ARRAY_SIZE; } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT ValueType Get(vtkm::Id index) const { VTKM_TEST_ASSERT(index >= 0, "Bad portal index."); VTKM_TEST_ASSERT(index < this->GetNumberOfValues(), "Bad portal index."); @@ -51,7 +51,7 @@ struct TestIndexPortal { typedef vtkm::Id ValueType; - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT ValueType Get(vtkm::Id index) const { return index; } }; @@ -59,7 +59,7 @@ struct TestZeroPortal { typedef vtkm::IdComponent ValueType; - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT ValueType Get(vtkm::Id) const { return 0; } }; diff --git a/vtkm/exec/cuda/internal/ArrayPortalFromThrust.h b/vtkm/exec/cuda/internal/ArrayPortalFromThrust.h index 2389ad629..d9c16a24a 100644 --- a/vtkm/exec/cuda/internal/ArrayPortalFromThrust.h +++ b/vtkm/exec/cuda/internal/ArrayPortalFromThrust.h @@ -239,9 +239,9 @@ public: typedef T ValueType; typedef thrust::system::cuda::pointer< T > IteratorType; - VTKM_EXEC_CONT_EXPORT ArrayPortalFromThrust() { } + VTKM_EXEC_CONT ArrayPortalFromThrust() { } - VTKM_CONT_EXPORT + VTKM_CONT ArrayPortalFromThrust(thrust::system::cuda::pointer< T > begin, thrust::system::cuda::pointer< T > end) : BeginIterator( begin ), @@ -253,13 +253,13 @@ public: /// type casting that the iterators do (like the non-const to const cast). /// template - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT ArrayPortalFromThrust(const ArrayPortalFromThrust &src) : BeginIterator(src.GetIteratorBegin()), EndIterator(src.GetIteratorEnd()) { } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::Id GetNumberOfValues() const { // Not using std::distance because on CUDA it cannot be used on a device. return static_cast( (this->EndIterator - this->BeginIterator) ); @@ -279,10 +279,10 @@ public: *(this->BeginIterator + static_cast(index)) = value; } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT IteratorType GetIteratorBegin() const { return this->BeginIterator; } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT IteratorType GetIteratorEnd() const { return this->EndIterator; } private: @@ -298,9 +298,9 @@ public: typedef T ValueType; typedef thrust::system::cuda::pointer< const T > IteratorType; - VTKM_EXEC_CONT_EXPORT ConstArrayPortalFromThrust() { } + VTKM_EXEC_CONT ConstArrayPortalFromThrust() { } - VTKM_CONT_EXPORT + VTKM_CONT ConstArrayPortalFromThrust(const thrust::system::cuda::pointer< const T > begin, const thrust::system::cuda::pointer< const T > end) : BeginIterator( begin ), @@ -314,14 +314,14 @@ public: /// type casting that the iterators do (like the non-const to const cast). /// // template - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT ConstArrayPortalFromThrust(const ArrayPortalFromThrust &src) : BeginIterator(src.GetIteratorBegin()), EndIterator(src.GetIteratorEnd()) { } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::Id GetNumberOfValues() const { // Not using std::distance because on CUDA it cannot be used on a device. return static_cast( (this->EndIterator - this->BeginIterator) ); @@ -350,10 +350,10 @@ public: *(this->BeginIterator + index) = value; } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT IteratorType GetIteratorBegin() const { return this->BeginIterator; } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT IteratorType GetIteratorEnd() const { return this->EndIterator; } private: @@ -384,16 +384,16 @@ public: typedef typename PortalType::IteratorType IteratorType; - VTKM_CONT_EXPORT + VTKM_CONT ArrayPortalToIterators(const PortalType &portal) : BIterator(portal.GetIteratorBegin()), EIterator(portal.GetIteratorEnd()) { } - VTKM_CONT_EXPORT + VTKM_CONT IteratorType GetBegin() const { return this->BIterator; } - VTKM_CONT_EXPORT + VTKM_CONT IteratorType GetEnd() const { return this->EIterator; } private: @@ -416,16 +416,16 @@ public: typedef typename PortalType::IteratorType IteratorType; - VTKM_CONT_EXPORT + VTKM_CONT ArrayPortalToIterators(const PortalType &portal) : BIterator(portal.GetIteratorBegin()), EIterator(portal.GetIteratorEnd()) { } - VTKM_CONT_EXPORT + VTKM_CONT IteratorType GetBegin() const { return this->BIterator; } - VTKM_CONT_EXPORT + VTKM_CONT IteratorType GetEnd() const { return this->EIterator; } private: diff --git a/vtkm/exec/cuda/internal/IteratorFromArrayPortal.h b/vtkm/exec/cuda/internal/IteratorFromArrayPortal.h index 206ffa5f9..d4727c791 100644 --- a/vtkm/exec/cuda/internal/IteratorFromArrayPortal.h +++ b/vtkm/exec/cuda/internal/IteratorFromArrayPortal.h @@ -41,11 +41,11 @@ struct PortalValue { typedef typename ArrayPortalType::ValueType ValueType; - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT PortalValue(const ArrayPortalType &portal, vtkm::Id index) : Portal(portal), Index(index) { } - VTKM_EXEC_EXPORT + VTKM_EXEC void Swap( PortalValue &rhs ) throw() { //we need use the explicit type not a proxy temp object @@ -56,7 +56,7 @@ struct PortalValue rhs = aValue; } - VTKM_EXEC_EXPORT + VTKM_EXEC PortalValue &operator=( const PortalValue &rhs) { @@ -64,14 +64,14 @@ struct PortalValue return *this; } - VTKM_EXEC_EXPORT + VTKM_EXEC ValueType operator=(const ValueType& value) const { this->Portal.Set(this->Index, value); return value; } - VTKM_EXEC_EXPORT + VTKM_EXEC operator ValueType(void) const { return this->Portal.Get(this->Index); @@ -93,16 +93,16 @@ class IteratorFromArrayPortal : public { public: - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT IteratorFromArrayPortal() : Portal(), Index(0) { } - VTKM_CONT_EXPORT + VTKM_CONT explicit IteratorFromArrayPortal(const ArrayPortalType &portal, vtkm::Id index = 0) : Portal(portal), Index(index) { } - VTKM_EXEC_EXPORT + VTKM_EXEC PortalValue operator[](std::ptrdiff_t idx) const //NEEDS to be signed { @@ -117,14 +117,14 @@ private: // Implementation for ::thrust iterator_facade friend class ::thrust::iterator_core_access; - VTKM_EXEC_EXPORT + VTKM_EXEC PortalValue dereference() const { return PortalValue(this->Portal, this->Index); } - VTKM_EXEC_EXPORT + VTKM_EXEC bool equal(const IteratorFromArrayPortal &other) const { // Technically, we should probably check that the portals are the same, @@ -134,25 +134,25 @@ private: return (this->Index == other.Index); } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT void increment() { this->Index++; } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT void decrement() { this->Index--; } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT void advance(std::ptrdiff_t delta) { this->Index += static_cast(delta); } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT std::ptrdiff_t distance_to(const IteratorFromArrayPortal &other) const { diff --git a/vtkm/exec/cuda/internal/WrappedOperators.h b/vtkm/exec/cuda/internal/WrappedOperators.h index 1163759aa..821bfcda2 100644 --- a/vtkm/exec/cuda/internal/WrappedOperators.h +++ b/vtkm/exec/cuda/internal/WrappedOperators.h @@ -52,28 +52,28 @@ struct WrappedUnaryPredicate Function m_f; - VTKM_EXEC_EXPORT + VTKM_EXEC WrappedUnaryPredicate() : m_f() {} - VTKM_CONT_EXPORT + VTKM_CONT WrappedUnaryPredicate(const Function &f) : m_f(f) {} - VTKM_EXEC_EXPORT bool operator()(const T &x) const + VTKM_EXEC bool operator()(const T &x) const { return m_f(x); } template - VTKM_EXEC_EXPORT bool operator()(const PortalValue &x) const + VTKM_EXEC bool operator()(const PortalValue &x) const { return m_f((T)x); } - VTKM_EXEC_EXPORT bool operator()(const thrust::system::cuda::pointer x) const + VTKM_EXEC bool operator()(const thrust::system::cuda::pointer x) const { return m_f(*x); } @@ -96,62 +96,62 @@ struct WrappedBinaryOperator Function m_f; - VTKM_EXEC_EXPORT + VTKM_EXEC WrappedBinaryOperator() : m_f() {} - VTKM_CONT_EXPORT + VTKM_CONT WrappedBinaryOperator(const Function &f) : m_f(f) {} - VTKM_EXEC_EXPORT T operator()(const T &x, const T &y) const + VTKM_EXEC T operator()(const T &x, const T &y) const { return m_f(x, y); } template - VTKM_EXEC_EXPORT T operator()(const T &x, + VTKM_EXEC T operator()(const T &x, const PortalValue &y) const { return m_f(x, (T)y); } template - VTKM_EXEC_EXPORT T operator()(const PortalValue &x, + VTKM_EXEC T operator()(const PortalValue &x, const T &y) const { return m_f((T)x, y); } template - VTKM_EXEC_EXPORT T operator()(const PortalValue &x, + VTKM_EXEC T operator()(const PortalValue &x, const PortalValue &y) const { return m_f((T)x, (T)y); } - VTKM_EXEC_EXPORT T operator()(const thrust::system::cuda::pointer x, + VTKM_EXEC T operator()(const thrust::system::cuda::pointer x, const T* y) const { return m_f(*x, *y); } - VTKM_EXEC_EXPORT T operator()(const thrust::system::cuda::pointer x, + VTKM_EXEC T operator()(const thrust::system::cuda::pointer x, const T& y) const { return m_f(*x, y); } - VTKM_EXEC_EXPORT T operator()(const T& x, + VTKM_EXEC T operator()(const T& x, const thrust::system::cuda::pointer y) const { return m_f(x, *y); } - VTKM_EXEC_EXPORT T operator()(const thrust::system::cuda::pointer x, + VTKM_EXEC T operator()(const thrust::system::cuda::pointer x, const thrust::system::cuda::pointer y) const { return m_f(*x, *y); @@ -171,62 +171,62 @@ struct WrappedBinaryPredicate Function m_f; - VTKM_EXEC_EXPORT + VTKM_EXEC WrappedBinaryPredicate() : m_f() {} - VTKM_CONT_EXPORT + VTKM_CONT WrappedBinaryPredicate(const Function &f) : m_f(f) {} - VTKM_EXEC_EXPORT bool operator()(const T &x, const T &y) const + VTKM_EXEC bool operator()(const T &x, const T &y) const { return m_f(x, y); } template - VTKM_EXEC_EXPORT bool operator()(const T &x, + VTKM_EXEC bool operator()(const T &x, const PortalValue &y) const { return m_f(x, (T)y); } template - VTKM_EXEC_EXPORT bool operator()(const PortalValue &x, + VTKM_EXEC bool operator()(const PortalValue &x, const T &y) const { return m_f((T)x, y); } template - VTKM_EXEC_EXPORT bool operator()(const PortalValue &x, + VTKM_EXEC bool operator()(const PortalValue &x, const PortalValue &y) const { return m_f((T)x, (T)y); } - VTKM_EXEC_EXPORT bool operator()(const thrust::system::cuda::pointer x, + VTKM_EXEC bool operator()(const thrust::system::cuda::pointer x, const T* y) const { return m_f(*x, *y); } - VTKM_EXEC_EXPORT bool operator()(const thrust::system::cuda::pointer x, + VTKM_EXEC bool operator()(const thrust::system::cuda::pointer x, const T& y) const { return m_f(*x, y); } - VTKM_EXEC_EXPORT bool operator()(const T& x, + VTKM_EXEC bool operator()(const T& x, const thrust::system::cuda::pointer y) const { return m_f(x, *y); } - VTKM_EXEC_EXPORT bool operator()(const thrust::system::cuda::pointer x, + VTKM_EXEC bool operator()(const thrust::system::cuda::pointer x, const thrust::system::cuda::pointer y) const { return m_f(*x, *y); diff --git a/vtkm/exec/internal/ErrorMessageBuffer.h b/vtkm/exec/internal/ErrorMessageBuffer.h index 3d5c33025..9802a5bab 100644 --- a/vtkm/exec/internal/ErrorMessageBuffer.h +++ b/vtkm/exec/internal/ErrorMessageBuffer.h @@ -40,14 +40,14 @@ namespace internal { class ErrorMessageBuffer { public: - VTKM_EXEC_CONT_EXPORT ErrorMessageBuffer() + VTKM_EXEC_CONT ErrorMessageBuffer() : MessageBuffer(NULL), MessageBufferSize(0) { } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT ErrorMessageBuffer(char *messageBuffer, vtkm::Id bufferSize) : MessageBuffer(messageBuffer), MessageBufferSize(bufferSize) { } - VTKM_EXEC_EXPORT void RaiseError(const char *message) const + VTKM_EXEC void RaiseError(const char *message) const { // Only raise the error if one has not been raised yet. This check is not // guaranteed to work across threads. However, chances are that if two or @@ -69,7 +69,7 @@ public: this->MessageBuffer[this->MessageBufferSize-1] = '\0'; } - VTKM_EXEC_CONT_EXPORT bool IsErrorRaised() const + VTKM_EXEC_CONT bool IsErrorRaised() const { if (this->MessageBufferSize > 0) { diff --git a/vtkm/exec/internal/VecFromPortal.h b/vtkm/exec/internal/VecFromPortal.h index be9d7858b..a5d6c2c8b 100644 --- a/vtkm/exec/internal/VecFromPortal.h +++ b/vtkm/exec/internal/VecFromPortal.h @@ -42,23 +42,23 @@ public: typename std::remove_const::type; VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_EXPORT + VTKM_EXEC VecFromPortal() : NumComponents(0), Offset(0) { } VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_EXPORT + VTKM_EXEC VecFromPortal(const PortalType &portal, vtkm::IdComponent numComponents = 0, vtkm::Id offset = 0) : Portal(portal), NumComponents(numComponents), Offset(offset) { } - VTKM_EXEC_EXPORT + VTKM_EXEC vtkm::IdComponent GetNumberOfComponents() const { return this->NumComponents; } template - VTKM_EXEC_EXPORT + VTKM_EXEC void CopyInto(vtkm::Vec &dest) const { vtkm::IdComponent numComponents = vtkm::Min(DestSize, this->NumComponents); @@ -69,7 +69,7 @@ public: } VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_EXPORT + VTKM_EXEC ComponentType operator[](vtkm::IdComponent index) const { return this->Portal.Get(index + this->Offset); @@ -100,7 +100,7 @@ public: typedef typename vtkm::TypeTraits::NumericTag NumericTag; typedef TypeTraitsVectorTag DimensionalityTag; - VTKM_EXEC_EXPORT + VTKM_EXEC static vtkm::exec::internal::VecFromPortal ZeroInitialization() { return vtkm::exec::internal::VecFromPortal(); @@ -116,12 +116,12 @@ struct VecTraits > typedef vtkm::VecTraitsTagMultipleComponents HasMultipleComponents; typedef vtkm::VecTraitsTagSizeVariable IsSizeStatic; - VTKM_EXEC_EXPORT + VTKM_EXEC static vtkm::IdComponent GetNumberOfComponents(const VecType &vector) { return vector.GetNumberOfComponents(); } - VTKM_EXEC_EXPORT + VTKM_EXEC static ComponentType GetComponent(const VecType &vector, vtkm::IdComponent componentIndex) { @@ -129,7 +129,7 @@ struct VecTraits > } template - VTKM_EXEC_EXPORT + VTKM_EXEC static void CopyInto(const VecType &src, vtkm::Vec &dest) { diff --git a/vtkm/exec/internal/VecFromPortalPermute.h b/vtkm/exec/internal/VecFromPortalPermute.h index 9d90a9af0..d5b2b090c 100644 --- a/vtkm/exec/internal/VecFromPortalPermute.h +++ b/vtkm/exec/internal/VecFromPortalPermute.h @@ -43,20 +43,20 @@ public: typename std::remove_const::type; - VTKM_EXEC_EXPORT + VTKM_EXEC VecFromPortalPermute() { } - VTKM_EXEC_EXPORT + VTKM_EXEC VecFromPortalPermute(const IndexVecType *indices, const PortalType &portal) : Indices(indices), Portal(portal) { } - VTKM_EXEC_EXPORT + VTKM_EXEC vtkm::IdComponent GetNumberOfComponents() const { return this->Indices->GetNumberOfComponents(); } template - VTKM_EXEC_EXPORT + VTKM_EXEC void CopyInto(vtkm::Vec &dest) const { vtkm::IdComponent numComponents = @@ -68,7 +68,7 @@ public: } VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_EXPORT + VTKM_EXEC ComponentType operator[](vtkm::IdComponent index) const { return this->Portal.Get((*this->Indices)[index]); @@ -101,7 +101,7 @@ public: typedef typename vtkm::TypeTraits::NumericTag NumericTag; typedef TypeTraitsVectorTag DimensionalityTag; - VTKM_EXEC_EXPORT + VTKM_EXEC static VecType ZeroInitialization() { return VecType(); @@ -119,12 +119,12 @@ struct VecTraits< typedef vtkm::VecTraitsTagMultipleComponents HasMultipleComponents; typedef vtkm::VecTraitsTagSizeVariable IsSizeStatic; - VTKM_EXEC_EXPORT + VTKM_EXEC static vtkm::IdComponent GetNumberOfComponents(const VecType &vector) { return vector.GetNumberOfComponents(); } - VTKM_EXEC_EXPORT + VTKM_EXEC static ComponentType GetComponent(const VecType &vector, vtkm::IdComponent componentIndex) { @@ -132,7 +132,7 @@ struct VecTraits< } template - VTKM_EXEC_EXPORT + VTKM_EXEC static void CopyInto(const VecType &src, vtkm::Vec &dest) { diff --git a/vtkm/exec/internal/WorkletInvokeFunctor.h b/vtkm/exec/internal/WorkletInvokeFunctor.h index 3abae0e4a..98caec7bc 100644 --- a/vtkm/exec/internal/WorkletInvokeFunctor.h +++ b/vtkm/exec/internal/WorkletInvokeFunctor.h @@ -36,13 +36,13 @@ template class WorkletInvokeFunctor : public vtkm::exec::FunctorBase { public: - VTKM_CONT_EXPORT + VTKM_CONT WorkletInvokeFunctor(const WorkletType &worklet, const InvocationType &invocation, const vtkm::Id &globalIndexOffset=0) : Worklet(worklet), Invocation(invocation), GlobalIndexOffset(globalIndexOffset) { } - VTKM_CONT_EXPORT + VTKM_CONT void SetErrorMessageBuffer( const vtkm::exec::internal::ErrorMessageBuffer &buffer) { @@ -52,7 +52,7 @@ public: VTKM_SUPPRESS_EXEC_WARNINGS template - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(T index) const { detail::DoWorkletInvokeFunctor(this->Worklet, diff --git a/vtkm/exec/internal/WorkletInvokeFunctorDetail.h b/vtkm/exec/internal/WorkletInvokeFunctorDetail.h index 4c1719b2f..34a433eb2 100644 --- a/vtkm/exec/internal/WorkletInvokeFunctorDetail.h +++ b/vtkm/exec/internal/WorkletInvokeFunctorDetail.h @@ -89,7 +89,7 @@ template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoWorkletInvokeFunctor( const WorkletType &worklet, const vtkm::internal::Invocation< @@ -146,7 +146,7 @@ template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoWorkletInvokeFunctor( const WorkletType &worklet, const vtkm::internal::Invocation< @@ -198,7 +198,7 @@ template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoWorkletInvokeFunctor( const WorkletType &worklet, const vtkm::internal::Invocation< @@ -265,7 +265,7 @@ template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoWorkletInvokeFunctor( const WorkletType &worklet, const vtkm::internal::Invocation< @@ -327,7 +327,7 @@ template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoWorkletInvokeFunctor( const WorkletType &worklet, const vtkm::internal::Invocation< @@ -404,7 +404,7 @@ template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoWorkletInvokeFunctor( const WorkletType &worklet, const vtkm::internal::Invocation< @@ -476,7 +476,7 @@ template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoWorkletInvokeFunctor( const WorkletType &worklet, const vtkm::internal::Invocation< @@ -563,7 +563,7 @@ template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoWorkletInvokeFunctor( const WorkletType &worklet, const vtkm::internal::Invocation< @@ -645,7 +645,7 @@ template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoWorkletInvokeFunctor( const WorkletType &worklet, const vtkm::internal::Invocation< @@ -742,7 +742,7 @@ template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoWorkletInvokeFunctor( const WorkletType &worklet, const vtkm::internal::Invocation< @@ -834,7 +834,7 @@ template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoWorkletInvokeFunctor( const WorkletType &worklet, const vtkm::internal::Invocation< @@ -941,7 +941,7 @@ template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoWorkletInvokeFunctor( const WorkletType &worklet, const vtkm::internal::Invocation< @@ -1043,7 +1043,7 @@ template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoWorkletInvokeFunctor( const WorkletType &worklet, const vtkm::internal::Invocation< @@ -1160,7 +1160,7 @@ template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoWorkletInvokeFunctor( const WorkletType &worklet, const vtkm::internal::Invocation< @@ -1272,7 +1272,7 @@ template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoWorkletInvokeFunctor( const WorkletType &worklet, const vtkm::internal::Invocation< @@ -1399,7 +1399,7 @@ template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoWorkletInvokeFunctor( const WorkletType &worklet, const vtkm::internal::Invocation< @@ -1521,7 +1521,7 @@ template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoWorkletInvokeFunctor( const WorkletType &worklet, const vtkm::internal::Invocation< @@ -1658,7 +1658,7 @@ template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoWorkletInvokeFunctor( const WorkletType &worklet, const vtkm::internal::Invocation< @@ -1790,7 +1790,7 @@ template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoWorkletInvokeFunctor( const WorkletType &worklet, const vtkm::internal::Invocation< @@ -1937,7 +1937,7 @@ template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoWorkletInvokeFunctor( const WorkletType &worklet, const vtkm::internal::Invocation< diff --git a/vtkm/exec/internal/WorkletInvokeFunctorDetail.h.in b/vtkm/exec/internal/WorkletInvokeFunctorDetail.h.in index 49844a135..406bc74e8 100644 --- a/vtkm/exec/internal/WorkletInvokeFunctorDetail.h.in +++ b/vtkm/exec/internal/WorkletInvokeFunctorDetail.h.in @@ -150,7 +150,7 @@ template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoWorkletInvokeFunctor( const WorkletType &worklet, const vtkm::internal::Invocation< @@ -211,7 +211,7 @@ template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoWorkletInvokeFunctor( const WorkletType &worklet, const vtkm::internal::Invocation< diff --git a/vtkm/exec/internal/testing/UnitTestVecFromPortal.cxx b/vtkm/exec/internal/testing/UnitTestVecFromPortal.cxx index ee3f370b4..ffc69ec69 100644 --- a/vtkm/exec/internal/testing/UnitTestVecFromPortal.cxx +++ b/vtkm/exec/internal/testing/UnitTestVecFromPortal.cxx @@ -38,10 +38,10 @@ class TestPortal public: typedef T ValueType; - VTKM_EXEC_EXPORT + VTKM_EXEC vtkm::Id GetNumberOfValues() const { return ARRAY_SIZE; } - VTKM_EXEC_EXPORT + VTKM_EXEC ValueType Get(vtkm::Id index) const { return TestValue(index, ValueType()); } }; diff --git a/vtkm/exec/internal/testing/UnitTestVecFromPortalPermute.cxx b/vtkm/exec/internal/testing/UnitTestVecFromPortalPermute.cxx index a721ac4ff..e6d0b14fe 100644 --- a/vtkm/exec/internal/testing/UnitTestVecFromPortalPermute.cxx +++ b/vtkm/exec/internal/testing/UnitTestVecFromPortalPermute.cxx @@ -40,10 +40,10 @@ class TestPortal public: typedef T ValueType; - VTKM_EXEC_EXPORT + VTKM_EXEC vtkm::Id GetNumberOfValues() const { return ARRAY_SIZE; } - VTKM_EXEC_EXPORT + VTKM_EXEC ValueType Get(vtkm::Id index) const { return TestValue(index, ValueType()); } }; diff --git a/vtkm/exec/internal/testing/UnitTestWorkletInvokeFunctor.cxx b/vtkm/exec/internal/testing/UnitTestWorkletInvokeFunctor.cxx index c6365df01..cea15297d 100644 --- a/vtkm/exec/internal/testing/UnitTestWorkletInvokeFunctor.cxx +++ b/vtkm/exec/internal/testing/UnitTestWorkletInvokeFunctor.cxx @@ -34,10 +34,10 @@ namespace { struct TestExecObject { - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT TestExecObject() : Value(NULL) { } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT TestExecObject(vtkm::Id *value) : Value(value) { } vtkm::Id *Value; @@ -46,7 +46,7 @@ struct TestExecObject struct MyOutputToInputMapPortal { typedef vtkm::Id ValueType; - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::Id Get(vtkm::Id index) const { return index; } }; @@ -84,13 +84,13 @@ struct Fetch< { typedef vtkm::Id ValueType; - VTKM_EXEC_EXPORT + VTKM_EXEC ValueType Load(const vtkm::exec::arg::ThreadIndicesBasic &indices, const TestExecObject &execObject) const { return *execObject.Value + 10*indices.GetInputIndex(); } - VTKM_EXEC_EXPORT + VTKM_EXEC void Store(const vtkm::exec::arg::ThreadIndicesBasic &, const TestExecObject &, ValueType) const { @@ -107,14 +107,14 @@ struct Fetch< { typedef vtkm::Id ValueType; - VTKM_EXEC_EXPORT + VTKM_EXEC ValueType Load(const vtkm::exec::arg::ThreadIndicesBasic &, const TestExecObject &) const { // No-op return ValueType(); } - VTKM_EXEC_EXPORT + VTKM_EXEC void Store(const vtkm::exec::arg::ThreadIndicesBasic &indices, const TestExecObject &execObject, ValueType value) const { @@ -165,13 +165,13 @@ typedef vtkm::internal::Invocation< // Not a full worklet, but provides operators that we expect in a worklet. struct TestWorkletProxy : vtkm::exec::FunctorBase { - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(vtkm::Id input, vtkm::Id &output) const { output = input + 100; } - VTKM_EXEC_EXPORT + VTKM_EXEC vtkm::Id operator()(vtkm::Id input) const { return input + 200; @@ -179,7 +179,7 @@ struct TestWorkletProxy : vtkm::exec::FunctorBase template - VTKM_EXEC_EXPORT + VTKM_EXEC vtkm::exec::arg::ThreadIndicesBasic GetThreadIndices(const T& threadIndex, const OutToInArrayType& outToIn, @@ -199,7 +199,7 @@ struct TestWorkletProxy : vtkm::exec::FunctorBase // Not a full worklet, but provides operators that we expect in a worklet. struct TestWorkletErrorProxy : vtkm::exec::FunctorBase { - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(vtkm::Id, vtkm::Id) const { this->RaiseError(ERROR_MESSAGE); @@ -207,7 +207,7 @@ struct TestWorkletErrorProxy : vtkm::exec::FunctorBase template - VTKM_EXEC_EXPORT + VTKM_EXEC vtkm::exec::arg::ThreadIndicesBasic GetThreadIndices(const T& threadIndex, const OutToInArrayType& outToIn, diff --git a/vtkm/filter/CellAverage.h b/vtkm/filter/CellAverage.h index 51e7ae78d..2fed871de 100644 --- a/vtkm/filter/CellAverage.h +++ b/vtkm/filter/CellAverage.h @@ -30,11 +30,11 @@ namespace filter { class CellAverage : public vtkm::filter::FilterCell { public: - VTKM_CONT_EXPORT + VTKM_CONT CellAverage(); template - VTKM_CONT_EXPORT + VTKM_CONT vtkm::filter::ResultField DoExecute(const vtkm::cont::DataSet &input, const vtkm::cont::ArrayHandle& field, const vtkm::filter::FieldMetadata& fieldMeta, diff --git a/vtkm/filter/CellAverage.hxx b/vtkm/filter/CellAverage.hxx index c79288e1d..96342dc89 100644 --- a/vtkm/filter/CellAverage.hxx +++ b/vtkm/filter/CellAverage.hxx @@ -27,6 +27,7 @@ namespace filter { //----------------------------------------------------------------------------- +inline VTKM_CONT CellAverage::CellAverage(): vtkm::filter::FilterCell(), Worklet() @@ -39,6 +40,7 @@ template +inline VTKM_CONT vtkm::filter::ResultField CellAverage::DoExecute( const vtkm::cont::DataSet &input, const vtkm::cont::ArrayHandle &inField, diff --git a/vtkm/filter/Clip.h b/vtkm/filter/Clip.h index 4f540406d..5f52431cd 100644 --- a/vtkm/filter/Clip.h +++ b/vtkm/filter/Clip.h @@ -30,17 +30,17 @@ namespace filter { class Clip : public vtkm::filter::FilterDataSetWithField { public: - VTKM_CONT_EXPORT + VTKM_CONT Clip(); - VTKM_CONT_EXPORT + VTKM_CONT void SetClipValue(vtkm::Float64 value){ this->ClipValue = value; } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Float64 GetClipValue() const { return this->ClipValue; } template - VTKM_CONT_EXPORT + VTKM_CONT vtkm::filter::ResultDataSet DoExecute(const vtkm::cont::DataSet& input, const vtkm::cont::ArrayHandle& field, const vtkm::filter::FieldMetadata& fieldMeta, @@ -50,7 +50,7 @@ public: //Map a new field onto the resulting dataset after running the filter. //This call is only valid after Execute has been called. template - VTKM_CONT_EXPORT + VTKM_CONT bool DoMapField(vtkm::filter::ResultDataSet& result, const vtkm::cont::ArrayHandle& input, const vtkm::filter::FieldMetadata& fieldMeta, diff --git a/vtkm/filter/Clip.hxx b/vtkm/filter/Clip.hxx index 682b6693c..09c53910f 100644 --- a/vtkm/filter/Clip.hxx +++ b/vtkm/filter/Clip.hxx @@ -28,6 +28,7 @@ namespace vtkm { namespace filter { //----------------------------------------------------------------------------- +inline VTKM_CONT Clip::Clip(): vtkm::filter::FilterDataSetWithField(), ClipValue(0), @@ -41,6 +42,7 @@ template +inline VTKM_CONT vtkm::filter::ResultDataSet Clip::DoExecute(const vtkm::cont::DataSet& input, const vtkm::cont::ArrayHandle& field, const vtkm::filter::FieldMetadata& fieldMeta, @@ -86,6 +88,7 @@ template +inline VTKM_CONT bool Clip::DoMapField(vtkm::filter::ResultDataSet& result, const vtkm::cont::ArrayHandle& input, const vtkm::filter::FieldMetadata& fieldMeta, diff --git a/vtkm/filter/ExternalFaces.h b/vtkm/filter/ExternalFaces.h index e53bb8a24..ce79164e9 100644 --- a/vtkm/filter/ExternalFaces.h +++ b/vtkm/filter/ExternalFaces.h @@ -30,11 +30,11 @@ namespace filter { class ExternalFaces : public vtkm::filter::FilterDataSet { public: - VTKM_CONT_EXPORT + VTKM_CONT ExternalFaces(); template - VTKM_CONT_EXPORT + VTKM_CONT vtkm::filter::ResultDataSet DoExecute(const vtkm::cont::DataSet& input, const vtkm::filter::PolicyBase& policy, const DeviceAdapter& tag); @@ -42,7 +42,7 @@ public: //Map a new field onto the resulting dataset after running the filter //this call is only valid template - VTKM_CONT_EXPORT + VTKM_CONT bool DoMapField(vtkm::filter::ResultDataSet& result, const vtkm::cont::ArrayHandle& input, const vtkm::filter::FieldMetadata& fieldMeta, diff --git a/vtkm/filter/ExternalFaces.hxx b/vtkm/filter/ExternalFaces.hxx index f0fc5a58a..077ad55a8 100644 --- a/vtkm/filter/ExternalFaces.hxx +++ b/vtkm/filter/ExternalFaces.hxx @@ -82,6 +82,7 @@ public: } //----------------------------------------------------------------------------- +inline VTKM_CONT ExternalFaces::ExternalFaces(): vtkm::filter::FilterDataSet() { @@ -91,6 +92,7 @@ ExternalFaces::ExternalFaces(): //----------------------------------------------------------------------------- template +inline VTKM_CONT vtkm::filter::ResultDataSet ExternalFaces::DoExecute(const vtkm::cont::DataSet& input, const vtkm::filter::PolicyBase& policy, const DeviceAdapter&) @@ -125,6 +127,7 @@ template +inline VTKM_CONT bool ExternalFaces::DoMapField(vtkm::filter::ResultDataSet&, const vtkm::cont::ArrayHandle&, const vtkm::filter::FieldMetadata&, diff --git a/vtkm/filter/FieldMetadata.h b/vtkm/filter/FieldMetadata.h index a95779871..8fb93e8d7 100644 --- a/vtkm/filter/FieldMetadata.h +++ b/vtkm/filter/FieldMetadata.h @@ -30,7 +30,7 @@ namespace filter { class FieldMetadata { public: - VTKM_CONT_EXPORT + VTKM_CONT FieldMetadata(): Name(), Association(vtkm::cont::Field::ASSOC_ANY), @@ -38,7 +38,7 @@ public: { } - VTKM_CONT_EXPORT + VTKM_CONT FieldMetadata(const vtkm::cont::Field& f): Name(f.GetName()), Association(f.GetAssociation()), @@ -46,7 +46,7 @@ public: { } - VTKM_CONT_EXPORT + VTKM_CONT FieldMetadata(const vtkm::cont::CoordinateSystem &sys): Name(sys.GetName()), Association(sys.GetAssociation()), @@ -54,28 +54,28 @@ public: { } - VTKM_CONT_EXPORT + VTKM_CONT bool IsPointField() const {return this->Association == vtkm::cont::Field::ASSOC_POINTS; } - VTKM_CONT_EXPORT + VTKM_CONT bool IsCellField() const {return this->Association == vtkm::cont::Field::ASSOC_CELL_SET; } - VTKM_CONT_EXPORT + VTKM_CONT const std::string& GetName() const {return this->Name; } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::cont::Field::AssociationEnum GetAssociation() const { return this->Association; } - VTKM_CONT_EXPORT + VTKM_CONT const std::string& GetCellSetName() const {return this->CellSetName; } template - VTKM_CONT_EXPORT + VTKM_CONT vtkm::cont::Field AsField(const vtkm::cont::ArrayHandle &handle) const { //Field only handles arrayHandles with default storage tag, so use @@ -92,7 +92,7 @@ public: } } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::cont::Field AsField(const vtkm::cont::DynamicArrayHandle &dhandle) const { if(this->IsCellField()) diff --git a/vtkm/filter/FilterCell.h b/vtkm/filter/FilterCell.h index b0cc259ac..527bc8281 100644 --- a/vtkm/filter/FilterCell.h +++ b/vtkm/filter/FilterCell.h @@ -30,14 +30,14 @@ template class FilterCell : public vtkm::filter::FilterField< Derived > { public: - VTKM_CONT_EXPORT + VTKM_CONT FilterCell(); - VTKM_CONT_EXPORT + VTKM_CONT void SetActiveCellSet(vtkm::Id index) { this->CellSetIndex = index; } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Id GetActiveCellSetIndex() const { return this->CellSetIndex; } diff --git a/vtkm/filter/FilterCell.hxx b/vtkm/filter/FilterCell.hxx index 305ae02de..1aa44ac8a 100644 --- a/vtkm/filter/FilterCell.hxx +++ b/vtkm/filter/FilterCell.hxx @@ -24,6 +24,7 @@ namespace filter { //---------------------------------------------------------------------------- template +inline VTKM_CONT FilterCell::FilterCell(): vtkm::filter::FilterField< Derived >(), CellSetIndex(0) diff --git a/vtkm/filter/FilterDataSet.h b/vtkm/filter/FilterDataSet.h index 3235c8215..179fb6ed7 100644 --- a/vtkm/filter/FilterDataSet.h +++ b/vtkm/filter/FilterDataSet.h @@ -38,30 +38,30 @@ template class FilterDataSet { public: - VTKM_CONT_EXPORT + VTKM_CONT FilterDataSet(); - VTKM_CONT_EXPORT + VTKM_CONT void SetActiveCellSet(vtkm::Id index) { this->CellSetIndex = index; } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Id GetActiveCellSetIndex() const { return this->CellSetIndex; } - VTKM_CONT_EXPORT + VTKM_CONT void SetActiveCoordinateSystem(vtkm::Id index) { this->CoordinateSystemIndex = index; } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Id GetActiveCoordinateSystemIndex() const { return this->CoordinateSystemIndex; } - VTKM_CONT_EXPORT + VTKM_CONT ResultDataSet Execute(const vtkm::cont::DataSet &input); template - VTKM_CONT_EXPORT + VTKM_CONT ResultDataSet Execute(const vtkm::cont::DataSet &input, const vtkm::filter::PolicyBase& policy ); @@ -71,19 +71,19 @@ public: // ASSOC_POINTS -> map using point mapping // ASSOC_CELL_SET -> how do we map this? // ASSOC_LOGICAL_DIM -> unable to map? - VTKM_CONT_EXPORT + VTKM_CONT bool MapFieldOntoOutput(ResultDataSet& result, const vtkm::cont::Field& field); template - VTKM_CONT_EXPORT + VTKM_CONT bool MapFieldOntoOutput(ResultDataSet& result, const vtkm::cont::Field& field, const vtkm::filter::PolicyBase& policy); private: template - VTKM_CONT_EXPORT + VTKM_CONT ResultDataSet PrepareForExecution(const vtkm::cont::DataSet& input, const vtkm::filter::PolicyBase& policy); diff --git a/vtkm/filter/FilterDataSet.hxx b/vtkm/filter/FilterDataSet.hxx index 5cbb5534c..315d02360 100644 --- a/vtkm/filter/FilterDataSet.hxx +++ b/vtkm/filter/FilterDataSet.hxx @@ -37,6 +37,7 @@ namespace filter { //---------------------------------------------------------------------------- template +inline VTKM_CONT FilterDataSet::FilterDataSet(): OutputFieldName(), CellSetIndex(0), @@ -48,6 +49,7 @@ FilterDataSet::FilterDataSet(): //----------------------------------------------------------------------------- template +inline VTKM_CONT ResultDataSet FilterDataSet::Execute(const vtkm::cont::DataSet &input) { return this->Execute(input, vtkm::filter::DefaultPolicy()); @@ -56,6 +58,7 @@ ResultDataSet FilterDataSet::Execute(const vtkm::cont::DataSet &input) //----------------------------------------------------------------------------- template template +inline VTKM_CONT ResultDataSet FilterDataSet::Execute(const vtkm::cont::DataSet &input, const vtkm::filter::PolicyBase& policy ) { @@ -73,7 +76,7 @@ struct FilterDataSetPrepareForExecutionFunctor const vtkm::cont::DataSet &Input; const vtkm::filter::PolicyBase &Policy; - VTKM_CONT_EXPORT + VTKM_CONT FilterDataSetPrepareForExecutionFunctor( Derived *self, const vtkm::cont::DataSet &input, @@ -82,7 +85,7 @@ struct FilterDataSetPrepareForExecutionFunctor { } template - VTKM_CONT_EXPORT + VTKM_CONT bool operator()(Device) { this->Result = this->Self->DoExecute(this->Input, this->Policy, Device()); @@ -93,6 +96,7 @@ struct FilterDataSetPrepareForExecutionFunctor template template +inline VTKM_CONT ResultDataSet FilterDataSet::PrepareForExecution( const vtkm::cont::DataSet &input, const vtkm::filter::PolicyBase& policy ) @@ -110,6 +114,7 @@ ResultDataSet FilterDataSet::PrepareForExecution( //----------------------------------------------------------------------------- template +inline VTKM_CONT bool FilterDataSet::MapFieldOntoOutput(ResultDataSet& result, const vtkm::cont::Field& field) { @@ -119,6 +124,7 @@ bool FilterDataSet::MapFieldOntoOutput(ResultDataSet& result, //----------------------------------------------------------------------------- template template +inline VTKM_CONT bool FilterDataSet::MapFieldOntoOutput(ResultDataSet& result, const vtkm::cont::Field& field, const vtkm::filter::PolicyBase& policy) diff --git a/vtkm/filter/FilterDataSetWithField.h b/vtkm/filter/FilterDataSetWithField.h index 101cd5c05..b9a2c7b00 100644 --- a/vtkm/filter/FilterDataSetWithField.h +++ b/vtkm/filter/FilterDataSetWithField.h @@ -37,49 +37,49 @@ template class FilterDataSetWithField { public: - VTKM_CONT_EXPORT + VTKM_CONT FilterDataSetWithField(); - VTKM_CONT_EXPORT + VTKM_CONT void SetActiveCellSet(vtkm::Id index) { this->CellSetIndex = index; } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Id GetActiveCellSetIndex() const { return this->CellSetIndex; } - VTKM_CONT_EXPORT + VTKM_CONT void SetActiveCoordinateSystem(vtkm::Id index) { this->CoordinateSystemIndex = index; } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Id GetActiveCoordinateSystemIndex() const { return this->CoordinateSystemIndex; } - VTKM_CONT_EXPORT + VTKM_CONT ResultDataSet Execute(const vtkm::cont::DataSet &input, const std::string &inFieldName); - VTKM_CONT_EXPORT + VTKM_CONT ResultDataSet Execute(const vtkm::cont::DataSet &input, const vtkm::cont::Field &field); - VTKM_CONT_EXPORT + VTKM_CONT ResultDataSet Execute(const vtkm::cont::DataSet &input, const vtkm::cont::CoordinateSystem &field); template - VTKM_CONT_EXPORT + VTKM_CONT ResultDataSet Execute(const vtkm::cont::DataSet &input, const std::string &inFieldName, const vtkm::filter::PolicyBase& policy ); template - VTKM_CONT_EXPORT + VTKM_CONT ResultDataSet Execute(const vtkm::cont::DataSet &input, const vtkm::cont::Field &field, const vtkm::filter::PolicyBase& policy ); template - VTKM_CONT_EXPORT + VTKM_CONT ResultDataSet Execute(const vtkm::cont::DataSet &input, const vtkm::cont::CoordinateSystem &field, const vtkm::filter::PolicyBase& policy ); @@ -90,26 +90,26 @@ public: // ASSOC_POINTS -> map using point mapping // ASSOC_CELL_SET -> how do we map this? // ASSOC_LOGICAL_DIM -> unable to map? - VTKM_CONT_EXPORT + VTKM_CONT bool MapFieldOntoOutput(ResultDataSet& result, const vtkm::cont::Field& field); template - VTKM_CONT_EXPORT + VTKM_CONT bool MapFieldOntoOutput(ResultDataSet& result, const vtkm::cont::Field& field, const vtkm::filter::PolicyBase& policy); private: template - VTKM_CONT_EXPORT + VTKM_CONT ResultDataSet PrepareForExecution(const vtkm::cont::DataSet& input, const vtkm::cont::Field& field, const vtkm::filter::PolicyBase& policy); //How do we specify float/double coordinate types? template - VTKM_CONT_EXPORT + VTKM_CONT ResultDataSet PrepareForExecution(const vtkm::cont::DataSet& input, const vtkm::cont::CoordinateSystem& field, const vtkm::filter::PolicyBase& policy); diff --git a/vtkm/filter/FilterDataSetWithField.hxx b/vtkm/filter/FilterDataSetWithField.hxx index d7ad81599..cbbda3b13 100644 --- a/vtkm/filter/FilterDataSetWithField.hxx +++ b/vtkm/filter/FilterDataSetWithField.hxx @@ -37,6 +37,7 @@ namespace filter { //---------------------------------------------------------------------------- template +inline VTKM_CONT FilterDataSetWithField::FilterDataSetWithField(): OutputFieldName(), CellSetIndex(0), @@ -48,6 +49,7 @@ FilterDataSetWithField::FilterDataSetWithField(): //----------------------------------------------------------------------------- template +inline VTKM_CONT ResultDataSet FilterDataSetWithField::Execute(const vtkm::cont::DataSet &input, const std::string &inFieldName) { @@ -58,6 +60,7 @@ ResultDataSet FilterDataSetWithField::Execute(const vtkm::cont::DataSet //----------------------------------------------------------------------------- template +inline VTKM_CONT ResultDataSet FilterDataSetWithField::Execute(const vtkm::cont::DataSet &input, const vtkm::cont::Field &field) { @@ -68,6 +71,7 @@ ResultDataSet FilterDataSetWithField::Execute(const vtkm::cont::DataSet //----------------------------------------------------------------------------- template +inline VTKM_CONT ResultDataSet FilterDataSetWithField::Execute(const vtkm::cont::DataSet &input, const vtkm::cont::CoordinateSystem &field) { @@ -79,6 +83,7 @@ ResultDataSet FilterDataSetWithField::Execute(const vtkm::cont::DataSet //----------------------------------------------------------------------------- template template +inline VTKM_CONT ResultDataSet FilterDataSetWithField::Execute(const vtkm::cont::DataSet &input, const std::string &inFieldName, const vtkm::filter::PolicyBase& policy ) @@ -91,6 +96,7 @@ ResultDataSet FilterDataSetWithField::Execute(const vtkm::cont::DataSet //----------------------------------------------------------------------------- template template +inline VTKM_CONT ResultDataSet FilterDataSetWithField::Execute(const vtkm::cont::DataSet &input, const vtkm::cont::Field &field, const vtkm::filter::PolicyBase& policy ) @@ -101,6 +107,7 @@ ResultDataSet FilterDataSetWithField::Execute(const vtkm::cont::DataSet //----------------------------------------------------------------------------- template template +inline VTKM_CONT ResultDataSet FilterDataSetWithField::Execute(const vtkm::cont::DataSet &input, const vtkm::cont::CoordinateSystem &field, const vtkm::filter::PolicyBase& policy ) @@ -113,6 +120,7 @@ ResultDataSet FilterDataSetWithField::Execute(const vtkm::cont::DataSet //----------------------------------------------------------------------------- template template +inline VTKM_CONT ResultDataSet FilterDataSetWithField::PrepareForExecution(const vtkm::cont::DataSet &input, const vtkm::cont::Field &field, const vtkm::filter::PolicyBase& policy ) @@ -138,6 +146,7 @@ ResultDataSet FilterDataSetWithField::PrepareForExecution(const vtkm::c //----------------------------------------------------------------------------- template template +inline VTKM_CONT ResultDataSet FilterDataSetWithField::PrepareForExecution(const vtkm::cont::DataSet &input, const vtkm::cont::CoordinateSystem &field, const vtkm::filter::PolicyBase& policy ) @@ -166,6 +175,7 @@ ResultDataSet FilterDataSetWithField::PrepareForExecution(const vtkm::c //----------------------------------------------------------------------------- template +inline VTKM_CONT bool FilterDataSetWithField::MapFieldOntoOutput(ResultDataSet& result, const vtkm::cont::Field& field) { @@ -175,6 +185,7 @@ bool FilterDataSetWithField::MapFieldOntoOutput(ResultDataSet& result, //----------------------------------------------------------------------------- template template +inline VTKM_CONT bool FilterDataSetWithField::MapFieldOntoOutput(ResultDataSet& result, const vtkm::cont::Field& field, const vtkm::filter::PolicyBase& policy) diff --git a/vtkm/filter/FilterField.h b/vtkm/filter/FilterField.h index 3aa4aae9d..10740c6ba 100644 --- a/vtkm/filter/FilterField.h +++ b/vtkm/filter/FilterField.h @@ -36,38 +36,38 @@ template class FilterField { public: - VTKM_CONT_EXPORT + VTKM_CONT void SetOutputFieldName( const std::string& name ) { this->OutputFieldName = name; } - VTKM_CONT_EXPORT + VTKM_CONT const std::string& GetOutputFieldName() const { return this->OutputFieldName; } - VTKM_CONT_EXPORT + VTKM_CONT ResultField Execute(const vtkm::cont::DataSet &input, const std::string &inFieldName); - VTKM_CONT_EXPORT + VTKM_CONT ResultField Execute(const vtkm::cont::DataSet &input, const vtkm::cont::Field &field); - VTKM_CONT_EXPORT + VTKM_CONT ResultField Execute(const vtkm::cont::DataSet &input, const vtkm::cont::CoordinateSystem &field); template - VTKM_CONT_EXPORT + VTKM_CONT ResultField Execute(const vtkm::cont::DataSet &input, const std::string &inFieldName, const vtkm::filter::PolicyBase& policy ); template - VTKM_CONT_EXPORT + VTKM_CONT ResultField Execute(const vtkm::cont::DataSet &input, const vtkm::cont::Field &field, const vtkm::filter::PolicyBase& policy ); template - VTKM_CONT_EXPORT + VTKM_CONT ResultField Execute(const vtkm::cont::DataSet &input, const vtkm::cont::CoordinateSystem &field, const vtkm::filter::PolicyBase& policy ); @@ -76,13 +76,13 @@ public: private: template - VTKM_CONT_EXPORT + VTKM_CONT ResultField PrepareForExecution(const vtkm::cont::DataSet& input, const vtkm::cont::Field& field, const vtkm::filter::PolicyBase& policy); template - VTKM_CONT_EXPORT + VTKM_CONT ResultField PrepareForExecution(const vtkm::cont::DataSet& input, const vtkm::cont::CoordinateSystem& field, const vtkm::filter::PolicyBase& policy); diff --git a/vtkm/filter/FilterField.hxx b/vtkm/filter/FilterField.hxx index 2d065615d..b539d1931 100644 --- a/vtkm/filter/FilterField.hxx +++ b/vtkm/filter/FilterField.hxx @@ -37,6 +37,7 @@ namespace filter { //----------------------------------------------------------------------------- template +inline VTKM_CONT ResultField FilterField::Execute(const vtkm::cont::DataSet &input, const std::string &inFieldName) { @@ -47,6 +48,7 @@ ResultField FilterField::Execute(const vtkm::cont::DataSet &input, //----------------------------------------------------------------------------- template +inline VTKM_CONT ResultField FilterField::Execute(const vtkm::cont::DataSet &input, const vtkm::cont::Field &field) { @@ -57,6 +59,7 @@ ResultField FilterField::Execute(const vtkm::cont::DataSet &input, //----------------------------------------------------------------------------- template +inline VTKM_CONT ResultField FilterField::Execute(const vtkm::cont::DataSet &input, const vtkm::cont::CoordinateSystem &field) { @@ -68,6 +71,7 @@ ResultField FilterField::Execute(const vtkm::cont::DataSet &input, //----------------------------------------------------------------------------- template template +inline VTKM_CONT ResultField FilterField::Execute(const vtkm::cont::DataSet &input, const std::string &inFieldName, const vtkm::filter::PolicyBase& policy ) @@ -80,6 +84,7 @@ ResultField FilterField::Execute(const vtkm::cont::DataSet &input, //----------------------------------------------------------------------------- template template +inline VTKM_CONT ResultField FilterField::Execute(const vtkm::cont::DataSet &input, const vtkm::cont::Field &field, const vtkm::filter::PolicyBase& policy ) @@ -90,6 +95,7 @@ ResultField FilterField::Execute(const vtkm::cont::DataSet &input, //----------------------------------------------------------------------------- template template +inline VTKM_CONT ResultField FilterField::Execute(const vtkm::cont::DataSet &input, const vtkm::cont::CoordinateSystem &field, const vtkm::filter::PolicyBase& policy ) @@ -102,6 +108,7 @@ ResultField FilterField::Execute(const vtkm::cont::DataSet &input, //----------------------------------------------------------------------------- template template +inline VTKM_CONT ResultField FilterField::PrepareForExecution(const vtkm::cont::DataSet &input, const vtkm::cont::Field &field, const vtkm::filter::PolicyBase& policy ) @@ -127,6 +134,7 @@ ResultField FilterField::PrepareForExecution(const vtkm::cont::DataSet //----------------------------------------------------------------------------- template template +inline VTKM_CONT ResultField FilterField::PrepareForExecution(const vtkm::cont::DataSet &input, const vtkm::cont::CoordinateSystem &field, const vtkm::filter::PolicyBase& policy ) diff --git a/vtkm/filter/Histogram.h b/vtkm/filter/Histogram.h index 0c2126b9f..a0a1e071b 100644 --- a/vtkm/filter/Histogram.h +++ b/vtkm/filter/Histogram.h @@ -30,26 +30,26 @@ class Histogram : public vtkm::filter::FilterField { public: //Construct a histogram with a default of 10 bins - VTKM_CONT_EXPORT + VTKM_CONT Histogram(); - VTKM_CONT_EXPORT + VTKM_CONT void SetNumberOfBins(vtkm::Id count){ this->NumberOfBins = count; } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Id GetNumberOfBins() const { return this->NumberOfBins; } //Returns the bin delta of the last computed field, be it from DoExecute //or from MapField - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Float64 GetBinDelta() const { return this->BinDelta; } //Returns the the min and max values for that last computed field - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Range GetDataRange() const { return this->DataRange; } template - VTKM_CONT_EXPORT + VTKM_CONT vtkm::filter::ResultField DoExecute(const vtkm::cont::DataSet& input, const vtkm::cont::ArrayHandle& field, const vtkm::filter::FieldMetadata& fieldMeta, diff --git a/vtkm/filter/Histogram.hxx b/vtkm/filter/Histogram.hxx index 3573f153b..f045324fa 100644 --- a/vtkm/filter/Histogram.hxx +++ b/vtkm/filter/Histogram.hxx @@ -26,6 +26,7 @@ namespace filter { //----------------------------------------------------------------------------- +inline VTKM_CONT Histogram::Histogram(): NumberOfBins(10), BinDelta(0), @@ -39,6 +40,7 @@ template +inline VTKM_CONT vtkm::filter::ResultField Histogram::DoExecute(const vtkm::cont::DataSet &inDataSet, const vtkm::cont::ArrayHandle &field, diff --git a/vtkm/filter/MarchingCubes.h b/vtkm/filter/MarchingCubes.h index 4a1b4e70d..bfc44bb6b 100644 --- a/vtkm/filter/MarchingCubes.h +++ b/vtkm/filter/MarchingCubes.h @@ -41,29 +41,29 @@ namespace filter { class MarchingCubes : public vtkm::filter::FilterDataSetWithField { public: - VTKM_CONT_EXPORT + VTKM_CONT MarchingCubes(); - VTKM_CONT_EXPORT + VTKM_CONT void SetIsoValue(vtkm::Float64 value){ this->IsoValue = value; } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Float64 GetIsoValue() const { return this->IsoValue; } - VTKM_CONT_EXPORT + VTKM_CONT void SetMergeDuplicatePoints(bool on) { this->Worklet.SetMergeDuplicatePoints(on); } - VTKM_CONT_EXPORT + VTKM_CONT bool GetMergeDuplicatePoints() const { return this->Worklet.GetMergeDuplicatePoints(); } - VTKM_CONT_EXPORT + VTKM_CONT void SetGenerateNormals(bool on) { this->GenerateNormals = on; } - VTKM_CONT_EXPORT + VTKM_CONT bool GetGenerateNormals() const { return this->GenerateNormals; } template - VTKM_CONT_EXPORT + VTKM_CONT vtkm::filter::ResultDataSet DoExecute(const vtkm::cont::DataSet& input, const vtkm::cont::ArrayHandle& field, const vtkm::filter::FieldMetadata& fieldMeta, @@ -73,7 +73,7 @@ public: //Map a new field onto the resulting dataset after running the filter //this call is only valid template - VTKM_CONT_EXPORT + VTKM_CONT bool DoMapField(vtkm::filter::ResultDataSet& result, const vtkm::cont::ArrayHandle& input, const vtkm::filter::FieldMetadata& fieldMeta, diff --git a/vtkm/filter/MarchingCubes.hxx b/vtkm/filter/MarchingCubes.hxx index 6c05114bc..2318c4419 100644 --- a/vtkm/filter/MarchingCubes.hxx +++ b/vtkm/filter/MarchingCubes.hxx @@ -29,6 +29,7 @@ namespace vtkm { namespace filter { //----------------------------------------------------------------------------- +inline VTKM_CONT MarchingCubes::MarchingCubes(): vtkm::filter::FilterDataSetWithField(), IsoValue(0), @@ -43,6 +44,7 @@ template +inline VTKM_CONT vtkm::filter::ResultDataSet MarchingCubes::DoExecute(const vtkm::cont::DataSet& input, const vtkm::cont::ArrayHandle& field, const vtkm::filter::FieldMetadata& fieldMeta, @@ -122,6 +124,7 @@ template +inline VTKM_CONT bool MarchingCubes::DoMapField(vtkm::filter::ResultDataSet& result, const vtkm::cont::ArrayHandle& input, const vtkm::filter::FieldMetadata& fieldMeta, diff --git a/vtkm/filter/PointElevation.h b/vtkm/filter/PointElevation.h index 9410c9761..42317d704 100644 --- a/vtkm/filter/PointElevation.h +++ b/vtkm/filter/PointElevation.h @@ -31,21 +31,21 @@ namespace filter { class PointElevation : public vtkm::filter::FilterField { public: - VTKM_CONT_EXPORT + VTKM_CONT PointElevation(); - VTKM_CONT_EXPORT + VTKM_CONT void SetLowPoint(vtkm::Float64 x, vtkm::Float64 y, vtkm::Float64 z); - VTKM_CONT_EXPORT + VTKM_CONT void SetHighPoint(vtkm::Float64 x, vtkm::Float64 y, vtkm::Float64 z); - VTKM_CONT_EXPORT + VTKM_CONT void SetRange(vtkm::Float64 low, vtkm::Float64 high); template - VTKM_CONT_EXPORT + VTKM_CONT vtkm::filter::ResultField DoExecute(const vtkm::cont::DataSet &input, const vtkm::cont::ArrayHandle &field, const vtkm::filter::FieldMetadata& fieldMeta, diff --git a/vtkm/filter/PointElevation.hxx b/vtkm/filter/PointElevation.hxx index a2aba6f8f..d86ec9ff1 100644 --- a/vtkm/filter/PointElevation.hxx +++ b/vtkm/filter/PointElevation.hxx @@ -25,6 +25,7 @@ namespace filter { //----------------------------------------------------------------------------- +inline VTKM_CONT PointElevation::PointElevation(): Worklet() { @@ -32,18 +33,21 @@ PointElevation::PointElevation(): } //----------------------------------------------------------------------------- +inline VTKM_CONT void PointElevation::SetLowPoint(vtkm::Float64 x, vtkm::Float64 y, vtkm::Float64 z) { this->Worklet.SetLowPoint( vtkm::make_Vec(x,y,z) ); } //----------------------------------------------------------------------------- +inline VTKM_CONT void PointElevation::SetHighPoint(vtkm::Float64 x, vtkm::Float64 y, vtkm::Float64 z) { this->Worklet.SetHighPoint( vtkm::make_Vec(x,y,z) ); } //----------------------------------------------------------------------------- +inline VTKM_CONT void PointElevation::SetRange(vtkm::Float64 low, vtkm::Float64 high) { this->Worklet.SetRange(low,high); @@ -54,6 +58,7 @@ template +inline VTKM_CONT vtkm::filter::ResultField PointElevation::DoExecute(const vtkm::cont::DataSet &inDataSet, const vtkm::cont::ArrayHandle &field, diff --git a/vtkm/filter/PolicyBase.h b/vtkm/filter/PolicyBase.h index e1a2c2397..3fbd6a2ac 100644 --- a/vtkm/filter/PolicyBase.h +++ b/vtkm/filter/PolicyBase.h @@ -40,7 +40,7 @@ class PolicyBase //----------------------------------------------------------------------------- template -VTKM_CONT_EXPORT +VTKM_CONT vtkm::cont::DynamicArrayHandleBase< typename DerivedPolicy::FieldTypeList, typename DerivedPolicy::FieldStorageList @@ -55,7 +55,7 @@ ApplyPolicy(const vtkm::cont::Field& field, //----------------------------------------------------------------------------- template -VTKM_CONT_EXPORT +VTKM_CONT vtkm::cont::DynamicArrayHandleBase< typename vtkm::filter::FilterTraits::InputFieldTypeList, typename DerivedPolicy::FieldStorageList @@ -74,7 +74,7 @@ ApplyPolicy(const vtkm::cont::Field& field, //----------------------------------------------------------------------------- template -VTKM_CONT_EXPORT +VTKM_CONT vtkm::cont::DynamicArrayHandleBase< typename DerivedPolicy::CoordinateTypeList, typename DerivedPolicy::CoordinateStorageList @@ -89,7 +89,7 @@ ApplyPolicy(const vtkm::cont::CoordinateSystem& coordinates, //----------------------------------------------------------------------------- template -VTKM_CONT_EXPORT +VTKM_CONT vtkm::cont::DynamicArrayHandleBase< typename DerivedPolicy::CoordinateTypeList, typename DerivedPolicy::CoordinateStorageList @@ -107,7 +107,7 @@ ApplyPolicy(const vtkm::cont::CoordinateSystem& coordinates, //----------------------------------------------------------------------------- template -VTKM_CONT_EXPORT +VTKM_CONT vtkm::cont::DynamicCellSetBase< typename DerivedPolicy::AllCellSetList > ApplyPolicy(const vtkm::cont::DynamicCellSet& cellset, const vtkm::filter::PolicyBase&) @@ -118,7 +118,7 @@ ApplyPolicy(const vtkm::cont::DynamicCellSet& cellset, //----------------------------------------------------------------------------- template -VTKM_CONT_EXPORT +VTKM_CONT vtkm::cont::DynamicCellSetBase< typename DerivedPolicy::StructuredCellSetList > ApplyPolicyStructured(const vtkm::cont::DynamicCellSet& cellset, const vtkm::filter::PolicyBase&) @@ -129,7 +129,7 @@ ApplyPolicyStructured(const vtkm::cont::DynamicCellSet& cellset, //----------------------------------------------------------------------------- template -VTKM_CONT_EXPORT +VTKM_CONT vtkm::cont::DynamicCellSetBase< typename DerivedPolicy::UnstructuredCellSetList > ApplyPolicyUnstructured(const vtkm::cont::DynamicCellSet& cellset, const vtkm::filter::PolicyBase&) diff --git a/vtkm/filter/ResultBase.h b/vtkm/filter/ResultBase.h index ffba46e5c..629816716 100644 --- a/vtkm/filter/ResultBase.h +++ b/vtkm/filter/ResultBase.h @@ -42,29 +42,29 @@ public: /// Returns true if these results are from a successful execution of a /// filter. /// - VTKM_CONT_EXPORT + VTKM_CONT bool IsValid() const { return this->Valid; } /// Returns the results of the filter in terms of a \c DataSet. /// - VTKM_CONT_EXPORT + VTKM_CONT const vtkm::cont::DataSet &GetDataSet() const { return this->Data; } protected: - VTKM_CONT_EXPORT + VTKM_CONT ResultBase(): Valid(false) { } - VTKM_CONT_EXPORT + VTKM_CONT ResultBase(const vtkm::cont::DataSet &dataSet) : Valid(true), Data(dataSet) { } - VTKM_CONT_EXPORT + VTKM_CONT void SetValid(bool valid) { this->Valid = valid; } - VTKM_CONT_EXPORT + VTKM_CONT void SetDataSet(const vtkm::cont::DataSet &dataSet) { this->Data = dataSet; @@ -73,7 +73,7 @@ protected: /// Returns a writable reference to the data set. /// - VTKM_CONT_EXPORT + VTKM_CONT vtkm::cont::DataSet &GetDataSetReference() { return this->Data; diff --git a/vtkm/filter/ResultDataSet.h b/vtkm/filter/ResultDataSet.h index 330109a46..94dcb51dc 100644 --- a/vtkm/filter/ResultDataSet.h +++ b/vtkm/filter/ResultDataSet.h @@ -39,20 +39,20 @@ namespace filter { class ResultDataSet : public vtkm::filter::ResultBase { public: - VTKM_CONT_EXPORT + VTKM_CONT ResultDataSet() { } - VTKM_CONT_EXPORT + VTKM_CONT ResultDataSet(const vtkm::cont::DataSet &dataSet) : ResultBase(dataSet) { } - VTKM_CONT_EXPORT + VTKM_CONT const vtkm::cont::DataSet &GetDataSet() const { return this->ResultBase::GetDataSet(); } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::cont::DataSet &GetDataSet() { return this->ResultBase::GetDataSetReference(); diff --git a/vtkm/filter/ResultField.h b/vtkm/filter/ResultField.h index e333819b1..c23f56d5e 100644 --- a/vtkm/filter/ResultField.h +++ b/vtkm/filter/ResultField.h @@ -39,14 +39,14 @@ namespace filter { class ResultField : public vtkm::filter::ResultBase { public: - VTKM_CONT_EXPORT + VTKM_CONT ResultField() { } /// Use this constructor if the field has already been added to the data set. /// In this case, just tell us what the field name is (and optionally its /// association). /// - VTKM_CONT_EXPORT + VTKM_CONT ResultField(const vtkm::cont::DataSet &dataSet, const std::string &fieldName, vtkm::cont::Field::AssociationEnum fieldAssociation @@ -62,7 +62,7 @@ public: /// Use this constructor if you have build a \c Field object. An output /// \c DataSet will be created by adding the field to the input. /// - VTKM_CONT_EXPORT + VTKM_CONT ResultField(const vtkm::cont::DataSet &inDataSet, const vtkm::cont::Field &field) : FieldName(field.GetName()), FieldAssociation(field.GetAssociation()) @@ -86,7 +86,7 @@ public: /// for \c ASSOC_WHOLE_MESH and \c ASSOC_POINTS associations. /// template - VTKM_CONT_EXPORT + VTKM_CONT ResultField(const vtkm::cont::DataSet &inDataSet, const vtkm::cont::ArrayHandle &fieldArray, const std::string &fieldName, @@ -129,7 +129,7 @@ public: /// that associated set must also be given. The element set name is ignored /// for \c ASSOC_WHOLE_MESH and \c ASSOC_POINTS associations. /// - VTKM_CONT_EXPORT + VTKM_CONT ResultField(const vtkm::cont::DataSet &inDataSet, const vtkm::cont::DynamicArrayHandle &fieldArray, const std::string &fieldName, @@ -165,14 +165,14 @@ public: this->FieldAssociation)); } - VTKM_CONT_EXPORT + VTKM_CONT const vtkm::cont::Field &GetField() const { return this->GetDataSet().GetField(this->FieldName, this->FieldAssociation); } template - VTKM_CONT_EXPORT + VTKM_CONT bool FieldAs(vtkm::cont::ArrayHandle &dest) const { try diff --git a/vtkm/filter/Threshold.h b/vtkm/filter/Threshold.h index b004ae1a4..1872bd4cb 100644 --- a/vtkm/filter/Threshold.h +++ b/vtkm/filter/Threshold.h @@ -30,21 +30,21 @@ namespace filter { class Threshold : public vtkm::filter::FilterDataSetWithField { public: - VTKM_CONT_EXPORT + VTKM_CONT Threshold(); - VTKM_CONT_EXPORT + VTKM_CONT void SetLowerThreshold(vtkm::Float64 value){ this->LowerValue = value; } - VTKM_CONT_EXPORT + VTKM_CONT void SetUpperThreshold(vtkm::Float64 value){ this->UpperValue = value; } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Float64 GetLowerThreshold() const { return this->LowerValue; } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Float64 GetUpperThreshold() const { return this->UpperValue; } template - VTKM_CONT_EXPORT + VTKM_CONT vtkm::filter::ResultDataSet DoExecute(const vtkm::cont::DataSet& input, const vtkm::cont::ArrayHandle& field, const vtkm::filter::FieldMetadata& fieldMeta, @@ -54,7 +54,7 @@ public: //Map a new field onto the resulting dataset after running the filter //this call is only valid template - VTKM_CONT_EXPORT + VTKM_CONT bool DoMapField(vtkm::filter::ResultDataSet& result, const vtkm::cont::ArrayHandle& input, const vtkm::filter::FieldMetadata& fieldMeta, diff --git a/vtkm/filter/Threshold.hxx b/vtkm/filter/Threshold.hxx index 5b5012608..68e45860d 100644 --- a/vtkm/filter/Threshold.hxx +++ b/vtkm/filter/Threshold.hxx @@ -30,7 +30,7 @@ namespace class ThresholdRange { public: - VTKM_CONT_EXPORT + VTKM_CONT ThresholdRange(const vtkm::Float64& lower, const vtkm::Float64& upper) : Lower(lower), @@ -38,7 +38,7 @@ public: { } template - VTKM_EXEC_EXPORT + VTKM_EXEC bool operator()(const T& value) const { return value >= static_cast(this->Lower) && @@ -80,6 +80,7 @@ namespace vtkm { namespace filter { //----------------------------------------------------------------------------- +inline VTKM_CONT Threshold::Threshold(): vtkm::filter::FilterDataSetWithField(), LowerValue(0), @@ -94,6 +95,7 @@ template +inline VTKM_CONT vtkm::filter::ResultDataSet Threshold::DoExecute(const vtkm::cont::DataSet& input, const vtkm::cont::ArrayHandle& field, const vtkm::filter::FieldMetadata& fieldMeta, @@ -157,6 +159,7 @@ template +inline VTKM_CONT bool Threshold::DoMapField(vtkm::filter::ResultDataSet& result, const vtkm::cont::ArrayHandle& input, const vtkm::filter::FieldMetadata& fieldMeta, diff --git a/vtkm/filter/VertexClustering.h b/vtkm/filter/VertexClustering.h index 394322b4f..1a95cf379 100644 --- a/vtkm/filter/VertexClustering.h +++ b/vtkm/filter/VertexClustering.h @@ -30,17 +30,17 @@ namespace filter { class VertexClustering : public vtkm::filter::FilterDataSet { public: - VTKM_CONT_EXPORT + VTKM_CONT VertexClustering(); - VTKM_CONT_EXPORT + VTKM_CONT void SetNumberOfDivisions(const vtkm::Id3& num ) { this->NumberOfDivisions = num; } - VTKM_CONT_EXPORT + VTKM_CONT const vtkm::Id3& GetNumberOfDivisions() const { return this->NumberOfDivisions; } template - VTKM_CONT_EXPORT + VTKM_CONT vtkm::filter::ResultDataSet DoExecute(const vtkm::cont::DataSet& input, const vtkm::filter::PolicyBase& policy, const DeviceAdapter& tag); @@ -48,7 +48,7 @@ public: //Map a new field onto the resulting dataset after running the filter //this call is only valid template - VTKM_CONT_EXPORT + VTKM_CONT bool DoMapField(vtkm::filter::ResultDataSet& result, const vtkm::cont::ArrayHandle& input, const vtkm::filter::FieldMetadata& fieldMeta, diff --git a/vtkm/filter/VertexClustering.hxx b/vtkm/filter/VertexClustering.hxx index 4751be138..ce0d1cf51 100644 --- a/vtkm/filter/VertexClustering.hxx +++ b/vtkm/filter/VertexClustering.hxx @@ -37,6 +37,7 @@ namespace } //----------------------------------------------------------------------------- +inline VTKM_CONT VertexClustering::VertexClustering(): vtkm::filter::FilterDataSet(), NumberOfDivisions(256, 256, 256) @@ -47,6 +48,7 @@ VertexClustering::VertexClustering(): //----------------------------------------------------------------------------- template +inline VTKM_CONT vtkm::filter::ResultDataSet VertexClustering::DoExecute(const vtkm::cont::DataSet& input, const vtkm::filter::PolicyBase& policy, const DeviceAdapter& tag) @@ -73,6 +75,7 @@ template +inline VTKM_CONT bool VertexClustering::DoMapField(vtkm::filter::ResultDataSet&, const vtkm::cont::ArrayHandle&, const vtkm::filter::FieldMetadata&, diff --git a/vtkm/filter/testing/UnitTestMarchingCubesFilter.cxx b/vtkm/filter/testing/UnitTestMarchingCubesFilter.cxx index fc169baac..8ab3325e8 100644 --- a/vtkm/filter/testing/UnitTestMarchingCubesFilter.cxx +++ b/vtkm/filter/testing/UnitTestMarchingCubesFilter.cxx @@ -40,11 +40,11 @@ public: const vtkm::FloatDefault xmin, ymin, zmin, xmax, ymax, zmax; const vtkm::Id cellsPerLayer; - VTKM_CONT_EXPORT + VTKM_CONT TangleField(const vtkm::Id3 dims, const vtkm::FloatDefault mins[3], const vtkm::FloatDefault maxs[3]) : xdim(dims[0]), ydim(dims[1]), zdim(dims[2]), xmin(mins[0]), ymin(mins[1]), zmin(mins[2]), xmax(maxs[0]), ymax(maxs[1]), zmax(maxs[2]), cellsPerLayer((xdim) * (ydim)) { } - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(const vtkm::Id &vertexId, vtkm::Float32 &v) const { const vtkm::Id x = vertexId % (xdim); @@ -101,12 +101,12 @@ vtkm::cont::DataSet MakeIsosurfaceTestDataSet(vtkm::Id3 dims) class EuclideanNorm { public: - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT EuclideanNorm() : Reference(0.,0.,0.) {} - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT EuclideanNorm(vtkm::Vec reference):Reference(reference) {} - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::Float32 operator()(vtkm::Vec v) const { vtkm::Vec d(v[0]-this->Reference[0], @@ -122,16 +122,16 @@ private: class CubeGridConnectivity { public: - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT CubeGridConnectivity() : Dimension(1), DimSquared(1), DimPlus1Squared(4) {} - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT CubeGridConnectivity(vtkm::Id dim) : Dimension(dim), DimSquared(dim*dim), DimPlus1Squared((dim+1)*(dim+1)) {} - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::Id operator()(vtkm::Id vertex) const { typedef vtkm::CellShapeTagHexahedron HexTag; diff --git a/vtkm/internal/ArrayPortalUniformPointCoordinates.h b/vtkm/internal/ArrayPortalUniformPointCoordinates.h index 079d3bcba..24c966d61 100644 --- a/vtkm/internal/ArrayPortalUniformPointCoordinates.h +++ b/vtkm/internal/ArrayPortalUniformPointCoordinates.h @@ -33,10 +33,10 @@ class ArrayPortalUniformPointCoordinates public: typedef vtkm::Vec ValueType; - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT ArrayPortalUniformPointCoordinates() : NumberOfValues(0) { } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT ArrayPortalUniformPointCoordinates(vtkm::Id3 dimensions, ValueType origin, ValueType spacing) @@ -46,7 +46,7 @@ public: Spacing(spacing) { } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT ArrayPortalUniformPointCoordinates( const ArrayPortalUniformPointCoordinates &src) : Dimensions(src.Dimensions), @@ -55,7 +55,7 @@ public: Spacing(src.Spacing) { } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT ArrayPortalUniformPointCoordinates & operator=(const ArrayPortalUniformPointCoordinates &src) { @@ -66,10 +66,10 @@ public: return *this; } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::Id GetNumberOfValues() const { return this->NumberOfValues; } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT ValueType Get(vtkm::Id index) const { VTKM_ASSERT(index >= 0); VTKM_ASSERT(index < this->GetNumberOfValues()); @@ -79,10 +79,10 @@ public: index/(this->Dimensions[0]*this->Dimensions[1]))); } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::Id3 GetRange3() const { return this->Dimensions; } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT ValueType Get(vtkm::Id3 index) const { VTKM_ASSERT((index[0] >= 0) && (index[1] >= 0) && (index[2] >= 0)); VTKM_ASSERT((index[0] < this->Dimensions[0]) && @@ -93,13 +93,13 @@ public: this->Origin[2] + this->Spacing[2] * static_cast(index[2])); } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT const vtkm::Id3 &GetDimensions() const { return this->Dimensions; } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT const ValueType &GetOrigin() const { return this->Origin; } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT const ValueType &GetSpacing() const { return this->Spacing; } private: diff --git a/vtkm/internal/ConnectivityStructuredInternals.h b/vtkm/internal/ConnectivityStructuredInternals.h index fe03914e2..c375aed02 100644 --- a/vtkm/internal/ConnectivityStructuredInternals.h +++ b/vtkm/internal/ConnectivityStructuredInternals.h @@ -39,31 +39,31 @@ class ConnectivityStructuredInternals<1> public: typedef vtkm::Id SchedulingRangeType; - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT void SetPointDimensions(vtkm::Id dimensions) { this->PointDimensions = dimensions; } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::Id GetPointDimensions() const { return this->PointDimensions; } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::Id GetCellDimensions() const { return this->PointDimensions - 1; } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT SchedulingRangeType GetSchedulingRange(vtkm::TopologyElementTagCell) const { return this->GetNumberOfCells(); } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT SchedulingRangeType GetSchedulingRange(vtkm::TopologyElementTagPoint) const { return this->GetNumberOfPoints(); @@ -72,18 +72,18 @@ public: static const vtkm::IdComponent NUM_POINTS_IN_CELL = 2; static const vtkm::IdComponent MAX_CELL_TO_POINT = 2; - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::Id GetNumberOfPoints() const {return this->PointDimensions;} - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::Id GetNumberOfCells() const {return this->PointDimensions-1;} - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::IdComponent GetNumberOfPointsInCell() const {return NUM_POINTS_IN_CELL;} - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::IdComponent GetCellShape() const {return vtkm::CELL_SHAPE_LINE;} typedef vtkm::CellShapeTagLine CellShapeTag; - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::Vec GetPointsOfCell(vtkm::Id index) const { vtkm::Vec pointIds; @@ -92,7 +92,7 @@ public: return pointIds; } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::IdComponent GetNumberOfCellsIncidentOnPoint(vtkm::Id pointIndex) const { return @@ -100,7 +100,7 @@ public: + static_cast(pointIndex < this->PointDimensions-1)); } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::VecVariable GetCellsOfPoint(vtkm::Id index) const { @@ -118,31 +118,31 @@ public: return cellIds; } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::Id FlatToLogicalPointIndex(vtkm::Id flatPointIndex) const { return flatPointIndex; } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::Id LogicalToFlatPointIndex(vtkm::Id logicalPointIndex) const { return logicalPointIndex; } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::Id FlatToLogicalCellIndex(vtkm::Id flatCellIndex) const { return flatCellIndex; } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::Id LogicalToFlatCellIndex(vtkm::Id logicalCellIndex) const { return logicalCellIndex; } - VTKM_CONT_EXPORT + VTKM_CONT void PrintSummary(std::ostream &out) const { out<<" UniformConnectivity<1> "; @@ -161,33 +161,33 @@ class ConnectivityStructuredInternals<2> public: typedef vtkm::Id2 SchedulingRangeType; - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT void SetPointDimensions(vtkm::Id2 dims) { this->PointDimensions = dims; } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT const vtkm::Id2 &GetPointDimensions() const { return this->PointDimensions; } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::Id2 GetCellDimensions() const { return this->PointDimensions - vtkm::Id2(1); } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::Id GetNumberOfPoints() const { return vtkm::ReduceProduct(this->GetPointDimensions()); } //returns an id2 to signal what kind of scheduling to use - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::Id2 GetSchedulingRange(vtkm::TopologyElementTagCell) const { return this->GetCellDimensions(); } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::Id2 GetSchedulingRange(vtkm::TopologyElementTagPoint) const { return this->GetPointDimensions(); } @@ -195,19 +195,19 @@ public: static const vtkm::IdComponent NUM_POINTS_IN_CELL = 4; static const vtkm::IdComponent MAX_CELL_TO_POINT = 4; - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::Id GetNumberOfCells() const { return vtkm::ReduceProduct(this->GetCellDimensions()); } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::IdComponent GetNumberOfPointsInCell() const {return NUM_POINTS_IN_CELL;} - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::IdComponent GetCellShape() const { return vtkm::CELL_SHAPE_QUAD; } typedef vtkm::CellShapeTagQuad CellShapeTag; - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::Vec GetPointsOfCell(const SchedulingRangeType &logicalCellIndex) const { @@ -219,14 +219,14 @@ public: return pointIds; } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::Vec GetPointsOfCell(vtkm::Id cellIndex) const { return this->GetPointsOfCell(this->FlatToLogicalCellIndex(cellIndex)); } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::IdComponent GetNumberOfCellsIncidentOnPoint(const SchedulingRangeType &ij) const { @@ -238,14 +238,14 @@ public: (ij[0] < this->PointDimensions[0]-1) && (ij[1] < this->PointDimensions[1]-1))); } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::IdComponent GetNumberOfCellsIncidentOnPoint(vtkm::Id pointIndex) const { return this->GetNumberOfCellsIncidentOnPoint( this->FlatToLogicalPointIndex(pointIndex)); } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::VecVariable GetCellsOfPoint(const SchedulingRangeType &ij) const { @@ -271,14 +271,14 @@ public: return cellIds; } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::VecVariable GetCellsOfPoint(vtkm::Id pointIndex) const { return this->GetCellsOfPoint(this->FlatToLogicalPointIndex(pointIndex)); } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::Id2 FlatToLogicalPointIndex(vtkm::Id flatPointIndex) const { vtkm::Id2 logicalPointIndex; @@ -287,14 +287,14 @@ public: return logicalPointIndex; } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::Id LogicalToFlatPointIndex(const vtkm::Id2 &logicalPointIndex) const { return logicalPointIndex[0] + this->PointDimensions[0]*logicalPointIndex[1]; } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::Id2 FlatToLogicalCellIndex(vtkm::Id flatCellIndex) const { vtkm::Id2 cellDimensions = this->GetCellDimensions(); @@ -304,7 +304,7 @@ public: return logicalCellIndex; } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::Id LogicalToFlatCellIndex(const vtkm::Id2 &logicalCellIndex) const { vtkm::Id2 cellDimensions = this->GetCellDimensions(); @@ -312,7 +312,7 @@ public: + cellDimensions[0]*logicalCellIndex[1]; } - VTKM_CONT_EXPORT + VTKM_CONT void PrintSummary(std::ostream &out) const { out<<" UniformConnectivity<2> "; @@ -331,7 +331,7 @@ class ConnectivityStructuredInternals<3> public: typedef vtkm::Id3 SchedulingRangeType; - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT void SetPointDimensions(vtkm::Id3 dims) { this->PointDimensions = dims; @@ -339,30 +339,30 @@ public: this->CellDim01 = (dims[0]-1) * (dims[1]-1); } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT const vtkm::Id3& GetPointDimensions() const { return this->PointDimensions; } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT const vtkm::Id3& GetCellDimensions() const { return this->CellDimensions; } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::Id GetNumberOfPoints() const { return vtkm::ReduceProduct(this->PointDimensions); } //returns an id3 to signal what kind of scheduling to use - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT const vtkm::Id3& GetSchedulingRange(vtkm::TopologyElementTagCell) const { return this->GetCellDimensions(); } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT const vtkm::Id3& GetSchedulingRange(vtkm::TopologyElementTagPoint) const { return this->GetPointDimensions(); } @@ -370,19 +370,19 @@ public: static const vtkm::IdComponent NUM_POINTS_IN_CELL = 8; static const vtkm::IdComponent MAX_CELL_TO_POINT = 8; - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::Id GetNumberOfCells() const { return vtkm::ReduceProduct(this->GetCellDimensions()); } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::IdComponent GetNumberOfPointsInCell() const {return NUM_POINTS_IN_CELL;} - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::IdComponent GetCellShape() const { return vtkm::CELL_SHAPE_HEXAHEDRON; } typedef vtkm::CellShapeTagHexahedron CellShapeTag; - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::Vec GetPointsOfCell(const SchedulingRangeType &ijk) const { @@ -399,14 +399,14 @@ public: return pointIds; } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::Vec GetPointsOfCell(vtkm::Id cellIndex) const { return this->GetPointsOfCell(this->FlatToLogicalCellIndex(cellIndex)); } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::IdComponent GetNumberOfCellsIncidentOnPoint(const SchedulingRangeType &ijk) const { @@ -430,14 +430,14 @@ public: ); } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::IdComponent GetNumberOfCellsIncidentOnPoint(vtkm::Id pointIndex) const { return this->GetNumberOfCellsIncidentOnPoint( this->FlatToLogicalPointIndex(pointIndex)); } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::VecVariable GetCellsOfPoint(const SchedulingRangeType &ijk) const { @@ -488,14 +488,14 @@ public: return cellIds; } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::VecVariable GetCellsOfPoint(vtkm::Id pointIndex) const { return this->GetCellsOfPoint(this->FlatToLogicalPointIndex(pointIndex)); } - VTKM_CONT_EXPORT + VTKM_CONT void PrintSummary(std::ostream &out) const { out<<" UniformConnectivity<3> "; @@ -503,7 +503,7 @@ public: out<PointDimensions[0] * this->PointDimensions[1]; @@ -514,7 +514,7 @@ public: flatPointIndex / pointDims01); } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::Id LogicalToFlatPointIndex(const vtkm::Id3 &logicalPointIndex) const { return logicalPointIndex[0] @@ -522,7 +522,7 @@ public: + this->PointDimensions[1]*logicalPointIndex[2]); } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::Id3 FlatToLogicalCellIndex(vtkm::Id flatCellIndex) const { const vtkm::Id indexij = flatCellIndex % this->CellDim01; @@ -532,7 +532,7 @@ public: ); } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::Id LogicalToFlatCellIndex(const vtkm::Id3 &logicalCellIndex) const { return logicalCellIndex[0] @@ -571,7 +571,7 @@ struct ConnectivityStructuredIndexHelper< typedef vtkm::Vec IndicesType; template - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT static IndicesType GetIndices(const ConnectivityType &connectivity, const IndexType &cellIndex) { @@ -579,7 +579,7 @@ struct ConnectivityStructuredIndexHelper< } template - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT static vtkm::IdComponent GetNumberOfIndices( const ConnectivityType &connectivity, const IndexType &vtkmNotUsed(cellIndex)) @@ -587,7 +587,7 @@ struct ConnectivityStructuredIndexHelper< return connectivity.GetNumberOfPointsInCell(); } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT static LogicalIndexType FlatToLogicalFromIndex(const ConnectivityType &connectivity, vtkm::Id flatFromIndex) @@ -595,7 +595,7 @@ struct ConnectivityStructuredIndexHelper< return connectivity.FlatToLogicalPointIndex(flatFromIndex); } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT static vtkm::Id LogicalToFlatFromIndex(const ConnectivityType &connectivity, const LogicalIndexType &logicalFromIndex) @@ -603,7 +603,7 @@ struct ConnectivityStructuredIndexHelper< return connectivity.LogicalToFlatPointIndex(logicalFromIndex); } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT static LogicalIndexType FlatToLogicalToIndex(const ConnectivityType &connectivity, vtkm::Id flatToIndex) @@ -611,7 +611,7 @@ struct ConnectivityStructuredIndexHelper< return connectivity.FlatToLogicalCellIndex(flatToIndex); } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT static vtkm::Id LogicalToFlatToIndex(const ConnectivityType &connectivity, const LogicalIndexType &logicalToIndex) @@ -632,7 +632,7 @@ struct ConnectivityStructuredIndexHelper< IndicesType; template - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT static IndicesType GetIndices(const ConnectivityType &connectivity, const IndexType &pointIndex) { @@ -640,7 +640,7 @@ struct ConnectivityStructuredIndexHelper< } template - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT static vtkm::IdComponent GetNumberOfIndices( const ConnectivityType &connectivity, const IndexType &pointIndex) @@ -648,7 +648,7 @@ struct ConnectivityStructuredIndexHelper< return connectivity.GetNumberOfCellsIncidentOnPoint(pointIndex); } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT static LogicalIndexType FlatToLogicalFromIndex(const ConnectivityType &connectivity, vtkm::Id flatFromIndex) @@ -656,7 +656,7 @@ struct ConnectivityStructuredIndexHelper< return connectivity.FlatToLogicalCellIndex(flatFromIndex); } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT static vtkm::Id LogicalToFlatFromIndex(const ConnectivityType &connectivity, const LogicalIndexType &logicalFromIndex) @@ -664,7 +664,7 @@ struct ConnectivityStructuredIndexHelper< return connectivity.LogicalToFlatCellIndex(logicalFromIndex); } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT static LogicalIndexType FlatToLogicalToIndex(const ConnectivityType &connectivity, vtkm::Id flatToIndex) @@ -672,7 +672,7 @@ struct ConnectivityStructuredIndexHelper< return connectivity.FlatToLogicalPointIndex(flatToIndex); } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT static vtkm::Id LogicalToFlatToIndex(const ConnectivityType &connectivity, const LogicalIndexType &logicalToIndex) diff --git a/vtkm/internal/ExportMacros.h b/vtkm/internal/ExportMacros.h index 5b231f2be..05256f903 100644 --- a/vtkm/internal/ExportMacros.h +++ b/vtkm/internal/ExportMacros.h @@ -27,22 +27,22 @@ */ #ifdef VTKM_CUDA -#define VTKM_EXEC_EXPORT inline __device__ __host__ -#define VTKM_EXEC_CONT_EXPORT inline __device__ __host__ +#define VTKM_EXEC __device__ __host__ +#define VTKM_EXEC_CONT __device__ __host__ #if __CUDAVER__ >= 75000 # define VTKM_SUPPRESS_EXEC_WARNINGS #pragma nv_exec_check_disable #else # define VTKM_SUPPRESS_EXEC_WARNINGS #pragma hd_warning_disable #endif -#define VTKM_EXEC_CONSTANT_EXPORT __device__ __constant__ +#define VTKM_EXEC_CONSTANT __device__ __constant__ #else -#define VTKM_EXEC_EXPORT inline -#define VTKM_EXEC_CONT_EXPORT inline +#define VTKM_EXEC +#define VTKM_EXEC_CONT #define VTKM_SUPPRESS_EXEC_WARNINGS -#define VTKM_EXEC_CONSTANT_EXPORT +#define VTKM_EXEC_CONSTANT #endif -#define VTKM_CONT_EXPORT inline +#define VTKM_CONT // constexpr support was added to VisualStudio 2015 and above. So this makes // sure when that we gracefully fall back to just const when using 2013 diff --git a/vtkm/internal/FunctionInterface.h b/vtkm/internal/FunctionInterface.h index 4dbf35da1..88a8110d3 100644 --- a/vtkm/internal/FunctionInterface.h +++ b/vtkm/internal/FunctionInterface.h @@ -32,11 +32,11 @@ namespace detail { struct IdentityFunctor { template - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT T &operator()(T &x) const { return x; } template - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT const T &operator()(const T &x) const { return x; } }; @@ -47,7 +47,7 @@ struct FunctionInterfaceCopyParameters { VTKM_SUPPRESS_EXEC_WARNINGS template static - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT void Copy(vtkm::internal::detail::ParameterContainer &dest, const vtkm::internal::detail::ParameterContainer &src) { @@ -61,7 +61,7 @@ template struct FunctionInterfaceCopyParameters<0, ParameterIndex> { template static - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT void Copy(vtkm::internal::detail::ParameterContainer &, const vtkm::internal::detail::ParameterContainer &) { @@ -252,14 +252,14 @@ public: /// Returns the number of parameters held in this \c FunctionInterface. The /// return value is the same as \c ARITY. /// - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::IdComponent GetArity() const { return ARITY; } /// Retrieves the return value from the last invocation called. This method /// will result in a compiler error if used with a function having a void /// return type. /// - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT ResultType GetReturnValue() const { return this->Result.Value; } /// Retrieves the return value from the last invocation wrapped in a \c @@ -268,12 +268,12 @@ public: /// return is non-void before trying to use it, but using this method can /// simplify templated programming. /// - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT const FunctionInterfaceReturnContainer &GetReturnValueSafe() const { return this->Result; } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT FunctionInterfaceReturnContainer &GetReturnValueSafe() { return this->Result; @@ -310,7 +310,7 @@ public: /// \endcode /// template - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT const typename ParameterType::type & GetParameter( vtkm::internal::IndexTag = @@ -356,7 +356,7 @@ public: /// template keyword. /// template - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT void SetParameter( const typename ParameterType::type& parameter, vtkm::internal::IndexTag = @@ -397,7 +397,7 @@ public: /// can be retrieved with GetReturnValue(). /// template - VTKM_CONT_EXPORT + VTKM_CONT void InvokeCont(const Function &f) { detail::DoInvokeCont(f, this->Parameters, @@ -405,7 +405,7 @@ public: detail::IdentityFunctor()); } template - VTKM_CONT_EXPORT + VTKM_CONT void InvokeCont(Function &f) { detail::DoInvokeCont(f, this->Parameters, @@ -413,7 +413,7 @@ public: detail::IdentityFunctor()); } template - VTKM_EXEC_EXPORT + VTKM_EXEC void InvokeExec(const Function &f) { detail::DoInvokeExec(f, this->Parameters, @@ -421,7 +421,7 @@ public: detail::IdentityFunctor()); } template - VTKM_EXEC_EXPORT + VTKM_EXEC void InvokeExec(Function &f) { detail::DoInvokeExec(f, this->Parameters, @@ -439,22 +439,22 @@ public: /// FunctionInterface and can be retrieved with GetReturnValue(). /// template - VTKM_CONT_EXPORT + VTKM_CONT void InvokeCont(const Function &f, const TransformFunctor &transform) { detail::DoInvokeCont(f, this->Parameters, this->Result, transform); } template - VTKM_CONT_EXPORT + VTKM_CONT void InvokeCont(Function &f, const TransformFunctor &transform) { detail::DoInvokeCont(f, this->Parameters, this->Result, transform); } template - VTKM_EXEC_EXPORT + VTKM_EXEC void InvokeExec(const Function &f, const TransformFunctor &transform) { detail::DoInvokeExec(f, this->Parameters, this->Result, transform); } template - VTKM_EXEC_EXPORT + VTKM_EXEC void InvokeExec(Function &f, const TransformFunctor &transform) { detail::DoInvokeExec(f, this->Parameters, this->Result, transform); } @@ -472,7 +472,7 @@ public: /// template. /// template - VTKM_CONT_EXPORT + VTKM_CONT typename AppendType::type Append(const NewType& newParameter) const { @@ -529,7 +529,7 @@ public: /// /// template - VTKM_CONT_EXPORT + VTKM_CONT typename ReplaceType::type Replace(const NewType& newParameter, vtkm::internal::IndexTag = @@ -587,7 +587,7 @@ public: /// }; /// /// template - /// VTKM_CONT_EXPORT + /// VTKM_CONT /// const T *operator()(const T &x, vtkm::internal::IndexTag) const { /// return &x; /// } @@ -602,7 +602,7 @@ public: /// \endcode /// template - VTKM_CONT_EXPORT + VTKM_CONT typename StaticTransformType::type StaticTransformCont(const Transform &transform) const { @@ -613,7 +613,7 @@ public: return newFuncInterface; } template - VTKM_EXEC_EXPORT + VTKM_EXEC typename StaticTransformType::type StaticTransformExec(const Transform &transform) const { @@ -649,7 +649,7 @@ public: /// template - /// VTKM_CONT_EXPORT + /// VTKM_CONT /// void operator()(const InputType &input, /// const ContinueFunctor &continueFunc, /// vtkm::internal::IndexTag) const @@ -658,7 +658,7 @@ public: /// } /// /// template - /// VTKM_CONT_EXPORT + /// VTKM_CONT /// void operator()(const std::string &input, /// const ContinueFunctor &continueFunc, /// vtkm::internal::IndexTag) const @@ -679,7 +679,7 @@ public: /// /// struct MyFinishFunctor { /// template - /// VTKM_CONT_EXPORT + /// VTKM_CONT /// void operator()(vtkm::internal::FunctionInterface &funcInterface) const /// { /// // Do something @@ -700,7 +700,7 @@ public: /// calling the continue functor. /// template - VTKM_CONT_EXPORT + VTKM_CONT void DynamicTransformCont(const TransformFunctor &transform, const FinishFunctor &finish) const { typedef detail::FunctionInterfaceDynamicTransformContContinue< @@ -726,22 +726,22 @@ public: /// index of the parameter. /// template - VTKM_CONT_EXPORT + VTKM_CONT void ForEachCont(const Functor &f) const { detail::DoForEachCont(f, this->Parameters); } template - VTKM_CONT_EXPORT + VTKM_CONT void ForEachCont(const Functor &f) { detail::DoForEachCont(f, this->Parameters); } template - VTKM_EXEC_EXPORT + VTKM_EXEC void ForEachExec(const Functor &f) const { detail::DoForEachExec(f, this->Parameters); } template - VTKM_EXEC_EXPORT + VTKM_EXEC void ForEachExec(const Functor &f) { detail::DoForEachExec(f, this->Parameters); } @@ -772,7 +772,7 @@ public: { } template - VTKM_CONT_EXPORT + VTKM_CONT void operator()(const T& newParameter) const { typedef typename FunctionInterface::ComponentSig NewFSigComp; diff --git a/vtkm/internal/FunctionInterfaceDetailPost.h b/vtkm/internal/FunctionInterfaceDetailPost.h index 1af9618d4..3cec8cd9e 100644 --- a/vtkm/internal/FunctionInterfaceDetailPost.h +++ b/vtkm/internal/FunctionInterfaceDetailPost.h @@ -247,7 +247,7 @@ struct FunctionInterfaceStaticTransformType -VTKM_EXEC_CONT_EXPORT +VTKM_EXEC_CONT FunctionInterface make_FunctionInterface( ) @@ -271,7 +271,7 @@ make_FunctionInterface( VTKM_SUPPRESS_EXEC_WARNINGS template -VTKM_EXEC_CONT_EXPORT +VTKM_EXEC_CONT FunctionInterface make_FunctionInterface( const P1& p1 @@ -298,7 +298,7 @@ VTKM_SUPPRESS_EXEC_WARNINGS template -VTKM_EXEC_CONT_EXPORT +VTKM_EXEC_CONT FunctionInterface make_FunctionInterface( const P1& p1, @@ -328,7 +328,7 @@ template -VTKM_EXEC_CONT_EXPORT +VTKM_EXEC_CONT FunctionInterface make_FunctionInterface( const P1& p1, @@ -361,7 +361,7 @@ template -VTKM_EXEC_CONT_EXPORT +VTKM_EXEC_CONT FunctionInterface make_FunctionInterface( const P1& p1, @@ -397,7 +397,7 @@ template -VTKM_EXEC_CONT_EXPORT +VTKM_EXEC_CONT FunctionInterface make_FunctionInterface( const P1& p1, @@ -436,7 +436,7 @@ template -VTKM_EXEC_CONT_EXPORT +VTKM_EXEC_CONT FunctionInterface make_FunctionInterface( const P1& p1, @@ -478,7 +478,7 @@ template -VTKM_EXEC_CONT_EXPORT +VTKM_EXEC_CONT FunctionInterface make_FunctionInterface( const P1& p1, @@ -523,7 +523,7 @@ template -VTKM_EXEC_CONT_EXPORT +VTKM_EXEC_CONT FunctionInterface make_FunctionInterface( const P1& p1, @@ -571,7 +571,7 @@ template -VTKM_EXEC_CONT_EXPORT +VTKM_EXEC_CONT FunctionInterface make_FunctionInterface( const P1& p1, @@ -622,7 +622,7 @@ template -VTKM_EXEC_CONT_EXPORT +VTKM_EXEC_CONT FunctionInterface make_FunctionInterface( const P1& p1, diff --git a/vtkm/internal/FunctionInterfaceDetailPost.h.in b/vtkm/internal/FunctionInterfaceDetailPost.h.in index f85018a10..5ae8ce470 100644 --- a/vtkm/internal/FunctionInterfaceDetailPost.h.in +++ b/vtkm/internal/FunctionInterfaceDetailPost.h.in @@ -120,7 +120,7 @@ $for(num_params in xrange(0, max_parameters+1))\ /// VTKM_SUPPRESS_EXEC_WARNINGS template<$template_params(num_params)> -VTKM_EXEC_CONT_EXPORT +VTKM_EXEC_CONT FunctionInterface<$signature(num_params)> make_FunctionInterface( $for(param_index in xrange(1,num_params+1))\ diff --git a/vtkm/internal/FunctionInterfaceDetailPre.h b/vtkm/internal/FunctionInterfaceDetailPre.h index 682623467..402b2d14a 100644 --- a/vtkm/internal/FunctionInterfaceDetailPre.h +++ b/vtkm/internal/FunctionInterfaceDetailPre.h @@ -280,7 +280,7 @@ struct ParameterContainerAccess<1> { VTKM_SUPPRESS_EXEC_WARNINGS template - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT const typename AtType<1, FunctionSignature>::type & Get(const ParameterContainer ¶meters) { return parameters.Parameter1; @@ -288,7 +288,7 @@ struct ParameterContainerAccess<1> { VTKM_SUPPRESS_EXEC_WARNINGS template - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT void Set(ParameterContainer ¶meters, const typename AtType<1, FunctionSignature>::type &value) { parameters.Parameter1 = value; @@ -300,7 +300,7 @@ struct ParameterContainerAccess<2> { VTKM_SUPPRESS_EXEC_WARNINGS template - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT const typename AtType<2, FunctionSignature>::type & Get(const ParameterContainer ¶meters) { return parameters.Parameter2; @@ -308,7 +308,7 @@ struct ParameterContainerAccess<2> { VTKM_SUPPRESS_EXEC_WARNINGS template - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT void Set(ParameterContainer ¶meters, const typename AtType<2, FunctionSignature>::type &value) { parameters.Parameter2 = value; @@ -320,7 +320,7 @@ struct ParameterContainerAccess<3> { VTKM_SUPPRESS_EXEC_WARNINGS template - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT const typename AtType<3, FunctionSignature>::type & Get(const ParameterContainer ¶meters) { return parameters.Parameter3; @@ -328,7 +328,7 @@ struct ParameterContainerAccess<3> { VTKM_SUPPRESS_EXEC_WARNINGS template - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT void Set(ParameterContainer ¶meters, const typename AtType<3, FunctionSignature>::type &value) { parameters.Parameter3 = value; @@ -340,7 +340,7 @@ struct ParameterContainerAccess<4> { VTKM_SUPPRESS_EXEC_WARNINGS template - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT const typename AtType<4, FunctionSignature>::type & Get(const ParameterContainer ¶meters) { return parameters.Parameter4; @@ -348,7 +348,7 @@ struct ParameterContainerAccess<4> { VTKM_SUPPRESS_EXEC_WARNINGS template - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT void Set(ParameterContainer ¶meters, const typename AtType<4, FunctionSignature>::type &value) { parameters.Parameter4 = value; @@ -360,7 +360,7 @@ struct ParameterContainerAccess<5> { VTKM_SUPPRESS_EXEC_WARNINGS template - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT const typename AtType<5, FunctionSignature>::type & Get(const ParameterContainer ¶meters) { return parameters.Parameter5; @@ -368,7 +368,7 @@ struct ParameterContainerAccess<5> { VTKM_SUPPRESS_EXEC_WARNINGS template - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT void Set(ParameterContainer ¶meters, const typename AtType<5, FunctionSignature>::type &value) { parameters.Parameter5 = value; @@ -380,7 +380,7 @@ struct ParameterContainerAccess<6> { VTKM_SUPPRESS_EXEC_WARNINGS template - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT const typename AtType<6, FunctionSignature>::type & Get(const ParameterContainer ¶meters) { return parameters.Parameter6; @@ -388,7 +388,7 @@ struct ParameterContainerAccess<6> { VTKM_SUPPRESS_EXEC_WARNINGS template - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT void Set(ParameterContainer ¶meters, const typename AtType<6, FunctionSignature>::type &value) { parameters.Parameter6 = value; @@ -400,7 +400,7 @@ struct ParameterContainerAccess<7> { VTKM_SUPPRESS_EXEC_WARNINGS template - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT const typename AtType<7, FunctionSignature>::type & Get(const ParameterContainer ¶meters) { return parameters.Parameter7; @@ -408,7 +408,7 @@ struct ParameterContainerAccess<7> { VTKM_SUPPRESS_EXEC_WARNINGS template - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT void Set(ParameterContainer ¶meters, const typename AtType<7, FunctionSignature>::type &value) { parameters.Parameter7 = value; @@ -420,7 +420,7 @@ struct ParameterContainerAccess<8> { VTKM_SUPPRESS_EXEC_WARNINGS template - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT const typename AtType<8, FunctionSignature>::type & Get(const ParameterContainer ¶meters) { return parameters.Parameter8; @@ -428,7 +428,7 @@ struct ParameterContainerAccess<8> { VTKM_SUPPRESS_EXEC_WARNINGS template - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT void Set(ParameterContainer ¶meters, const typename AtType<8, FunctionSignature>::type &value) { parameters.Parameter8 = value; @@ -440,7 +440,7 @@ struct ParameterContainerAccess<9> { VTKM_SUPPRESS_EXEC_WARNINGS template - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT const typename AtType<9, FunctionSignature>::type & Get(const ParameterContainer ¶meters) { return parameters.Parameter9; @@ -448,7 +448,7 @@ struct ParameterContainerAccess<9> { VTKM_SUPPRESS_EXEC_WARNINGS template - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT void Set(ParameterContainer ¶meters, const typename AtType<9, FunctionSignature>::type &value) { parameters.Parameter9 = value; @@ -460,7 +460,7 @@ struct ParameterContainerAccess<10> { VTKM_SUPPRESS_EXEC_WARNINGS template - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT const typename AtType<10, FunctionSignature>::type & Get(const ParameterContainer ¶meters) { return parameters.Parameter10; @@ -468,7 +468,7 @@ struct ParameterContainerAccess<10> { VTKM_SUPPRESS_EXEC_WARNINGS template - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT void Set(ParameterContainer ¶meters, const typename AtType<10, FunctionSignature>::type &value) { parameters.Parameter10 = value; @@ -486,7 +486,7 @@ struct CopyAllParameters<1> { VTKM_SUPPRESS_EXEC_WARNINGS template - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT void Copy(vtkm::internal::detail::ParameterContainer &dest, const vtkm::internal::detail::ParameterContainer &src) { @@ -499,7 +499,7 @@ struct CopyAllParameters<2> { VTKM_SUPPRESS_EXEC_WARNINGS template - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT void Copy(vtkm::internal::detail::ParameterContainer &dest, const vtkm::internal::detail::ParameterContainer &src) { @@ -513,7 +513,7 @@ struct CopyAllParameters<3> { VTKM_SUPPRESS_EXEC_WARNINGS template - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT void Copy(vtkm::internal::detail::ParameterContainer &dest, const vtkm::internal::detail::ParameterContainer &src) { @@ -528,7 +528,7 @@ struct CopyAllParameters<4> { VTKM_SUPPRESS_EXEC_WARNINGS template - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT void Copy(vtkm::internal::detail::ParameterContainer &dest, const vtkm::internal::detail::ParameterContainer &src) { @@ -544,7 +544,7 @@ struct CopyAllParameters<5> { VTKM_SUPPRESS_EXEC_WARNINGS template - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT void Copy(vtkm::internal::detail::ParameterContainer &dest, const vtkm::internal::detail::ParameterContainer &src) { @@ -561,7 +561,7 @@ struct CopyAllParameters<6> { VTKM_SUPPRESS_EXEC_WARNINGS template - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT void Copy(vtkm::internal::detail::ParameterContainer &dest, const vtkm::internal::detail::ParameterContainer &src) { @@ -579,7 +579,7 @@ struct CopyAllParameters<7> { VTKM_SUPPRESS_EXEC_WARNINGS template - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT void Copy(vtkm::internal::detail::ParameterContainer &dest, const vtkm::internal::detail::ParameterContainer &src) { @@ -598,7 +598,7 @@ struct CopyAllParameters<8> { VTKM_SUPPRESS_EXEC_WARNINGS template - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT void Copy(vtkm::internal::detail::ParameterContainer &dest, const vtkm::internal::detail::ParameterContainer &src) { @@ -618,7 +618,7 @@ struct CopyAllParameters<9> { VTKM_SUPPRESS_EXEC_WARNINGS template - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT void Copy(vtkm::internal::detail::ParameterContainer &dest, const vtkm::internal::detail::ParameterContainer &src) { @@ -639,7 +639,7 @@ struct CopyAllParameters<10> { VTKM_SUPPRESS_EXEC_WARNINGS template - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT void Copy(vtkm::internal::detail::ParameterContainer &dest, const vtkm::internal::detail::ParameterContainer &src) { @@ -662,7 +662,7 @@ struct CopyAllParameters<0> { VTKM_SUPPRESS_EXEC_WARNINGS template - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT void Copy(vtkm::internal::detail::ParameterContainer &, const vtkm::internal::detail::ParameterContainer &) { @@ -677,7 +677,7 @@ VTKM_SUPPRESS_EXEC_WARNINGS template -VTKM_CONT_EXPORT +VTKM_CONT void DoInvokeCont( const Functor &f, ParameterContainer ¶meters, @@ -692,7 +692,7 @@ VTKM_SUPPRESS_EXEC_WARNINGS template -VTKM_CONT_EXPORT +VTKM_CONT void DoInvokeCont( const Functor &f, ParameterContainer ¶meters, @@ -708,7 +708,7 @@ VTKM_SUPPRESS_EXEC_WARNINGS template -VTKM_CONT_EXPORT +VTKM_CONT void DoInvokeCont( Functor &f, ParameterContainer ¶meters, @@ -723,7 +723,7 @@ VTKM_SUPPRESS_EXEC_WARNINGS template -VTKM_CONT_EXPORT +VTKM_CONT void DoInvokeCont( Functor &f, ParameterContainer ¶meters, @@ -739,7 +739,7 @@ VTKM_SUPPRESS_EXEC_WARNINGS template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoInvokeExec( const Functor &f, ParameterContainer ¶meters, @@ -754,7 +754,7 @@ VTKM_SUPPRESS_EXEC_WARNINGS template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoInvokeExec( const Functor &f, ParameterContainer ¶meters, @@ -770,7 +770,7 @@ VTKM_SUPPRESS_EXEC_WARNINGS template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoInvokeExec( Functor &f, ParameterContainer ¶meters, @@ -785,7 +785,7 @@ VTKM_SUPPRESS_EXEC_WARNINGS template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoInvokeExec( Functor &f, ParameterContainer ¶meters, @@ -802,7 +802,7 @@ template -VTKM_CONT_EXPORT +VTKM_CONT void DoInvokeCont( const Functor &f, ParameterContainer ¶meters, @@ -817,7 +817,7 @@ VTKM_SUPPRESS_EXEC_WARNINGS template -VTKM_CONT_EXPORT +VTKM_CONT void DoInvokeCont( const Functor &f, ParameterContainer ¶meters, @@ -833,7 +833,7 @@ template -VTKM_CONT_EXPORT +VTKM_CONT void DoInvokeCont( Functor &f, ParameterContainer ¶meters, @@ -848,7 +848,7 @@ VTKM_SUPPRESS_EXEC_WARNINGS template -VTKM_CONT_EXPORT +VTKM_CONT void DoInvokeCont( Functor &f, ParameterContainer ¶meters, @@ -864,7 +864,7 @@ template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoInvokeExec( const Functor &f, ParameterContainer ¶meters, @@ -879,7 +879,7 @@ VTKM_SUPPRESS_EXEC_WARNINGS template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoInvokeExec( const Functor &f, ParameterContainer ¶meters, @@ -895,7 +895,7 @@ template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoInvokeExec( Functor &f, ParameterContainer ¶meters, @@ -910,7 +910,7 @@ VTKM_SUPPRESS_EXEC_WARNINGS template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoInvokeExec( Functor &f, ParameterContainer ¶meters, @@ -927,7 +927,7 @@ template -VTKM_CONT_EXPORT +VTKM_CONT void DoInvokeCont( const Functor &f, ParameterContainer ¶meters, @@ -944,7 +944,7 @@ template -VTKM_CONT_EXPORT +VTKM_CONT void DoInvokeCont( const Functor &f, ParameterContainer ¶meters, @@ -962,7 +962,7 @@ template -VTKM_CONT_EXPORT +VTKM_CONT void DoInvokeCont( Functor &f, ParameterContainer ¶meters, @@ -979,7 +979,7 @@ template -VTKM_CONT_EXPORT +VTKM_CONT void DoInvokeCont( Functor &f, ParameterContainer ¶meters, @@ -997,7 +997,7 @@ template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoInvokeExec( const Functor &f, ParameterContainer ¶meters, @@ -1014,7 +1014,7 @@ template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoInvokeExec( const Functor &f, ParameterContainer ¶meters, @@ -1032,7 +1032,7 @@ template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoInvokeExec( Functor &f, ParameterContainer ¶meters, @@ -1049,7 +1049,7 @@ template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoInvokeExec( Functor &f, ParameterContainer ¶meters, @@ -1068,7 +1068,7 @@ template -VTKM_CONT_EXPORT +VTKM_CONT void DoInvokeCont( const Functor &f, ParameterContainer ¶meters, @@ -1087,7 +1087,7 @@ template -VTKM_CONT_EXPORT +VTKM_CONT void DoInvokeCont( const Functor &f, ParameterContainer ¶meters, @@ -1107,7 +1107,7 @@ template -VTKM_CONT_EXPORT +VTKM_CONT void DoInvokeCont( Functor &f, ParameterContainer ¶meters, @@ -1126,7 +1126,7 @@ template -VTKM_CONT_EXPORT +VTKM_CONT void DoInvokeCont( Functor &f, ParameterContainer ¶meters, @@ -1146,7 +1146,7 @@ template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoInvokeExec( const Functor &f, ParameterContainer ¶meters, @@ -1165,7 +1165,7 @@ template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoInvokeExec( const Functor &f, ParameterContainer ¶meters, @@ -1185,7 +1185,7 @@ template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoInvokeExec( Functor &f, ParameterContainer ¶meters, @@ -1204,7 +1204,7 @@ template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoInvokeExec( Functor &f, ParameterContainer ¶meters, @@ -1225,7 +1225,7 @@ template -VTKM_CONT_EXPORT +VTKM_CONT void DoInvokeCont( const Functor &f, ParameterContainer ¶meters, @@ -1246,7 +1246,7 @@ template -VTKM_CONT_EXPORT +VTKM_CONT void DoInvokeCont( const Functor &f, ParameterContainer ¶meters, @@ -1268,7 +1268,7 @@ template -VTKM_CONT_EXPORT +VTKM_CONT void DoInvokeCont( Functor &f, ParameterContainer ¶meters, @@ -1289,7 +1289,7 @@ template -VTKM_CONT_EXPORT +VTKM_CONT void DoInvokeCont( Functor &f, ParameterContainer ¶meters, @@ -1311,7 +1311,7 @@ template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoInvokeExec( const Functor &f, ParameterContainer ¶meters, @@ -1332,7 +1332,7 @@ template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoInvokeExec( const Functor &f, ParameterContainer ¶meters, @@ -1354,7 +1354,7 @@ template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoInvokeExec( Functor &f, ParameterContainer ¶meters, @@ -1375,7 +1375,7 @@ template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoInvokeExec( Functor &f, ParameterContainer ¶meters, @@ -1398,7 +1398,7 @@ template -VTKM_CONT_EXPORT +VTKM_CONT void DoInvokeCont( const Functor &f, ParameterContainer ¶meters, @@ -1421,7 +1421,7 @@ template -VTKM_CONT_EXPORT +VTKM_CONT void DoInvokeCont( const Functor &f, ParameterContainer ¶meters, @@ -1445,7 +1445,7 @@ template -VTKM_CONT_EXPORT +VTKM_CONT void DoInvokeCont( Functor &f, ParameterContainer ¶meters, @@ -1468,7 +1468,7 @@ template -VTKM_CONT_EXPORT +VTKM_CONT void DoInvokeCont( Functor &f, ParameterContainer ¶meters, @@ -1492,7 +1492,7 @@ template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoInvokeExec( const Functor &f, ParameterContainer ¶meters, @@ -1515,7 +1515,7 @@ template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoInvokeExec( const Functor &f, ParameterContainer ¶meters, @@ -1539,7 +1539,7 @@ template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoInvokeExec( Functor &f, ParameterContainer ¶meters, @@ -1562,7 +1562,7 @@ template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoInvokeExec( Functor &f, ParameterContainer ¶meters, @@ -1587,7 +1587,7 @@ template -VTKM_CONT_EXPORT +VTKM_CONT void DoInvokeCont( const Functor &f, ParameterContainer ¶meters, @@ -1612,7 +1612,7 @@ template -VTKM_CONT_EXPORT +VTKM_CONT void DoInvokeCont( const Functor &f, ParameterContainer ¶meters, @@ -1638,7 +1638,7 @@ template -VTKM_CONT_EXPORT +VTKM_CONT void DoInvokeCont( Functor &f, ParameterContainer ¶meters, @@ -1663,7 +1663,7 @@ template -VTKM_CONT_EXPORT +VTKM_CONT void DoInvokeCont( Functor &f, ParameterContainer ¶meters, @@ -1689,7 +1689,7 @@ template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoInvokeExec( const Functor &f, ParameterContainer ¶meters, @@ -1714,7 +1714,7 @@ template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoInvokeExec( const Functor &f, ParameterContainer ¶meters, @@ -1740,7 +1740,7 @@ template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoInvokeExec( Functor &f, ParameterContainer ¶meters, @@ -1765,7 +1765,7 @@ template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoInvokeExec( Functor &f, ParameterContainer ¶meters, @@ -1792,7 +1792,7 @@ template -VTKM_CONT_EXPORT +VTKM_CONT void DoInvokeCont( const Functor &f, ParameterContainer ¶meters, @@ -1819,7 +1819,7 @@ template -VTKM_CONT_EXPORT +VTKM_CONT void DoInvokeCont( const Functor &f, ParameterContainer ¶meters, @@ -1847,7 +1847,7 @@ template -VTKM_CONT_EXPORT +VTKM_CONT void DoInvokeCont( Functor &f, ParameterContainer ¶meters, @@ -1874,7 +1874,7 @@ template -VTKM_CONT_EXPORT +VTKM_CONT void DoInvokeCont( Functor &f, ParameterContainer ¶meters, @@ -1902,7 +1902,7 @@ template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoInvokeExec( const Functor &f, ParameterContainer ¶meters, @@ -1929,7 +1929,7 @@ template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoInvokeExec( const Functor &f, ParameterContainer ¶meters, @@ -1957,7 +1957,7 @@ template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoInvokeExec( Functor &f, ParameterContainer ¶meters, @@ -1984,7 +1984,7 @@ template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoInvokeExec( Functor &f, ParameterContainer ¶meters, @@ -2013,7 +2013,7 @@ template -VTKM_CONT_EXPORT +VTKM_CONT void DoInvokeCont( const Functor &f, ParameterContainer ¶meters, @@ -2042,7 +2042,7 @@ template -VTKM_CONT_EXPORT +VTKM_CONT void DoInvokeCont( const Functor &f, ParameterContainer ¶meters, @@ -2072,7 +2072,7 @@ template -VTKM_CONT_EXPORT +VTKM_CONT void DoInvokeCont( Functor &f, ParameterContainer ¶meters, @@ -2101,7 +2101,7 @@ template -VTKM_CONT_EXPORT +VTKM_CONT void DoInvokeCont( Functor &f, ParameterContainer ¶meters, @@ -2131,7 +2131,7 @@ template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoInvokeExec( const Functor &f, ParameterContainer ¶meters, @@ -2160,7 +2160,7 @@ template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoInvokeExec( const Functor &f, ParameterContainer ¶meters, @@ -2190,7 +2190,7 @@ template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoInvokeExec( Functor &f, ParameterContainer ¶meters, @@ -2219,7 +2219,7 @@ template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoInvokeExec( Functor &f, ParameterContainer ¶meters, @@ -2250,7 +2250,7 @@ template -VTKM_CONT_EXPORT +VTKM_CONT void DoInvokeCont( const Functor &f, ParameterContainer ¶meters, @@ -2281,7 +2281,7 @@ template -VTKM_CONT_EXPORT +VTKM_CONT void DoInvokeCont( const Functor &f, ParameterContainer ¶meters, @@ -2313,7 +2313,7 @@ template -VTKM_CONT_EXPORT +VTKM_CONT void DoInvokeCont( Functor &f, ParameterContainer ¶meters, @@ -2344,7 +2344,7 @@ template -VTKM_CONT_EXPORT +VTKM_CONT void DoInvokeCont( Functor &f, ParameterContainer ¶meters, @@ -2376,7 +2376,7 @@ template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoInvokeExec( const Functor &f, ParameterContainer ¶meters, @@ -2407,7 +2407,7 @@ template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoInvokeExec( const Functor &f, ParameterContainer ¶meters, @@ -2439,7 +2439,7 @@ template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoInvokeExec( Functor &f, ParameterContainer ¶meters, @@ -2470,7 +2470,7 @@ template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoInvokeExec( Functor &f, ParameterContainer ¶meters, @@ -2503,7 +2503,7 @@ template -VTKM_CONT_EXPORT +VTKM_CONT void DoInvokeCont( const Functor &f, ParameterContainer ¶meters, @@ -2536,7 +2536,7 @@ template -VTKM_CONT_EXPORT +VTKM_CONT void DoInvokeCont( const Functor &f, ParameterContainer ¶meters, @@ -2570,7 +2570,7 @@ template -VTKM_CONT_EXPORT +VTKM_CONT void DoInvokeCont( Functor &f, ParameterContainer ¶meters, @@ -2603,7 +2603,7 @@ template -VTKM_CONT_EXPORT +VTKM_CONT void DoInvokeCont( Functor &f, ParameterContainer ¶meters, @@ -2637,7 +2637,7 @@ template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoInvokeExec( const Functor &f, ParameterContainer ¶meters, @@ -2670,7 +2670,7 @@ template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoInvokeExec( const Functor &f, ParameterContainer ¶meters, @@ -2704,7 +2704,7 @@ template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoInvokeExec( Functor &f, ParameterContainer ¶meters, @@ -2737,7 +2737,7 @@ template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoInvokeExec( Functor &f, ParameterContainer ¶meters, @@ -2767,7 +2767,7 @@ VTKM_SUPPRESS_EXEC_WARNINGS template -VTKM_CONT_EXPORT +VTKM_CONT void DoStaticTransformCont( const Transform &transform, const ParameterContainer &originalParameters, @@ -2782,7 +2782,7 @@ VTKM_SUPPRESS_EXEC_WARNINGS template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoStaticTransformExec( const Transform &transform, const ParameterContainer &originalParameters, @@ -2799,7 +2799,7 @@ template -VTKM_CONT_EXPORT +VTKM_CONT void DoStaticTransformCont( const Transform &transform, const ParameterContainer &originalParameters, @@ -2815,7 +2815,7 @@ template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoStaticTransformExec( const Transform &transform, const ParameterContainer &originalParameters, @@ -2833,7 +2833,7 @@ template -VTKM_CONT_EXPORT +VTKM_CONT void DoStaticTransformCont( const Transform &transform, const ParameterContainer &originalParameters, @@ -2853,7 +2853,7 @@ template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoStaticTransformExec( const Transform &transform, const ParameterContainer &originalParameters, @@ -2875,7 +2875,7 @@ template -VTKM_CONT_EXPORT +VTKM_CONT void DoStaticTransformCont( const Transform &transform, const ParameterContainer &originalParameters, @@ -2899,7 +2899,7 @@ template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoStaticTransformExec( const Transform &transform, const ParameterContainer &originalParameters, @@ -2925,7 +2925,7 @@ template -VTKM_CONT_EXPORT +VTKM_CONT void DoStaticTransformCont( const Transform &transform, const ParameterContainer &originalParameters, @@ -2953,7 +2953,7 @@ template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoStaticTransformExec( const Transform &transform, const ParameterContainer &originalParameters, @@ -2983,7 +2983,7 @@ template -VTKM_CONT_EXPORT +VTKM_CONT void DoStaticTransformCont( const Transform &transform, const ParameterContainer &originalParameters, @@ -3015,7 +3015,7 @@ template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoStaticTransformExec( const Transform &transform, const ParameterContainer &originalParameters, @@ -3049,7 +3049,7 @@ template -VTKM_CONT_EXPORT +VTKM_CONT void DoStaticTransformCont( const Transform &transform, const ParameterContainer &originalParameters, @@ -3085,7 +3085,7 @@ template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoStaticTransformExec( const Transform &transform, const ParameterContainer &originalParameters, @@ -3123,7 +3123,7 @@ template -VTKM_CONT_EXPORT +VTKM_CONT void DoStaticTransformCont( const Transform &transform, const ParameterContainer &originalParameters, @@ -3163,7 +3163,7 @@ template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoStaticTransformExec( const Transform &transform, const ParameterContainer &originalParameters, @@ -3205,7 +3205,7 @@ template -VTKM_CONT_EXPORT +VTKM_CONT void DoStaticTransformCont( const Transform &transform, const ParameterContainer &originalParameters, @@ -3249,7 +3249,7 @@ template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoStaticTransformExec( const Transform &transform, const ParameterContainer &originalParameters, @@ -3295,7 +3295,7 @@ template -VTKM_CONT_EXPORT +VTKM_CONT void DoStaticTransformCont( const Transform &transform, const ParameterContainer &originalParameters, @@ -3343,7 +3343,7 @@ template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoStaticTransformExec( const Transform &transform, const ParameterContainer &originalParameters, @@ -3375,7 +3375,7 @@ void DoStaticTransformExec( VTKM_SUPPRESS_EXEC_WARNINGS template -VTKM_CONT_EXPORT +VTKM_CONT void DoForEachCont( const Functor &f, const ParameterContainer ¶meters) @@ -3387,7 +3387,7 @@ void DoForEachCont( VTKM_SUPPRESS_EXEC_WARNINGS template -VTKM_CONT_EXPORT +VTKM_CONT void DoForEachCont( const Functor &f, ParameterContainer ¶meters) @@ -3399,7 +3399,7 @@ void DoForEachCont( VTKM_SUPPRESS_EXEC_WARNINGS template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoForEachExec( const Functor &f, const ParameterContainer ¶meters) @@ -3411,7 +3411,7 @@ void DoForEachExec( VTKM_SUPPRESS_EXEC_WARNINGS template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoForEachExec( const Functor &f, ParameterContainer ¶meters) @@ -3424,7 +3424,7 @@ VTKM_SUPPRESS_EXEC_WARNINGS template -VTKM_CONT_EXPORT +VTKM_CONT void DoForEachCont( const Functor &f, const ParameterContainer ¶meters) @@ -3436,7 +3436,7 @@ VTKM_SUPPRESS_EXEC_WARNINGS template -VTKM_CONT_EXPORT +VTKM_CONT void DoForEachCont( const Functor &f, ParameterContainer ¶meters) @@ -3448,7 +3448,7 @@ VTKM_SUPPRESS_EXEC_WARNINGS template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoForEachExec( const Functor &f, const ParameterContainer ¶meters) @@ -3460,7 +3460,7 @@ VTKM_SUPPRESS_EXEC_WARNINGS template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoForEachExec( const Functor &f, ParameterContainer ¶meters) @@ -3473,7 +3473,7 @@ template -VTKM_CONT_EXPORT +VTKM_CONT void DoForEachCont( const Functor &f, const ParameterContainer ¶meters) @@ -3487,7 +3487,7 @@ template -VTKM_CONT_EXPORT +VTKM_CONT void DoForEachCont( const Functor &f, ParameterContainer ¶meters) @@ -3501,7 +3501,7 @@ template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoForEachExec( const Functor &f, const ParameterContainer ¶meters) @@ -3515,7 +3515,7 @@ template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoForEachExec( const Functor &f, ParameterContainer ¶meters) @@ -3530,7 +3530,7 @@ template -VTKM_CONT_EXPORT +VTKM_CONT void DoForEachCont( const Functor &f, const ParameterContainer ¶meters) @@ -3546,7 +3546,7 @@ template -VTKM_CONT_EXPORT +VTKM_CONT void DoForEachCont( const Functor &f, ParameterContainer ¶meters) @@ -3562,7 +3562,7 @@ template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoForEachExec( const Functor &f, const ParameterContainer ¶meters) @@ -3578,7 +3578,7 @@ template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoForEachExec( const Functor &f, ParameterContainer ¶meters) @@ -3595,7 +3595,7 @@ template -VTKM_CONT_EXPORT +VTKM_CONT void DoForEachCont( const Functor &f, const ParameterContainer ¶meters) @@ -3613,7 +3613,7 @@ template -VTKM_CONT_EXPORT +VTKM_CONT void DoForEachCont( const Functor &f, ParameterContainer ¶meters) @@ -3631,7 +3631,7 @@ template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoForEachExec( const Functor &f, const ParameterContainer ¶meters) @@ -3649,7 +3649,7 @@ template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoForEachExec( const Functor &f, ParameterContainer ¶meters) @@ -3668,7 +3668,7 @@ template -VTKM_CONT_EXPORT +VTKM_CONT void DoForEachCont( const Functor &f, const ParameterContainer ¶meters) @@ -3688,7 +3688,7 @@ template -VTKM_CONT_EXPORT +VTKM_CONT void DoForEachCont( const Functor &f, ParameterContainer ¶meters) @@ -3708,7 +3708,7 @@ template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoForEachExec( const Functor &f, const ParameterContainer ¶meters) @@ -3728,7 +3728,7 @@ template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoForEachExec( const Functor &f, ParameterContainer ¶meters) @@ -3749,7 +3749,7 @@ template -VTKM_CONT_EXPORT +VTKM_CONT void DoForEachCont( const Functor &f, const ParameterContainer ¶meters) @@ -3771,7 +3771,7 @@ template -VTKM_CONT_EXPORT +VTKM_CONT void DoForEachCont( const Functor &f, ParameterContainer ¶meters) @@ -3793,7 +3793,7 @@ template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoForEachExec( const Functor &f, const ParameterContainer ¶meters) @@ -3815,7 +3815,7 @@ template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoForEachExec( const Functor &f, ParameterContainer ¶meters) @@ -3838,7 +3838,7 @@ template -VTKM_CONT_EXPORT +VTKM_CONT void DoForEachCont( const Functor &f, const ParameterContainer ¶meters) @@ -3862,7 +3862,7 @@ template -VTKM_CONT_EXPORT +VTKM_CONT void DoForEachCont( const Functor &f, ParameterContainer ¶meters) @@ -3886,7 +3886,7 @@ template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoForEachExec( const Functor &f, const ParameterContainer ¶meters) @@ -3910,7 +3910,7 @@ template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoForEachExec( const Functor &f, ParameterContainer ¶meters) @@ -3935,7 +3935,7 @@ template -VTKM_CONT_EXPORT +VTKM_CONT void DoForEachCont( const Functor &f, const ParameterContainer ¶meters) @@ -3961,7 +3961,7 @@ template -VTKM_CONT_EXPORT +VTKM_CONT void DoForEachCont( const Functor &f, ParameterContainer ¶meters) @@ -3987,7 +3987,7 @@ template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoForEachExec( const Functor &f, const ParameterContainer ¶meters) @@ -4013,7 +4013,7 @@ template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoForEachExec( const Functor &f, ParameterContainer ¶meters) @@ -4040,7 +4040,7 @@ template -VTKM_CONT_EXPORT +VTKM_CONT void DoForEachCont( const Functor &f, const ParameterContainer ¶meters) @@ -4068,7 +4068,7 @@ template -VTKM_CONT_EXPORT +VTKM_CONT void DoForEachCont( const Functor &f, ParameterContainer ¶meters) @@ -4096,7 +4096,7 @@ template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoForEachExec( const Functor &f, const ParameterContainer ¶meters) @@ -4124,7 +4124,7 @@ template -VTKM_EXEC_EXPORT +VTKM_EXEC void DoForEachExec( const Functor &f, ParameterContainer ¶meters) diff --git a/vtkm/internal/FunctionInterfaceDetailPre.h.in b/vtkm/internal/FunctionInterfaceDetailPre.h.in index 3425bc799..033afdd98 100644 --- a/vtkm/internal/FunctionInterfaceDetailPre.h.in +++ b/vtkm/internal/FunctionInterfaceDetailPre.h.in @@ -182,7 +182,7 @@ struct ParameterContainerAccess<$(param_index)> { VTKM_SUPPRESS_EXEC_WARNINGS template - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT const typename AtType<$(param_index), FunctionSignature>::type & Get(const ParameterContainer ¶meters) { return parameters.Parameter$(param_index); @@ -190,7 +190,7 @@ struct ParameterContainerAccess<$(param_index)> { VTKM_SUPPRESS_EXEC_WARNINGS template - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT void Set(ParameterContainer ¶meters, const typename AtType<$(param_index), FunctionSignature>::type &value) { parameters.Parameter$(param_index) = value; @@ -210,7 +210,7 @@ struct CopyAllParameters<$(num_params)> { VTKM_SUPPRESS_EXEC_WARNINGS template - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT void Copy(vtkm::internal::detail::ParameterContainer &dest, const vtkm::internal::detail::ParameterContainer &src) { @@ -227,7 +227,7 @@ struct CopyAllParameters<0> { VTKM_SUPPRESS_EXEC_WARNINGS template - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT void Copy(vtkm::internal::detail::ParameterContainer &, const vtkm::internal::detail::ParameterContainer &) { @@ -247,7 +247,7 @@ VTKM_SUPPRESS_EXEC_WARNINGS template -VTKM_$(environment.upper())_EXPORT +VTKM_$(environment.upper()) void DoInvoke$(environment)( $(functor_const)Functor &f, ParameterContainer<$signature(num_params)> ¶meters, @@ -270,7 +270,7 @@ VTKM_SUPPRESS_EXEC_WARNINGS template0) $template_params(num_params,1)> -VTKM_$(environment.upper())_EXPORT +VTKM_$(environment.upper()) void DoInvoke$(environment)( $(functor_const)Functor &f, ParameterContainer<$signature(num_params,'void')> ¶meters, @@ -306,7 +306,7 @@ VTKM_SUPPRESS_EXEC_WARNINGS template -VTKM_$(environment.upper())_EXPORT +VTKM_$(environment.upper()) void DoStaticTransform$(environment)( const Transform &transform, const ParameterContainer<$signature(num_params,ptype(0,'Original'),'Original')> &originalParameters, @@ -337,7 +337,7 @@ $for(function_interface_const in ['const ', ''])\ VTKM_SUPPRESS_EXEC_WARNINGS template -VTKM_$(environment.upper())_EXPORT +VTKM_$(environment.upper()) void DoForEach$(environment)( const Functor &f, $(function_interface_const)ParameterContainer<$signature(num_params)> ¶meters) diff --git a/vtkm/internal/Invocation.h b/vtkm/internal/Invocation.h index af9a98ba6..98a4d3154 100644 --- a/vtkm/internal/Invocation.h +++ b/vtkm/internal/Invocation.h @@ -90,7 +90,7 @@ struct Invocation /// \brief Default Invocation constructors that holds the given parameters /// by reference. - VTKM_CONT_EXPORT + VTKM_CONT Invocation(const ParameterInterface& parameters, OutputToInputMapType outputToInputMap = OutputToInputMapType(), VisitArrayType visitArray = VisitArrayType()) @@ -116,7 +116,7 @@ struct Invocation /// \c Parameters are replaced with those provided. /// template - VTKM_CONT_EXPORT + VTKM_CONT typename ChangeParametersType::type ChangeParameters(const NewParameterInterface& newParameters) const { return typename ChangeParametersType::type( @@ -180,7 +180,7 @@ struct Invocation /// \c InputDomainIndex is changed to the static number given. /// template - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT typename ChangeInputDomainIndexType::type ChangeInputDomainIndex() const { return typename ChangeInputDomainIndexType::type( @@ -204,7 +204,7 @@ struct Invocation /// \c OutputToInputMap is replaced with that provided. /// template - VTKM_CONT_EXPORT + VTKM_CONT typename ChangeOutputToInputMapType::type ChangeOutputToInputMap(NewOutputToInputMapType newOutputToInputMap) const { return typename ChangeOutputToInputMapType::type( @@ -228,7 +228,7 @@ struct Invocation /// \c VisitArray is replaced with that provided. /// template - VTKM_CONT_EXPORT + VTKM_CONT typename ChangeVisitArrayType::type ChangeVisitArray(NewVisitArrayType newVisitArray) const { return typename ChangeVisitArrayType::type( @@ -243,7 +243,7 @@ struct Invocation /// A convenience method to get the input domain object. /// VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT const InputDomainType& GetInputDomain() const { return this->Parameters.template GetParameter(); @@ -269,7 +269,7 @@ template -VTKM_CONT_EXPORT +VTKM_CONT vtkm::internal::Invocation -VTKM_CONT_EXPORT +VTKM_CONT vtkm::internal::Invocation struct ListContainsImpl //----------------------------------------------------------------------------- template -VTKM_CONT_EXPORT +VTKM_CONT void ListForEachImpl(const Functor &, brigand::empty_sequence) { } template -VTKM_CONT_EXPORT +VTKM_CONT void ListForEachImpl(const Functor &f, brigand::list) { f(T1()); @@ -130,7 +130,7 @@ void ListForEachImpl(const Functor &f, brigand::list) template -VTKM_CONT_EXPORT +VTKM_CONT void ListForEachImpl(const Functor &f, brigand::list) { f(T1()); @@ -141,7 +141,7 @@ template -VTKM_CONT_EXPORT +VTKM_CONT void ListForEachImpl(const Functor &f, brigand::list) { f(T1()); @@ -155,7 +155,7 @@ template -VTKM_CONT_EXPORT +VTKM_CONT void ListForEachImpl(const Functor &f, brigand::list) { f(T1()); @@ -166,14 +166,14 @@ void ListForEachImpl(const Functor &f, brigand::list) } template -VTKM_CONT_EXPORT +VTKM_CONT void ListForEachImpl(Functor &, brigand::empty_sequence) { } template -VTKM_CONT_EXPORT +VTKM_CONT void ListForEachImpl(Functor &f, brigand::list) { f(T1()); @@ -182,7 +182,7 @@ void ListForEachImpl(Functor &f, brigand::list) template -VTKM_CONT_EXPORT +VTKM_CONT void ListForEachImpl(Functor &f, brigand::list) { f(T1()); @@ -193,7 +193,7 @@ template -VTKM_CONT_EXPORT +VTKM_CONT void ListForEachImpl(Functor &f, brigand::list) { f(T1()); @@ -207,7 +207,7 @@ template -VTKM_CONT_EXPORT +VTKM_CONT void ListForEachImpl(Functor &f, brigand::list) { f(T1()); diff --git a/vtkm/interop/TransferToOpenGL.h b/vtkm/interop/TransferToOpenGL.h index 5c7ec5b1a..9ee3465b8 100644 --- a/vtkm/interop/TransferToOpenGL.h +++ b/vtkm/interop/TransferToOpenGL.h @@ -42,7 +42,7 @@ namespace interop{ /// This function will throw exceptions if the transfer wasn't possible /// template -VTKM_CONT_EXPORT +VTKM_CONT void TransferToOpenGL(vtkm::cont::ArrayHandle handle, BufferState& state, DeviceAdapterTag) diff --git a/vtkm/interop/cuda/internal/TransferToOpenGL.h b/vtkm/interop/cuda/internal/TransferToOpenGL.h index 936f91395..4967cbe9a 100644 --- a/vtkm/interop/cuda/internal/TransferToOpenGL.h +++ b/vtkm/interop/cuda/internal/TransferToOpenGL.h @@ -137,7 +137,7 @@ class TransferToOpenGL { typedef vtkm::cont::DeviceAdapterTagCuda DeviceAdapterTag; public: - VTKM_CONT_EXPORT explicit TransferToOpenGL(BufferState& state): + VTKM_CONT explicit TransferToOpenGL(BufferState& state): State(state), Resource(nullptr) { @@ -160,7 +160,7 @@ public: } template< typename StorageTag > - VTKM_CONT_EXPORT + VTKM_CONT void Transfer ( vtkm::cont::ArrayHandle &handle) const { diff --git a/vtkm/interop/internal/BufferTypePicker.h b/vtkm/interop/internal/BufferTypePicker.h index 24beda21a..216793b74 100644 --- a/vtkm/interop/internal/BufferTypePicker.h +++ b/vtkm/interop/internal/BufferTypePicker.h @@ -31,31 +31,31 @@ namespace internal { namespace detail { template -VTKM_CONT_EXPORT +static inline VTKM_CONT GLenum BufferTypePickerImpl(NumericTag, DimensionalityTag) { return GL_ARRAY_BUFFER; } -VTKM_CONT_EXPORT -GLenum BufferTypePickerImpl(vtkm::TypeTraitsIntegerTag, - vtkm::TypeTraitsScalarTag) +VTKM_CONT +static inline GLenum BufferTypePickerImpl(vtkm::TypeTraitsIntegerTag, + vtkm::TypeTraitsScalarTag) { return GL_ELEMENT_ARRAY_BUFFER; } } //namespace detail -VTKM_CONT_EXPORT GLenum BufferTypePicker( vtkm::Int32 ) +static inline VTKM_CONT GLenum BufferTypePicker( vtkm::Int32 ) { return GL_ELEMENT_ARRAY_BUFFER; } -VTKM_CONT_EXPORT GLenum BufferTypePicker( vtkm::UInt32 ) +static inline VTKM_CONT GLenum BufferTypePicker( vtkm::UInt32 ) { return GL_ELEMENT_ARRAY_BUFFER; } -VTKM_CONT_EXPORT GLenum BufferTypePicker( vtkm::Int64 ) +static inline VTKM_CONT GLenum BufferTypePicker( vtkm::Int64 ) { return GL_ELEMENT_ARRAY_BUFFER; } -VTKM_CONT_EXPORT GLenum BufferTypePicker( vtkm::UInt64 ) +static inline VTKM_CONT GLenum BufferTypePicker( vtkm::UInt64 ) { return GL_ELEMENT_ARRAY_BUFFER; } @@ -64,7 +64,7 @@ VTKM_CONT_EXPORT GLenum BufferTypePicker( vtkm::UInt64 ) /// integer types, and GL_ARRAY_BUFFER is used for everything else /// template -VTKM_CONT_EXPORT GLenum BufferTypePicker( T ) +static inline VTKM_CONT GLenum BufferTypePicker( T ) { typedef vtkm::TypeTraits Traits; return detail::BufferTypePickerImpl(typename Traits::NumericTag(), diff --git a/vtkm/interop/internal/TransferToOpenGL.h b/vtkm/interop/internal/TransferToOpenGL.h index 606fcb032..725f3fbb2 100644 --- a/vtkm/interop/internal/TransferToOpenGL.h +++ b/vtkm/interop/internal/TransferToOpenGL.h @@ -36,7 +36,7 @@ namespace detail { template -VTKM_CONT_EXPORT +VTKM_CONT void CopyFromHandle( vtkm::cont::ArrayHandle& handle, vtkm::interop::BufferState& state, @@ -84,7 +84,7 @@ void CopyFromHandle( } template -VTKM_CONT_EXPORT +VTKM_CONT void CopyFromHandle( vtkm::cont::ArrayHandle& handle, vtkm::interop::BufferState& state, @@ -129,7 +129,7 @@ template class TransferToOpenGL { public: - VTKM_CONT_EXPORT explicit TransferToOpenGL(BufferState& state): + VTKM_CONT explicit TransferToOpenGL(BufferState& state): State(state) { if( !this->State.HasType() ) @@ -139,7 +139,7 @@ public: } template< typename StorageTag > - VTKM_CONT_EXPORT + VTKM_CONT void Transfer ( vtkm::cont::ArrayHandle& handle) const { diff --git a/vtkm/interop/testing/TestingOpenGLInterop.h b/vtkm/interop/testing/TestingOpenGLInterop.h index be2924dae..108187ef8 100644 --- a/vtkm/interop/testing/TestingOpenGLInterop.h +++ b/vtkm/interop/testing/TestingOpenGLInterop.h @@ -279,7 +279,7 @@ private: public: - VTKM_CONT_EXPORT static int Run() + VTKM_CONT static int Run() { std::cout << "TestingOpenGLInterop Run() " << std::endl; diff --git a/vtkm/io/writer/VTKDataSetWriter.h b/vtkm/io/writer/VTKDataSetWriter.h index 0a4db9358..c70e7fc12 100644 --- a/vtkm/io/writer/VTKDataSetWriter.h +++ b/vtkm/io/writer/VTKDataSetWriter.h @@ -53,7 +53,7 @@ private: std::ostream &out; template - VTKM_CONT_EXPORT + VTKM_CONT void Output(const PortalType &portal) const { for (vtkm::Id index = 0; index < portal.GetNumberOfValues(); index++) @@ -79,13 +79,13 @@ private: } public: - VTKM_CONT_EXPORT + VTKM_CONT OutputPointsFunctor(std::ostream &o) : out(o) { } template - VTKM_CONT_EXPORT + VTKM_CONT void operator()(const vtkm::cont::ArrayHandle &array) const { this->Output(array.GetPortalConstControl()); @@ -98,7 +98,7 @@ private: std::ostream &out; template - VTKM_CONT_EXPORT + VTKM_CONT void Output(const PortalType &portal) const { for (vtkm::Id index = 0; index < portal.GetNumberOfValues(); index++) @@ -117,13 +117,13 @@ private: } } public: - VTKM_CONT_EXPORT + VTKM_CONT OutputFieldFunctor(std::ostream &o) : out(o) { } template - VTKM_CONT_EXPORT + VTKM_CONT void operator()(const vtkm::cont::ArrayHandle &array) const { this->Output(array.GetPortalConstControl()); @@ -381,11 +381,11 @@ private: } public: - VTKM_CONT_EXPORT + VTKM_CONT explicit VTKDataSetWriter(const std::string &filename) : FileName(filename) { } - VTKM_CONT_EXPORT + VTKM_CONT void WriteDataSet(vtkm::cont::DataSet dataSet, vtkm::Id cellSetIndex = 0) const { @@ -422,7 +422,7 @@ public: } } - VTKM_CONT_EXPORT + VTKM_CONT void WriteDataSet(vtkm::cont::DataSet dataSet, const std::string &cellSetName) { diff --git a/vtkm/rendering/Actor.cxx b/vtkm/rendering/Actor.cxx index c2c772967..f39840c5e 100644 --- a/vtkm/rendering/Actor.cxx +++ b/vtkm/rendering/Actor.cxx @@ -36,7 +36,7 @@ struct Actor::InternalsType vtkm::Range ScalarRange; vtkm::Bounds SpatialBounds; - VTKM_CONT_EXPORT + VTKM_CONT InternalsType(const vtkm::cont::DynamicCellSet &cells, const vtkm::cont::CoordinateSystem &coordinates, const vtkm::cont::Field &scalarField, @@ -54,7 +54,7 @@ struct Actor::RangeFunctor const vtkm::cont::CoordinateSystem &Coordinates; const vtkm::cont::Field &ScalarField; - VTKM_CONT_EXPORT + VTKM_CONT RangeFunctor(vtkm::rendering::Actor *self, const vtkm::cont::CoordinateSystem &coordinates, const vtkm::cont::Field &scalarField) @@ -64,7 +64,7 @@ struct Actor::RangeFunctor { } template - VTKM_CONT_EXPORT + VTKM_CONT bool operator()(Device) { VTKM_IS_DEVICE_ADAPTER_TAG(Device); diff --git a/vtkm/rendering/AxisAnnotation3D.h b/vtkm/rendering/AxisAnnotation3D.h index 369ec89e7..cc6275d2c 100644 --- a/vtkm/rendering/AxisAnnotation3D.h +++ b/vtkm/rendering/AxisAnnotation3D.h @@ -62,19 +62,19 @@ public: ~AxisAnnotation3D(); - VTKM_CONT_EXPORT + VTKM_CONT void SetMoreOrLessTickAdjustment(int offset) { this->MoreOrLessTickAdjustment = offset; } - VTKM_CONT_EXPORT + VTKM_CONT void SetColor(vtkm::rendering::Color c) { this->Color = c; } - VTKM_CONT_EXPORT + VTKM_CONT void SetAxis(int a) { this->Axis = a; @@ -85,20 +85,20 @@ public: /// offset of 0 means the tick is inside the frame /// offset of 1 means the tick is outside the frame /// offset of 0.5 means the tick is centered on the frame - VTKM_CONT_EXPORT + VTKM_CONT void SetMajorTickSize(vtkm::Float64 size, vtkm::Float64 offset) { this->TickMajorSize = size; this->TickMajorOffset = offset; } - VTKM_CONT_EXPORT + VTKM_CONT void SetMinorTickSize(vtkm::Float64 size, vtkm::Float64 offset) { this->TickMinorSize = size; this->TickMinorOffset = offset; } - VTKM_CONT_EXPORT + VTKM_CONT void SetWorldPosition(const vtkm::Vec &point0, const vtkm::Vec &point1) { @@ -106,7 +106,7 @@ public: this->Point1 = point1; } - VTKM_CONT_EXPORT + VTKM_CONT void SetWorldPosition(vtkm::Float64 x0, vtkm::Float64 y0, vtkm::Float64 z0, vtkm::Float64 x1, vtkm::Float64 y1, vtkm::Float64 z1) { diff --git a/vtkm/rendering/BitmapFont.h b/vtkm/rendering/BitmapFont.h index 3e48a90ef..1f0ede382 100644 --- a/vtkm/rendering/BitmapFont.h +++ b/vtkm/rendering/BitmapFont.h @@ -87,7 +87,7 @@ public: const Character &GetChar(char c) const; - VTKM_CONT_EXPORT + VTKM_CONT const std::vector &GetRawImageData() const { return this->RawImageFileData; diff --git a/vtkm/rendering/BoundingBoxAnnotation.h b/vtkm/rendering/BoundingBoxAnnotation.h index 07ef098d8..c2b9f2e3f 100644 --- a/vtkm/rendering/BoundingBoxAnnotation.h +++ b/vtkm/rendering/BoundingBoxAnnotation.h @@ -39,25 +39,25 @@ public: virtual ~BoundingBoxAnnotation(); - VTKM_CONT_EXPORT + VTKM_CONT const vtkm::Bounds &GetExtents() const { return this->Extents; } - VTKM_CONT_EXPORT + VTKM_CONT void SetExtents(const vtkm::Bounds &extents) { this->Extents = extents; } - VTKM_CONT_EXPORT + VTKM_CONT const vtkm::rendering::Color &GetColor() const { return this->Color; } - VTKM_CONT_EXPORT + VTKM_CONT void SetColor(vtkm::rendering::Color c) { this->Color = c; diff --git a/vtkm/rendering/Camera.h b/vtkm/rendering/Camera.h index f9a2fdd34..4aaef1bcf 100644 --- a/vtkm/rendering/Camera.h +++ b/vtkm/rendering/Camera.h @@ -38,7 +38,7 @@ class VTKM_RENDERING_EXPORT Camera struct Camera3DStruct { public: - VTKM_CONT_EXPORT + VTKM_CONT Camera3DStruct() : LookAt(0.0f, 0.0f, 0.0f), Position(0.0f, 0.0f, 1.0f), @@ -71,7 +71,7 @@ class VTKM_RENDERING_EXPORT Camera struct VTKM_RENDERING_EXPORT Camera2DStruct { public: - VTKM_CONT_EXPORT + VTKM_CONT Camera2DStruct() : Left(-1.0f), Right(1.0f), @@ -104,7 +104,7 @@ class VTKM_RENDERING_EXPORT Camera public: enum ModeEnum { MODE_2D, MODE_3D }; - VTKM_CONT_EXPORT + VTKM_CONT Camera(ModeEnum vtype=Camera::MODE_3D) : Mode(vtype), NearPlane(0.01f), @@ -131,22 +131,22 @@ public: /// looking at data in the x-y plane. 3D mode allows the camera to be /// positioned anywhere and pointing at any place in 3D. /// - VTKM_CONT_EXPORT + VTKM_CONT vtkm::rendering::Camera::ModeEnum GetMode() const { return this->Mode; } - VTKM_CONT_EXPORT + VTKM_CONT void SetMode(vtkm::rendering::Camera::ModeEnum mode) { this->Mode = mode; } - VTKM_CONT_EXPORT + VTKM_CONT void SetModeTo3D() { this->SetMode(vtkm::rendering::Camera::MODE_3D); } - VTKM_CONT_EXPORT + VTKM_CONT void SetModeTo2D() { this->SetMode(vtkm::rendering::Camera::MODE_2D); @@ -165,24 +165,24 @@ public: /// usually has less effect on the depth precision, so can be placed well far /// behind the geometry. /// - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Range GetClippingRange() const { return vtkm::Range(this->NearPlane, this->FarPlane); } - VTKM_CONT_EXPORT + VTKM_CONT void SetClippingRange(vtkm::Float32 nearPlane, vtkm::Float32 farPlane) { this->NearPlane = nearPlane; this->FarPlane = farPlane; } - VTKM_CONT_EXPORT + VTKM_CONT void SetClippingRange(vtkm::Float64 nearPlane, vtkm::Float64 farPlane) { this->SetClippingRange(static_cast(nearPlane), static_cast(farPlane)); } - VTKM_CONT_EXPORT + VTKM_CONT void SetClippingRange(const vtkm::Range &nearFarRange) { this->SetClippingRange(nearFarRange.Min, nearFarRange.Max); @@ -196,7 +196,7 @@ public: /// the viewport are relative to the rendered image's bounds. The left and /// bottom of the image are at -1 and the right and top are at 1. /// - VTKM_CONT_EXPORT + VTKM_CONT void GetViewport(vtkm::Float32 &left, vtkm::Float32 &right, vtkm::Float32 &bottom, @@ -207,7 +207,7 @@ public: bottom = this->ViewportBottom; top = this->ViewportTop; } - VTKM_CONT_EXPORT + VTKM_CONT void GetViewport(vtkm::Float64 &left, vtkm::Float64 &right, vtkm::Float64 &bottom, @@ -218,7 +218,7 @@ public: bottom = this->ViewportBottom; top = this->ViewportTop; } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Bounds GetViewport() const { return vtkm::Bounds(this->ViewportLeft, @@ -228,7 +228,7 @@ public: 0.0, 0.0); } - VTKM_CONT_EXPORT + VTKM_CONT void SetViewport(vtkm::Float32 left, vtkm::Float32 right, vtkm::Float32 bottom, @@ -239,7 +239,7 @@ public: this->ViewportBottom = bottom; this->ViewportTop = top; } - VTKM_CONT_EXPORT + VTKM_CONT void SetViewport(vtkm::Float64 left, vtkm::Float64 right, vtkm::Float64 bottom, @@ -250,7 +250,7 @@ public: static_cast(bottom), static_cast(top)); } - VTKM_CONT_EXPORT + VTKM_CONT void SetViewport(const vtkm::Bounds &viewportBounds) { this->SetViewport(viewportBounds.X.Min, @@ -264,18 +264,18 @@ public: /// When in 3D mode, the camera is set up to be facing the \c LookAt /// position. If \c LookAt is set, the mode is changed to 3D mode. /// - VTKM_CONT_EXPORT + VTKM_CONT const vtkm::Vec &GetLookAt() const { return this->Camera3D.LookAt; } - VTKM_CONT_EXPORT + VTKM_CONT void SetLookAt(const vtkm::Vec &lookAt) { this->SetModeTo3D(); this->Camera3D.LookAt = lookAt; } - VTKM_CONT_EXPORT + VTKM_CONT void SetLookAt(const vtkm::Vec &lookAt) { this->SetLookAt(vtkm::Vec(lookAt)); @@ -286,18 +286,18 @@ public: /// When in 3D mode, the camera is modeled to be at a particular location. If /// \c Position is set, the mode is changed to 3D mode. /// - VTKM_CONT_EXPORT + VTKM_CONT const vtkm::Vec &GetPosition() const { return this->Camera3D.Position; } - VTKM_CONT_EXPORT + VTKM_CONT void SetPosition(const vtkm::Vec &position) { this->SetModeTo3D(); this->Camera3D.Position = position; } - VTKM_CONT_EXPORT + VTKM_CONT void SetPosition(const vtkm::Vec &position) { this->SetPosition(vtkm::Vec(position)); @@ -310,18 +310,18 @@ public: /// the image so that the top of the image is in the direction pointed to by /// view up. If \c ViewUp is set, the mode is changed to 3D mode. /// - VTKM_CONT_EXPORT + VTKM_CONT const vtkm::Vec &GetViewUp() const { return this->Camera3D.ViewUp; } - VTKM_CONT_EXPORT + VTKM_CONT void SetViewUp(const vtkm::Vec &viewUp) { this->SetModeTo3D(); this->Camera3D.ViewUp = viewUp; } - VTKM_CONT_EXPORT + VTKM_CONT void SetViewUp(const vtkm::Vec &viewUp) { this->SetViewUp(vtkm::Vec(viewUp)); @@ -334,18 +334,18 @@ public: /// /// Setting the field of view changes the mode to 3D. /// - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Float32 GetFieldOfView() const { return this->Camera3D.FieldOfView; } - VTKM_CONT_EXPORT + VTKM_CONT void SetFieldOfView(vtkm::Float32 fov) { this->SetModeTo3D(); this->Camera3D.FieldOfView = fov; } - VTKM_CONT_EXPORT + VTKM_CONT void SetFieldOfView(vtkm::Float64 fov) { this->SetFieldOfView(static_cast(fov)); @@ -357,17 +357,17 @@ public: /// \brief Pans the camera /// - VTKM_CONT_EXPORT + VTKM_CONT void Pan(vtkm::Float64 dx, vtkm::Float64 dy) { this->Pan(static_cast(dx), static_cast(dy)); } - VTKM_CONT_EXPORT + VTKM_CONT void Pan(vtkm::Vec direction) { this->Pan(direction[0], direction[1]); } - VTKM_CONT_EXPORT + VTKM_CONT void Pan(vtkm::Vec direction) { this->Pan(direction[0], direction[1]); @@ -381,7 +381,7 @@ public: /// void Zoom(vtkm::Float32 zoom); - VTKM_CONT_EXPORT + VTKM_CONT void Zoom(vtkm::Float64 zoom) { this->Zoom(static_cast(zoom)); @@ -402,7 +402,7 @@ public: vtkm::Float32 endX, vtkm::Float32 endY); - VTKM_CONT_EXPORT + VTKM_CONT void TrackballRotate(vtkm::Float64 startX, vtkm::Float64 startY, vtkm::Float64 endX, @@ -432,7 +432,7 @@ public: /// void Roll(vtkm::Float32 angleDegrees); - VTKM_CONT_EXPORT + VTKM_CONT void Roll(vtkm::Float64 angleDegrees) { this->Roll(static_cast(angleDegrees)); @@ -449,7 +449,7 @@ public: /// void Azimuth(vtkm::Float32 angleDegrees); - VTKM_CONT_EXPORT + VTKM_CONT void Azimuth(vtkm::Float64 angleDegrees) { this->Azimuth(static_cast(angleDegrees)); @@ -467,7 +467,7 @@ public: /// void Elevation(vtkm::Float32 angleDegrees); - VTKM_CONT_EXPORT + VTKM_CONT void Elevation(vtkm::Float64 angleDegrees) { this->Elevation(static_cast(angleDegrees)); @@ -485,7 +485,7 @@ public: /// void Dolly(vtkm::Float32 value); - VTKM_CONT_EXPORT + VTKM_CONT void Dolly(vtkm::Float64 value) { this->Dolly(static_cast(value)); @@ -500,7 +500,7 @@ public: /// /// \c SetViewRange2D changes the camera mode to 2D. /// - VTKM_CONT_EXPORT + VTKM_CONT void GetViewRange2D(vtkm::Float32 &left, vtkm::Float32 &right, vtkm::Float32 &bottom, @@ -511,7 +511,7 @@ public: bottom = this->Camera2D.Bottom; top = this->Camera2D.Top; } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Bounds GetViewRange2D() const { return vtkm::Bounds(this->Camera2D.Left, @@ -521,7 +521,7 @@ public: 0.0, 0.0); } - VTKM_CONT_EXPORT + VTKM_CONT void SetViewRange2D(vtkm::Float32 left, vtkm::Float32 right, vtkm::Float32 bottom, @@ -537,7 +537,7 @@ public: this->Camera2D.YPan = 0; this->Camera2D.Zoom = 1; } - VTKM_CONT_EXPORT + VTKM_CONT void SetViewRange2D(vtkm::Float64 left, vtkm::Float64 right, vtkm::Float64 bottom, @@ -548,13 +548,13 @@ public: static_cast(bottom), static_cast(top)); } - VTKM_CONT_EXPORT + VTKM_CONT void SetViewRange2D(const vtkm::Range &xRange, const vtkm::Range &yRange) { this->SetViewRange2D(xRange.Min, xRange.Max, yRange.Min, yRange.Max); } - VTKM_CONT_EXPORT + VTKM_CONT void SetViewRange2D(const vtkm::Bounds &viewRange) { this->SetViewRange2D(viewRange.X, viewRange.Y); diff --git a/vtkm/rendering/Canvas.h b/vtkm/rendering/Canvas.h index 32efa75e5..d0d93a7d1 100644 --- a/vtkm/rendering/Canvas.h +++ b/vtkm/rendering/Canvas.h @@ -52,25 +52,25 @@ public: typedef vtkm::cont::ArrayHandle > ColorBufferType; typedef vtkm::cont::ArrayHandle DepthBufferType; - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Id GetWidth() const { return this->Width; } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Id GetHeight() const { return this->Height; } - VTKM_CONT_EXPORT + VTKM_CONT const ColorBufferType &GetColorBuffer() const { return this->ColorBuffer; } - VTKM_CONT_EXPORT + VTKM_CONT ColorBufferType &GetColorBuffer() { return this->ColorBuffer; } - VTKM_CONT_EXPORT + VTKM_CONT const DepthBufferType &GetDepthBuffer() const { return this->DepthBuffer; } - VTKM_CONT_EXPORT + VTKM_CONT DepthBufferType &GetDepthBuffer() { return this->DepthBuffer; } - VTKM_CONT_EXPORT + VTKM_CONT void ResizeBuffers(vtkm::Id width, vtkm::Id height) { VTKM_ASSERT(width >= 0); @@ -90,13 +90,13 @@ public: this->Height = height; } - VTKM_CONT_EXPORT + VTKM_CONT const vtkm::rendering::Color &GetBackgroundColor() const { return this->BackgroundColor; } - VTKM_CONT_EXPORT + VTKM_CONT void SetBackgroundColor(const vtkm::rendering::Color &color) { this->BackgroundColor = color; @@ -118,7 +118,7 @@ public: vtkm::Float32 linewidth, const vtkm::rendering::Color &color) const = 0; - VTKM_CONT_EXPORT + VTKM_CONT void AddLine(vtkm::Float64 x0, vtkm::Float64 y0, vtkm::Float64 x1, vtkm::Float64 y1, vtkm::Float32 linewidth, @@ -134,7 +134,7 @@ public: const vtkm::rendering::ColorTable &colorTable, bool horizontal) const = 0; - VTKM_CONT_EXPORT + VTKM_CONT void AddColorBar(vtkm::Float32 x, vtkm::Float32 y, vtkm::Float32 width, vtkm::Float32 height, const vtkm::rendering::ColorTable &colorTable, @@ -155,7 +155,7 @@ public: const vtkm::rendering::Color & color, const std::string &text) const = 0; - VTKM_CONT_EXPORT + VTKM_CONT void AddText(vtkm::Float32 x, vtkm::Float32 y, vtkm::Float32 scale, vtkm::Float32 angle, diff --git a/vtkm/rendering/CanvasRayTracer.cxx b/vtkm/rendering/CanvasRayTracer.cxx index a4d2dd1e5..721a074c1 100644 --- a/vtkm/rendering/CanvasRayTracer.cxx +++ b/vtkm/rendering/CanvasRayTracer.cxx @@ -36,13 +36,13 @@ class ClearBuffers : public vtkm::worklet::WorkletMapField { vtkm::rendering::Color ClearColor; public: - VTKM_CONT_EXPORT + VTKM_CONT ClearBuffers(const vtkm::rendering::Color &clearColor) : ClearColor(clearColor) {} typedef void ControlSignature(FieldOut<>, FieldOut<>); typedef void ExecutionSignature(_1, _2); - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(vtkm::Vec &color, vtkm::Float32 &depth) const { @@ -60,7 +60,7 @@ struct ClearBuffersInvokeFunctor ColorBufferType ColorBuffer; DepthBufferType DepthBuffer; - VTKM_CONT_EXPORT + VTKM_CONT ClearBuffersInvokeFunctor(const vtkm::rendering::Color &backgroundColor, const ColorBufferType &colorBuffer, const DepthBufferType &depthBuffer) @@ -70,7 +70,7 @@ struct ClearBuffersInvokeFunctor { } template - VTKM_CONT_EXPORT + VTKM_CONT bool operator()(Device) const { VTKM_IS_DEVICE_ADAPTER_TAG(Device); diff --git a/vtkm/rendering/Color.h b/vtkm/rendering/Color.h index 3f4f8a2d2..2a0685cb3 100644 --- a/vtkm/rendering/Color.h +++ b/vtkm/rendering/Color.h @@ -36,12 +36,12 @@ class Color public: vtkm::Vec Components; - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT Color() : Components(0, 0, 0, 1) { } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT Color(vtkm::Float32 r_, vtkm::Float32 g_, vtkm::Float32 b_, @@ -49,12 +49,12 @@ class Color : Components(r_, g_, b_, a_) { } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT Color(const vtkm::Vec &components) : Components(components) { } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT void SetComponentFromByte(vtkm::Int32 i, vtkm::UInt8 v) { // Note that though GetComponentAsByte below @@ -82,7 +82,7 @@ class Color if (Components[i]>1) Components[i] = 1; } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::UInt8 GetComponentAsByte(int i) { // We need this to match what OpenGL/Mesa do. @@ -111,7 +111,7 @@ class Color return vtkm::UInt8((tv < 0) ? 0 : (tv > 255) ? 255 : tv); } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT void GetRGBA(vtkm::UInt8 &r, vtkm::UInt8 &g, vtkm::UInt8 &b, vtkm::UInt8 &a) { @@ -121,13 +121,13 @@ class Color a = GetComponentAsByte(3); } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::Float64 RawBrightness() { return (Components[0]+Components[1]+Components[2])/3.; } - VTKM_CONT_EXPORT + VTKM_CONT friend std::ostream &operator<<(std::ostream &out, const Color &c) { out << "["<ColorTable = colorTable; @@ -51,7 +51,7 @@ public: void SetRange(const vtkm::Range &range, vtkm::IdComponent numTicks); - VTKM_CONT_EXPORT + VTKM_CONT void SetRange(vtkm::Float64 l, vtkm::Float64 h, vtkm::IdComponent numTicks) { this->SetRange(vtkm::Range(l,h), numTicks); diff --git a/vtkm/rendering/Mapper.h b/vtkm/rendering/Mapper.h index f2109e1cc..f9869a764 100644 --- a/vtkm/rendering/Mapper.h +++ b/vtkm/rendering/Mapper.h @@ -29,6 +29,7 @@ namespace rendering { class VTKM_RENDERING_EXPORT Mapper { public: + VTKM_CONT Mapper() { } diff --git a/vtkm/rendering/MapperGL.cxx b/vtkm/rendering/MapperGL.cxx index 4b757fc75..07fa4d110 100644 --- a/vtkm/rendering/MapperGL.cxx +++ b/vtkm/rendering/MapperGL.cxx @@ -43,7 +43,7 @@ public: const vtkm::rendering::ColorTable ColorTable; const vtkm::Float32 SMin, SDiff; - VTKM_CONT_EXPORT + VTKM_CONT MapColorAndVertices(const vtkm::rendering::ColorTable &colorTable, vtkm::Float32 sMin, vtkm::Float32 sDiff) : ColorTable(colorTable), @@ -62,7 +62,7 @@ public: typename InputArrayPortalType, typename InputArrayV3PortalType, typename OutputArrayPortalType> - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(const vtkm::Id &i, InputArrayIndexPortalType &indices, const InputArrayPortalType &scalar, @@ -128,7 +128,7 @@ struct MapColorAndVerticesInvokeFunctor vtkm::cont::ArrayHandle OutColor; vtkm::cont::ArrayHandle OutVertices; - VTKM_CONT_EXPORT + VTKM_CONT MapColorAndVerticesInvokeFunctor( const vtkm::cont::ArrayHandle< vtkm::Vec > &indices, const vtkm::rendering::ColorTable &colorTable, @@ -151,7 +151,7 @@ struct MapColorAndVerticesInvokeFunctor {} template - VTKM_CONT_EXPORT + VTKM_CONT bool operator()(Device) const { VTKM_IS_DEVICE_ADAPTER_TAG(Device); @@ -167,7 +167,7 @@ struct MapColorAndVerticesInvokeFunctor }; template -VTKM_CONT_EXPORT +VTKM_CONT void RenderTriangles(MapperGL &mapper, vtkm::Id numTri, const PtType &verts, const vtkm::cont::ArrayHandle< vtkm::Vec > &indices, diff --git a/vtkm/rendering/MapperRayTracer.cxx b/vtkm/rendering/MapperRayTracer.cxx index eea131d67..58c70cbe0 100644 --- a/vtkm/rendering/MapperRayTracer.cxx +++ b/vtkm/rendering/MapperRayTracer.cxx @@ -39,13 +39,13 @@ struct MapperRayTracer::InternalsType std::shared_ptr RayTracerContainer; - VTKM_CONT_EXPORT + VTKM_CONT InternalsType() : Canvas(nullptr) { } template - VTKM_CONT_EXPORT + VTKM_CONT vtkm::rendering::raytracing::RayTracer *GetRayTracer(Device) { VTKM_IS_DEVICE_ADAPTER_TAG(Device); @@ -110,7 +110,7 @@ struct MapperRayTracer::RenderFunctor vtkm::rendering::Camera Camera; vtkm::Range ScalarRange; - VTKM_CONT_EXPORT + VTKM_CONT RenderFunctor(vtkm::rendering::MapperRayTracer *self, const vtkm::cont::ArrayHandle > &indices, vtkm::Id numberOfTriangles, diff --git a/vtkm/rendering/MapperVolume.cxx b/vtkm/rendering/MapperVolume.cxx index c711561f7..4fbc37ccd 100644 --- a/vtkm/rendering/MapperVolume.cxx +++ b/vtkm/rendering/MapperVolume.cxx @@ -43,13 +43,13 @@ struct MapperVolume::InternalsType std::shared_ptr RayTracerContainer; - VTKM_CONT_EXPORT + VTKM_CONT InternalsType() : Canvas(nullptr) { } template - VTKM_CONT_EXPORT + VTKM_CONT vtkm::rendering::raytracing::VolumeRendererStructured * GetRayTracer(Device) { @@ -115,7 +115,7 @@ struct MapperVolume::RenderFunctor vtkm::rendering::Camera Camera; vtkm::Range ScalarRange; - VTKM_CONT_EXPORT + VTKM_CONT RenderFunctor(vtkm::rendering::MapperVolume *self, const vtkm::cont::CellSetStructured<3> cellSet, const vtkm::cont::CoordinateSystem &coordinates, diff --git a/vtkm/rendering/MatrixHelpers.h b/vtkm/rendering/MatrixHelpers.h index 9e79415d7..0f939b857 100644 --- a/vtkm/rendering/MatrixHelpers.h +++ b/vtkm/rendering/MatrixHelpers.h @@ -28,7 +28,7 @@ namespace rendering { struct MatrixHelpers { - static VTKM_CONT_EXPORT + static VTKM_CONT void CreateOGLMatrix(const vtkm::Matrix &mtx, vtkm::Float32 *oglM) { @@ -50,7 +50,7 @@ struct MatrixHelpers oglM[15] = mtx[3][3]; } - static VTKM_CONT_EXPORT + static VTKM_CONT vtkm::Matrix ViewMatrix(const vtkm::Vec &position, const vtkm::Vec &lookAt, const vtkm::Vec &up) @@ -83,7 +83,7 @@ struct MatrixHelpers return matrix; } - static VTKM_CONT_EXPORT + static VTKM_CONT vtkm::Matrix WorldMatrix(const vtkm::Vec &neworigin, const vtkm::Vec &newx, const vtkm::Vec &newy, @@ -109,7 +109,7 @@ struct MatrixHelpers return matrix; } - static VTKM_CONT_EXPORT + static VTKM_CONT vtkm::Matrix TrackballMatrix(vtkm::Float32 p1x, vtkm::Float32 p1y, vtkm::Float32 p2x, diff --git a/vtkm/rendering/TextureGL.cxx b/vtkm/rendering/TextureGL.cxx index 1e61f461b..08ba5cb15 100644 --- a/vtkm/rendering/TextureGL.cxx +++ b/vtkm/rendering/TextureGL.cxx @@ -35,12 +35,12 @@ struct TextureGL::InternalsType bool Linear2D; bool LinearMIP; - VTKM_CONT_EXPORT + VTKM_CONT InternalsType() : Id(0), Dimension(0), MIPMap(false), Linear2D(true), LinearMIP(true) { } - VTKM_CONT_EXPORT + VTKM_CONT ~InternalsType() { if (this->Id != 0) diff --git a/vtkm/rendering/Triangulator.h b/vtkm/rendering/Triangulator.h index a70465f3a..f6dbe2b3e 100644 --- a/vtkm/rendering/Triangulator.h +++ b/vtkm/rendering/Triangulator.h @@ -50,13 +50,13 @@ public: { T Value; public: - VTKM_CONT_EXPORT + VTKM_CONT MemSet(T value) : Value(value) {} typedef void ControlSignature(FieldOut<>); typedef void ExecutionSignature(_1); - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(T &outValue) const { outValue = Value; @@ -65,13 +65,13 @@ public: class CountTriangles : public vtkm::worklet::WorkletMapField { public: - VTKM_CONT_EXPORT + VTKM_CONT CountTriangles(){} typedef void ControlSignature(FieldIn<>, FieldOut<>); typedef void ExecutionSignature(_1, _2); - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(const vtkm::Id &shapeType, vtkm::Id &triangles) const { @@ -96,7 +96,7 @@ public: FieldInTo<>); typedef void ExecutionSignature(FromIndices, _2); //typedef _1 InputDomain; - VTKM_CONT_EXPORT + VTKM_CONT TrianglulateStructured(vtkm::cont::ArrayHandle< vtkm::Vec > &outputIndices) { this->OutputIndices = outputIndices.PrepareForOutput(outputIndices.GetNumberOfValues(), DeviceAdapter() ); @@ -104,7 +104,7 @@ public: //TODO: Remove the if/then with templates. template - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(const CellNodeVecType &cellIndices, const vtkm::Id &cellIndex) const { @@ -172,11 +172,11 @@ public: class IndicesSort : public vtkm::worklet::WorkletMapField { public: - VTKM_CONT_EXPORT + VTKM_CONT IndicesSort(){} typedef void ControlSignature(FieldInOut<>); typedef void ExecutionSignature(_1); - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()( vtkm::Vec &triangleIndices) const { // first field contains the id of the cell the @@ -205,7 +205,7 @@ public: struct IndicesLessThan { - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT bool operator()(const vtkm::Vec &a, const vtkm::Vec &b) const { @@ -221,17 +221,17 @@ public: class UniqueTriangles : public vtkm::worklet::WorkletMapField { public: - VTKM_CONT_EXPORT + VTKM_CONT UniqueTriangles(){} typedef void ControlSignature(ExecObject, ExecObject); typedef void ExecutionSignature(_1,_2,WorkIndex); - VTKM_EXEC_EXPORT + VTKM_EXEC bool IsTwin(const vtkm::Vec &a, const vtkm::Vec &b) const { return (a[1] == b[1] && a[2] == b[2] && a[3] == b[3]); } - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(vtkm::exec::ExecutionWholeArrayConst > &indices, vtkm::exec::ExecutionWholeArray &outputFlags, const vtkm::Id &index) const @@ -260,7 +260,7 @@ public: vtkm::Int32 WEDGE_INDICES; vtkm::Int32 PYRAMID_INDICES; public: - VTKM_CONT_EXPORT + VTKM_CONT Trianglulate(vtkm::cont::ArrayHandle< vtkm::Vec > &outputIndices, const vtkm::cont::ArrayHandle &indices, const vtkm::Id &size) @@ -281,7 +281,7 @@ public: _2, _3, WorkIndex); - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(const vtkm::Id &shapeType, const vtkm::Id &indexOffset, const vtkm::Id &triangleOffset, @@ -428,10 +428,10 @@ public: }; //class Trianglulate public: - VTKM_CONT_EXPORT + VTKM_CONT Triangulator() {} - VTKM_CONT_EXPORT + VTKM_CONT void ExternalTrianlges(vtkm::cont::ArrayHandle< vtkm::Vec > &outputIndices, vtkm::Id &outputTriangles) { @@ -456,7 +456,7 @@ public: outputTriangles = subset.GetNumberOfValues(); } - VTKM_CONT_EXPORT + VTKM_CONT void Run(const vtkm::cont::DynamicCellSet &cellset, vtkm::cont::ArrayHandle< vtkm::Vec > &outputIndices, vtkm::Id &outputTriangles) diff --git a/vtkm/rendering/View.h b/vtkm/rendering/View.h index 7756ab21d..deec78c7d 100644 --- a/vtkm/rendering/View.h +++ b/vtkm/rendering/View.h @@ -51,64 +51,64 @@ public: virtual ~View(); - VTKM_CONT_EXPORT + VTKM_CONT const vtkm::rendering::Scene &GetScene() const { return this->Scene; } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::rendering::Scene &GetScene() { return this->Scene; } - VTKM_CONT_EXPORT + VTKM_CONT void SetScene(const vtkm::rendering::Scene &scene) { this->Scene = scene; } - VTKM_CONT_EXPORT + VTKM_CONT const vtkm::rendering::Mapper &GetMapper() const { return *this->MapperPointer; } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::rendering::Mapper &GetMapper() { return *this->MapperPointer; } - VTKM_CONT_EXPORT + VTKM_CONT const vtkm::rendering::Canvas &GetCanvas() const { return *this->CanvasPointer; } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::rendering::Canvas &GetCanvas() { return *this->CanvasPointer; } - VTKM_CONT_EXPORT + VTKM_CONT const vtkm::rendering::WorldAnnotator &GetWorldAnnotator() const { return *this->WorldAnnotatorPointer; } - VTKM_CONT_EXPORT + VTKM_CONT const vtkm::rendering::Camera &GetCamera() const { return this->Camera; } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::rendering::Camera &GetCamera() { return this->Camera; } - VTKM_CONT_EXPORT + VTKM_CONT void SetCamera(const vtkm::rendering::Camera &camera) { this->Camera = camera; } - VTKM_CONT_EXPORT + VTKM_CONT const vtkm::rendering::Color &GetBackgroundColor() const { return this->CanvasPointer->GetBackgroundColor(); } - VTKM_CONT_EXPORT + VTKM_CONT void SetBackgroundColor(const vtkm::rendering::Color &color) { this->CanvasPointer->SetBackgroundColor(color); diff --git a/vtkm/rendering/WorldAnnotator.h b/vtkm/rendering/WorldAnnotator.h index bd71b965d..f4be9269d 100644 --- a/vtkm/rendering/WorldAnnotator.h +++ b/vtkm/rendering/WorldAnnotator.h @@ -39,7 +39,7 @@ public: const vtkm::rendering::Color &color, bool inFront = false) const; - VTKM_CONT_EXPORT + VTKM_CONT void AddLine(vtkm::Float64 x0, vtkm::Float64 y0, vtkm::Float64 z0, vtkm::Float64 x1, vtkm::Float64 y1, vtkm::Float64 z1, vtkm::Float32 lineWidth, @@ -61,7 +61,7 @@ public: const vtkm::rendering::Color &color, const std::string &text) const; - VTKM_CONT_EXPORT + VTKM_CONT void AddText(vtkm::Float32 originX, vtkm::Float32 originY, vtkm::Float32 originZ, diff --git a/vtkm/rendering/internal/RunTriangulator.cxx b/vtkm/rendering/internal/RunTriangulator.cxx index b3724c3c8..2f15d3549 100644 --- a/vtkm/rendering/internal/RunTriangulator.cxx +++ b/vtkm/rendering/internal/RunTriangulator.cxx @@ -35,13 +35,13 @@ struct TriangulatorFunctor vtkm::cont::ArrayHandle > Indices; vtkm::Id NumberOfTriangles; - VTKM_CONT_EXPORT + VTKM_CONT TriangulatorFunctor(vtkm::cont::DynamicCellSet cellSet) : CellSet(cellSet) { } template - VTKM_CONT_EXPORT + VTKM_CONT bool operator()(Device) { vtkm::rendering::Triangulator triangulator; diff --git a/vtkm/rendering/raytracing/BoundingVolumeHierarchy.h b/vtkm/rendering/raytracing/BoundingVolumeHierarchy.h index d7e000016..155511ee8 100644 --- a/vtkm/rendering/raytracing/BoundingVolumeHierarchy.h +++ b/vtkm/rendering/raytracing/BoundingVolumeHierarchy.h @@ -56,11 +56,11 @@ public: vtkm::Vec ExtentMin; vtkm::Vec ExtentMax; vtkm::Id LeafCount; - VTKM_CONT_EXPORT + VTKM_CONT LinearBVH() {} template - VTKM_CONT_EXPORT + VTKM_CONT void Allocate(const vtkm::Id &leafCount, DeviceAdapter deviceAdapter) { @@ -84,11 +84,11 @@ public: class CountingIterator : public vtkm::worklet::WorkletMapField { public: - VTKM_CONT_EXPORT + VTKM_CONT CountingIterator(){} typedef void ControlSignature(FieldOut<>); typedef void ExecutionSignature(WorkIndex, _1); - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(const vtkm::Id &index, vtkm::Id &outId) const { outId = index; @@ -98,7 +98,7 @@ public: class FindAABBs : public vtkm::worklet::WorkletMapField { public: - VTKM_CONT_EXPORT + VTKM_CONT FindAABBs() {} typedef void ControlSignature(FieldIn<>, FieldOut<>, @@ -117,7 +117,7 @@ public: _7, _8); template - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(const vtkm::Vec indices, vtkm::Float32 &xmin, vtkm::Float32 &ymin, @@ -164,7 +164,7 @@ public: PortalConst InputPortal; Portal OutputPortal; public: - VTKM_CONT_EXPORT + VTKM_CONT GatherFloat32(const FloatArrayHandle &inputPortal, FloatArrayHandle &outputPortal, const vtkm::Id &size) @@ -174,7 +174,7 @@ public: } typedef void ControlSignature(FieldIn<>); typedef void ExecutionSignature(WorkIndex, _1); - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(const vtkm::Id &outIndex, const vtkm::Id &inIndex) const { OutputPortal.Set(outIndex, InputPortal.Get(inIndex)); @@ -192,7 +192,7 @@ public: PortalConst InputPortal; Portal OutputPortal; public: - VTKM_CONT_EXPORT + VTKM_CONT GatherVecCast(const Vec4IdArrayHandle &inputPortal, Vec4IntArrayHandle &outputPortal, const vtkm::Id &size) @@ -202,7 +202,7 @@ public: } typedef void ControlSignature(FieldIn<>); typedef void ExecutionSignature(WorkIndex, _1); - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(const vtkm::Id &outIndex, const vtkm::Id &inIndex) const { OutputPortal.Set(outIndex, InputPortal.Get(inIndex)); @@ -226,7 +226,7 @@ public: vtkm::cont::ArrayHandle leftChild; vtkm::cont::ArrayHandle rightChild; - VTKM_CONT_EXPORT + VTKM_CONT BVHData(vtkm::Id numPrimitives) : NumPrimitives(numPrimitives) { @@ -246,7 +246,7 @@ public: } - VTKM_CONT_EXPORT + VTKM_CONT ~BVHData() { // @@ -258,12 +258,12 @@ public: delete zmaxs; } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Id GetNumberOfPrimitives() const { return NumPrimitives; } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Id GetNumberOfInnerNodes() const { return InnerNodeCount; @@ -298,7 +298,7 @@ public: //Int8ArrayPortal CountersPortal; vtkm::exec::AtomicArray Counters; public: - VTKM_CONT_EXPORT + VTKM_CONT PropagateAABBs(IdArrayHandle &parents, IdArrayHandle &leftChildren, IdArrayHandle &rightChildren, @@ -328,7 +328,7 @@ public: _5, _6); template - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT void operator()(const vtkm::Id workIndex, const vtkm::exec::ExecutionWholeArrayConst &xmin, const vtkm::exec::ExecutionWholeArrayConst &ymin, @@ -447,7 +447,7 @@ public: vtkm::Vec MinCoordinate; //expands 10-bit unsigned int into 30 bits - VTKM_EXEC_EXPORT + VTKM_EXEC vtkm::UInt32 ExpandBits(vtkm::UInt32 x) const { x = (x * 0x00010001u) & 0xFF0000FFu; @@ -458,7 +458,7 @@ public: } //Returns 30 bit morton code for coordinates for //coordinates in the unit cude - VTKM_EXEC_EXPORT + VTKM_EXEC vtkm::UInt32 Morton3D(vtkm::Float32 &x, vtkm::Float32 &y, vtkm::Float32 &z) const @@ -476,7 +476,7 @@ public: } public: - VTKM_CONT_EXPORT + VTKM_CONT MortonCodeAABB(const vtkm::Vec &inverseExtent, const vtkm::Vec &minCoordinate) : InverseExtent(inverseExtent), @@ -498,7 +498,7 @@ public: _7); typedef _7 InputDomain; - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(const vtkm::Float32 &xmin, const vtkm::Float32 &ymin, const vtkm::Float32 &zmin, @@ -536,7 +536,7 @@ public: vtkm::Id LeafCount; vtkm::Id InnerCount; //TODO: get instrinsic support - VTKM_EXEC_EXPORT + VTKM_EXEC vtkm::Int32 CountLeadingZeros(vtkm::UInt32 &x) const { vtkm::UInt32 y; @@ -555,7 +555,7 @@ public: // // returns count of the largest binary prefix - VTKM_EXEC_EXPORT + VTKM_EXEC vtkm::Int32 delta(const vtkm::Int32 &a, const vtkm::Int32 &b) const { @@ -576,7 +576,7 @@ public: return count; } public: - VTKM_CONT_EXPORT + VTKM_CONT TreeBuilder(const UIntArrayHandle &mortonCodesHandle, IdArrayHandle &parentHandle, const vtkm::Id &leafCount) @@ -591,7 +591,7 @@ public: typedef void ExecutionSignature(WorkIndex, _1, _2); - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(const vtkm::Id &index, vtkm::Id &leftChild, vtkm::Id &rightChild) const @@ -660,10 +660,10 @@ public: public: - VTKM_CONT_EXPORT + VTKM_CONT LinearBVHBuilder() {} - VTKM_CONT_EXPORT + VTKM_CONT void SortAABBS(BVHData &bvh, vtkm::cont::ArrayHandle< vtkm::Vec > &triangleIndices, vtkm::cont::ArrayHandle< vtkm::Vec > &outputTriangleIndices) @@ -765,7 +765,7 @@ public: } // method SortAABBs - VTKM_CONT_EXPORT + VTKM_CONT void run(vtkm::cont::DynamicArrayHandleCoordinateSystem &coordsHandle, vtkm::cont::ArrayHandle< vtkm::Vec > &triangleIndices, const vtkm::Id &numberOfTriangles, diff --git a/vtkm/rendering/raytracing/Camera.h b/vtkm/rendering/raytracing/Camera.h index 9a6f8cce3..4a384b21e 100644 --- a/vtkm/rendering/raytracing/Camera.h +++ b/vtkm/rendering/raytracing/Camera.h @@ -52,7 +52,7 @@ public: vtkm::Int32 NumPixels; public: - VTKM_CONT_EXPORT + VTKM_CONT SurfaceConverter(const vtkm::Int32 &width, const vtkm::Int32 &subsetWidth, const vtkm::Int32 &xmin, @@ -78,7 +78,7 @@ public: _3, _4, WorkIndex); - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()( const vtkm::Vec &inColor, const vtkm::Float32 &inDepth, @@ -111,7 +111,7 @@ public: vtkm::Vec< vtkm::Float32, 3> nlook;// normalized look vtkm::Vec< vtkm::Float32, 3> delta_x; vtkm::Vec< vtkm::Float32, 3> delta_y; - VTKM_CONT_EXPORT + VTKM_CONT PerspectiveRayGen(vtkm::Int32 width, vtkm::Int32 height, vtkm::Float32 fovX, @@ -160,7 +160,7 @@ public: _1, _2, _3); - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(vtkm::Id idx, vtkm::Float32 &rayDirX, vtkm::Float32 &rayDirY, @@ -209,7 +209,7 @@ public: ColorBuffer4f FrameBuffer; - VTKM_CONT_EXPORT + VTKM_CONT Camera() { this->Height = 500; @@ -240,7 +240,7 @@ public: //this->ImageSubsetModeOn = true; } - VTKM_CONT_EXPORT + VTKM_CONT void SetParameters(const vtkm::rendering::Camera &camera, const vtkm::rendering::CanvasRayTracer &canvas) { @@ -254,7 +254,7 @@ public: } - VTKM_CONT_EXPORT + VTKM_CONT void SetHeight(const vtkm::Int32 &height) { if(height <= 0) @@ -270,13 +270,13 @@ public: } } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Int32 GetHeight() const { return this->Height; } - VTKM_CONT_EXPORT + VTKM_CONT void SetWidth(const vtkm::Int32 &width) { if(width <= 0) @@ -292,13 +292,13 @@ public: } } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Int32 GetWidth() const { return this->Width; } - VTKM_CONT_EXPORT + VTKM_CONT void SetZoom(const vtkm::Float32 &zoom) { if(zoom <= 0) @@ -313,13 +313,13 @@ public: } } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Float32 GetZoom() const { return this->Zoom; } - VTKM_CONT_EXPORT + VTKM_CONT void SetFieldOfView(const vtkm::Float32 °rees) { if(degrees <= 0) @@ -348,13 +348,13 @@ public: this->CameraView.SetFieldOfView(this->FovX); } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Float32 GetFieldOfView() const { return this->FovX; } - VTKM_CONT_EXPORT + VTKM_CONT void SetUp(const vtkm::Vec &up) { if(this->Up != up) @@ -365,13 +365,13 @@ public: } } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Vec GetUp() const { return this->Up; } - VTKM_CONT_EXPORT + VTKM_CONT void SetLookAt(const vtkm::Vec &lookAt) { if(this->LookAt != lookAt) @@ -381,13 +381,13 @@ public: } } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Vec GetLookAt() const { return this->LookAt; } - VTKM_CONT_EXPORT + VTKM_CONT void SetPosition(const vtkm::Vec &position) { if(this->Position != position) @@ -397,25 +397,25 @@ public: } } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Vec GetPosition() const { return this->Position; } - VTKM_CONT_EXPORT + VTKM_CONT void ResetIsViewDirty() { this->IsViewDirty = false; } - VTKM_CONT_EXPORT + VTKM_CONT bool GetIsViewDirty() const { return this->IsViewDirty; } - VTKM_CONT_EXPORT + VTKM_CONT void WriteToSurface(CanvasRayTracer *canvas, const vtkm::cont::ArrayHandle &distances) { @@ -446,7 +446,7 @@ public: canvas->GetDepthBuffer().GetPortalControl().Get(0); } - VTKM_CONT_EXPORT + VTKM_CONT void CreateRays(Ray &rays, const vtkm::Bounds boundingBox = vtkm::Bounds()) { @@ -489,7 +489,7 @@ public: } //create rays - VTKM_CONT_EXPORT + VTKM_CONT void CreateRays(VolumeRay &rays, const vtkm::Bounds &boundingBox = vtkm::Bounds()) { @@ -518,7 +518,7 @@ public: } //create rays private: - VTKM_CONT_EXPORT + VTKM_CONT void FindSubset(const vtkm::Bounds &bounds) { vtkm::Float32 x[2], y[2], z[2]; @@ -612,7 +612,7 @@ private: } - VTKM_CONT_EXPORT + VTKM_CONT void UpdateDimensions(RayBase *rays, const vtkm::Bounds &boundingBox = vtkm::Bounds()) { diff --git a/vtkm/rendering/raytracing/Ray.h b/vtkm/rendering/raytracing/Ray.h index b34773963..2f5dca9a5 100644 --- a/vtkm/rendering/raytracing/Ray.h +++ b/vtkm/rendering/raytracing/Ray.h @@ -29,14 +29,14 @@ namespace raytracing { class RayBase { public: - VTKM_CONT_EXPORT + VTKM_CONT RayBase() { } - VTKM_CONT_EXPORT + VTKM_CONT virtual ~RayBase(){} - VTKM_CONT_EXPORT + VTKM_CONT virtual void resize(const vtkm::Int32 vtkmNotUsed(newSize)){} }; template @@ -87,7 +87,7 @@ public: vtkm::cont::ArrayHandle HitIdx; vtkm::Int32 NumRays; - VTKM_CONT_EXPORT + VTKM_CONT Ray() { NumRays = 0; @@ -111,7 +111,7 @@ public: DirY, inComp[1], DirZ, inComp[2]); } - VTKM_CONT_EXPORT + VTKM_CONT Ray( const vtkm::Int32 size) { NumRays = size; @@ -160,7 +160,7 @@ public: DirY, inComp[1], DirZ, inComp[2]); } - VTKM_CONT_EXPORT + VTKM_CONT virtual void resize( const vtkm::Int32 newSize) { if(newSize == NumRays) return; //nothing to do @@ -209,7 +209,7 @@ public: vtkm::cont::ArrayHandle MaxDistance; //distance to hit vtkm::cont::ArrayHandle HitIndex; vtkm::Int32 NumRays; - VTKM_CONT_EXPORT + VTKM_CONT VolumeRay() { NumRays = 0; @@ -222,7 +222,7 @@ public: DirY, inComp[1], DirZ, inComp[2]); } - VTKM_CONT_EXPORT + VTKM_CONT VolumeRay( const vtkm::Int32 size) { NumRays = size; @@ -245,7 +245,7 @@ public: DirY, inComp[1], DirZ, inComp[2]); } - VTKM_CONT_EXPORT + VTKM_CONT virtual void resize( const vtkm::Int32 newSize) { if(newSize == NumRays) return; //nothing to do diff --git a/vtkm/rendering/raytracing/RayTracer.h b/vtkm/rendering/raytracing/RayTracer.h index 8a87106c5..50fbd1515 100644 --- a/vtkm/rendering/raytracing/RayTracer.h +++ b/vtkm/rendering/raytracing/RayTracer.h @@ -38,7 +38,7 @@ namespace raytracing { class IntersectionPoint : public vtkm::worklet::WorkletMapField { public: - VTKM_CONT_EXPORT + VTKM_CONT IntersectionPoint() {} typedef void ControlSignature(FieldIn<>, FieldIn<>, @@ -54,7 +54,7 @@ public: _5, _6, _7); - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(const vtkm::Id &hitIndex, const vtkm::Float32 &distance, const vtkm::Vec &rayDir, @@ -85,7 +85,7 @@ public: IndicesArrayPortal IndicesPortal; public: - VTKM_CONT_EXPORT + VTKM_CONT CalculateNormals(const Vec4IntArrayHandle &indices) : IndicesPortal( indices.PrepareForInput( DeviceAdapter() ) ) {} @@ -102,7 +102,7 @@ public: _5, _6); template - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(const vtkm::Id &hitIndex, const vtkm::Vec &rayDir, vtkm::Float32 &normalX, @@ -138,7 +138,7 @@ public: vtkm::Float32 invDeltaScalar; public: - VTKM_CONT_EXPORT + VTKM_CONT LerpScalar(const Vec4IntArrayHandle &indices, const vtkm::Float32 &minScalar, const vtkm::Float32 &maxScalar) @@ -161,7 +161,7 @@ public: _4, _5); template - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(const vtkm::Id &hitIndex, const vtkm::Float32 &u, const vtkm::Float32 &v, @@ -194,7 +194,7 @@ public: vtkm::Float32 invDeltaScalar; public: - VTKM_CONT_EXPORT + VTKM_CONT NodalScalar(const Vec4IntArrayHandle &indices, const vtkm::Float32 &minScalar, const vtkm::Float32 &maxScalar) @@ -213,7 +213,7 @@ public: _2, _3); template - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(const vtkm::Id &hitIndex, vtkm::Float32 &scalar, const ScalarPortalType &scalars) const @@ -230,7 +230,7 @@ public: } }; //class LerpScalar - VTKM_CONT_EXPORT + VTKM_CONT void run(Ray &rays, LinearBVH &bvh, vtkm::cont::DynamicArrayHandleCoordinateSystem &coordsHandle, @@ -295,7 +295,7 @@ public: vtkm::Vec BackgroundColor; public: - VTKM_CONT_EXPORT + VTKM_CONT MapScalarToColor(const ColorArrayHandle &colorMap, const vtkm::Int32 &colorMapSize, const vtkm::Vec &lightPosition, @@ -329,7 +329,7 @@ public: _3, _4, _5); - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(const vtkm::Id &hitIdx, const vtkm::Float32 &scalar, const vtkm::Vec &normal, @@ -369,7 +369,7 @@ public: } }; //class MapScalarToColor - VTKM_CONT_EXPORT + VTKM_CONT void run(Ray &rays, vtkm::cont::ArrayHandle > &colorMap, ColorBuffer4f &colorBuffer, @@ -413,25 +413,25 @@ protected: vtkm::Bounds DataBounds; vtkm::Vec BackgroundColor; public: - VTKM_CONT_EXPORT + VTKM_CONT RayTracer() { IsSceneDirty = true; } - VTKM_CONT_EXPORT + VTKM_CONT void SetBackgroundColor(const vtkm::Vec &backgroundColor) { BackgroundColor = backgroundColor; } - VTKM_CONT_EXPORT + VTKM_CONT Camera& GetCamera() { return camera; } - VTKM_CONT_EXPORT + VTKM_CONT void SetData(const vtkm::cont::DynamicArrayHandleCoordinateSystem &coordsHandle, const vtkm::cont::ArrayHandle< vtkm::Vec > &indices, const vtkm::cont::Field &scalarField, @@ -448,13 +448,13 @@ public: DataBounds = dataBounds; } - VTKM_CONT_EXPORT + VTKM_CONT void SetColorMap(const vtkm::cont::ArrayHandle > &colorMap) { ColorMap = colorMap; } - VTKM_CONT_EXPORT + VTKM_CONT void Init() { Builder.run(CoordsHandle, Indices, NumberOfTriangles, Bvh); @@ -462,7 +462,7 @@ public: IsSceneDirty = false; } - VTKM_CONT_EXPORT + VTKM_CONT void Render(CanvasRayTracer *canvas) { vtkm::cont::Timer renderTimer; diff --git a/vtkm/rendering/raytracing/TriangleIntersector.h b/vtkm/rendering/raytracing/TriangleIntersector.h index 3ae9147a3..263c31e1a 100644 --- a/vtkm/rendering/raytracing/TriangleIntersector.h +++ b/vtkm/rendering/raytracing/TriangleIntersector.h @@ -56,12 +56,12 @@ public: vtkm::Float32 MaxDistance; Float4ArrayPortal FlatBVH; Int4ArrayPortal Leafs; - VTKM_EXEC_EXPORT + VTKM_EXEC vtkm::Float32 rcp(vtkm::Float32 f) const { return 1.0f/f;} - VTKM_EXEC_EXPORT + VTKM_EXEC vtkm::Float32 rcp_safe(vtkm::Float32 f) const { return rcp((fabs(f) < 1e-8f) ? 1e-8f : f); } public: - VTKM_CONT_EXPORT + VTKM_CONT Intersector(bool occlusion, vtkm::Float32 maxDistance, LinearBVH &bvh) @@ -85,7 +85,7 @@ public: _6, _7); template - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(const vtkm::Vec &rayDir, const vtkm::Vec &rayOrigin, vtkm::Float32 &distance, @@ -243,7 +243,7 @@ public: - VTKM_CONT_EXPORT + VTKM_CONT void run(Ray &rays, LinearBVH &bvh, vtkm::cont::DynamicArrayHandleCoordinateSystem coordsHandle) diff --git a/vtkm/rendering/raytracing/VolumeRendererStructured.h b/vtkm/rendering/raytracing/VolumeRendererStructured.h index 96f95f7f7..3617976a3 100644 --- a/vtkm/rendering/raytracing/VolumeRendererStructured.h +++ b/vtkm/rendering/raytracing/VolumeRendererStructured.h @@ -65,7 +65,7 @@ public: vtkm::Float32 SampleDistance; vtkm::Float32 InverseDeltaScalar; public: - VTKM_CONT_EXPORT + VTKM_CONT Sampler(vtkm::Vec cameraPosition, const ColorArrayHandle &colorMap, const UniformArrayHandle &coordinates, @@ -103,7 +103,7 @@ public: _3, _4, _5); - VTKM_EXEC_EXPORT + VTKM_EXEC void LocateCell(const vtkm::Vec &point, vtkm::Vec &cellIndices) const @@ -130,7 +130,7 @@ public: } template - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(const vtkm::Vec &rayDir, const vtkm::Float32 &minDistance, const vtkm::Float32 &maxDistance, @@ -272,7 +272,7 @@ public: vtkm::Float32 SampleDistance; vtkm::Float32 InverseDeltaScalar; public: - VTKM_CONT_EXPORT + VTKM_CONT SamplerCellAssoc(vtkm::Vec cameraPosition, const ColorArrayHandle &colorMap, const UniformArrayHandle &coordinates, @@ -313,7 +313,7 @@ public: _3, _4, _5); - VTKM_EXEC_EXPORT + VTKM_EXEC void LocateCellId(const vtkm::Vec &point, vtkm::Id &cellId) const @@ -329,7 +329,7 @@ public: } template - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(const vtkm::Vec &rayDir, const vtkm::Float32 &minDistance, const vtkm::Float32 &maxDistance, @@ -426,7 +426,7 @@ class SamplerCellAssocRect : public vtkm::worklet::WorkletMapField DefaultConstHandle CoordPortals[3]; public: - VTKM_CONT_EXPORT + VTKM_CONT SamplerCellAssocRect(vtkm::Vec cameraPosition, const ColorArrayHandle &colorMap, const CartesianArrayHandle &coordinates, @@ -465,7 +465,7 @@ class SamplerCellAssocRect : public vtkm::worklet::WorkletMapField // Locate assumes that the point is within the data set which // should be true when the min and max distance are passed in // This is a linear search from the previous cell loc - VTKM_EXEC_EXPORT + VTKM_EXEC void LocateCell(vtkm::Vec &cell, const vtkm::Vec &point, @@ -493,7 +493,7 @@ class SamplerCellAssocRect : public vtkm::worklet::WorkletMapField } template - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(const vtkm::Vec &rayDir, const vtkm::Float32 &minDistance, const vtkm::Float32 &maxDistance, @@ -619,7 +619,7 @@ class SamplerCellAssocRect : public vtkm::worklet::WorkletMapField DefaultConstHandle CoordPortals[3]; public: - VTKM_CONT_EXPORT + VTKM_CONT SamplerRect(vtkm::Vec cameraPosition, const ColorArrayHandle &colorMap, const CartesianArrayHandle &coordinates, @@ -656,7 +656,7 @@ class SamplerCellAssocRect : public vtkm::worklet::WorkletMapField _3, _4, _5); - VTKM_EXEC_EXPORT + VTKM_EXEC void GetCellIndices(const vtkm::Vec cell, vtkm::Vec &cellIndices) const @@ -675,7 +675,7 @@ class SamplerCellAssocRect : public vtkm::worklet::WorkletMapField // Locate assumes that the point is within the data set which // should be true when the min and max distance are passed in // - VTKM_EXEC_EXPORT + VTKM_EXEC void LocateCell(vtkm::Vec &cell, const vtkm::Vec &point, @@ -708,7 +708,7 @@ class SamplerCellAssocRect : public vtkm::worklet::WorkletMapField } template - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(const vtkm::Vec &rayDir, const vtkm::Float32 &minDistance, const vtkm::Float32 &maxDistance, @@ -848,7 +848,7 @@ class SamplerCellAssocRect : public vtkm::worklet::WorkletMapField vtkm::Float32 Zmax; vtkm::Vec CameraPosition; public: - VTKM_CONT_EXPORT + VTKM_CONT CalcRayStart(vtkm::Vec cameraPosition, const vtkm::Bounds boundingBox) : CameraPosition(cameraPosition) @@ -861,10 +861,10 @@ class SamplerCellAssocRect : public vtkm::worklet::WorkletMapField Zmax = static_cast(boundingBox.Z.Max); } - VTKM_EXEC_EXPORT + VTKM_EXEC vtkm::Float32 rcp(vtkm::Float32 f) const { return 1.0f/f;} - VTKM_EXEC_EXPORT + VTKM_EXEC vtkm::Float32 rcp_safe(vtkm::Float32 f) const { return rcp((fabs(f) < 1e-8f) ? 1e-8f : f); } typedef void ControlSignature(FieldIn<>, @@ -873,7 +873,7 @@ class SamplerCellAssocRect : public vtkm::worklet::WorkletMapField typedef void ExecutionSignature(_1, _2, _3); - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(const vtkm::Vec &rayDir, vtkm::Float32 &minDistance, vtkm::Float32 &maxDistance) const @@ -913,14 +913,14 @@ class SamplerCellAssocRect : public vtkm::worklet::WorkletMapField { vtkm::Vec BackgroundColor; public: - VTKM_CONT_EXPORT + VTKM_CONT CompositeBackground(const vtkm::Vec &backgroundColor) : BackgroundColor(backgroundColor) {} typedef void ControlSignature(FieldInOut<>); typedef void ExecutionSignature(_1); - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(vtkm::Vec &color) const { @@ -933,7 +933,7 @@ class SamplerCellAssocRect : public vtkm::worklet::WorkletMapField } }; //class CompositeBackground - VTKM_CONT_EXPORT + VTKM_CONT VolumeRendererStructured() { IsSceneDirty = false; @@ -941,26 +941,26 @@ class SamplerCellAssocRect : public vtkm::worklet::WorkletMapField SampleDistance = -1.f; } - VTKM_CONT_EXPORT + VTKM_CONT Camera& GetCamera() { return camera; } - VTKM_CONT_EXPORT + VTKM_CONT void SetColorMap(const vtkm::cont::ArrayHandle > &colorMap) { ColorMap = colorMap; } - VTKM_CONT_EXPORT + VTKM_CONT void Init() { camera.CreateRays(Rays, DataBounds); IsSceneDirty = true; } - VTKM_CONT_EXPORT + VTKM_CONT void SetData(const vtkm::cont::CoordinateSystem &coords, const vtkm::cont::Field &scalarField, const vtkm::Bounds &coordsBounds, @@ -977,7 +977,7 @@ class SamplerCellAssocRect : public vtkm::worklet::WorkletMapField } - VTKM_CONT_EXPORT + VTKM_CONT void Render(CanvasRayTracer *canvas) { if(IsSceneDirty) @@ -1081,7 +1081,7 @@ class SamplerCellAssocRect : public vtkm::worklet::WorkletMapField camera.WriteToSurface(canvas, Rays.MinDistance); } //Render - VTKM_CONT_EXPORT + VTKM_CONT void SetSampleDistance(const vtkm::Float32 & distance) { if(distance <= 0.f) @@ -1089,7 +1089,7 @@ class SamplerCellAssocRect : public vtkm::worklet::WorkletMapField SampleDistance = distance; } - VTKM_CONT_EXPORT + VTKM_CONT void SetBackgroundColor(const vtkm::Vec &backgroundColor) { BackgroundColor = backgroundColor; diff --git a/vtkm/rendering/raytracing/Worklets.h b/vtkm/rendering/raytracing/Worklets.h index 80f59eb4a..0805536fa 100644 --- a/vtkm/rendering/raytracing/Worklets.h +++ b/vtkm/rendering/raytracing/Worklets.h @@ -31,13 +31,13 @@ class MemSet : public vtkm::worklet::WorkletMapField { T Value; public: - VTKM_CONT_EXPORT + VTKM_CONT MemSet(T value) : Value(value) {} typedef void ControlSignature(FieldOut<>); typedef void ExecutionSignature(_1); - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(T &outValue) const { outValue = Value; @@ -47,7 +47,7 @@ public: struct MaxValue { template - VTKM_EXEC_CONT_EXPORT T operator()(const T& a,const T& b) const + VTKM_EXEC_CONT T operator()(const T& a,const T& b) const { return (a > b) ? a : b; } @@ -57,7 +57,7 @@ struct MaxValue struct MinValue { template - VTKM_EXEC_CONT_EXPORT T operator()(const T& a,const T& b) const + VTKM_EXEC_CONT T operator()(const T& a,const T& b) const { return (a < b) ? a : b; } diff --git a/vtkm/testing/Testing.h b/vtkm/testing/Testing.h index 832bb1684..1572f6bb0 100644 --- a/vtkm/testing/Testing.h +++ b/vtkm/testing/Testing.h @@ -166,12 +166,12 @@ public: class TestFailure { public: - VTKM_CONT_EXPORT TestFailure(const std::string &file, + VTKM_CONT TestFailure(const std::string &file, vtkm::Id line, const std::string &message) : File(file), Line(line), Message(message) { } - VTKM_CONT_EXPORT TestFailure(const std::string &file, + VTKM_CONT TestFailure(const std::string &file, vtkm::Id line, const std::string &message, const std::string &condition) @@ -183,9 +183,9 @@ public: this->Message.append(")"); } - VTKM_CONT_EXPORT const std::string &GetFile() const { return this->File; } - VTKM_CONT_EXPORT vtkm::Id GetLine() const { return this->Line; } - VTKM_CONT_EXPORT const std::string &GetMessage() const + VTKM_CONT const std::string &GetFile() const { return this->File; } + VTKM_CONT vtkm::Id GetLine() const { return this->Line; } + VTKM_CONT const std::string &GetMessage() const { return this->Message; } @@ -195,7 +195,7 @@ public: std::string Message; }; - static VTKM_CONT_EXPORT void Assert(bool condition, + static VTKM_CONT void Assert(bool condition, const std::string &file, vtkm::Id line, const std::string &message, @@ -240,7 +240,7 @@ public: /// \endcode /// template - static VTKM_CONT_EXPORT int Run(Func function) + static VTKM_CONT int Run(Func function) { try { @@ -338,7 +338,7 @@ public: /// variance due to floating point numerical inaccuracies. /// template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT bool test_equal(VectorType1 vector1, VectorType2 vector2, vtkm::Float64 tolerance = 0.0001) @@ -395,7 +395,7 @@ bool test_equal(VectorType1 vector1, /// Special implementation of test_equal for strings, which don't fit a model /// of fixed length vectors of numbers. /// -VTKM_CONT_EXPORT +static inline VTKM_CONT bool test_equal(const std::string &string1, const std::string &string2) { return string1 == string2; @@ -405,7 +405,7 @@ bool test_equal(const std::string &string1, const std::string &string2) /// than a vector of numbers of the same type. /// template -VTKM_CONT_EXPORT +static inline VTKM_CONT bool test_equal(const vtkm::Pair &pair1, const vtkm::Pair &pair2, vtkm::Float64 tolerance = 0.0001) @@ -417,7 +417,7 @@ bool test_equal(const vtkm::Pair &pair1, /// Special implementation of test_equal for Ranges. /// -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT bool test_equal(const vtkm::Range &range1, const vtkm::Range &range2, vtkm::Float64 tolerance = 0.0001) @@ -428,7 +428,7 @@ bool test_equal(const vtkm::Range &range1, /// Special implementation of test_equal for Bounds. /// -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT bool test_equal(const vtkm::Bounds &bounds1, const vtkm::Bounds &bounds2, vtkm::Float64 tolerance = 0.0001) @@ -439,14 +439,14 @@ bool test_equal(const vtkm::Bounds &bounds1, } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT T TestValue(vtkm::Id index, T, vtkm::TypeTraitsIntegerTag) { return T(index*100); } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT T TestValue(vtkm::Id index, T, vtkm::TypeTraitsRealTag) { return T(0.01*static_cast(index) + 1.001); @@ -458,14 +458,14 @@ T TestValue(vtkm::Id index, T, vtkm::TypeTraitsRealTag) /// given type. Different types might give different values. /// template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT T TestValue(vtkm::Id index, T) { return TestValue(index, T(), typename vtkm::TypeTraits::NumericTag()); } template -VTKM_EXEC_CONT_EXPORT +static inline VTKM_EXEC_CONT vtkm::Vec TestValue(vtkm::Id index, vtkm::Vec) { vtkm::Vec value; for (vtkm::IdComponent i = 0; i < N; i++) @@ -475,7 +475,7 @@ vtkm::Vec TestValue(vtkm::Id index, vtkm::Vec) { return value; } -VTKM_CONT_EXPORT +static inline VTKM_CONT std::string TestValue(vtkm::Id index, std::string) { std::stringstream stream; stream << index; @@ -486,7 +486,7 @@ std::string TestValue(vtkm::Id index, std::string) { /// returned by vtkm::testing::TestValue. /// template -VTKM_CONT_EXPORT +static inline VTKM_CONT void CheckPortal(const PortalType &portal) { typedef typename PortalType::ValueType ValueType; @@ -510,7 +510,7 @@ void CheckPortal(const PortalType &portal) /// by vtkm::testing::TestValue. The ArrayPortal must be allocated first. /// template -VTKM_CONT_EXPORT +static inline VTKM_CONT void SetPortal(const PortalType &portal) { typedef typename PortalType::ValueType ValueType; diff --git a/vtkm/testing/TestingImplicitFunctions.h b/vtkm/testing/TestingImplicitFunctions.h index 6b479a80e..4593b2e38 100644 --- a/vtkm/testing/TestingImplicitFunctions.h +++ b/vtkm/testing/TestingImplicitFunctions.h @@ -63,7 +63,7 @@ struct TestingImplicitFunctions { } template - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(const VecType &point, ScalarType &val) const { val = this->Function.Value(point); diff --git a/vtkm/testing/TestingMath.h b/vtkm/testing/TestingMath.h index e5307280e..26c6c219d 100644 --- a/vtkm/testing/TestingMath.h +++ b/vtkm/testing/TestingMath.h @@ -43,57 +43,57 @@ namespace UnitTestMathNamespace { const vtkm::IdComponent NUM_NUMBERS = 5; -VTKM_EXEC_CONSTANT_EXPORT +VTKM_EXEC_CONSTANT const vtkm::Float64 NumberList[NUM_NUMBERS] = { 0.25, 0.5, 1.0, 2.0, 3.75 }; -VTKM_EXEC_CONSTANT_EXPORT +VTKM_EXEC_CONSTANT const vtkm::Float64 AngleList[NUM_NUMBERS] = { 0.643501108793284, // angle for 3, 4, 5 triangle. 0.78539816339745, // pi/4 0.5235987755983, // pi/6 1.0471975511966, // pi/3 0.0 }; -VTKM_EXEC_CONSTANT_EXPORT +VTKM_EXEC_CONSTANT const vtkm::Float64 OppositeList[NUM_NUMBERS] = { 3.0, 1.0, 1.0, 1.732050807568877 /*sqrt(3)*/, 0.0 }; -VTKM_EXEC_CONSTANT_EXPORT +VTKM_EXEC_CONSTANT const vtkm::Float64 AdjacentList[NUM_NUMBERS] = { 4.0, 1.0, 1.732050807568877 /*sqrt(3)*/, 1.0, 1.0 }; -VTKM_EXEC_CONSTANT_EXPORT +VTKM_EXEC_CONSTANT const vtkm::Float64 HypotenuseList[NUM_NUMBERS] = { 5.0, 1.414213562373095 /*sqrt(2)*/, 2.0, 2.0, 1.0 }; -VTKM_EXEC_CONSTANT_EXPORT +VTKM_EXEC_CONSTANT const vtkm::Float64 NumeratorList[NUM_NUMBERS] = { 6.5, 5.8, 9.3, 77.0, 0.1 }; -VTKM_EXEC_CONSTANT_EXPORT +VTKM_EXEC_CONSTANT const vtkm::Float64 DenominatorList[NUM_NUMBERS] = { 2.3, 1.6, 3.1, 19.0, 0.4 }; -VTKM_EXEC_CONSTANT_EXPORT +VTKM_EXEC_CONSTANT const vtkm::Float64 FModRemainderList[NUM_NUMBERS]={ 1.9, 1.0, 0.0, 1.0, 0.1 }; -VTKM_EXEC_CONSTANT_EXPORT +VTKM_EXEC_CONSTANT const vtkm::Float64 RemainderList[NUM_NUMBERS] = {-0.4,-0.6, 0.0, 1.0, 0.1 }; -VTKM_EXEC_CONSTANT_EXPORT +VTKM_EXEC_CONSTANT const vtkm::Int64 QuotientList[NUM_NUMBERS] = { 3 , 4 , 3 , 4 , 0 }; -VTKM_EXEC_CONSTANT_EXPORT +VTKM_EXEC_CONSTANT const vtkm::Float64 XList[NUM_NUMBERS] = {4.6, 0.1, 73.4, 55.0, 3.75 }; -VTKM_EXEC_CONSTANT_EXPORT +VTKM_EXEC_CONSTANT const vtkm::Float64 FractionalList[NUM_NUMBERS] = {0.6, 0.1, 0.4, 0.0, 0.75 }; -VTKM_EXEC_CONSTANT_EXPORT +VTKM_EXEC_CONSTANT const vtkm::Float64 FloorList[NUM_NUMBERS] = {4.0, 0.0, 73.0, 55.0, 3.0 }; -VTKM_EXEC_CONSTANT_EXPORT +VTKM_EXEC_CONSTANT const vtkm::Float64 CeilList[NUM_NUMBERS] = {5.0, 1.0, 74.0, 55.0, 4.0 }; -VTKM_EXEC_CONSTANT_EXPORT +VTKM_EXEC_CONSTANT const vtkm::Float64 RoundList[NUM_NUMBERS] = {5.0, 0.0, 73.0, 55.0, 4.0 }; //----------------------------------------------------------------------------- template struct ScalarFieldTests : public vtkm::exec::FunctorBase { - VTKM_EXEC_EXPORT + VTKM_EXEC void TestPi() const { // std::cout << "Testing Pi" << std::endl; VTKM_MATH_ASSERT(test_equal(vtkm::Pi(), 3.14159265), "Pi not correct."); } - VTKM_EXEC_EXPORT + VTKM_EXEC void TestArcTan2() const { // std::cout << "Testing arc tan 2" << std::endl; @@ -122,7 +122,7 @@ struct ScalarFieldTests : public vtkm::exec::FunctorBase "ATan2 Quadrant 4"); } - VTKM_EXEC_EXPORT + VTKM_EXEC void TestPow() const { // std::cout << "Running power tests." << std::endl; @@ -135,7 +135,7 @@ struct ScalarFieldTests : public vtkm::exec::FunctorBase } } - VTKM_EXEC_EXPORT + VTKM_EXEC void TestLog2() const { // std::cout << "Testing Log2" << std::endl; @@ -147,7 +147,7 @@ struct ScalarFieldTests : public vtkm::exec::FunctorBase "Bad value from Log2"); } - VTKM_EXEC_EXPORT + VTKM_EXEC void TestNonFinites() const { // std::cout << "Testing non-finites." << std::endl; @@ -200,7 +200,7 @@ struct ScalarFieldTests : public vtkm::exec::FunctorBase VTKM_MATH_ASSERT(vtkm::IsFinite(epsilon), "Bad finite check."); } - VTKM_EXEC_EXPORT + VTKM_EXEC void TestRemainders() const { // std::cout << "Testing remainders." << std::endl; @@ -224,7 +224,7 @@ struct ScalarFieldTests : public vtkm::exec::FunctorBase } } - VTKM_EXEC_EXPORT + VTKM_EXEC void TestRound() const { // std::cout << "Testing round." << std::endl; @@ -250,7 +250,7 @@ struct ScalarFieldTests : public vtkm::exec::FunctorBase } } - VTKM_EXEC_EXPORT + VTKM_EXEC void TestIsNegative() const { // std::cout << "Testing SignBit and IsNegative." << std::endl; @@ -275,7 +275,7 @@ struct ScalarFieldTests : public vtkm::exec::FunctorBase VTKM_MATH_ASSERT(vtkm::IsNegative(x), "IsNegative wrong for -0.02."); } - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(vtkm::Id) const { this->TestPi(); @@ -310,7 +310,7 @@ struct ScalarVectorFieldTests : public vtkm::exec::FunctorBase NUM_COMPONENTS = Traits::NUM_COMPONENTS }; - VTKM_EXEC_EXPORT + VTKM_EXEC void TestTriangleTrig() const { // std::cout << "Testing normal trig functions." << std::endl; @@ -372,7 +372,7 @@ struct ScalarVectorFieldTests : public vtkm::exec::FunctorBase } } - VTKM_EXEC_EXPORT + VTKM_EXEC void TestHyperbolicTrig() const { // std::cout << "Testing hyperbolic trig functions." << std::endl; @@ -416,7 +416,7 @@ struct ScalarVectorFieldTests : public vtkm::exec::FunctorBase } template - VTKM_EXEC_EXPORT + VTKM_EXEC void RaiseToTest(FunctionType function, ComponentType exponent) const { @@ -444,10 +444,10 @@ struct ScalarVectorFieldTests : public vtkm::exec::FunctorBase } struct SqrtFunctor { - VTKM_EXEC_EXPORT + VTKM_EXEC VectorType operator()(VectorType x) const { return vtkm::Sqrt(x); } }; - VTKM_EXEC_EXPORT + VTKM_EXEC void TestSqrt() const { // std::cout << " Testing Sqrt" << std::endl; @@ -455,10 +455,10 @@ struct ScalarVectorFieldTests : public vtkm::exec::FunctorBase } struct RSqrtFunctor { - VTKM_EXEC_EXPORT + VTKM_EXEC VectorType operator()(VectorType x) const {return vtkm::RSqrt(x);} }; - VTKM_EXEC_EXPORT + VTKM_EXEC void TestRSqrt() const { // std::cout << " Testing RSqrt"<< std::endl; @@ -466,10 +466,10 @@ struct ScalarVectorFieldTests : public vtkm::exec::FunctorBase } struct CbrtFunctor { - VTKM_EXEC_EXPORT + VTKM_EXEC VectorType operator()(VectorType x) const { return vtkm::Cbrt(x); } }; - VTKM_EXEC_EXPORT + VTKM_EXEC void TestCbrt() const { // std::cout << " Testing Cbrt" << std::endl; @@ -477,10 +477,10 @@ struct ScalarVectorFieldTests : public vtkm::exec::FunctorBase } struct RCbrtFunctor { - VTKM_EXEC_EXPORT + VTKM_EXEC VectorType operator()(VectorType x) const {return vtkm::RCbrt(x);} }; - VTKM_EXEC_EXPORT + VTKM_EXEC void TestRCbrt() const { // std::cout << " Testing RCbrt" << std::endl; @@ -488,7 +488,7 @@ struct ScalarVectorFieldTests : public vtkm::exec::FunctorBase } template - VTKM_EXEC_EXPORT + VTKM_EXEC void RaiseByTest(FunctionType function, ComponentType base, ComponentType exponentbias = 0.0, @@ -520,10 +520,10 @@ struct ScalarVectorFieldTests : public vtkm::exec::FunctorBase } struct ExpFunctor { - VTKM_EXEC_EXPORT + VTKM_EXEC VectorType operator()(VectorType x) const {return vtkm::Exp(x);} }; - VTKM_EXEC_EXPORT + VTKM_EXEC void TestExp() const { // std::cout << " Testing Exp" << std::endl; @@ -531,10 +531,10 @@ struct ScalarVectorFieldTests : public vtkm::exec::FunctorBase } struct Exp2Functor { - VTKM_EXEC_EXPORT + VTKM_EXEC VectorType operator()(VectorType x) const {return vtkm::Exp2(x);} }; - VTKM_EXEC_EXPORT + VTKM_EXEC void TestExp2() const { // std::cout << " Testing Exp2" << std::endl; @@ -542,10 +542,10 @@ struct ScalarVectorFieldTests : public vtkm::exec::FunctorBase } struct ExpM1Functor { - VTKM_EXEC_EXPORT + VTKM_EXEC VectorType operator()(VectorType x) const {return vtkm::ExpM1(x);} }; - VTKM_EXEC_EXPORT + VTKM_EXEC void TestExpM1() const { // std::cout << " Testing ExpM1" << std::endl; @@ -556,10 +556,10 @@ struct ScalarVectorFieldTests : public vtkm::exec::FunctorBase } struct Exp10Functor { - VTKM_EXEC_EXPORT + VTKM_EXEC VectorType operator()(VectorType x) const {return vtkm::Exp10(x);} }; - VTKM_EXEC_EXPORT + VTKM_EXEC void TestExp10() const { // std::cout << " Testing Exp10" << std::endl; @@ -567,7 +567,7 @@ struct ScalarVectorFieldTests : public vtkm::exec::FunctorBase } template - VTKM_EXEC_EXPORT + VTKM_EXEC void LogBaseTest(FunctionType function, ComponentType base, ComponentType bias=0.0) const @@ -599,10 +599,10 @@ struct ScalarVectorFieldTests : public vtkm::exec::FunctorBase } struct LogFunctor { - VTKM_EXEC_EXPORT + VTKM_EXEC VectorType operator()(VectorType x) const {return vtkm::Log(x);} }; - VTKM_EXEC_EXPORT + VTKM_EXEC void TestLog() const { // std::cout << " Testing Log" << std::endl; @@ -610,10 +610,10 @@ struct ScalarVectorFieldTests : public vtkm::exec::FunctorBase } struct Log10Functor { - VTKM_EXEC_EXPORT + VTKM_EXEC VectorType operator()(VectorType x) const {return vtkm::Log10(x);} }; - VTKM_EXEC_EXPORT + VTKM_EXEC void TestLog10() const { // std::cout << " Testing Log10" << std::endl; @@ -621,10 +621,10 @@ struct ScalarVectorFieldTests : public vtkm::exec::FunctorBase } struct Log1PFunctor { - VTKM_EXEC_EXPORT + VTKM_EXEC VectorType operator()(VectorType x) const {return vtkm::Log1P(x);} }; - VTKM_EXEC_EXPORT + VTKM_EXEC void TestLog1P() const { // std::cout << " Testing Log1P" << std::endl; @@ -633,7 +633,7 @@ struct ScalarVectorFieldTests : public vtkm::exec::FunctorBase 1.0); } - VTKM_EXEC_EXPORT + VTKM_EXEC void TestCopySign() const { // std::cout << "Testing CopySign." << std::endl; @@ -653,7 +653,7 @@ struct ScalarVectorFieldTests : public vtkm::exec::FunctorBase "CopySign failed."); } - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(vtkm::Id) const { this->TestTriangleTrig(); @@ -688,7 +688,7 @@ struct TryScalarVectorFieldTests template struct AllTypesTests : public vtkm::exec::FunctorBase { - VTKM_EXEC_EXPORT + VTKM_EXEC void TestMinMax() const { T low = TestValue(2, T()); @@ -710,7 +710,7 @@ struct AllTypesTests : public vtkm::exec::FunctorBase VTKM_MATH_ASSERT(test_equal(vtkm::Max(mixed2, mixed1), high), "Wrong max."); } - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(vtkm::Id) const { this->TestMinMax(); @@ -732,7 +732,7 @@ struct TryAllTypesTests template struct AbsTests : public vtkm::exec::FunctorBase { - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(vtkm::Id index) const { // std::cout << "Testing Abs." << std::endl; T positive = TestValue(index, T()); // Assuming all TestValues positive. diff --git a/vtkm/testing/UnitTestListTag.cxx b/vtkm/testing/UnitTestListTag.cxx index a593f57d7..71de2efe8 100644 --- a/vtkm/testing/UnitTestListTag.cxx +++ b/vtkm/testing/UnitTestListTag.cxx @@ -60,7 +60,7 @@ struct MutableFunctor std::vector FoundTypes; template - VTKM_CONT_EXPORT + VTKM_CONT void operator()(T) { this->FoundTypes.push_back(T::NUMBER); } @@ -75,7 +75,7 @@ struct ConstantFunctor } template - VTKM_CONT_EXPORT + VTKM_CONT void operator()(T) const { g_FoundType.push_back(T::NUMBER); } diff --git a/vtkm/testing/UnitTestNewtonsMethod.cxx b/vtkm/testing/UnitTestNewtonsMethod.cxx index 53be7c59b..0ae6f0aec 100644 --- a/vtkm/testing/UnitTestNewtonsMethod.cxx +++ b/vtkm/testing/UnitTestNewtonsMethod.cxx @@ -37,7 +37,7 @@ struct EvaluateFunctions { typedef vtkm::Vec Vector3; - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT Vector3 operator()(Vector3 x) const { Vector3 fx; @@ -53,7 +53,7 @@ struct EvaluateJacobian typedef vtkm::Vec Vector3; typedef vtkm::Matrix Matrix3x3; - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT Matrix3x3 operator()(Vector3 x) const { Matrix3x3 jacobian; jacobian(0,0) = 2*x[0]; jacobian(0,1) = 2*x[1]; jacobian(0,2) = 2*x[2]; diff --git a/vtkm/testing/UnitTestTypeListTag.cxx b/vtkm/testing/UnitTestTypeListTag.cxx index 6fd746997..506da9df4 100644 --- a/vtkm/testing/UnitTestTypeListTag.cxx +++ b/vtkm/testing/UnitTestTypeListTag.cxx @@ -75,7 +75,7 @@ struct TestFunctor TestFunctor(const TypeSet &expectedTypes) : ExpectedTypes(expectedTypes) { } template - VTKM_CONT_EXPORT + VTKM_CONT void operator()(T) { this->ExpectedTypes.Found(T()); } diff --git a/vtkm/worklet/AverageByKey.h b/vtkm/worklet/AverageByKey.h index 3c218fcf6..68e2de7bd 100644 --- a/vtkm/worklet/AverageByKey.h +++ b/vtkm/worklet/AverageByKey.h @@ -42,7 +42,7 @@ struct DivideWorklet: public vtkm::worklet::WorkletMapField typedef void ExecutionSignature(_1, _2, _3); template - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(const ValueType &v, const vtkm::Id &count, ValueType &vout) const { typedef typename VecTraits::ComponentType ComponentType; @@ -50,7 +50,7 @@ struct DivideWorklet: public vtkm::worklet::WorkletMapField } template - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(const T1&, const vtkm::Id &, T2 &) const { } }; diff --git a/vtkm/worklet/CellAverage.h b/vtkm/worklet/CellAverage.h index 01bd37801..c6b475d9e 100644 --- a/vtkm/worklet/CellAverage.h +++ b/vtkm/worklet/CellAverage.h @@ -40,7 +40,7 @@ public: typedef _2 InputDomain; template - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(const PointValueVecType &pointValues, const vtkm::IdComponent &numPoints, OutType &average) const @@ -64,7 +64,7 @@ public: private: template - VTKM_EXEC_EXPORT + VTKM_EXEC void DoAverage(const PointValueVecType &pointValues, const vtkm::IdComponent &numPoints, OutType &average, @@ -83,7 +83,7 @@ private: template - VTKM_EXEC_EXPORT + VTKM_EXEC void DoAverage(const PointValueVecType &pointValues, const vtkm::IdComponent &numPoints, OutType &average, @@ -104,7 +104,7 @@ private: typename OutType, vtkm::IdComponent InVecSize, vtkm::IdComponent OutVecSize> - VTKM_EXEC_EXPORT + VTKM_EXEC void DoAverage(const PointValueVecType &vtkmNotUsed(pointValues), const vtkm::IdComponent &vtkmNotUsed(numPoints), OutType &vtkmNotUsed(average), diff --git a/vtkm/worklet/Clip.h b/vtkm/worklet/Clip.h index 1cddc8b17..13657792b 100644 --- a/vtkm/worklet/Clip.h +++ b/vtkm/worklet/Clip.h @@ -50,14 +50,14 @@ namespace worklet { namespace internal { template -VTKM_EXEC_CONT_EXPORT +VTKM_EXEC_CONT T Scale(const T &val, vtkm::Float64 scale) { return static_cast(scale * static_cast(val)); } template -VTKM_EXEC_CONT_EXPORT +VTKM_EXEC_CONT vtkm::Vec Scale(const vtkm::Vec &val, vtkm::Float64 scale) { @@ -78,13 +78,13 @@ private: ::template ExecutionTypes::Portal IdPortal; public: - VTKM_CONT_EXPORT + VTKM_CONT ExecutionConnectivityExplicit() : Shapes(), NumIndices(), Connectivity(), IndexOffsets() { } - VTKM_CONT_EXPORT + VTKM_CONT ExecutionConnectivityExplicit(const UInt8Portal &shapes, const IdComponentPortal &numIndices, const IdPortal &connectivity, @@ -96,25 +96,25 @@ public: { } - VTKM_EXEC_EXPORT + VTKM_EXEC void SetCellShape(vtkm::Id cellIndex, vtkm::UInt8 shape) { this->Shapes.Set(cellIndex, shape); } - VTKM_EXEC_EXPORT + VTKM_EXEC void SetNumberOfIndices(vtkm::Id cellIndex, vtkm::IdComponent numIndices) { this->NumIndices.Set(cellIndex, numIndices); } - VTKM_EXEC_EXPORT + VTKM_EXEC void SetIndexOffset(vtkm::Id cellIndex, vtkm::Id indexOffset) { this->IndexOffsets.Set(cellIndex, indexOffset); } - VTKM_EXEC_EXPORT + VTKM_EXEC void SetConnectivity(vtkm::Id connectivityIndex, vtkm::Id pointIndex) { this->Connectivity.Set(connectivityIndex, pointIndex); @@ -139,7 +139,7 @@ struct ClipStats struct SumOp { - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT ClipStats operator()(const ClipStats &cs1, const ClipStats &cs2) const { ClipStats sum = cs1; @@ -158,7 +158,7 @@ struct EdgeInterpolation struct LessThanOp { - VTKM_EXEC_EXPORT + VTKM_EXEC bool operator()(const EdgeInterpolation &v1, const EdgeInterpolation &v2) const { return (v1.Vertex1 < v2.Vertex1) || @@ -168,7 +168,7 @@ struct EdgeInterpolation struct EqualToOp { - VTKM_EXEC_EXPORT + VTKM_EXEC bool operator()(const EdgeInterpolation &v1, const EdgeInterpolation &v2) const { return v1.Vertex1 == v2.Vertex1 && v1.Vertex2 == v2.Vertex2; @@ -177,7 +177,7 @@ struct EdgeInterpolation }; -VTKM_EXEC_CONT_EXPORT +VTKM_EXEC_CONT std::ostream& operator<<(std::ostream &out, const ClipStats &val) { return out << std::endl << "{ Cells: " << val.NumberOfCells @@ -185,7 +185,7 @@ std::ostream& operator<<(std::ostream &out, const ClipStats &val) << ", NewPoints: " << val.NumberOfNewPoints << " }"; } -VTKM_EXEC_CONT_EXPORT +VTKM_EXEC_CONT std::ostream& operator<<(std::ostream &out, const EdgeInterpolation &val) { return out << std::endl << "{ Vertex1: " << val.Vertex1 @@ -209,14 +209,14 @@ public: FieldOutCell stats); typedef void ExecutionSignature(_2, CellShape, PointCount, _3, _4); - VTKM_CONT_EXPORT + VTKM_CONT ComputeStats(vtkm::Float64 value, const ClipTablesPortal &clipTables) : Value(value), ClipTables(clipTables) { } template - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(const ScalarsVecType &scalars, CellShapeTag shape, vtkm::Id count, @@ -276,7 +276,7 @@ public: WholeArrayInOut< IdType > newPointsConnectivityReverseMap); typedef void ExecutionSignature(CellShape, _2, FromIndices, _3, _4, _5, _6, _7); - VTKM_CONT_EXPORT + VTKM_CONT GenerateCellSet(vtkm::Float64 value, const ClipTablesPortal clipTables) : Value(value), ClipTables(clipTables) { @@ -287,7 +287,7 @@ public: typename IndicesVecType, typename InterpolationWholeArrayType, typename ReverseMapWholeArrayType> - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()( CellShapeTag shape, const ScalarsVecType &scalars, @@ -349,7 +349,7 @@ public: } template - VTKM_EXEC_EXPORT + VTKM_EXEC void swap(T &v1, T &v2) const { T temp = v1; @@ -379,7 +379,7 @@ public: EdgeInterpolationPortalConst; public: - VTKM_CONT_EXPORT + VTKM_CONT AmendConnectivity(EdgeInterpolationPortalConst newPoints, EdgeInterpolationPortalConst uniqueNewPoints, IdPortalConst newPointsConnectivityReverseMap, @@ -393,7 +393,7 @@ public: { } - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(vtkm::Id idx) const { EdgeInterpolation current = this->NewPoints.Get(idx); @@ -524,14 +524,14 @@ public: class ClipWithImplicitFunction { public: - VTKM_CONT_EXPORT + VTKM_CONT ClipWithImplicitFunction(Clip *clipper, const vtkm::cont::DynamicCellSet &cellSet, ImplicitFunction function, vtkm::cont::CellSetExplicit<> *result) : Clipper(clipper), CellSet(&cellSet), Function(function), Result(result) { } template - VTKM_CONT_EXPORT + VTKM_CONT void operator()(const ArrayHandleType &handle) const { vtkm::cont::ArrayHandleTransform< @@ -586,7 +586,7 @@ public: ::template ExecutionTypes::PortalConst EdgeInterpolationPortalConst; - VTKM_CONT_EXPORT + VTKM_CONT Kernel(EdgeInterpolationPortalConst interpolation, vtkm::Id newPointsOffset, FieldPortal field) @@ -594,7 +594,7 @@ public: { } - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(vtkm::Id idx) const { EdgeInterpolation ei = this->Interpolation.Get(idx); @@ -610,7 +610,7 @@ public: FieldPortal Field; }; - VTKM_CONT_EXPORT + VTKM_CONT InterpolateField( vtkm::cont::ArrayHandle interpolationArray, vtkm::Id newPointsOffset, @@ -622,7 +622,7 @@ public: } template - VTKM_CONT_EXPORT + VTKM_CONT void operator()(const vtkm::cont::ArrayHandle &field) const { typedef vtkm::cont::DeviceAdapterAlgorithm Algorithm; diff --git a/vtkm/worklet/DispatcherMapField.h b/vtkm/worklet/DispatcherMapField.h index e1f5253a1..54ebe2345 100644 --- a/vtkm/worklet/DispatcherMapField.h +++ b/vtkm/worklet/DispatcherMapField.h @@ -43,12 +43,12 @@ class DispatcherMapField : vtkm::worklet::WorkletMapField> Superclass; public: - VTKM_CONT_EXPORT + VTKM_CONT DispatcherMapField(const WorkletType &worklet = WorkletType()) : Superclass(worklet) { } template - VTKM_CONT_EXPORT + VTKM_CONT void DoInvoke(const Invocation &invocation) const { // This is the type for the input domain diff --git a/vtkm/worklet/DispatcherMapTopology.h b/vtkm/worklet/DispatcherMapTopology.h index f5fe818b8..065b32e1a 100644 --- a/vtkm/worklet/DispatcherMapTopology.h +++ b/vtkm/worklet/DispatcherMapTopology.h @@ -46,12 +46,12 @@ class DispatcherMapTopology : > Superclass; public: - VTKM_CONT_EXPORT + VTKM_CONT DispatcherMapTopology(const WorkletType &worklet = WorkletType()) : Superclass(worklet) { } template - VTKM_CONT_EXPORT + VTKM_CONT void DoInvoke(const Invocation &invocation) const { // This is the type for the input domain diff --git a/vtkm/worklet/DispatcherStreamingMapField.h b/vtkm/worklet/DispatcherStreamingMapField.h index bd7f13cd1..327b98e29 100644 --- a/vtkm/worklet/DispatcherStreamingMapField.h +++ b/vtkm/worklet/DispatcherStreamingMapField.h @@ -38,7 +38,7 @@ struct DispatcherStreamingMapFieldTransformFunctor vtkm::Id CurBlockSize; vtkm::Id FullSize; - VTKM_CONT_EXPORT + VTKM_CONT DispatcherStreamingMapFieldTransformFunctor( vtkm::Id blockIndex, vtkm::Id blockSize, vtkm::Id curBlockSize, vtkm::Id fullSize) : BlockIndex(blockIndex), BlockSize(blockSize), @@ -71,7 +71,7 @@ struct DispatcherStreamingMapFieldTransformFunctor template struct TransformImpl { - VTKM_CONT_EXPORT + VTKM_CONT vtkm::cont::ArrayHandleStreaming operator()(const ArrayHandleType &array, vtkm::Id blockIndex, vtkm::Id blockSize, vtkm::Id curBlockSize, vtkm::Id fullSize) const @@ -87,7 +87,7 @@ struct DispatcherStreamingMapFieldTransformFunctor template struct TransformImpl { - VTKM_CONT_EXPORT + VTKM_CONT NotArrayHandleType operator()(const NotArrayHandleType ¬Array) const { return notArray; @@ -95,7 +95,7 @@ struct DispatcherStreamingMapFieldTransformFunctor }; template - VTKM_CONT_EXPORT + VTKM_CONT typename ReturnType::type operator()(const ParameterType &invokeData, vtkm::internal::IndexTag) const @@ -110,7 +110,7 @@ struct DispatcherStreamingMapFieldTransformFunctor template struct DispatcherStreamingMapFieldTransferFunctor { - VTKM_CONT_EXPORT + VTKM_CONT DispatcherStreamingMapFieldTransferFunctor() { } template @@ -124,7 +124,7 @@ struct DispatcherStreamingMapFieldTransferFunctor template struct TransformImpl { - VTKM_CONT_EXPORT + VTKM_CONT ArrayHandleType operator()(const ArrayHandleType &array) const { @@ -136,7 +136,7 @@ struct DispatcherStreamingMapFieldTransferFunctor template struct TransformImpl { - VTKM_CONT_EXPORT + VTKM_CONT NotArrayHandleType operator()(const NotArrayHandleType ¬Array) const { return notArray; @@ -144,7 +144,7 @@ struct DispatcherStreamingMapFieldTransferFunctor }; template - VTKM_CONT_EXPORT + VTKM_CONT typename ReturnType::type operator()(const ParameterType &invokeData, vtkm::internal::IndexTag) const @@ -173,18 +173,18 @@ class DispatcherStreamingMapField : vtkm::worklet::WorkletMapField> Superclass; public: - VTKM_CONT_EXPORT + VTKM_CONT DispatcherStreamingMapField(const WorkletType &worklet = WorkletType()) : Superclass(worklet), NumberOfBlocks(1) { } - VTKM_CONT_EXPORT + VTKM_CONT void SetNumberOfBlocks(vtkm::Id numberOfBlocks) { NumberOfBlocks = numberOfBlocks; } template - VTKM_CONT_EXPORT + VTKM_CONT void BasicInvoke(const Invocation &invocation, vtkm::Id numInstances, vtkm::Id globalIndexOffset, @@ -199,7 +199,7 @@ public: } template - VTKM_CONT_EXPORT + VTKM_CONT void DoInvoke(const Invocation &invocation) const { // This is the type for the input domain @@ -254,7 +254,7 @@ public: private: template - VTKM_CONT_EXPORT + VTKM_CONT void InvokeTransportParameters(const Invocation &invocation, const InputRangeType& inputRange, const InputRangeType& globalIndexOffset, @@ -291,7 +291,7 @@ private: } template - VTKM_CONT_EXPORT + VTKM_CONT void InvokeSchedule(const Invocation &invocation, RangeType range, RangeType globalIndexOffset, diff --git a/vtkm/worklet/ExternalFaces.h b/vtkm/worklet/ExternalFaces.h index 55cc9025f..6c0584707 100644 --- a/vtkm/worklet/ExternalFaces.h +++ b/vtkm/worklet/ExternalFaces.h @@ -53,7 +53,7 @@ struct ExternalFaces struct IsUnity { template - VTKM_EXEC_CONT_EXPORT bool operator()(const T &x) const + VTKM_EXEC_CONT bool operator()(const T &x) const { return x == T(1); } @@ -69,17 +69,17 @@ struct ExternalFaces public: - VTKM_CONT_EXPORT + VTKM_CONT GetConnIndex() {}; - VTKM_CONT_EXPORT + VTKM_CONT GetConnIndex(const vtkm::Id &f, const vtkm::Id &p) : FacesPerCell(f), PointsPerCell(p) {}; - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::Id operator()(vtkm::Id index) const { vtkm::Id divisor = FacesPerCell*PointsPerCell; @@ -94,7 +94,7 @@ struct ExternalFaces struct Id3LessThan { template - VTKM_EXEC_CONT_EXPORT bool operator()(const vtkm::Vec &a, + VTKM_EXEC_CONT bool operator()(const vtkm::Vec &a, const vtkm::Vec &b) const { bool isLessThan = false; @@ -131,11 +131,11 @@ struct ExternalFaces typedef void ControlSignature(FieldIn<>, FieldIn<>, FieldOut<>); typedef _3 ExecutionSignature(_1, _2); - VTKM_CONT_EXPORT + VTKM_CONT SubtractAndModulus(const vtkm::Id &c) : Modulus(c) { }; template - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT T operator()(const T &a, const T &b) const { return (a - b) % Modulus; @@ -151,7 +151,7 @@ struct ExternalFaces typedef _1 InputDomain; template - VTKM_EXEC_EXPORT + VTKM_EXEC T operator()(const T &cellType) const { if (cellType == vtkm::CELL_SHAPE_TETRA) return 4; @@ -174,14 +174,14 @@ struct ExternalFaces typedef void ExecutionSignature(_1, _3, CellShape, FromIndices); typedef _2 InputDomain; - VTKM_CONT_EXPORT + VTKM_CONT GetFace() { } template - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(const T &cellFaceId, FaceValueVecType &faceVertices, CellShapeTag shape, diff --git a/vtkm/worklet/FieldHistogram.h b/vtkm/worklet/FieldHistogram.h index 0aba34f34..272355d75 100644 --- a/vtkm/worklet/FieldHistogram.h +++ b/vtkm/worklet/FieldHistogram.h @@ -69,7 +69,7 @@ public: struct minFunctor { template< typename FieldType> - VTKM_EXEC_EXPORT + VTKM_EXEC FieldType operator()(const FieldType &x, const FieldType &y) const { return vtkm::Min(x, y); } @@ -78,7 +78,7 @@ public: struct maxFunctor { template< typename FieldType> - VTKM_EXEC_EXPORT + VTKM_EXEC FieldType operator()(const FieldType& x, const FieldType& y) const { return vtkm::Max(x, y); } @@ -98,7 +98,7 @@ public: FieldType minValue; FieldType delta; - VTKM_CONT_EXPORT + VTKM_CONT SetHistogramBin( vtkm::Id numberOfBins0, FieldType minValue0, @@ -107,7 +107,7 @@ public: minValue(minValue0), delta(delta0) {} - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(const FieldType &value, vtkm::Id &binIndex) const { binIndex = static_cast((value - minValue) / delta); @@ -130,11 +130,11 @@ public: typedef vtkm::cont::ArrayHandle::ExecutionTypes::PortalConst IdPortalType; IdPortalType totalCountArray; - VTKM_CONT_EXPORT + VTKM_CONT AdjacentDifference(IdPortalType totalCount) : totalCountArray(totalCount) { } - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(const vtkm::Id &index, vtkm::Id & difference) const { if (index == 0) diff --git a/vtkm/worklet/FieldStatistics.h b/vtkm/worklet/FieldStatistics.h index 213f94f32..77a8fa4d7 100644 --- a/vtkm/worklet/FieldStatistics.h +++ b/vtkm/worklet/FieldStatistics.h @@ -69,7 +69,7 @@ public: struct minFunctor { - VTKM_EXEC_EXPORT + VTKM_EXEC FieldType operator()(const FieldType &x, const FieldType &y) const { return Min(x, y); } @@ -77,7 +77,7 @@ public: struct maxFunctor { - VTKM_EXEC_EXPORT + VTKM_EXEC FieldType operator()(const FieldType& x, const FieldType& y) const { return Max(x, y); } @@ -96,10 +96,10 @@ public: vtkm::Id numPowers; - VTKM_CONT_EXPORT + VTKM_CONT CalculatePowers(vtkm::Id num) : numPowers(num) {} - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(const FieldType& value, FieldType &pow1, FieldType &pow2, @@ -123,10 +123,10 @@ public: FieldType constant; - VTKM_CONT_EXPORT + VTKM_CONT SubtractConst(const FieldType& constant0) : constant(constant0) {} - VTKM_EXEC_EXPORT + VTKM_EXEC FieldType operator()(const FieldType& value) const { return(value - constant); diff --git a/vtkm/worklet/Gradient.h b/vtkm/worklet/Gradient.h index b0fa0681b..e1b4a2fc2 100644 --- a/vtkm/worklet/Gradient.h +++ b/vtkm/worklet/Gradient.h @@ -56,7 +56,7 @@ struct CellGradient : vtkm::worklet::WorkletMapPointToCell template - VTKM_EXEC_EXPORT void operator()(CellTagType shape, + VTKM_EXEC void operator()(CellTagType shape, vtkm::IdComponent pointCount, const PointCoordVecType& pointCoordinates, const FieldInVecType& inputField, FieldOutType& outputField) const { @@ -83,7 +83,7 @@ struct CellGradient : vtkm::worklet::WorkletMapPointToCell template - VTKM_EXEC_EXPORT void Compute(CellShapeTag shape, + VTKM_EXEC void Compute(CellShapeTag shape, vtkm::IdComponent pointCount, const PointCoordVecType& wCoords, const FieldInVecType& field, FieldOutType& outputField, std::true_type) const @@ -97,7 +97,7 @@ struct CellGradient : vtkm::worklet::WorkletMapPointToCell typename PointCoordVecType, typename FieldInVecType, typename FieldOutType> - VTKM_EXEC_EXPORT void Compute(CellShapeTag, + VTKM_EXEC void Compute(CellShapeTag, vtkm::IdComponent, const PointCoordVecType&, const FieldInVecType&, @@ -125,4 +125,4 @@ struct CellGradient : vtkm::worklet::WorkletMapPointToCell } } // namespace vtkm::worklet -#endif \ No newline at end of file +#endif diff --git a/vtkm/worklet/KernelSplatter.h b/vtkm/worklet/KernelSplatter.h index abf3dfffe..4ef544542 100644 --- a/vtkm/worklet/KernelSplatter.h +++ b/vtkm/worklet/KernelSplatter.h @@ -161,11 +161,11 @@ struct KernelSplatterFilterUniformGrid typedef void ControlSignature(FieldIn<>, FieldOut<>); typedef void ExecutionSignature(_1, WorkIndex, _2); // - VTKM_CONT_EXPORT + VTKM_CONT zero_voxel() {} template - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT void operator()(const vtkm::Id &, const vtkm::Id &vtkmNotUsed(index), T &voxel_value) const { voxel_value = T(0); @@ -191,7 +191,7 @@ struct KernelSplatterFilterUniformGrid FieldOut<>, FieldOut<>, FieldOut<>, FieldOut<>); typedef void ExecutionSignature(_1, _2, _3, _4, _5, _6, _7, _8); - VTKM_CONT_EXPORT + VTKM_CONT GetFootprint( const vtkm::Vec &o, const vtkm::Vec &s, @@ -201,7 +201,7 @@ struct KernelSplatterFilterUniformGrid VolumeDimensions(dim), kernel_(kernel) { } template - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT void operator()( const T &x, const T &y, @@ -247,11 +247,11 @@ struct KernelSplatterFilterUniformGrid typedef void ControlSignature(FieldIn<>, FieldIn<>, FieldOut<>); typedef void ExecutionSignature(_1, _2, WorkIndex, _3); - VTKM_CONT_EXPORT + VTKM_CONT ComputeLocalNeighborId() {} template - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT void operator()(const T &modulus, const T &offset, const vtkm::Id &index, T &localId) const { @@ -281,7 +281,7 @@ struct KernelSplatterFilterUniformGrid FieldOut<>); typedef void ExecutionSignature(_1, _2, _3, _4, _5, _6, _7, _8); - VTKM_CONT_EXPORT + VTKM_CONT GetSplatValue( const vtkm::Vec &orig, const vtkm::Vec &s, @@ -290,7 +290,7 @@ struct KernelSplatterFilterUniformGrid : spacing_(s), origin_(orig), VolumeDim(dim), kernel(k) {} template - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT void operator()( const vtkm::Vec &splatPoint, const T &minBound, @@ -338,10 +338,10 @@ struct KernelSplatterFilterUniformGrid typedef void ControlSignature(FieldIn<>, FieldIn<>, ExecObject); typedef void ExecutionSignature(_1, _2, _3); - VTKM_CONT_EXPORT + VTKM_CONT UpdateVoxelSplats() {} - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT void operator()(const vtkm::Id &voxelIndex, const vtkm::Float64 &splatValue, vtkm::exec::ExecutionWholeArray &execArg) const diff --git a/vtkm/worklet/Magnitude.h b/vtkm/worklet/Magnitude.h index 5fd56de2a..c64751f1b 100644 --- a/vtkm/worklet/Magnitude.h +++ b/vtkm/worklet/Magnitude.h @@ -34,7 +34,7 @@ public: typedef void ExecutionSignature(_1, _2); template - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(const vtkm::Vec &inValue, T &outValue) const { diff --git a/vtkm/worklet/MarchingCubes.h b/vtkm/worklet/MarchingCubes.h index 58cdd69cc..630a8986f 100644 --- a/vtkm/worklet/MarchingCubes.h +++ b/vtkm/worklet/MarchingCubes.h @@ -69,7 +69,7 @@ make_ScalarField(const vtkm::cont::ArrayHandle& ah) // ----------------------------------------------------------------------------- template -VTKM_EXEC_EXPORT +VTKM_EXEC int GetHexahedronClassification(const T& values, const U isoValue) { return ((values[0] > isoValue) | @@ -99,7 +99,7 @@ public: T Isovalue; - VTKM_CONT_EXPORT + VTKM_CONT ClassifyCell(T isovalue) : Isovalue(isovalue) { @@ -107,7 +107,7 @@ public: template - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(const FieldInType &fieldIn, vtkm::IdComponent &numTriangles, const NumTrianglesTablePortalType &numTrianglesTable) const @@ -150,7 +150,7 @@ class EdgeWeightGenerateMetaData }; public: - VTKM_CONT_EXPORT + VTKM_CONT EdgeWeightGenerateMetaData( vtkm::Id size, vtkm::cont::ArrayHandle< vtkm::Vec, NormalStorageType >& normals, @@ -205,7 +205,7 @@ public: typedef _1 InputDomain; - VTKM_CONT_EXPORT + VTKM_CONT EdgeWeightGenerate(vtkm::Float64 isovalue, bool genNormals, const EdgeWeightGenerateMetaData& meta) : @@ -218,7 +218,7 @@ public: template - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()( vtkm::CellShapeTagGeneric shape, const FieldInType & fieldIn, // Input point field defining the contour @@ -239,7 +239,7 @@ public: template - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()( CellShapeTagQuad vtkmNotUsed(shape), const FieldInType & vtkmNotUsed(fieldIn), // Input point field defining the contour @@ -253,7 +253,7 @@ public: template - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()( vtkm::CellShapeTagHexahedron shape, const FieldInType &fieldIn, // Input point field defining the contour @@ -315,7 +315,7 @@ public: } } - VTKM_CONT_EXPORT + VTKM_CONT ScatterType GetScatter() const { return this->MetaData.Scatter; @@ -340,11 +340,11 @@ public: typedef void ExecutionSignature(_1, _2, _3, _4); typedef _1 InputDomain; - VTKM_CONT_EXPORT + VTKM_CONT ApplyToField() {} template - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(const vtkm::Id2& low_high, const WeightType &weight, const InFieldPortalType& inPortal, @@ -361,7 +361,7 @@ public: struct FirstValueSame { template - VTKM_EXEC_CONT_EXPORT bool operator()(const vtkm::Pair& a, + VTKM_EXEC_CONT bool operator()(const vtkm::Pair& a, const vtkm::Pair& b) const { return (a.first == b.first); diff --git a/vtkm/worklet/PointElevation.h b/vtkm/worklet/PointElevation.h index 4afbfc74b..96da67258 100644 --- a/vtkm/worklet/PointElevation.h +++ b/vtkm/worklet/PointElevation.h @@ -31,7 +31,7 @@ namespace worklet { namespace internal { template -VTKM_EXEC_EXPORT +VTKM_EXEC T clamp(const T& val, const T& min, const T& max) { return vtkm::Min(max, vtkm::Max(min, val)); @@ -45,30 +45,30 @@ public: typedef void ControlSignature(FieldIn, FieldOut); typedef _2 ExecutionSignature(_1); - VTKM_CONT_EXPORT + VTKM_CONT PointElevation() : LowPoint(0.0, 0.0, 0.0), HighPoint(0.0, 0.0, 1.0), RangeLow(0.0), RangeHigh(1.0) {} - VTKM_CONT_EXPORT + VTKM_CONT void SetLowPoint(const vtkm::Vec &point) { this->LowPoint = point; } - VTKM_CONT_EXPORT + VTKM_CONT void SetHighPoint(const vtkm::Vec &point) { this->HighPoint = point; } - VTKM_CONT_EXPORT + VTKM_CONT void SetRange(vtkm::Float64 low, vtkm::Float64 high) { this->RangeLow = low; this->RangeHigh = high; } - VTKM_EXEC_EXPORT + VTKM_EXEC vtkm::Float64 operator()(const vtkm::Vec &vec) const { vtkm::Vec direction = this->HighPoint - this->LowPoint; @@ -80,7 +80,7 @@ public: } template - VTKM_EXEC_EXPORT + VTKM_EXEC vtkm::Float64 operator()(const vtkm::Vec &vec) const { return (*this)(vtkm::make_Vec(static_cast(vec[0]), diff --git a/vtkm/worklet/ScatterCounting.h b/vtkm/worklet/ScatterCounting.h index b5b2df5d8..70357637f 100644 --- a/vtkm/worklet/ScatterCounting.h +++ b/vtkm/worklet/ScatterCounting.h @@ -55,7 +55,7 @@ struct ReverseInputToOutputMapKernel : vtkm::exec::FunctorBase VisitType Visit; vtkm::Id OutputSize; - VTKM_CONT_EXPORT + VTKM_CONT ReverseInputToOutputMapKernel(const InputMapType &inputToOutputMap, const OutputMapType &outputToInputMap, const VisitType &visit, @@ -66,7 +66,7 @@ struct ReverseInputToOutputMapKernel : vtkm::exec::FunctorBase OutputSize(outputSize) { } - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(vtkm::Id inputIndex) const { vtkm::Id outputStartIndex; @@ -105,13 +105,13 @@ struct SubtractToVisitIndexKernel : vtkm::exec::FunctorBase StartsOfGroupsType StartsOfGroups; VisitType Visit; - VTKM_CONT_EXPORT + VTKM_CONT SubtractToVisitIndexKernel(const StartsOfGroupsType &startsOfGroups, const VisitType &visit) : StartsOfGroups(startsOfGroups), Visit(visit) { } - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(vtkm::Id inputIndex) const { vtkm::Id startOfGroup = this->StartsOfGroups.Get(inputIndex); @@ -138,7 +138,7 @@ struct SubtractToVisitIndexKernel : vtkm::exec::FunctorBase struct ScatterCounting { template - VTKM_CONT_EXPORT + VTKM_CONT ScatterCounting(const CountArrayType &countArray, Device) { this->BuildArrays(countArray, Device()); @@ -146,7 +146,7 @@ struct ScatterCounting typedef vtkm::cont::ArrayHandle OutputToInputMapType; template - VTKM_CONT_EXPORT + VTKM_CONT OutputToInputMapType GetOutputToInputMap(RangeType) const { return this->OutputToInputMap; @@ -154,13 +154,13 @@ struct ScatterCounting typedef vtkm::cont::ArrayHandle VisitArrayType; template - VTKM_CONT_EXPORT + VTKM_CONT VisitArrayType GetVisitArray(RangeType) const { return this->VisitArray; } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Id GetOutputRange(vtkm::Id inputRange) const { if (inputRange != this->InputRange) @@ -174,7 +174,7 @@ struct ScatterCounting } return this->VisitArray.GetNumberOfValues(); } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Id GetOutputRange(vtkm::Id3 inputRange) const { return this->GetOutputRange(inputRange[0]*inputRange[1]*inputRange[2]); @@ -186,7 +186,7 @@ private: VisitArrayType VisitArray; template - VTKM_CONT_EXPORT + VTKM_CONT void BuildArrays(const CountArrayType &count, Device) { VTKM_IS_ARRAY_HANDLE(CountArrayType); @@ -231,7 +231,7 @@ private: } template - VTKM_CONT_EXPORT + VTKM_CONT void BuildOutputToInputMapWithFind( vtkm::Id outputSize, vtkm::cont::ArrayHandle inputToOutputMap, @@ -257,7 +257,7 @@ private: } template - VTKM_CONT_EXPORT + VTKM_CONT void BuildOutputToInputMapWithIterate( vtkm::Id outputSize, vtkm::cont::ArrayHandle inputToOutputMap, diff --git a/vtkm/worklet/ScatterIdentity.h b/vtkm/worklet/ScatterIdentity.h index e103c85f4..2d37dcbf5 100644 --- a/vtkm/worklet/ScatterIdentity.h +++ b/vtkm/worklet/ScatterIdentity.h @@ -39,12 +39,12 @@ namespace worklet { struct ScatterIdentity { typedef vtkm::cont::ArrayHandleIndex OutputToInputMapType; - VTKM_CONT_EXPORT + VTKM_CONT OutputToInputMapType GetOutputToInputMap(vtkm::Id inputRange) const { return OutputToInputMapType(inputRange); } - VTKM_CONT_EXPORT + VTKM_CONT OutputToInputMapType GetOutputToInputMap(vtkm::Id3 inputRange) const { return this->GetOutputToInputMap( @@ -52,19 +52,19 @@ struct ScatterIdentity } typedef vtkm::cont::ArrayHandleConstant VisitArrayType; - VTKM_CONT_EXPORT + VTKM_CONT VisitArrayType GetVisitArray(vtkm::Id inputRange) const { return VisitArrayType(1, inputRange); } - VTKM_CONT_EXPORT + VTKM_CONT VisitArrayType GetVisitArray(vtkm::Id3 inputRange) const { return this->GetVisitArray(inputRange[0]*inputRange[1]*inputRange[2]); } template - VTKM_CONT_EXPORT + VTKM_CONT RangeType GetOutputRange(RangeType inputRange) const { return inputRange; diff --git a/vtkm/worklet/ScatterUniform.h b/vtkm/worklet/ScatterUniform.h index eda0e469d..57a3b76b0 100644 --- a/vtkm/worklet/ScatterUniform.h +++ b/vtkm/worklet/ScatterUniform.h @@ -35,12 +35,12 @@ struct FunctorModulus { vtkm::IdComponent Modulus; - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT FunctorModulus(vtkm::IdComponent modulus = 1) : Modulus(modulus) { } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::IdComponent operator()(vtkm::Id index) const { return static_cast(index % this->Modulus); @@ -51,12 +51,12 @@ struct FunctorDiv { vtkm::Id Divisor; - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT FunctorDiv(vtkm::Id divisor = 1) : Divisor(divisor) { } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::Id operator()(vtkm::Id index) const { return index / this->Divisor; @@ -75,17 +75,17 @@ struct FunctorDiv /// struct ScatterUniform { - VTKM_CONT_EXPORT + VTKM_CONT ScatterUniform(vtkm::IdComponent numOutputsPerInput) : NumOutputsPerInput(numOutputsPerInput) { } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Id GetOutputRange(vtkm::Id inputRange) const { return inputRange * this->NumOutputsPerInput; } - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Id GetOutputRange(vtkm::Id3 inputRange) const { return this->GetOutputRange(inputRange[0]*inputRange[1]*inputRange[2]); @@ -94,7 +94,7 @@ struct ScatterUniform typedef vtkm::cont::ArrayHandleImplicit OutputToInputMapType; template - VTKM_CONT_EXPORT + VTKM_CONT OutputToInputMapType GetOutputToInputMap(RangeType inputRange) const { return OutputToInputMapType(detail::FunctorDiv(this->NumOutputsPerInput), @@ -104,7 +104,7 @@ struct ScatterUniform typedef vtkm::cont::ArrayHandleImplicit VisitArrayType; template - VTKM_CONT_EXPORT + VTKM_CONT VisitArrayType GetVisitArray(RangeType inputRange) const { return VisitArrayType(detail::FunctorModulus(this->NumOutputsPerInput), diff --git a/vtkm/worklet/StreamLineUniformGrid.h b/vtkm/worklet/StreamLineUniformGrid.h index d1dddbffb..d527b7e81 100644 --- a/vtkm/worklet/StreamLineUniformGrid.h +++ b/vtkm/worklet/StreamLineUniformGrid.h @@ -53,7 +53,7 @@ namespace internal { // Trilinear interpolation to calculate vector data at position template - VTKM_EXEC_EXPORT + VTKM_EXEC vtkm::Vec VecDataAtPos( vtkm::Vec pos, const vtkm::Id3 &vdims, @@ -143,7 +143,7 @@ public: struct IsUnity { template - VTKM_EXEC_CONT_EXPORT bool operator()(const T &x) const + VTKM_EXEC_CONT bool operator()(const T &x) const { return x == T(1); } @@ -164,7 +164,7 @@ public: typedef _1 InputDomain; typedef vtkm::worklet::ScatterUniform ScatterType; - VTKM_CONT_EXPORT + VTKM_CONT ScatterType GetScatter() const { return ScatterType(2); @@ -178,7 +178,7 @@ public: const vtkm::Id rowsize; const vtkm::Id streammode; - VTKM_CONT_EXPORT + VTKM_CONT MakeStreamLines(const FieldType tStep, const vtkm::Id sMode, const vtkm::Id nSteps, @@ -194,7 +194,7 @@ public: { } - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(vtkm::Id &seedId, vtkm::Vec &seedPos, vtkm::exec::ExecutionWholeArray &numIndices, diff --git a/vtkm/worklet/TetrahedralizeExplicitGrid.h b/vtkm/worklet/TetrahedralizeExplicitGrid.h index 3630b171d..a75b05336 100644 --- a/vtkm/worklet/TetrahedralizeExplicitGrid.h +++ b/vtkm/worklet/TetrahedralizeExplicitGrid.h @@ -58,10 +58,10 @@ public: typedef _3 ExecutionSignature(_1, _2); typedef _1 InputDomain; - VTKM_CONT_EXPORT + VTKM_CONT TetrahedraPerCell() {} - VTKM_EXEC_EXPORT + VTKM_EXEC vtkm::IdComponent operator()( vtkm::UInt8 shape, const vtkm::worklet::internal::TetrahedralizeTablesExecutionObject &tables) const @@ -84,14 +84,14 @@ public: typedef _1 InputDomain; typedef vtkm::worklet::ScatterCounting ScatterType; - VTKM_CONT_EXPORT + VTKM_CONT ScatterType GetScatter() const { return this->Scatter; } template - VTKM_CONT_EXPORT + VTKM_CONT TetrahedralizeCell(const CellArrayType &cellArray) : Scatter(cellArray, DeviceAdapter()) { } @@ -100,7 +100,7 @@ public: template - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(CellShapeTag shape, const ConnectivityInVec &connectivityIn, const vtkm::worklet::internal::TetrahedralizeTablesExecutionObject &tables, diff --git a/vtkm/worklet/TetrahedralizeUniformGrid.h b/vtkm/worklet/TetrahedralizeUniformGrid.h index 20f971625..c898f4902 100644 --- a/vtkm/worklet/TetrahedralizeUniformGrid.h +++ b/vtkm/worklet/TetrahedralizeUniformGrid.h @@ -40,7 +40,7 @@ namespace worklet { namespace detail { -VTKM_EXEC_CONSTANT_EXPORT +VTKM_EXEC_CONSTANT const static vtkm::IdComponent StructuredTetrahedronIndices[2][5][4] = { { { 0, 1, 3, 4 }, @@ -79,13 +79,13 @@ public: typedef _1 InputDomain; typedef vtkm::worklet::ScatterUniform ScatterType; - VTKM_CONT_EXPORT + VTKM_CONT ScatterType GetScatter() const { return ScatterType(5); } - VTKM_CONT_EXPORT + VTKM_CONT TetrahedralizeCell() { } @@ -93,7 +93,7 @@ public: template - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(const ConnectivityInVec &connectivityIn, ConnectivityOutVec &connectivityOut, const ThreadIndicesType threadIndices) const diff --git a/vtkm/worklet/Threshold.h b/vtkm/worklet/Threshold.h index 3fa6bfe82..8e30e132c 100644 --- a/vtkm/worklet/Threshold.h +++ b/vtkm/worklet/Threshold.h @@ -48,16 +48,16 @@ public: typedef _3 ExecutionSignature(_2, PointCount); - VTKM_CONT_EXPORT + VTKM_CONT ThresholdByPointField() : Predicate() { } - VTKM_CONT_EXPORT + VTKM_CONT explicit ThresholdByPointField(const UnaryPredicate &predicate) : Predicate(predicate) { } template - VTKM_EXEC_EXPORT + VTKM_EXEC bool operator()(const ScalarsVecType &scalars, vtkm::Id count) const { bool pass = false; @@ -82,16 +82,16 @@ public: typedef _3 ExecutionSignature(_2); - VTKM_CONT_EXPORT + VTKM_CONT ThresholdByCellField() : Predicate() { } - VTKM_CONT_EXPORT + VTKM_CONT explicit ThresholdByCellField(const UnaryPredicate &predicate) : Predicate(predicate) { } template - VTKM_EXEC_EXPORT + VTKM_EXEC bool operator()(const ScalarType &scalar) const { return this->Predicate(scalar); diff --git a/vtkm/worklet/TriangulateExplicitGrid.h b/vtkm/worklet/TriangulateExplicitGrid.h index e189c5d3b..4ce9d8b1f 100644 --- a/vtkm/worklet/TriangulateExplicitGrid.h +++ b/vtkm/worklet/TriangulateExplicitGrid.h @@ -59,10 +59,10 @@ public: typedef _4 ExecutionSignature(_1,_2,_3); typedef _1 InputDomain; - VTKM_CONT_EXPORT + VTKM_CONT TrianglesPerCell() {} - VTKM_EXEC_EXPORT + VTKM_EXEC vtkm::IdComponent operator()( vtkm::UInt8 shape, vtkm::IdComponent numPoints, @@ -86,14 +86,14 @@ public: typedef _1 InputDomain; typedef vtkm::worklet::ScatterCounting ScatterType; - VTKM_CONT_EXPORT + VTKM_CONT ScatterType GetScatter() const { return this->Scatter; } template - VTKM_CONT_EXPORT + VTKM_CONT TriangulateCell(const CountArrayType &countArray) : Scatter(countArray, DeviceAdapter()) { } @@ -102,7 +102,7 @@ public: template - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()( CellShapeTag shape, const ConnectivityInVec &connectivityIn, diff --git a/vtkm/worklet/TriangulateUniformGrid.h b/vtkm/worklet/TriangulateUniformGrid.h index 111f8a590..cb696a5de 100644 --- a/vtkm/worklet/TriangulateUniformGrid.h +++ b/vtkm/worklet/TriangulateUniformGrid.h @@ -40,7 +40,7 @@ namespace worklet { namespace detail { -VTKM_EXEC_CONSTANT_EXPORT +VTKM_EXEC_CONSTANT const static vtkm::IdComponent StructuredTriangleIndices[2][3] = { { 0, 1, 2 }, { 0, 2, 3 } @@ -67,19 +67,19 @@ public: typedef _1 InputDomain; typedef vtkm::worklet::ScatterUniform ScatterType; - VTKM_CONT_EXPORT + VTKM_CONT ScatterType GetScatter() const { return ScatterType(2); } - VTKM_CONT_EXPORT + VTKM_CONT TriangulateCell() { } // Each quad cell produces 2 triangle cells template - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(const ConnectivityInVec &connectivityIn, ConnectivityOutVec &connectivityOut, vtkm::IdComponent visitIndex) const diff --git a/vtkm/worklet/VertexClustering.h b/vtkm/worklet/VertexClustering.h index 074856cdc..4af858222 100644 --- a/vtkm/worklet/VertexClustering.h +++ b/vtkm/worklet/VertexClustering.h @@ -61,7 +61,7 @@ private: typedef typename KeyArrayIn::ValueType KeyType; public: - VTKM_CONT_EXPORT + VTKM_CONT AverageByKeyDynamicValue(const KeyArrayIn &inputKeys, KeyArrayOut &outputKeys, vtkm::cont::DynamicArrayHandle &outputValues) @@ -69,7 +69,7 @@ public: { } template - VTKM_CONT_EXPORT + VTKM_CONT void operator()(const ValueArrayIn& coordinates) const { typedef typename ValueArrayIn::ValueType ValueType; @@ -111,14 +111,14 @@ struct VertexClustering typedef void ControlSignature(FieldIn , FieldOut); typedef void ExecutionSignature(_1, _2); - VTKM_CONT_EXPORT + VTKM_CONT MapPointsWorklet(const GridInfo &grid) : Grid(grid) { } /// determine grid resolution for clustering template - VTKM_EXEC_EXPORT + VTKM_EXEC vtkm::Id GetClusterId(const PointType &p) const { typedef typename PointType::ComponentType ComponentType; @@ -136,7 +136,7 @@ struct VertexClustering } template - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(const PointType &point, vtkm::Id &cid) const { cid = this->GetClusterId(point); @@ -153,13 +153,13 @@ struct VertexClustering FieldOutCell cellClusterIds); typedef void ExecutionSignature(_2, _3); - VTKM_CONT_EXPORT + VTKM_CONT MapCellsWorklet() { } // TODO: Currently only works with Triangle cell types template - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(const ClusterIdsVecType &pointClusterIds, vtkm::Id3 &cellClusterId) const { @@ -178,7 +178,7 @@ struct VertexClustering typedef void ExecutionSignature(WorkIndex, _1, _2); // WorkIndex: use vtkm indexing template - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(const vtkm::Id &counter, const vtkm::Id &cid, const OutPortalType &outPortal) const @@ -191,7 +191,7 @@ struct VertexClustering { vtkm::Id NPoints; - VTKM_EXEC_EXPORT + VTKM_EXEC void rotate(vtkm::Id3 &ids) const { vtkm::Id temp=ids[0]; ids[0] = ids[1]; ids[1] = ids[2]; ids[2] = temp; @@ -203,13 +203,13 @@ struct VertexClustering WholeArrayIn); typedef void ExecutionSignature(_1, _2, _3); - VTKM_CONT_EXPORT + VTKM_CONT Cid2PointIdWorklet( vtkm::Id nPoints ): NPoints(nPoints) {} template - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(const vtkm::Id3 &cid3, vtkm::Id3 &pointId3, const InPortalType& inPortal) const @@ -250,12 +250,12 @@ struct VertexClustering typedef void ControlSignature(FieldIn , FieldOut); typedef void ExecutionSignature(_1, _2); - VTKM_CONT_EXPORT + VTKM_CONT Cid3HashWorklet(vtkm::Id nPoints) : NPoints(nPoints) { } - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(const vtkm::Id3 &cid, vtkm::Int64 &cidHash) const { cidHash = cid[0] + this->NPoints * (cid[1] + this->NPoints * cid[2]); // get a unique hash value @@ -271,12 +271,12 @@ struct VertexClustering typedef void ControlSignature(FieldIn , FieldOut); typedef void ExecutionSignature(_1, _2); - VTKM_CONT_EXPORT + VTKM_CONT Cid3UnhashWorklet(vtkm::Id nPoints) : NPoints(nPoints) { } - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(const vtkm::Int64 &cidHash, vtkm::Id3 &cid) const { cid[0] = static_cast( cidHash % this->NPoints ); @@ -289,7 +289,7 @@ struct VertexClustering class Id3Less { public: - VTKM_EXEC_EXPORT + VTKM_EXEC bool operator() (const vtkm::Id3 & a, const vtkm::Id3 & b) const { if (a[0] < 0) diff --git a/vtkm/worklet/WaveletCompressor.h b/vtkm/worklet/WaveletCompressor.h index 5f5883790..6a9f31540 100644 --- a/vtkm/worklet/WaveletCompressor.h +++ b/vtkm/worklet/WaveletCompressor.h @@ -37,7 +37,7 @@ public: // Multi-level 1D wavelet decomposition template< typename SignalArrayType, typename CoeffArrayType, typename DeviceTag > - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Id WaveDecompose( const SignalArrayType &sigIn, // Input vtkm::Id nLevels, // n levels of DWT CoeffArrayType &coeffOut, @@ -106,7 +106,7 @@ public: // Multi-level 1D wavelet reconstruction template< typename CoeffArrayType, typename SignalArrayType, typename DeviceTag > - VTKM_CONT_EXPORT + VTKM_CONT vtkm::Id WaveReconstruct( const CoeffArrayType &coeffIn, // Input vtkm::Id nLevels, // n levels of DWT std::vector &L, @@ -157,7 +157,7 @@ public: // Multi-level 2D wavelet decomposition template< typename InArrayType, typename OutArrayType, typename DeviceTag> - VTKM_CONT_EXPORT + VTKM_CONT FLOAT_64 WaveDecompose2D( const InArrayType &sigIn, // Input vtkm::Id nLevels, // n levels of DWT vtkm::Id inX, // Input X dim @@ -229,7 +229,7 @@ public: // Multi-level 2D wavelet reconstruction template< typename InArrayType, typename OutArrayType, typename DeviceTag> - VTKM_CONT_EXPORT + VTKM_CONT FLOAT_64 WaveReconstruct2D( const InArrayType &arrIn, // Input vtkm::Id nLevels, // n levels of DWT vtkm::Id inX, // Input X dim diff --git a/vtkm/worklet/WorkletMapTopology.h b/vtkm/worklet/WorkletMapTopology.h index f0ec32196..4177b6949 100644 --- a/vtkm/worklet/WorkletMapTopology.h +++ b/vtkm/worklet/WorkletMapTopology.h @@ -126,7 +126,7 @@ public: VTKM_SUPPRESS_EXEC_WARNINGS template - VTKM_EXEC_EXPORT + VTKM_EXEC vtkm::exec::arg::ThreadIndicesTopologyMap GetThreadIndices(const T& threadIndex, const OutToInArrayType& outToIn, diff --git a/vtkm/worklet/internal/ClipTables.h b/vtkm/worklet/internal/ClipTables.h index 23ffbafd1..49b6a2e49 100644 --- a/vtkm/worklet/internal/ClipTables.h +++ b/vtkm/worklet/internal/ClipTables.h @@ -1650,7 +1650,7 @@ static vtkm::UInt8 CellEdges[CELL_EDGES_SIZE] = { }; // index into ClipTablesIndices for each shape -VTKM_EXEC_CONSTANT_EXPORT +VTKM_EXEC_CONSTANT static vtkm::Int16 CellIndexLookup[vtkm::NUMBER_OF_CELL_SHAPES] = { -1, // 0 = vtkm::CELL_SHAPE_EMPTY_CELL 0, // 1 = vtkm::CELL_SHAPE_VERTEX @@ -1679,20 +1679,20 @@ public: class DevicePortal { public: - VTKM_EXEC_EXPORT + VTKM_EXEC vtkm::Id GetCaseIndex(vtkm::Id shape, vtkm::Id caseId) const { vtkm::Id index = CellIndexLookup[shape]; return this->ClipTablesIndicesPortal.Get(index + caseId); } - VTKM_EXEC_EXPORT + VTKM_EXEC vtkm::UInt8 ValueAt(vtkm::Id idx) const { return this->ClipTablesDataPortal.Get(idx); } - VTKM_EXEC_EXPORT + VTKM_EXEC EdgeVec GetEdge(vtkm::Id shape, vtkm::Id edgeId) const { vtkm::Id index = ((shape * MAX_CELL_EDGES) + edgeId) * 2; diff --git a/vtkm/worklet/internal/DispatcherBase.h b/vtkm/worklet/internal/DispatcherBase.h index c591066ab..2ea74204c 100644 --- a/vtkm/worklet/internal/DispatcherBase.h +++ b/vtkm/worklet/internal/DispatcherBase.h @@ -128,12 +128,12 @@ struct DispatcherBaseTypeCheckFunctor { const ContinueFunctor &Continue; - VTKM_CONT_EXPORT + VTKM_CONT DispatcherBaseTypeCheckFunctor(const ContinueFunctor &continueFunc) : Continue(continueFunc) { } template - VTKM_CONT_EXPORT + VTKM_CONT void operator()(const T &x) const { typedef std::integral_constant - VTKM_CONT_EXPORT + VTKM_CONT void WillContinue(const T &x, std::true_type) const { this->Continue(x); } template - VTKM_CONT_EXPORT + VTKM_CONT void WillContinue(const T&, std::false_type) const { } }; @@ -168,7 +168,7 @@ struct DispatcherBaseDynamicTransform template - VTKM_CONT_EXPORT + VTKM_CONT void operator()(const InputType &input, const ContinueFunctor &continueFunc, const vtkm::internal::IndexTag& indexTag) const @@ -191,12 +191,12 @@ struct DispatcherBaseDynamicTransformHelper { const DispatcherBaseType *Dispatcher; - VTKM_CONT_EXPORT + VTKM_CONT DispatcherBaseDynamicTransformHelper(const DispatcherBaseType *dispatcher) : Dispatcher(dispatcher) { } template - VTKM_CONT_EXPORT + VTKM_CONT void operator()(const FunctionInterface ¶meters) const { this->Dispatcher->DynamicTransformInvoke(parameters, std::true_type() ); } @@ -220,7 +220,7 @@ struct DispatcherBaseTransportFunctor { vtkm::Id NumInstances; - VTKM_CONT_EXPORT + VTKM_CONT DispatcherBaseTransportFunctor(vtkm::Id numInstances) : NumInstances(numInstances) { } @@ -228,7 +228,7 @@ struct DispatcherBaseTransportFunctor // Chances are we need to allow the transport for each argument to manage // 3D indices (for example, allocate a 3D array instead of a 1D array). // But for now, just treat all transports as 1D arrays. - VTKM_CONT_EXPORT + VTKM_CONT DispatcherBaseTransportFunctor(vtkm::Id3 dimensions) : NumInstances(dimensions[0]*dimensions[1]*dimensions[2]) { } @@ -241,7 +241,7 @@ struct DispatcherBaseTransportFunctor }; template - VTKM_CONT_EXPORT + VTKM_CONT typename ReturnType::type operator()(const ControlParameter &invokeData, vtkm::internal::IndexTag) const @@ -288,7 +288,7 @@ private: ExecutionSignatureCheck; template - VTKM_CONT_EXPORT + VTKM_CONT void StartInvoke( const vtkm::internal::FunctionInterface ¶meters) const { @@ -320,7 +320,7 @@ private: template - VTKM_CONT_EXPORT + VTKM_CONT void StartInvokeDynamic( const vtkm::internal::FunctionInterface ¶meters, std::true_type) const @@ -340,7 +340,7 @@ private: } template - VTKM_CONT_EXPORT + VTKM_CONT void StartInvokeDynamic( const vtkm::internal::FunctionInterface ¶meters, std::false_type) const @@ -371,7 +371,7 @@ private: } template - VTKM_CONT_EXPORT + VTKM_CONT void DynamicTransformInvoke( const vtkm::internal::FunctionInterface ¶meters, std::true_type ) const @@ -385,7 +385,7 @@ private: } template - VTKM_CONT_EXPORT + VTKM_CONT void DynamicTransformInvoke( const vtkm::internal::FunctionInterface &, std::false_type ) const @@ -394,7 +394,7 @@ private: public: template - VTKM_CONT_EXPORT + VTKM_CONT void Invoke(ArgTypes... args) const { this->StartInvoke( @@ -402,11 +402,11 @@ public: } protected: - VTKM_CONT_EXPORT + VTKM_CONT DispatcherBase(const WorkletType &worklet) : Worklet(worklet) { } template - VTKM_CONT_EXPORT + VTKM_CONT void BasicInvoke(const Invocation &invocation, vtkm::Id numInstances, DeviceAdapter device) const @@ -419,7 +419,7 @@ protected: } template - VTKM_CONT_EXPORT + VTKM_CONT void BasicInvoke(const Invocation &invocation, vtkm::Id2 dimensions, DeviceAdapter device) const @@ -431,7 +431,7 @@ protected: template - VTKM_CONT_EXPORT + VTKM_CONT void BasicInvoke(const Invocation &invocation, vtkm::Id3 dimensions, DeviceAdapter device) const @@ -451,7 +451,7 @@ private: void operator=(const MyType &); template - VTKM_CONT_EXPORT + VTKM_CONT void InvokeTransportParameters(const Invocation &invocation, const InputRangeType& inputRange, const OutputRangeType& outputRange, @@ -495,7 +495,7 @@ private: } template - VTKM_CONT_EXPORT + VTKM_CONT void InvokeSchedule(const Invocation &invocation, RangeType range, DeviceAdapter) const diff --git a/vtkm/worklet/internal/TriangulateTables.h b/vtkm/worklet/internal/TriangulateTables.h index b96b34f61..78a61ec27 100644 --- a/vtkm/worklet/internal/TriangulateTables.h +++ b/vtkm/worklet/internal/TriangulateTables.h @@ -86,11 +86,11 @@ public: typedef typename TriangulateArrayHandle::ExecutionTypes::PortalConst PortalType; - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT TriangulateTablesExecutionObject() { } - VTKM_CONT_EXPORT + VTKM_CONT TriangulateTablesExecutionObject(const TriangulateArrayHandle &counts, const TriangulateArrayHandle &offsets, const TriangulateArrayHandle &indices) @@ -100,7 +100,7 @@ public: { } template - VTKM_EXEC_EXPORT + VTKM_EXEC vtkm::IdComponent GetCount(CellShape shape, vtkm::IdComponent numPoints) const { if (shape.Id == vtkm::CELL_SHAPE_POLYGON) @@ -114,7 +114,7 @@ public: } template - VTKM_EXEC_EXPORT + VTKM_EXEC vtkm::Vec GetIndices(CellShape shape, vtkm::IdComponent triangleIndex) const { @@ -145,7 +145,7 @@ private: class TriangulateTables { public: - VTKM_CONT_EXPORT + VTKM_CONT TriangulateTables() : Counts(vtkm::cont::make_ArrayHandle( vtkm::worklet::internal::TriangleCountData, @@ -234,11 +234,11 @@ public: typedef typename TriangulateArrayHandle::ExecutionTypes::PortalConst PortalType; - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT TetrahedralizeTablesExecutionObject() { } - VTKM_CONT_EXPORT + VTKM_CONT TetrahedralizeTablesExecutionObject(const TriangulateArrayHandle &counts, const TriangulateArrayHandle &offsets, const TriangulateArrayHandle &indices) @@ -248,14 +248,14 @@ public: { } template - VTKM_EXEC_EXPORT + VTKM_EXEC vtkm::IdComponent GetCount(CellShape shape) const { return this->Counts.Get(shape.Id); } template - VTKM_EXEC_EXPORT + VTKM_EXEC vtkm::Vec GetIndices(CellShape shape, vtkm::IdComponent tetrahedronIndex) const { @@ -278,7 +278,7 @@ private: class TetrahedralizeTables { public: - VTKM_CONT_EXPORT + VTKM_CONT TetrahedralizeTables() : Counts(vtkm::cont::make_ArrayHandle( vtkm::worklet::internal::TetrahedronCountData, diff --git a/vtkm/worklet/internal/WorkletBase.h b/vtkm/worklet/internal/WorkletBase.h index bdd3ebe7c..5811a4ddf 100644 --- a/vtkm/worklet/internal/WorkletBase.h +++ b/vtkm/worklet/internal/WorkletBase.h @@ -114,7 +114,7 @@ public: /// In addition to defining the scatter type, the worklet must produce the /// scatter. The default ScatterIdentity has no state, so just return an /// instance. - VTKM_CONT_EXPORT + VTKM_CONT ScatterType GetScatter() const { return ScatterType(); } /// \brief A type list containing the type vtkm::Id. @@ -305,7 +305,7 @@ public: /// VTKM_SUPPRESS_EXEC_WARNINGS template - VTKM_EXEC_EXPORT + VTKM_EXEC vtkm::exec::arg::ThreadIndicesBasic GetThreadIndices(const T& threadIndex, const OutToInArrayType& outToIn, diff --git a/vtkm/worklet/internal/testing/UnitTestDispatcherBase.cxx b/vtkm/worklet/internal/testing/UnitTestDispatcherBase.cxx index a6f6e4262..16b71c5c0 100644 --- a/vtkm/worklet/internal/testing/UnitTestDispatcherBase.cxx +++ b/vtkm/worklet/internal/testing/UnitTestDispatcherBase.cxx @@ -36,10 +36,10 @@ static const vtkm::Id ARRAY_SIZE = 10; struct TestExecObject { - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT TestExecObject() : Array(nullptr) { } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT TestExecObject(vtkm::Id *array) : Array(array) { } vtkm::Id *Array; @@ -77,7 +77,7 @@ struct Transport { typedef TestExecObject ExecObjectType; - VTKM_CONT_EXPORT + VTKM_CONT ExecObjectType operator()(vtkm::Id *contData, vtkm::Id size) const { VTKM_TEST_ASSERT(size == ARRAY_SIZE, @@ -116,13 +116,13 @@ struct FetchRaiseError(ERROR_MESSAGE); @@ -229,11 +229,11 @@ class TestDispatcher : typename Superclass::ExecutionInterface, 1> Invocation; public: - VTKM_CONT_EXPORT + VTKM_CONT TestDispatcher(const WorkletType &worklet = WorkletType()) : Superclass(worklet) { } - VTKM_CONT_EXPORT + VTKM_CONT void DoInvoke(const Invocation &invocation) const { std::cout << "In TestDispatcher::DoInvoke()" << std::endl; diff --git a/vtkm/worklet/splatkernels/Gaussian.h b/vtkm/worklet/splatkernels/Gaussian.h index 392f46976..487f9f872 100644 --- a/vtkm/worklet/splatkernels/Gaussian.h +++ b/vtkm/worklet/splatkernels/Gaussian.h @@ -38,7 +38,7 @@ struct Gaussian : public KernelBase< Gaussian > // Constructor // Calculate coefficients used repeatedly when evaluating the kernel // value or gradient - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT Gaussian(double smoothingLength) : KernelBase< Gaussian >(smoothingLength) { @@ -48,8 +48,8 @@ struct Gaussian : public KernelBase< Gaussian > maxRadius2_ = maxRadius_*maxRadius_; // norm_ = 1.0 / pow(M_PI, static_cast(Dimensions) / 2.0); - scale_W_ = norm_ * power (Hinverse_); - scale_GradW_ = - 2.0 * power(Hinverse_) / norm_; + scale_W_ = norm_ * PowerExpansion (Hinverse_); + scale_GradW_ = - 2.0 * PowerExpansion(Hinverse_) / norm_; } //--------------------------------------------------------------------- @@ -58,7 +58,7 @@ struct Gaussian : public KernelBase< Gaussian > //--------------------------------------------------------------------- // compute w(h) for the given distance - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT double w(double distance) const { if (distance > //--------------------------------------------------------------------- // compute w(h) for the given squared distance - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT double w2(double distance2) const { if (distance2 > //--------------------------------------------------------------------- // compute w(h) for a variable h kernel - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT double w(double h, double distance) const { if (distance(Hinverse); + double scale_W = norm_ * PowerExpansion(Hinverse); double Q = distance * Hinverse; return scale_W * exp(-Q*Q); @@ -101,12 +101,12 @@ struct Gaussian : public KernelBase< Gaussian > //--------------------------------------------------------------------- // compute w(h) for a variable h kernel using distance squared - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT double w2(double h, double distance2) const { if (distance2(Hinverse); + double scale_W = norm_ * PowerExpansion(Hinverse); double Q = distance2 * Hinverse * Hinverse; return scale_W * exp(-Q); @@ -117,7 +117,7 @@ struct Gaussian : public KernelBase< Gaussian > //--------------------------------------------------------------------- // Calculates the kernel derivative for a distance {x,y,z} vector // from the centre - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vector_type gradW(double distance, const vector_type& pos) const { double Q = distance * Hinverse_; @@ -133,11 +133,11 @@ struct Gaussian : public KernelBase< Gaussian > //--------------------------------------------------------------------- // Calculates the kernel derivative for a distance {x,y,z} vector // from the centre using a variable h - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vector_type gradW(double h, double distance, const vector_type& pos) const { double Hinverse = 1.0/h; - double scale_GradW = - 2.0 * power(Hinverse) + double scale_GradW = - 2.0 * PowerExpansion(Hinverse) / pow(M_PI, static_cast(Dimensions) / 2.0); double Q = distance * Hinverse; @@ -153,7 +153,7 @@ struct Gaussian : public KernelBase< Gaussian > //--------------------------------------------------------------------- // return the maximum distance at which this kernel is non zero - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT double maxDistance() const { return maxRadius_; @@ -161,7 +161,7 @@ struct Gaussian : public KernelBase< Gaussian > //--------------------------------------------------------------------- // return the maximum distance at which this variable h kernel is non zero - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT double maxDistance(double h) const { return getDilationFactor()*h; @@ -169,7 +169,7 @@ struct Gaussian : public KernelBase< Gaussian > //--------------------------------------------------------------------- // return the maximum distance at which this kernel is non zero - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT double maxSquaredDistance() const { return maxRadius2_; @@ -177,10 +177,10 @@ struct Gaussian : public KernelBase< Gaussian > //--------------------------------------------------------------------- // return the maximum distance at which this kernel is non zero - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT double maxSquaredDistance(double h) const { - return power<2>(getDilationFactor())*h*h; + return PowerExpansion<2>(getDilationFactor())*h*h; } private: diff --git a/vtkm/worklet/splatkernels/KernelBase.h b/vtkm/worklet/splatkernels/KernelBase.h index f02b1de68..53aa0253e 100644 --- a/vtkm/worklet/splatkernels/KernelBase.h +++ b/vtkm/worklet/splatkernels/KernelBase.h @@ -34,13 +34,20 @@ typedef vtkm::Vec vector_type; #endif // templated utility to generate expansions at compile time for x^N -template -VTKM_EXEC_CONT_EXPORT -double power(double x) { return x * power(x); } +template +inline VTKM_EXEC_CONT +vtkm::Float64 PowerExpansion(vtkm::Float64 x) +{ + return x * PowerExpansion(x); +} template <> -VTKM_EXEC_CONT_EXPORT -double power<0>(double) { return 1; } +inline VTKM_EXEC_CONT +vtkm::Float64 PowerExpansion<1>(vtkm::Float64 x) { return x; } + +template <> +inline VTKM_EXEC_CONT +vtkm::Float64 PowerExpansion<0>(vtkm::Float64) { return 1; } //--------------------------------------------------------------------- // Base class for Kernels @@ -53,7 +60,7 @@ struct KernelBase // Calculate coefficients used repeatedly when evaluating the kernel // value or gradient // The smoothing length is usually denoted as 'h' in SPH literature - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT KernelBase(double smoothingLength) : smoothingLength_(smoothingLength) {} @@ -66,7 +73,7 @@ struct KernelBase //--------------------------------------------------------------------- // compute w(h) for the given distance - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT double w(double distance) { return static_cast(this)->w(distance); } @@ -75,7 +82,7 @@ struct KernelBase // compute w(h) for the given squared distance // this version takes the distance squared as a convenience/optimization // but not all implementations will benefit from it - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT double w2(double distance2) { return static_cast(this)->w2(distance2); } @@ -85,7 +92,7 @@ struct KernelBase // this is less efficient than the fixed radius version as coefficients // must be calculatd on the fly, but it is required when all particles // have different smoothing lengths - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT double w(double h, double distance) { return static_cast(this)->w(h, distance); } @@ -93,7 +100,7 @@ struct KernelBase //--------------------------------------------------------------------- // compute w(h) for a variable h kernel using distance squared // this version takes the distance squared as a convenience/optimization - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT double w2(double h, double distance2) { return static_cast(this)->w2(h, distance2); } @@ -101,7 +108,7 @@ struct KernelBase //--------------------------------------------------------------------- // Calculates the kernel derivative for a distance {x,y,z} vector // from the centre. - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vector_type gradW(double distance, const vector_type& pos) { return static_cast(this)->gradW(distance, pos); } @@ -109,27 +116,27 @@ struct KernelBase // Calculates the kernel derivative at the given distance using a variable h value // this is less efficient than the fixed radius version as coefficients // must be calculatd on the fly - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vector_type gradW(double h, double distance, const vector_type& pos) { return static_cast(this)->gradW(h, distance, pos); } // return the multiplier between smoothing length and max cutoff distance - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT double getDilationFactor() const { return static_cast(this)->getDilationFactor; } // return the maximum cutoff distance over which the kernel acts, // beyond this distance the kernel value is zero - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT double maxDistance() { return static_cast(this)->maxDistance(); } // return the maximum cutoff distance over which the kernel acts, // beyond this distance the kernel value is zero - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT double maxDistanceSquared() { return static_cast(this)->maxDistanceSquared(); } diff --git a/vtkm/worklet/splatkernels/Spline3rdOrder.h b/vtkm/worklet/splatkernels/Spline3rdOrder.h index d0679635d..6ae47b5c3 100644 --- a/vtkm/worklet/splatkernels/Spline3rdOrder.h +++ b/vtkm/worklet/splatkernels/Spline3rdOrder.h @@ -36,7 +36,7 @@ struct Spline3rdOrder : public KernelBase< Spline3rdOrder > // Constructor // Calculate coefficients used repeatedly when evaluating the kernel // value or gradient - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT Spline3rdOrder(double smoothingLength) : KernelBase< Spline3rdOrder >(smoothingLength) { @@ -51,12 +51,12 @@ struct Spline3rdOrder : public KernelBase< Spline3rdOrder > if (Dimensions==3) { norm_ = 1.0/M_PI; } - scale_W_ = norm_ * power (Hinverse_); - scale_GradW_ = norm_ * power(Hinverse_); + scale_W_ = norm_ * PowerExpansion (Hinverse_); + scale_GradW_ = norm_ * PowerExpansion(Hinverse_); } //--------------------------------------------------------------------- // Calculates the kernel value for the given distance - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT double w(double distance) const { // compute Q=(r/h) @@ -75,7 +75,7 @@ struct Spline3rdOrder : public KernelBase< Spline3rdOrder > //--------------------------------------------------------------------- // Calculates the kernel value for the given squared distance - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT double w2(double distance2) const { // compute Q @@ -94,11 +94,11 @@ struct Spline3rdOrder : public KernelBase< Spline3rdOrder > //--------------------------------------------------------------------- // compute w(h) for a variable h kernel - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT double w(double h, double distance) const { double Hinverse = 1.0/h; - double scale_W = norm_ * power(Hinverse); + double scale_W = norm_ * PowerExpansion(Hinverse); double Q = distance * Hinverse; if (Q<1.0) { return scale_W *(1.0 - (3.0/2.0)*Q*Q + (3.0/4.0)*Q*Q*Q); @@ -114,11 +114,11 @@ struct Spline3rdOrder : public KernelBase< Spline3rdOrder > //--------------------------------------------------------------------- // compute w(h) for a variable h kernel using distance squared - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT double w2(double h, double distance2) const { double Hinverse = 1.0/h; - double scale_W = norm_ * power(Hinverse); + double scale_W = norm_ * PowerExpansion(Hinverse); double Q = sqrt(distance2) * Hinverse; if (Q<1.0) { return scale_W *(1.0 - (3.0/2.0)*Q*Q + (3.0/4.0)*Q*Q*Q); @@ -137,7 +137,7 @@ struct Spline3rdOrder : public KernelBase< Spline3rdOrder > // The used formula is the derivation of Speith (3.126) for the value // with (3.21) for the direction of the gradient vector. // Be careful: grad W is antisymmetric in r (3.25)!. - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vector_type gradW(double distance, const vector_type& pos) const { double Q = distance * Hinverse_; @@ -157,11 +157,11 @@ struct Spline3rdOrder : public KernelBase< Spline3rdOrder > } //--------------------------------------------------------------------- - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vector_type gradW(double h, double distance, const vector_type& pos) const { double Hinverse = 1.0/h; - double scale_GradW = norm_ * power(Hinverse); + double scale_GradW = norm_ * PowerExpansion(Hinverse); double Q = distance * Hinverse; if (Q==0.0) { return vector_type(0.0); @@ -180,7 +180,7 @@ struct Spline3rdOrder : public KernelBase< Spline3rdOrder > //--------------------------------------------------------------------- // return the maximum distance at which this kernel is non zero - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT double maxDistance() const { return maxRadius_; @@ -188,7 +188,7 @@ struct Spline3rdOrder : public KernelBase< Spline3rdOrder > //--------------------------------------------------------------------- // return the maximum distance at which this variable h kernel is non zero - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT double maxDistance(double h) const { return 2.0*h; @@ -196,7 +196,7 @@ struct Spline3rdOrder : public KernelBase< Spline3rdOrder > //--------------------------------------------------------------------- // return the maximum distance at which this kernel is non zero - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT double maxSquaredDistance() const { return maxRadius2_; @@ -204,7 +204,7 @@ struct Spline3rdOrder : public KernelBase< Spline3rdOrder > //--------------------------------------------------------------------- // return the maximum distance at which this kernel is non zero - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT double maxSquaredDistance(double h) const { return 4.0*h*h; @@ -212,7 +212,7 @@ struct Spline3rdOrder : public KernelBase< Spline3rdOrder > //--------------------------------------------------------------------- // return the multiplier between smoothing length and max cutoff distance - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT double getDilationFactor() const { return 2.0; } private: diff --git a/vtkm/worklet/testing/UnitTestMarchingCubes.cxx b/vtkm/worklet/testing/UnitTestMarchingCubes.cxx index aa9670388..cb6c480af 100644 --- a/vtkm/worklet/testing/UnitTestMarchingCubes.cxx +++ b/vtkm/worklet/testing/UnitTestMarchingCubes.cxx @@ -41,11 +41,11 @@ public: const vtkm::FloatDefault xmin, ymin, zmin, xmax, ymax, zmax; const vtkm::Id cellsPerLayer; - VTKM_CONT_EXPORT + VTKM_CONT TangleField(const vtkm::Id3 dims, const vtkm::FloatDefault mins[3], const vtkm::FloatDefault maxs[3]) : xdim(dims[0]), ydim(dims[1]), zdim(dims[2]), xmin(mins[0]), ymin(mins[1]), zmin(mins[2]), xmax(maxs[0]), ymax(maxs[1]), zmax(maxs[2]), cellsPerLayer((xdim) * (ydim)) { } - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(const vtkm::Id &vertexId, vtkm::Float32 &v) const { const vtkm::Id x = vertexId % (xdim); @@ -102,12 +102,12 @@ vtkm::cont::DataSet MakeIsosurfaceTestDataSet(vtkm::Id3 dims) class EuclideanNorm { public: - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT EuclideanNorm() : Reference(0.,0.,0.) {} - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT EuclideanNorm(vtkm::Vec reference):Reference(reference) {} - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::Float32 operator()(vtkm::Vec v) const { vtkm::Vec d(v[0]-this->Reference[0], @@ -123,16 +123,16 @@ private: class CubeGridConnectivity { public: - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT CubeGridConnectivity() : Dimension(1), DimSquared(1), DimPlus1Squared(4) {} - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT CubeGridConnectivity(vtkm::Id dim) : Dimension(dim), DimSquared(dim*dim), DimPlus1Squared((dim+1)*(dim+1)) {} - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::Id operator()(vtkm::Id vertex) const { typedef vtkm::CellShapeTagHexahedron HexTag; diff --git a/vtkm/worklet/testing/UnitTestScatterCounting.cxx b/vtkm/worklet/testing/UnitTestScatterCounting.cxx index 60653c117..734f0e277 100644 --- a/vtkm/worklet/testing/UnitTestScatterCounting.cxx +++ b/vtkm/worklet/testing/UnitTestScatterCounting.cxx @@ -129,24 +129,24 @@ struct TestScatterCountingWorklet : public vtkm::worklet::WorkletMapField typedef vtkm::worklet::ScatterCounting ScatterType; - VTKM_CONT_EXPORT + VTKM_CONT ScatterType GetScatter() const { return this->Scatter; } template - VTKM_CONT_EXPORT + VTKM_CONT TestScatterCountingWorklet(const CountArrayType &countArray) : Scatter(countArray, VTKM_DEFAULT_DEVICE_ADAPTER_TAG()) { } template - VTKM_CONT_EXPORT + VTKM_CONT TestScatterCountingWorklet(const CountArrayType &countArray, Device) : Scatter(countArray, Device()) { } - VTKM_CONT_EXPORT + VTKM_CONT TestScatterCountingWorklet(const vtkm::worklet::ScatterCounting &scatter) : Scatter(scatter) { } - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(vtkm::Id inputIndex, vtkm::Id &indexCopy, vtkm::IdComponent &writeVisit, diff --git a/vtkm/worklet/testing/UnitTestStreamLineUniformGrid.cxx b/vtkm/worklet/testing/UnitTestStreamLineUniformGrid.cxx index f0f4332f3..2cfa282f4 100644 --- a/vtkm/worklet/testing/UnitTestStreamLineUniformGrid.cxx +++ b/vtkm/worklet/testing/UnitTestStreamLineUniformGrid.cxx @@ -30,7 +30,7 @@ namespace { template -VTKM_EXEC_CONT_EXPORT +VTKM_EXEC_CONT vtkm::Vec Normalize(vtkm::Vec v) { T magnitude = static_cast(sqrt(vtkm::dot(v, v))); diff --git a/vtkm/worklet/testing/UnitTestStreamingSine.cxx b/vtkm/worklet/testing/UnitTestStreamingSine.cxx index 3812ae9dc..f611e07ab 100644 --- a/vtkm/worklet/testing/UnitTestStreamingSine.cxx +++ b/vtkm/worklet/testing/UnitTestStreamingSine.cxx @@ -38,7 +38,7 @@ public: typedef _2 ExecutionSignature(_1, WorkIndex); template - VTKM_EXEC_EXPORT + VTKM_EXEC T operator()(T x, vtkm::Id& index) const { return (static_cast(index) + vtkm::Sin(x)); } diff --git a/vtkm/worklet/testing/UnitTestThreshold.cxx b/vtkm/worklet/testing/UnitTestThreshold.cxx index a14afbc0c..c7677bd11 100644 --- a/vtkm/worklet/testing/UnitTestThreshold.cxx +++ b/vtkm/worklet/testing/UnitTestThreshold.cxx @@ -34,12 +34,12 @@ namespace { class HasValue { public: - VTKM_CONT_EXPORT + VTKM_CONT HasValue(vtkm::Float32 value) : Value(value) { } template - VTKM_EXEC_EXPORT + VTKM_EXEC bool operator()(ScalarType value) const { return static_cast(value) == this->Value; diff --git a/vtkm/worklet/testing/UnitTestWaveletCompressor.cxx b/vtkm/worklet/testing/UnitTestWaveletCompressor.cxx index f2c87e2c2..8185800fe 100644 --- a/vtkm/worklet/testing/UnitTestWaveletCompressor.cxx +++ b/vtkm/worklet/testing/UnitTestWaveletCompressor.cxx @@ -41,7 +41,7 @@ public: typedef void ExecutionSignature(_1, WorkIndex); template - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(T& x, const vtkm::Id& workIdx) const { x = vtkm::Sin(vtkm::Float64(workIdx) / 100.0) * 100.0; @@ -54,7 +54,7 @@ public: typedef void ControlSignature(FieldInOut<>); typedef void ExecutionSignature(_1, WorkIndex); - VTKM_EXEC_EXPORT + VTKM_EXEC GaussianWorklet2D( vtkm::Id dx, vtkm::Id dy, vtkm::Float64 a, vtkm::Float64 x, vtkm::Float64 y, vtkm::Float64 sx, vtkm::Float64 xy ) @@ -66,14 +66,14 @@ public: sigmaY2 = 2 * sigmaY * sigmaY; } - VTKM_EXEC_EXPORT + VTKM_EXEC void Sig1Dto2D( vtkm::Id idx, vtkm::Id &x, vtkm::Id &y ) const { x = idx % dimX; y = idx / dimX; } - VTKM_EXEC_EXPORT + VTKM_EXEC vtkm::Float64 GetGaussian( vtkm::Float64 x, vtkm::Float64 y ) const { vtkm::Float64 power = (x-x0) * (x-x0) / sigmaX2 + (y-y0) * (y-y0) / sigmaY2; @@ -81,7 +81,7 @@ public: } template - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(T& val, const vtkm::Id& workIdx) const { vtkm::Id x, y; diff --git a/vtkm/worklet/testing/UnitTestWorkletMapField.cxx b/vtkm/worklet/testing/UnitTestWorkletMapField.cxx index ef91dc8f5..2a2749d82 100644 --- a/vtkm/worklet/testing/UnitTestWorkletMapField.cxx +++ b/vtkm/worklet/testing/UnitTestWorkletMapField.cxx @@ -32,7 +32,7 @@ public: typedef void ExecutionSignature(_1, _2, _3, WorkIndex); template - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(const T &in, T &out, T &inout, vtkm::Id workIndex) const { if (!test_equal(in, TestValue(workIndex, T()) + T(100))) @@ -48,7 +48,7 @@ public: } template - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(const T1 &, const T2 &, const T3 &, vtkm::Id) const { this->RaiseError("Cannot call this worklet with different types."); @@ -64,7 +64,7 @@ public: typedef _2 ExecutionSignature(_1, _3, WorkIndex); template - VTKM_EXEC_EXPORT + VTKM_EXEC T1 operator()(const T1 &in, T3 &inout, vtkm::Id workIndex) const { if (!test_equal(in, TestValue(workIndex, T1()) + T1(100))) @@ -90,7 +90,7 @@ template struct DoStaticTestWorklet { template - VTKM_CONT_EXPORT + VTKM_CONT void operator()(T) const { std::cout << "Set up data." << std::endl; @@ -123,7 +123,7 @@ template struct DoDynamicTestWorklet { template - VTKM_CONT_EXPORT + VTKM_CONT void operator()(T) const { std::cout << "Set up data." << std::endl; @@ -160,7 +160,7 @@ template struct DoTestWorklet { template - VTKM_CONT_EXPORT + VTKM_CONT void operator()(T t) const { DoStaticTestWorklet sw; sw(t); diff --git a/vtkm/worklet/testing/UnitTestWorkletMapFieldExecArg.cxx b/vtkm/worklet/testing/UnitTestWorkletMapFieldExecArg.cxx index cb8f98d4c..227f33696 100644 --- a/vtkm/worklet/testing/UnitTestWorkletMapFieldExecArg.cxx +++ b/vtkm/worklet/testing/UnitTestWorkletMapFieldExecArg.cxx @@ -35,7 +35,7 @@ public: typedef void ExecutionSignature(_1, _2, _3, _4); template - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(const vtkm::Id &index, const vtkm::exec::ExecutionWholeArrayConst &execIn, vtkm::exec::ExecutionWholeArray &execOut, @@ -50,7 +50,7 @@ public: } template - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(const vtkm::Id &, const T1 &, const T2 &, const T3&) const { this->RaiseError("Cannot call this worklet with different types."); @@ -65,7 +65,7 @@ template struct DoTestWorklet { template - VTKM_CONT_EXPORT + VTKM_CONT void operator()(T) const { std::cout << "Set up data." << std::endl; diff --git a/vtkm/worklet/testing/UnitTestWorkletMapFieldWholeArray.cxx b/vtkm/worklet/testing/UnitTestWorkletMapFieldWholeArray.cxx index 2e3e12d30..bdb37d0a8 100644 --- a/vtkm/worklet/testing/UnitTestWorkletMapFieldWholeArray.cxx +++ b/vtkm/worklet/testing/UnitTestWorkletMapFieldWholeArray.cxx @@ -37,7 +37,7 @@ public: template - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(const vtkm::Id &index, const InPortalType &inPortal, const InOutPortalType &inOutPortal, @@ -70,7 +70,7 @@ public: typedef _1 InputDomain; template - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(const vtkm::Id &index, const AtomicArrayType &atomicArray) const { @@ -88,7 +88,7 @@ struct DoTestWholeArrayWorklet typedef TestWholeArrayWorklet WorkletType; // This just demonstrates that the WholeArray tags support dynamic arrays. - VTKM_CONT_EXPORT + VTKM_CONT void CallWorklet(const vtkm::cont::DynamicArrayHandle &inArray, const vtkm::cont::DynamicArrayHandle &inOutArray, const vtkm::cont::DynamicArrayHandle &outArray) const @@ -99,7 +99,7 @@ struct DoTestWholeArrayWorklet } template - VTKM_CONT_EXPORT + VTKM_CONT void operator()(T) const { std::cout << "Set up data." << std::endl; @@ -135,7 +135,7 @@ struct DoTestAtomicArrayWorklet typedef TestAtomicArrayWorklet WorkletType; // This just demonstrates that the WholeArray tags support dynamic arrays. - VTKM_CONT_EXPORT + VTKM_CONT void CallWorklet(const vtkm::cont::DynamicArrayHandle &inOutArray) const { std::cout << "Create and run dispatcher." << std::endl; @@ -144,7 +144,7 @@ struct DoTestAtomicArrayWorklet } template - VTKM_CONT_EXPORT + VTKM_CONT void operator()(T) const { std::cout << "Set up data." << std::endl; diff --git a/vtkm/worklet/testing/UnitTestWorkletMapTopologyExplicit.cxx b/vtkm/worklet/testing/UnitTestWorkletMapTopologyExplicit.cxx index 01e9d34e3..e39e88cba 100644 --- a/vtkm/worklet/testing/UnitTestWorkletMapTopologyExplicit.cxx +++ b/vtkm/worklet/testing/UnitTestWorkletMapTopologyExplicit.cxx @@ -40,7 +40,7 @@ public: typedef void ExecutionSignature(_1, _4, _2, PointCount, CellShape, PointIndices); typedef _3 InputDomain; - VTKM_CONT_EXPORT + VTKM_CONT MaxPointOrCellValue() { } template - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(const InCellType &cellValue, OutCellType &maxValue, const InPointVecType &pointValues, @@ -75,11 +75,11 @@ public: typedef void ExecutionSignature(_1, _3, PointCount); typedef _2 InputDomain; - VTKM_CONT_EXPORT + VTKM_CONT AveragePointToCellValue() { } template - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(const PointVecType &pointValues, OutType &avgVal, const vtkm::IdComponent &numPoints) const @@ -103,11 +103,11 @@ public: typedef void ExecutionSignature(_1, _3, CellCount); typedef _2 InputDomain; - VTKM_CONT_EXPORT + VTKM_CONT AverageCellToPointValue() { } template - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(const CellVecType &cellValues, OutType &avgVal, const vtkm::IdComponent &numCellIDs) const diff --git a/vtkm/worklet/testing/UnitTestWorkletMapTopologyUniform.cxx b/vtkm/worklet/testing/UnitTestWorkletMapTopologyUniform.cxx index e0c750eba..4d8e9497d 100644 --- a/vtkm/worklet/testing/UnitTestWorkletMapTopologyUniform.cxx +++ b/vtkm/worklet/testing/UnitTestWorkletMapTopologyUniform.cxx @@ -40,7 +40,7 @@ public: typedef void ExecutionSignature(_1, _4, _2, PointCount, CellShape, PointIndices); typedef _3 InputDomain; - VTKM_CONT_EXPORT + VTKM_CONT MaxPointOrCellValue() { } template - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(const InCellType &cellValue, OutCellType &maxValue, const InPointVecType &pointValues, @@ -75,11 +75,11 @@ public: typedef void ExecutionSignature(_1, _3, PointCount); typedef _2 InputDomain; - VTKM_CONT_EXPORT + VTKM_CONT AveragePointToCellValue() { } template - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(const PointVecType &pointValues, OutType &avgVal, const vtkm::IdComponent &numPoints) const @@ -103,11 +103,11 @@ public: typedef void ExecutionSignature(_1, _3, CellCount); typedef _2 InputDomain; - VTKM_CONT_EXPORT + VTKM_CONT AverageCellToPointValue() { } template - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(const CellVecType &cellValues, OutType &avgVal, const vtkm::IdComponent &numCellIDs) const @@ -129,11 +129,11 @@ struct CheckStructuredUniformPointCoords FieldInPoint pointCoords); typedef void ExecutionSignature(_2); - VTKM_CONT_EXPORT + VTKM_CONT CheckStructuredUniformPointCoords() { } template - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()( const vtkm::VecRectilinearPointCoordinates & vtkmNotUsed(coords)) const @@ -142,7 +142,7 @@ struct CheckStructuredUniformPointCoords } template - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(const PointCoordsVecType &vtkmNotUsed(coords)) const { this->RaiseError("Got wrong point coordinates type."); diff --git a/vtkm/worklet/wavelets/WaveletBase.h b/vtkm/worklet/wavelets/WaveletBase.h index 66e6a6394..c2f620dba 100644 --- a/vtkm/worklet/wavelets/WaveletBase.h +++ b/vtkm/worklet/wavelets/WaveletBase.h @@ -162,7 +162,7 @@ public: struct SortLessAbsFunctor { template< typename T > - VTKM_EXEC_EXPORT + VTKM_EXEC bool operator()(const T& x, const T& y) const { return vtkm::Abs(x) < vtkm::Abs(y); @@ -191,7 +191,7 @@ public: struct minFunctor { template< typename FieldType > - VTKM_EXEC_EXPORT + VTKM_EXEC FieldType operator()(const FieldType &x, const FieldType &y) const { return Min(x, y); } @@ -199,7 +199,7 @@ public: struct maxFunctor { template< typename FieldType > - VTKM_EXEC_EXPORT + VTKM_EXEC FieldType operator()(const FieldType& x, const FieldType& y) const { return vtkm::Max(x, y); } @@ -229,7 +229,7 @@ public: struct maxAbsFunctor { template< typename FieldType > - VTKM_EXEC_EXPORT + VTKM_EXEC FieldType operator()(const FieldType& x, const FieldType& y) const { return vtkm::Max( vtkm::Abs(x), vtkm::Abs(y) ); } diff --git a/vtkm/worklet/wavelets/WaveletTransforms.h b/vtkm/worklet/wavelets/WaveletTransforms.h index 0e5cdf037..796c34f7c 100644 --- a/vtkm/worklet/wavelets/WaveletTransforms.h +++ b/vtkm/worklet/wavelets/WaveletTransforms.h @@ -94,7 +94,7 @@ public: (void)y5; } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT void Translate2Dto1D( vtkm::Id inX, vtkm::Id inY, // 2D indices as input vtkm::Id &mat, vtkm::Id &idx ) const // which matrix, and idx of that matrix { @@ -205,7 +205,7 @@ public: mode_lr(mode) { (void)dimY2; } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT void Translate2Dto1D( vtkm::Id inX, vtkm::Id inY, // 2D indices as input vtkm::Id &mat, vtkm::Id &idx ) const // which matrix, and idx of that matrix { @@ -274,7 +274,7 @@ public: // Constructor - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT ForwardTransform2D ( const vtkm::cont::ArrayHandle &loFilter, const vtkm::cont::ArrayHandle &hiFilter, vtkm::Id filter_len, vtkm::Id approx_len, @@ -298,13 +298,13 @@ public: mode_lr ) { this->SetStartPosition(); } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT void Output1Dto2D( vtkm::Id idx, vtkm::Id &x, vtkm::Id &y ) const { x = idx % outDimX; y = idx / outDimX; } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::Id Output2Dto1D( vtkm::Id x, vtkm::Id y ) const { return y * outDimX + x; @@ -314,7 +314,7 @@ public: #define VAL vtkm::Float64 #define MAKEVAL(a) (static_cast(a)) template - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT VAL GetVal( const InPortalType1 &portal1, const InPortalType2 &portal2, const InPortalType3 &portal3, vtkm::Id inMatrix, vtkm::Id inIdx ) const { @@ -333,7 +333,7 @@ public: template - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT void operator()(const InPortalType1 &inPortal1, // left/top extension const InPortalType2 &inPortal2, // signal const InPortalType3 &inPortal3, // right/bottom extension @@ -421,7 +421,7 @@ private: const IndexTranslator3Matrices translator; vtkm::Id lstart, hstart; - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT void SetStartPosition() { this->lstart = this->oddlow ? 1 : 0; @@ -442,7 +442,7 @@ public: typedef _1 InputDomain; // Constructor - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT ExtensionWorklet2D ( vtkm::Id extdimX, vtkm::Id extdimY, vtkm::Id sigdimX, vtkm::Id sigdimY, vtkm::Id sigstartX, vtkm::Id sigstartY, @@ -457,7 +457,7 @@ public: { (void)sigDimY; } // Index translation helper - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT void Ext1Dto2D ( vtkm::Id idx, vtkm::Id &x, vtkm::Id &y ) const { x = idx % extDimX; @@ -465,21 +465,21 @@ public: } // Index translation helper - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::Id Sig2Dto1D( vtkm::Id x, vtkm::Id y ) const { return y * sigDimX + x; } // Index translation helper - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::Id SigPretend2Dto1D( vtkm::Id x, vtkm::Id y ) const { return (y + sigStartY) * sigDimX + x + sigStartX; } template< typename PortalOutType, typename PortalInType > - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()( PortalOutType &portalOut, const PortalInType &portalIn, const vtkm::Id &workIndex) const @@ -553,7 +553,7 @@ public: typedef _1 InputDomain; // Constructor - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT ForwardTransform( const vtkm::cont::ArrayHandle &loFilter, const vtkm::cont::ArrayHandle &hiFilter, vtkm::Id filLen, vtkm::Id approx_len, vtkm::Id detail_len, @@ -571,7 +571,7 @@ public: #define VAL vtkm::Float64 #define MAKEVAL(a) (static_cast(a)) template - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(const InputPortalType &signalIn, OutputPortalType &coeffOut, const vtkm::Id &workIndex) const @@ -609,7 +609,7 @@ private: bool oddlow, oddhigh; vtkm::Id xlstart, xhstart; - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT void SetStartPosition() { this->xlstart = this->oddlow ? 1 : 0; @@ -646,7 +646,7 @@ public: typedef _6 InputDomain; // Constructor - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT InverseTransform2D( const vtkm::cont::ArrayHandle &lo_fil, const vtkm::cont::ArrayHandle &hi_fil, vtkm::Id fil_len, @@ -681,7 +681,7 @@ public: } } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT void Output1Dto2D( vtkm::Id idx, vtkm::Id &x, vtkm::Id &y ) const { x = idx % outputDimX; @@ -693,7 +693,7 @@ public: #define MAKEVAL(a) (static_cast(a)) template - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT VAL GetVal( const InPortalType1 &ext1, const InPortalType2 &ext2, const InPortalType3 &ext3, @@ -721,7 +721,7 @@ public: template< typename InPortalType1, typename InPortalType2, typename InPortalType3, typename InPortalType4, typename InPortalTypecAcD, typename OutputValueType > - VTKM_EXEC_EXPORT + VTKM_EXEC void operator() (const InPortalType1 &portal1, const InPortalType2 &portal2, const InPortalType3 &portal3, @@ -901,7 +901,7 @@ public: typedef _1 InputDomain; // Constructor - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT InverseTransformOdd( const vtkm::cont::ArrayHandle &loFilter, const vtkm::cont::ArrayHandle &hiFilter, vtkm::Id filLen, vtkm::Id ca_len, vtkm::Id ext_len ) @@ -914,7 +914,7 @@ public: #define VAL vtkm::Float64 #define MAKEVAL(a) (static_cast(a)) template - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(const InputPortalType &coeffs, OutputPortalType &sigOut, const vtkm::Id &workIndex) const @@ -980,7 +980,7 @@ public: typedef _1 InputDomain; // Constructor - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT InverseTransformEven( const vtkm::cont::ArrayHandle &loFilter, const vtkm::cont::ArrayHandle &hiFilter, vtkm::Id filtL, vtkm::Id cAL, vtkm::Id cALExt, bool m ) @@ -993,7 +993,7 @@ public: #define VAL vtkm::Float64 #define MAKEVAL(a) (static_cast(a)) template - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()(const InputPortalType &coeffs, OutputPortalType &sigOut, const vtkm::Id &workIndex) const @@ -1060,7 +1060,7 @@ public: neg_threshold( t*-1.0 ) {} template - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()( ValueType &coeffVal ) const { if( neg_threshold < coeffVal && coeffVal < threshold ) @@ -1084,14 +1084,14 @@ public: // Constructor template - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT SquaredDeviation( ValueType t ) { this->mean = static_cast(t); } template - VTKM_EXEC_EXPORT + VTKM_EXEC ValueType operator()( const ValueType &num ) const { vtkm::Float64 num64 = static_cast( num ); @@ -1115,7 +1115,7 @@ public: typedef _1 InputDomain; template - VTKM_EXEC_EXPORT + VTKM_EXEC ValueType1 operator()( const ValueType1 &v1, const ValueType2 &v2 ) const { return v1 - static_cast(v2); @@ -1133,7 +1133,7 @@ public: typedef _1 InputDomain; template - VTKM_EXEC_EXPORT + VTKM_EXEC ValueType operator()( const ValueType &v ) const { return (v * v); @@ -1151,14 +1151,14 @@ public: typedef _1 InputDomain; // Constructor - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT CopyWorklet( vtkm::Id idx ) { this->startIdx = idx; } template< typename PortalInType, typename PortalOutType > - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()( const PortalInType &portalIn, PortalOutType &portalOut, const vtkm::Id &workIndex) const @@ -1182,11 +1182,11 @@ public: typedef _1 InputDomain; // Constructor - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT LeftSYMHExtentionWorklet( vtkm::Id len ) : addLen( len ) {} template< typename PortalOutType, typename PortalInType > - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()( PortalOutType &portalOut, const PortalInType &portalIn, const vtkm::Id &workIndex) const @@ -1210,11 +1210,11 @@ public: typedef _1 InputDomain; // Constructor - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT LeftSYMWExtentionWorklet( vtkm::Id len ) : addLen( len ) {} template< typename PortalOutType, typename PortalInType > - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()( PortalOutType &portalOut, const PortalInType &portalIn, const vtkm::Id &workIndex) const @@ -1238,11 +1238,11 @@ public: typedef _1 InputDomain; // Constructor - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT LeftASYMHExtentionWorklet( vtkm::Id len ) : addLen (len) {} template< typename PortalOutType, typename PortalInType > - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT void operator()( PortalOutType &portalOut, const PortalInType &portalIn, const vtkm::Id &workIndex) const @@ -1266,11 +1266,11 @@ public: typedef _1 InputDomain; // Constructor - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT LeftASYMWExtentionWorklet( vtkm::Id len ) : addLen (len) {} template< typename PortalOutType, typename PortalInType > - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT void operator()( PortalOutType &portalOut, const PortalInType &portalIn, const vtkm::Id &workIndex) const @@ -1294,11 +1294,11 @@ public: typedef _1 InputDomain; // Constructor - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT RightSYMHExtentionWorklet ( vtkm::Id sigInl ) : sigInLen( sigInl ) {} template< typename PortalOutType, typename PortalInType > - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()( PortalOutType &portalOut, const PortalInType &portalIn, const vtkm::Id &workIndex) const @@ -1322,11 +1322,11 @@ public: typedef _1 InputDomain; // Constructor - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT RightSYMWExtentionWorklet ( vtkm::Id sigInl ) : sigInLen( sigInl ) {} template< typename PortalOutType, typename PortalInType > - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()( PortalOutType &portalOut, const PortalInType &portalIn, const vtkm::Id &workIndex) const @@ -1350,11 +1350,11 @@ public: typedef _1 InputDomain; // Constructor - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT RightASYMHExtentionWorklet ( vtkm::Id sigInl ) : sigInLen( sigInl ) {} template< typename PortalOutType, typename PortalInType > - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT void operator()( PortalOutType &portalOut, const PortalInType &portalIn, const vtkm::Id &workIndex) const @@ -1378,11 +1378,11 @@ public: typedef _1 InputDomain; // Constructor - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT RightASYMWExtentionWorklet ( vtkm::Id sigInl ) : sigInLen( sigInl ) {} template< typename PortalOutType, typename PortalInType > - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT void operator()( PortalOutType &portalOut, const PortalInType &portalIn, const vtkm::Id &workIndex) const @@ -1404,11 +1404,11 @@ public: typedef void ExecutionSignature( _1, WorkIndex ); // Constructor - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT AssignZeroWorklet( vtkm::Id idx ) : zeroIdx( idx ) { } template< typename PortalType > - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()( PortalType &array, const vtkm::Id &workIdx ) const { @@ -1430,13 +1430,13 @@ public: typedef void ExecutionSignature( _1, WorkIndex ); // Constructor - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT AssignZero2DWorklet( vtkm::Id x, vtkm::Id y, vtkm::Id zero_x, vtkm::Id zero_y ) : dimX( x ), dimY( y ), zeroX( zero_x ), zeroY( zero_y ) { (void)dimY; } // Index translation helper - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT void GetLogicalDim( const Id &idx, Id &x, Id &y ) const { x = idx % dimX; @@ -1444,7 +1444,7 @@ public: } template< typename PortalType > - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()( PortalType &array, const vtkm::Id &workIdx ) const { @@ -1476,7 +1476,7 @@ public: typedef void ExecutionSignature( _1, _2, WorkIndex ); // Constructor - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT RectangleCopyTo( vtkm::Id inx, vtkm::Id iny, vtkm::Id outx, vtkm::Id outy, vtkm::Id xStart, vtkm::Id yStart ) @@ -1486,7 +1486,7 @@ public: this->outXStart = xStart; this->outYStart = yStart; } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT void GetLogicalDimOfInputRect( const vtkm::Id &idx, vtkm::Id &x, vtkm::Id &y ) const @@ -1495,7 +1495,7 @@ public: y = idx / inXLen; } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::Id Get1DIdxOfOutputRect( vtkm::Id x, vtkm::Id y ) const { @@ -1503,7 +1503,7 @@ public: } template< typename ValueInType, typename PortalOutType > - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()( const ValueInType &valueIn, PortalOutType &arrayOut, const vtkm::Id &workIdx ) const @@ -1533,7 +1533,7 @@ public: typedef _1 InputDomain; // Constructor - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT RectangleCopyFrom( vtkm::Id smallx, vtkm::Id smally, vtkm::Id bigx, vtkm::Id bigy, vtkm::Id xStart, vtkm::Id yStart ) @@ -1543,7 +1543,7 @@ public: this->bigXStart = xStart; this->bigYStart = yStart; } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT void GetLogicalDimOfSmallRect( const vtkm::Id &idx, vtkm::Id &x, vtkm::Id &y ) const @@ -1552,7 +1552,7 @@ public: y = idx / smallXLen; } - VTKM_EXEC_CONT_EXPORT + VTKM_EXEC_CONT vtkm::Id Get1DIdxOfBigRect( vtkm::Id x, vtkm::Id y ) const { @@ -1560,7 +1560,7 @@ public: } template< typename ValueType, typename PortalType > - VTKM_EXEC_EXPORT + VTKM_EXEC void operator()( ValueType &value, const PortalType &array, const vtkm::Id &workIdx ) const