Refactor ExecutionArrayInterfaceBasic to use inheriting constructors

vtkm/cont/cuda/internal/ExecutionArrayInterfaceBasicCuda.cu

@@ -29,12 +29,6 @@ namespace cont
 namespace internal
 {
 
-ExecutionArrayInterfaceBasic<DeviceAdapterTagCuda>::ExecutionArrayInterfaceBasic(
-  StorageBasicBase& storage)
-  : Superclass(storage)
-{
-}
-
 DeviceAdapterId ExecutionArrayInterfaceBasic<DeviceAdapterTagCuda>::GetDeviceId() const
 {
   return VTKM_DEVICE_ADAPTER_CUDA;

vtkm/cont/cuda/internal/ExecutionArrayInterfaceBasicCuda.h

@@ -32,9 +32,9 @@ template <>
 struct VTKM_CONT_EXPORT ExecutionArrayInterfaceBasic<DeviceAdapterTagCuda> final
   : public ExecutionArrayInterfaceBasicBase
 {
-  using Superclass = ExecutionArrayInterfaceBasicBase;
+  //inherit our parents constructor
+  using ExecutionArrayInterfaceBasicBase::ExecutionArrayInterfaceBasicBase;
 
-  VTKM_CONT ExecutionArrayInterfaceBasic(StorageBasicBase& storage);
   VTKM_CONT DeviceAdapterId GetDeviceId() const final;
   VTKM_CONT void Allocate(TypelessExecutionArray& execArray,
                           vtkm::Id numberOfValues,

vtkm/cont/internal/ArrayHandleBasicImpl.h

@@ -75,7 +75,7 @@ static PortalConstType CreatePortalConst(const ValueType* start, const ValueType
 /// Typeless interface for interacting with a execution memory buffer when using basic storage.
 struct VTKM_CONT_EXPORT ExecutionArrayInterfaceBasicBase
 {
-  VTKM_CONT ExecutionArrayInterfaceBasicBase(StorageBasicBase& storage);
+  VTKM_CONT explicit ExecutionArrayInterfaceBasicBase(StorageBasicBase& storage);
   VTKM_CONT virtual ~ExecutionArrayInterfaceBasicBase();
 
   VTKM_CONT

vtkm/cont/internal/ArrayManagerExecutionShareWithControl.cxx

@@ -27,12 +27,6 @@ namespace cont
 namespace internal
 {
 
-ExecutionArrayInterfaceBasicShareWithControl::ExecutionArrayInterfaceBasicShareWithControl(
-  vtkm::cont::internal::StorageBasicBase& storage)
-  : Superclass(storage)
-{
-}
-
 void ExecutionArrayInterfaceBasicShareWithControl::Allocate(TypelessExecutionArray& execArray,
                                                             vtkm::Id numberOfValues,
                                                             vtkm::UInt64 sizeOfValue) const

vtkm/cont/internal/ArrayManagerExecutionShareWithControl.h

@@ -135,9 +135,8 @@ struct ExecutionPortalFactoryBasicShareWithControl
 struct VTKM_CONT_EXPORT ExecutionArrayInterfaceBasicShareWithControl
   : public ExecutionArrayInterfaceBasicBase
 {
-  using Superclass = ExecutionArrayInterfaceBasicBase;
-
-  VTKM_CONT ExecutionArrayInterfaceBasicShareWithControl(StorageBasicBase& storage);
+  //inherit our parents constructor
+  using ExecutionArrayInterfaceBasicBase::ExecutionArrayInterfaceBasicBase;
 
   VTKM_CONT void Allocate(TypelessExecutionArray& execArray,
                           vtkm::Id numberOfValues,

vtkm/cont/openmp/internal/ArrayManagerExecutionOpenMP.cxx

@@ -26,16 +26,7 @@ namespace vtkm
 {
 namespace cont
 {
-namespace internal
-{
 
-ExecutionArrayInterfaceBasic<DeviceAdapterTagOpenMP>::ExecutionArrayInterfaceBasic(
-  StorageBasicBase& storage)
-  : Superclass(storage)
-{
-}
-
-} // end namespace internal
 
 VTKM_INSTANTIATE_ARRAYHANDLES_FOR_DEVICE_ADAPTER(DeviceAdapterTagOpenMP)
 }

vtkm/cont/openmp/internal/ArrayManagerExecutionOpenMP.h

@@ -27,6 +27,7 @@
 #include <vtkm/cont/internal/ArrayExportMacros.h>
 #include <vtkm/cont/internal/ArrayManagerExecution.h>
 #include <vtkm/cont/internal/ArrayManagerExecutionShareWithControl.h>
+#include <vtkm/cont/openmp/internal/ExecutionArrayInterfaceBasicOpenMP.h>
 
 namespace vtkm
 {
@@ -85,19 +86,6 @@ struct ExecutionPortalFactoryBasic<T, DeviceAdapterTagOpenMP>
   using Superclass::CreatePortalConst;
 };
 
-template <>
-struct VTKM_CONT_EXPORT ExecutionArrayInterfaceBasic<DeviceAdapterTagOpenMP> final
-  : public ExecutionArrayInterfaceBasicShareWithControl
-{
-  using Superclass = ExecutionArrayInterfaceBasicShareWithControl;
-
-  VTKM_CONT
-  ExecutionArrayInterfaceBasic(StorageBasicBase& storage);
-
-  VTKM_CONT
-  DeviceAdapterId GetDeviceId() const final { return VTKM_DEVICE_ADAPTER_OPENMP; }
-};
-
 } // namespace internal
 
 #ifndef vtk_m_cont_openmp_internal_ArrayManagerExecutionOpenMP_cxx

vtkm/cont/openmp/internal/CMakeLists.txt

@@ -23,6 +23,7 @@ set(headers
   DeviceAdapterAlgorithmOpenMP.h
   DeviceAdapterRuntimeDetectorOpenMP.h
   DeviceAdapterTagOpenMP.h
+  ExecutionArrayInterfaceBasicOpenMP.h
   FunctorsOpenMP.h
   ParallelQuickSortOpenMP.h
   ParallelRadixSortOpenMP.h
@@ -45,5 +46,6 @@ endif()
 target_sources(vtkm_cont PRIVATE
   ${CMAKE_CURRENT_SOURCE_DIR}/ArrayManagerExecutionOpenMP.cxx
   ${CMAKE_CURRENT_SOURCE_DIR}/DeviceAdapterAlgorithmOpenMP.cxx
+  ${CMAKE_CURRENT_SOURCE_DIR}/ExecutionArrayInterfaceBasicOpenMP.cxx
   ${CMAKE_CURRENT_SOURCE_DIR}/ParallelRadixSortOpenMP.cxx
 )

vtkm/cont/openmp/internal/ExecutionArrayInterfaceBasicOpenMP.cxx

@@ -0,0 +1,36 @@
+//============================================================================
+//  Copyright (c) Kitware, Inc.
+//  All rights reserved.
+//  See LICENSE.txt for details.
+//  This software is distributed WITHOUT ANY WARRANTY; without even
+//  the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+//  PURPOSE.  See the above copyright notice for more information.
+//
+//  Copyright 2014 National Technology & Engineering Solutions of Sandia, LLC (NTESS).
+//  Copyright 2014 UT-Battelle, LLC.
+//  Copyright 2014 Los Alamos National Security.
+//
+//  Under the terms of Contract DE-NA0003525 with NTESS,
+//  the U.S. Government retains certain rights in this software.
+//
+//  Under the terms of Contract DE-AC52-06NA25396 with Los Alamos National
+//  Laboratory (LANL), the U.S. Government retains certain rights in
+//  this software.
+//============================================================================
+#include <vtkm/cont/openmp/internal/ExecutionArrayInterfaceBasicOpenMP.h>
+
+namespace vtkm
+{
+namespace cont
+{
+namespace internal
+{
+
+DeviceAdapterId ExecutionArrayInterfaceBasic<DeviceAdapterTagOpenMP>::GetDeviceId() const
+{
+  return VTKM_DEVICE_ADAPTER_OPENMP;
+}
+
+} // namespace internal
+}
+} // namespace vtkm::cont

vtkm/cont/openmp/internal/ExecutionArrayInterfaceBasicOpenMP.h

@@ -0,0 +1,48 @@
+//============================================================================
+//  Copyright (c) Kitware, Inc.
+//  All rights reserved.
+//  See LICENSE.txt for details.
+//  This software is distributed WITHOUT ANY WARRANTY; without even
+//  the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+//  PURPOSE.  See the above copyright notice for more information.
+//
+//  Copyright 2014 National Technology & Engineering Solutions of Sandia, LLC (NTESS).
+//  Copyright 2014 UT-Battelle, LLC.
+//  Copyright 2014 Los Alamos National Security.
+//
+//  Under the terms of Contract DE-NA0003525 with NTESS,
+//  the U.S. Government retains certain rights in this software.
+//
+//  Under the terms of Contract DE-AC52-06NA25396 with Los Alamos National
+//  Laboratory (LANL), the U.S. Government retains certain rights in
+//  this software.
+//============================================================================
+#ifndef vtk_m_cont_openmp_internal_ExecutionArrayInterfaceBasicOpenMP_h
+#define vtk_m_cont_openmp_internal_ExecutionArrayInterfaceBasicOpenMP_h
+
+#include <vtkm/cont/internal/ArrayManagerExecutionShareWithControl.h>
+#include <vtkm/cont/openmp/internal/DeviceAdapterTagOpenMP.h>
+
+namespace vtkm
+{
+namespace cont
+{
+namespace internal
+{
+
+template <>
+struct VTKM_CONT_EXPORT ExecutionArrayInterfaceBasic<DeviceAdapterTagOpenMP> final
+  : public ExecutionArrayInterfaceBasicShareWithControl
+{
+  //inherit our parents constructor
+  using ExecutionArrayInterfaceBasicShareWithControl::ExecutionArrayInterfaceBasicShareWithControl;
+
+  VTKM_CONT
+  DeviceAdapterId GetDeviceId() const final;
+};
+
+} // namespace internal
+}
+} // namespace vtkm::cont
+
+#endif //vtk_m_cont_serial_internal_ExecutionArrayInterfaceBasicSerial_h

vtkm/cont/serial/internal/ArrayManagerExecutionSerial.cxx

@@ -26,16 +26,6 @@ namespace vtkm
 {
 namespace cont
 {
-namespace internal
-{
-
-ExecutionArrayInterfaceBasic<DeviceAdapterTagSerial>::ExecutionArrayInterfaceBasic(
-  StorageBasicBase& storage)
-  : Superclass(storage)
-{
-}
-
-} // end namespace internal
 
 VTKM_INSTANTIATE_ARRAYHANDLES_FOR_DEVICE_ADAPTER(DeviceAdapterTagSerial)
 }

vtkm/cont/serial/internal/ExecutionArrayInterfaceBasicSerial.cxx

@@ -25,8 +25,7 @@ namespace cont
 {
 namespace internal
 {
-vtkm::cont::DeviceAdapterId ExecutionArrayInterfaceBasic<DeviceAdapterTagSerial>::GetDeviceId()
-  const
+DeviceAdapterId ExecutionArrayInterfaceBasic<DeviceAdapterTagSerial>::GetDeviceId() const
 {
   return VTKM_DEVICE_ADAPTER_SERIAL;
 }

vtkm/cont/serial/internal/ExecutionArrayInterfaceBasicSerial.h

@@ -34,10 +34,8 @@ template <>
 struct VTKM_CONT_EXPORT ExecutionArrayInterfaceBasic<DeviceAdapterTagSerial> final
   : public ExecutionArrayInterfaceBasicShareWithControl
 {
-  using Superclass = ExecutionArrayInterfaceBasicShareWithControl;
-
-  VTKM_CONT
-  ExecutionArrayInterfaceBasic(StorageBasicBase& storage);
+  //inherit our parents constructor
+  using ExecutionArrayInterfaceBasicShareWithControl::ExecutionArrayInterfaceBasicShareWithControl;
 
   VTKM_CONT
   DeviceAdapterId GetDeviceId() const final;

vtkm/cont/tbb/internal/ArrayManagerExecutionTBB.cxx

@@ -26,16 +26,6 @@ namespace vtkm
 {
 namespace cont
 {
-namespace internal
-{
-
-ExecutionArrayInterfaceBasic<DeviceAdapterTagTBB>::ExecutionArrayInterfaceBasic(
-  StorageBasicBase& storage)
-  : Superclass(storage)
-{
-}
-
-} // end namespace internal
 
 VTKM_INSTANTIATE_ARRAYHANDLES_FOR_DEVICE_ADAPTER(DeviceAdapterTagTBB)
 }

vtkm/cont/tbb/internal/ExecutionArrayInterfaceBasicTBB.h

@@ -37,10 +37,8 @@ template <>
 struct VTKM_CONT_EXPORT ExecutionArrayInterfaceBasic<DeviceAdapterTagTBB> final
   : public ExecutionArrayInterfaceBasicShareWithControl
 {
-  using Superclass = ExecutionArrayInterfaceBasicShareWithControl;
-
-  VTKM_CONT
-  ExecutionArrayInterfaceBasic(StorageBasicBase& storage);
+  //inherit our parents constructor
+  using ExecutionArrayInterfaceBasicShareWithControl::ExecutionArrayInterfaceBasicShareWithControl;
 
   VTKM_CONT
   DeviceAdapterId GetDeviceId() const final;

vtkm/cont/testing/UnitTestDeviceAdapterAlgorithmGeneral.cxx

@@ -126,13 +126,8 @@ template <>
 struct ExecutionArrayInterfaceBasic<DeviceAdapterTagTestAlgorithmGeneral>
   : public ExecutionArrayInterfaceBasicShareWithControl
 {
-  using Superclass = ExecutionArrayInterfaceBasicShareWithControl;
-
-  VTKM_CONT
-  ExecutionArrayInterfaceBasic(StorageBasicBase& storage)
-    : Superclass(storage)
-  {
-  }
+  //inherit our parents constructor
+  using ExecutionArrayInterfaceBasicShareWithControl::ExecutionArrayInterfaceBasicShareWithControl;
 
   VTKM_CONT
   DeviceAdapterId GetDeviceId() const final { return -3; }