c++11

Signed-off-by: voropz <[email protected]>

Author: voropz

NeoML/Python/neoml/Dnn/Split.py

@@ -86,7 +86,7 @@ def __init__(self, input_layer, sizes, name=None):
 # ----------------------------------------------------------------------------------------------------------------------
 
 
-class SplitDepth(Layer):
+class SplitDepth(SplitLayer):
     """The layer that splits an input blob along the Depth dimension.
     
     :param input_layer: The input layer and the number of its output. If no number
@@ -120,7 +120,7 @@ def __init__(self, input_layer, sizes, name=None):
 # ----------------------------------------------------------------------------------------------------------------------
 
 
-class SplitWidth(Layer):
+class SplitWidth(SplitLayer):
     """The layer that splits an input blob along the Width dimension.
     
     :param input_layer: The input layer and the number of its output. If no number
@@ -154,7 +154,7 @@ def __init__(self, input_layer, sizes, name=None):
 # ----------------------------------------------------------------------------------------------------------------------
 
 
-class SplitHeight(Layer):
+class SplitHeight(SplitLayer):
     """The layer that splits an input blob along the Height dimension.
     
     :param input_layer: The input layer and the number of its output. If no number
@@ -188,7 +188,7 @@ def __init__(self, input_layer, sizes, name=None):
 # ----------------------------------------------------------------------------------------------------------------------
 
 
-class SplitListSize(Layer):
+class SplitListSize(SplitLayer):
     """The layer that splits an input blob along the ListSize dimension.
     
     :param input_layer: The input layer and the number of its output. If no number
@@ -222,7 +222,7 @@ def __init__(self, input_layer, sizes, name=None):
 # ----------------------------------------------------------------------------------------------------------------------
 
 
-class SplitBatchWidth(Layer):
+class SplitBatchWidth(SplitLayer):
     """The layer that splits an input blob along the BatchWidth dimension.
     
     :param input_layer: The input layer and the number of its output. If no number
@@ -256,7 +256,7 @@ def __init__(self, input_layer, sizes, name=None):
 # ----------------------------------------------------------------------------------------------------------------------
 
 
-class SplitBatchLength(Layer):
+class SplitBatchLength(SplitLayer):
     """The layer that splits an input blob along the BatchLength dimension.
     
     :param input_layer: The input layer and the number of its output. If no number

NeoML/Python/src/PySplitLayer.cpp

@@ -18,6 +18,31 @@ limitations under the License.
 
 #include "PySplitLayer.h"
 
+py::array CPyBaseSplitLayer::GetOutputCounts() const {
+	const auto& fineCounts = Layer<CBaseSplitLayer>()->GetOutputCounts();
+
+	py::array_t<int, py::array::c_style> counts( fineCounts.Size() );
+	auto countsData = counts.mutable_unchecked<>();
+
+	for( int i = 0; i < fineCounts.Size(); ++i ) {
+		countsData( i ) = fineCounts[i];
+	}
+
+	return counts;
+}
+
+void CPyBaseSplitLayer::SetOutputCounts( py::array counts ) {
+	NeoAssert( counts.ndim() == 1 );
+	NeoAssert( counts.dtype().is( py::dtype::of<int>() ) );
+
+	CArray<int> fineCounts;
+	fineCounts.SetSize( static_cast<int>(counts.size()) );
+	for( int i = 0; i < fineCounts.Size(); i++ ) {
+		fineCounts[i] = static_cast<const int*>(counts.data())[i];
+	}
+	Layer<CBaseSplitLayer>()->SetOutputCounts( fineCounts );
+}
+
 class CPySplitChannelsLayer : public CPyBaseSplitLayer {
 public:
 	explicit CPySplitChannelsLayer( CSplitChannelsLayer& layer, CPyMathEngineOwner& mathEngineOwner ) : CPyBaseSplitLayer( layer, mathEngineOwner ) {}
@@ -105,16 +130,16 @@ class CPySplitBatchLengthLayer : public CPyBaseSplitLayer {
 template <class Layer, class PythonLayer>
 PythonLayer* InitSplit( const std::string& className, const std::string& name, const CPyLayer& layer1, int outputNumber1, py::array sizes )
 {
-	static_assert( std::is_base_of_v<CPyBaseSplitLayer, PythonLayer>, "PySplitLayer.cpp, InitSplit" );
-	static_assert( std::is_constructible_v<PythonLayer, Layer&, CPyMathEngineOwner&>, "PySplitLayer.cpp, InitSplit" );
+	static_assert( std::is_base_of<CPyBaseSplitLayer, PythonLayer>::value, "PySplitLayer.cpp, InitSplit" );
+	static_assert( std::is_constructible<PythonLayer, Layer&, CPyMathEngineOwner&>::value, "PySplitLayer.cpp, InitSplit" );
 
 	py::gil_scoped_release release;
 	CDnn& dnn = layer1.Dnn();
 	CPtr<Layer> split = new Layer( dnn.GetMathEngine() );
 	split->SetName( FindFreeLayerName( dnn, className, name ).c_str() );
 	dnn.AddLayer( *split );
 	split->Connect( 0, layer1.BaseLayer(), outputNumber1 );
-	auto layer = std::make_unique<PythonLayer>( *split, layer1.MathEngineOwner() );
+	std::unique_ptr<PythonLayer> layer( new PythonLayer( *split, layer1.MathEngineOwner() ) );
 	layer->SetOutputCounts( sizes );
 	return layer.release();
 }

NeoML/Python/src/PySplitLayer.h

@@ -21,32 +21,9 @@ class CPyBaseSplitLayer : public CPyLayer {
 public:
 	CPyBaseSplitLayer( CBaseSplitLayer& layer, CPyMathEngineOwner& mathEngineOwner ) : CPyLayer( layer, mathEngineOwner ) {}
 
-	py::array GetOutputCounts() const
-	{
-		const auto& fineCounts = Layer<CBaseSplitLayer>()->GetOutputCounts();
-
-		py::array_t<int, py::array::c_style> counts( fineCounts.Size() );
-		auto countsData = counts.mutable_unchecked<>();
-
-		for( int i = 0; i < fineCounts.Size(); ++i ) {
-			countsData( i ) = fineCounts[i];
-		}
-
-		return counts;
-	}
-
-	void SetOutputCounts( py::array counts )
-	{
-		NeoAssert( counts.ndim() == 1 );
-		NeoAssert( counts.dtype().is( py::dtype::of<int>() ) );
-
-		CArray<int> fineCounts;
-		fineCounts.SetSize( static_cast<int>(counts.size()) );
-		for( int i = 0; i < fineCounts.Size(); i++ ) {
-			fineCounts[i] = static_cast<const int*>(counts.data())[i];
-		}
-		Layer<CBaseSplitLayer>()->SetOutputCounts( fineCounts );
-	}
+	py::array GetOutputCounts() const;
+
+	void SetOutputCounts( py::array counts );
 };
 
-void InitializeSplitLayer( py::module& m );
+void InitializeSplitLayer( py::module& m );