Move to a new build environment (#980)

* Update configuration for new build Signed-off-by: Valery Fedyunin <valery.fedyunin@abbyy.com> * Disable GPU tests on Windows Signed-off-by: Valery Fedyunin <valery.fedyunin@abbyy.com> * Fix gtest build Signed-off-by: Valery Fedyunin <valery.fedyunin@abbyy.com> * Fix clang compilation Signed-off-by: Valery Fedyunin <valery.fedyunin@abbyy.com> * Update build address Signed-off-by: Valery Fedyunin <valery.fedyunin@abbyy.com> * Revert "Update build address" This reverts commit 9e1a15d. Signed-off-by: Valery Fedyunin <valery.fedyunin@abbyy.com> * Delete publish paths Signed-off-by: Valery Fedyunin <valery.fedyunin@abbyy.com> --------- Signed-off-by: Valery Fedyunin <valery.fedyunin@abbyy.com>
neoml-lib · Oct 11, 2023 · ebf9b1f · ebf9b1f
1 parent a6cfa96
commit ebf9b1f
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 22 deletions.
diff --git a/Build/Configuration.txt b/Build/Configuration.txt
@@ -4,12 +4,14 @@ BUILD_PARALLELL_TASKS=4
 
 #BUILD_INCREASE_MODIFICATION = 1
 
-BUILD_SOURCES=\\LINGVO\ABBYY\R&D Department\Tools_Libs\Sources
+BUILD_SOURCES=
 
-BUILD_RESULTS=\\LINGVO\ABBYY\R&D Department\Tools_Libs\Results
+BUILD_RESULTS=
 
 BUILD_USERNAME=buildtech
 
+SENDMAIL_PS1_OPTIONS=-SmtpServer relay.abbyy.com -SmtpPort 587 -SmtpSecure -AttachmentsArchive Logs.zip
+
 #----------------------------------------------------------------------------------------
 
 VCToolsVersion=14.33.31629
@@ -25,9 +27,6 @@ CMAKE_GENERATOR=Visual Studio 17 2022
 CMAKE_GENERATOR_TOOLSET=v143,version=%VCToolsVersion%,host=x64
 
 _ABBYY_UTILS=%ProgramFiles(x86)%\ABBYY Build Utilities
-_GIT=%ProgramFiles%\Git
-_CMAKE=%ProgramFiles%\CMake
-_PYTHON=%ProgramFiles%\Python36
 
 BUILD_PLATFORM=Win32
 
@@ -37,9 +36,9 @@ PATH=%PATH%;%_MSVC%\bin\HostX64\x64
 PATH=%PATH%;%_MSDEV%\Common7\IDE
 PATH=%PATH%;%WindowsSdkDir%\bin\%TargetPlatformVersion%\x64
 PATH=%PATH%;%_ABBYY_UTILS%
-PATH=%PATH%;%_GIT%\bin
-PATH=%PATH%;%_CMAKE%\bin
-PATH=%PATH%;%_PYTHON%
+PATH=%PATH%;%GIT_PATH%
+PATH=%PATH%;%CMAKE_PATH%
+PATH=%PATH%;%PYTHON_PATH%
 PATH=%PATH%;%_MSDEV%\MSBuild\Current\Bin
 
 #----------------------------------------------------------------------------------------
@@ -60,8 +59,9 @@ PATH.x86=%PATH.x86%;%_MSDEV%\Common7\IDE
 PATH.x86=%PATH.x86%;%WindowsSdkDir%\bin\%TargetPlatformVersion%\x64
 PATH.x86=%PATH.x86%;%_ABBYY_UTILS%
 PATH.x86=%PATH.x86%;%_MSDEV%\MSBuild\Current\Bin
-PATH.x86=%PATH.x86%;%_GIT%\bin
-PATH.x86=%PATH.x86%;%_CMAKE%\bin
+PATH.x86=%PATH.x86%;%GIT_PATH%
+PATH.x86=%PATH.x86%;%CMAKE_PATH%
+PATH.x86=%PATH.x86%;%PYTHON_PATH%
 
 LIB.x86=%_MSVC%\Lib\x86;%WindowsSdkDir%\Lib
 LIB.x86=%LIB.x86%;%ProgramFiles(x86)%\Windows Kits\10\lib\%TargetPlatformVersion%\ucrt\x86
@@ -86,8 +86,9 @@ PATH.x64=%PATH.x64%;%_MSDEV%\Common7\IDE
 PATH.x64=%PATH.x64%;%WindowsSdkDir%\bin\%TargetPlatformVersion%\x64
 PATH.x64=%PATH.x64%;%_ABBYY_UTILS%
 PATH.x64=%PATH.x64%;%_MSDEV%\MSBuild\Current\Bin
-PATH.x64=%PATH.x64%;%_GIT%\bin
-PATH.x64=%PATH.x64%;%_CMAKE%\bin
+PATH.x64=%PATH.x64%;%GIT_PATH%
+PATH.x64=%PATH.x64%;%CMAKE_PATH%
+PATH.x64=%PATH.x64%;%PYTHON_PATH%
 
 LIB.x64=%_MSVC%\Lib\x64;%WindowsSdkDir%\Lib\x64
 LIB.x64=%LIB.x64%;%ProgramFiles(x86)%\Windows Kits\10\lib\%TargetPlatformVersion%\ucrt\x64

diff --git a/Build/NeoML.bld b/Build/NeoML.bld
@@ -41,18 +41,12 @@ group;para;RunMathEngineTests
 	configuration;x86
 		runx;%ROOT%\WinFinal\NeoMathEngineFullTestDesktop.exe;--MathEngine=cpu
 	end_configuration
-	configuration;x64
-		runx;%ROOT%\WinFinal.x64\NeoMathEngineFullTestDesktop.exe;--MathEngine=cuda
-	end_configuration
 end_group
 
 group;para;RunInferenceTests
 	configuration;x86
 		runx;%ROOT%\WinFinal\NeoMLInferenceTestDesktop.exe;--TestDataPath=%ROOT%\WinFinal\ --MathEngine=cpu
 	end_configuration
-	configuration;x64
-		runx;%ROOT%\WinFinal.x64\NeoMLInferenceTestDesktop.exe;--TestDataPath=%ROOT%\WinFinal.x64\ --MathEngine=gpu
-	end_configuration
 end_group
 
 group;para;RunCommonTests
@@ -61,17 +55,13 @@ group;para;RunCommonTests
 	end_configuration
 	configuration;x64
 		runx;%ROOT%\WinFinal.x64\NeoMLCCTestDesktop.exe;--TestDataPath=%ROOT%\WinFinal.x64\
-		runx;%ROOT%\WinFinal.x64\NeoMLTestDesktop.exe;--TestDataPath=%ROOT%\WinFinal.x64\ --MathEngine=gpu
 	end_configuration
 end_group
 
 group;seq;RunNeoMLTests
 	configuration;x86
 		runx;%ROOT%\WinFinal\NeoMLTest.exe;--TestDataPath=%ROOT%\WinFinal\ --MathEngine=cpu
 	end_configuration
-	configuration;x64
-		runx;%ROOT%\WinFinal.x64\NeoMLTest.exe;--TestDataPath=%ROOT%\WinFinal.x64\ --MathEngine=cuda
-	end_configuration
 end_group
 
 group;para;RunNeoOnnxTests

diff --git a/cmake/Settings.cmake b/cmake/Settings.cmake
@@ -71,6 +71,12 @@ function(configure_target TARGET_NAME)
             $<$<COMPILE_LANGUAGE:CXX>:-Wno-unknown-pragmas>
             $<$<COMPILE_LANGUAGE:CXX>:-Wno-strict-overflow>
         )
+        if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+            # This option is unknown to clang
+            target_compile_options(${TARGET_NAME} PRIVATE
+                $<$<COMPILE_LANGUAGE:CXX>:-Wno-deprecated-copy>
+            )
+        endif()
     endif()
 
     # No extensions use