Use unity build in OSS tests (neoml-lib#653)

* Compilation works!!!! Signed-off-by: Valeriy Fedyunin <valery.fedyunin@abbyy.com> * Fix randomziation tests Signed-off-by: Valeriy Fedyunin <valery.fedyunin@abbyy.com> * Fix name conflict Signed-off-by: Valeriy Fedyunin <valery.fedyunin@abbyy.com> * Try internal build Signed-off-by: Valeriy Fedyunin <valery.fedyunin@abbyy.com> * Enable distributed tests only for Windows and Linux Signed-off-by: Valeriy Fedyunin <valery.fedyunin@abbyy.com> * Revert "Enable distributed tests only for Windows and Linux" This reverts commit 00966ec. Signed-off-by: Valeriy Fedyunin <valery.fedyunin@abbyy.com> * Switch to updated NeoMLTest Signed-off-by: Valeriy Fedyunin <valery.fedyunin@abbyy.com> * Switch to actual NeoMLTest version Signed-off-by: Valeriy Fedyunin <valery.fedyunin@abbyy.com>
zimka · Jun 22, 2022 · 0ce77e9 · 0ce77e9
1 parent 5854899
commit 0ce77e9
Show file tree

Hide file tree

Showing 44 changed files with 710 additions and 1,393 deletions.
diff --git a/NeoML/test/desktop/CMakeLists.txt b/NeoML/test/desktop/CMakeLists.txt
@@ -13,7 +13,8 @@ add_executable(${PROJECT_NAME}
 )
 
 set_target_properties( ${PROJECT_NAME} PROPERTIES
-    UNITY_BUILD_MODE GROUP
+    UNITY_BUILD_MODE BATCH
+    UNITY_BUILD_BATCH_SIZE ${NeoML_UNITY_BUILD_BATCH_SIZE}
 )
 
 configure_target(${PROJECT_NAME})

diff --git a/NeoML/test/src/CMakeLists.txt b/NeoML/test/src/CMakeLists.txt
@@ -9,6 +9,7 @@ target_sources(${PROJECT_NAME} INTERFACE
     ${CMAKE_CURRENT_SOURCE_DIR}/TestFixture.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/TestParams.h
     ${CMAKE_CURRENT_SOURCE_DIR}/TestParams.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/MlTestCommon.h
     ${CMAKE_CURRENT_SOURCE_DIR}/ClusteringTest.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/DnnLayersSerializationTest.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/DnnSerializationTest.cpp
@@ -27,4 +28,9 @@ target_sources(${PROJECT_NAME} INTERFACE
     ${CMAKE_CURRENT_SOURCE_DIR}/DnnDistributedTest.cpp
 )
 
+set_target_properties( ${PROJECT_NAME} PROPERTIES
+    UNITY_BUILD_MODE BATCH
+    UNITY_BUILD_BATCH_SIZE ${NeoML_UNITY_BUILD_BATCH_SIZE}
+)
+
 target_include_directories(${PROJECT_NAME} INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/NeoML/test/src/FloatVectorTest.cpp b/NeoML/test/src/FloatVectorTest.cpp
@@ -17,6 +17,7 @@ limitations under the License.
 #pragma hdrstop
 
 #include <TestFixture.h>
+#include <MlTestCommon.h>
 
 using namespace NeoML;
 using namespace NeoMLTest;
@@ -27,17 +28,6 @@ class CFloatVectorTest : public CNeoMLTestFixture {
 	static void DeinitTestFixture() {}
 };
 
-static CSparseFloatVector generateRandomVector( CRandom& rand, int maxLength = 100,
-	float minValue = -100., float maxValue = 100. )
-{
-	CSparseFloatVector res;
-	for( int i = 0; i < maxLength; ++i ) {
-		int index = rand.UniformInt( 0, maxLength - 1 ) ;
-		res.SetAt( index, static_cast<float>( rand.Uniform( minValue, maxValue ) ) );
-	}
-	return res;
-}
-
 TEST_F( CFloatVectorTest, DotProduct )
 {
 	const int maxLength = 100;

diff --git a/NeoML/test/src/MlTestCommon.h b/NeoML/test/src/MlTestCommon.h
@@ -0,0 +1,31 @@
+/* Copyright © 2017-2022 ABBYY Production LLC
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+--------------------------------------------------------------------------------------------------------------*/
+
+#pragma once
+
+namespace NeoMLTest {
+
+inline CSparseFloatVector generateRandomVector( CRandom& rand, int maxLength = 100,
+	float minValue = -100., float maxValue = 100. )
+{
+	CSparseFloatVector res;
+	for( int i = 0; i < maxLength; ++i ) {
+		int index = rand.UniformInt( 0, maxLength - 1 ) ;
+		res.SetAt( index, static_cast<float>( rand.Uniform( minValue, maxValue ) ) );
+	}
+	return res;
+}
+
+} // namespace NeoMLTest
diff --git a/NeoML/test/src/SparseFloatMatrixTest.cpp b/NeoML/test/src/SparseFloatMatrixTest.cpp
@@ -17,6 +17,7 @@ limitations under the License.
 #pragma hdrstop
 
 #include <TestFixture.h>
+#include <MlTestCommon.h>
 
 using namespace NeoML;
 using namespace NeoMLTest;
@@ -27,17 +28,6 @@ class CSparseFloatMatrixTest : public CNeoMLTestFixture {
 	static void DeinitTestFixture() {}
 };
 
-static CSparseFloatVector generateRandomVector( CRandom& rand, int maxLength = 100,
-	float minValue = -100., float maxValue = 100. )
-{
-	CSparseFloatVector res;
-	for( int i = 0; i < maxLength; ++i ) {
-		int index = rand.UniformInt( 0, maxLength - 1 ) ;
-		res.SetAt( index, static_cast<float>( rand.Uniform( minValue, maxValue ) ) );
-	}
-	return res;
-}
-
 TEST_F( CSparseFloatMatrixTest, AddRow )
 {
 	const int maxLength = 100;

diff --git a/NeoML/test/src/TestFixture.cpp b/NeoML/test/src/TestFixture.cpp
@@ -66,7 +66,7 @@ namespace {
 #endif
 
 	static constexpr CharType TestDataPath[] = { '-','-','T','e','s','t','D','a','t','a','P','a','t','h','=' };
-	static constexpr CharType MathEngine[] = { '-','-','M','a','t','h','E','n','g','i','n','e','=' };
+	static constexpr CharType MathEngineArg[] = { '-','-','M','a','t','h','E','n','g','i','n','e','=' };
 	static constexpr CharType ThreadCount[] = { '-','-','T','h','r','e','a','d','C','o','u','n','t','=' };
 
 	static constexpr CharType Cpu[] = { 'c', 'p', 'u' };
@@ -77,7 +77,7 @@ namespace {
 	template <typename T>
 	TMathEngineType GetMathEngineType( int argc, T* argv[] )
 	{
-		auto value = ArgValue( argc, argv, MathEngine );
+		auto value = ArgValue( argc, argv, MathEngineArg );
 		if( !value ) {
 			return MET_Undefined;
 		}

diff --git a/NeoMathEngine/test/FullTestDesktop/CMakeLists.txt b/NeoMathEngine/test/FullTestDesktop/CMakeLists.txt
@@ -9,7 +9,8 @@ add_executable(${PROJECT_NAME}
 )
 
 set_target_properties( ${PROJECT_NAME} PROPERTIES
-    UNITY_BUILD_MODE GROUP
+    UNITY_BUILD_MODE BATCH
+    UNITY_BUILD_BATCH_SIZE ${NeoML_UNITY_BUILD_BATCH_SIZE}
 )
 
 if(MSVC)

diff --git a/NeoMathEngine/test/src/common/CMakeLists.txt b/NeoMathEngine/test/src/common/CMakeLists.txt
@@ -1,14 +1,16 @@
 project(CommonTestTools)
 
 add_library(${PROJECT_NAME}
+	MeTestCommon.h
 	TestFixture.cpp
 	TestFixture.h
 	TestParams.cpp
 	TestParams.h
 )
 
 set_target_properties( ${PROJECT_NAME} PROPERTIES
-    UNITY_BUILD_MODE GROUP
+    UNITY_BUILD_MODE BATCH
+    UNITY_BUILD_BATCH_SIZE ${NeoML_UNITY_BUILD_BATCH_SIZE}
 )
 
 configure_target(${PROJECT_NAME})