Skip to content

Check protobuf v28 for neoml 2.0.244 #1124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Check protobuf v28 for neoml 2.0.244 #1124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 0 additions & 13 deletions Build/Sources.ThirdParty.txt
View file
Open in desktop

This file was deleted.

14 changes: 9 additions & 5 deletions NeoML/Python/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,16 @@ if(NOT pybind11_POPULATED)
endif()

# Build NeoML
set(NeoML_INSTALL OFF CACHE BOOL "" FORCE)
set(NeoML_BUILD_TESTS OFF CACHE BOOL "" FORCE)
set(NeoOnnx_BUILD ON CACHE BOOL "" FORCE)
if(LINUX)
set(NeoOnnx_BUILD_SHARED OFF CACHE BOOL "" FORCE)
set(NeoML_INSTALL OFF CACHE BOOL "" FORCE)
set(NeoML_BUILD_TESTS OFF CACHE BOOL "" FORCE)
set(NeoML_BUILD_SHARED OFF CACHE BOOL "" FORCE)
set(NeoOnnx_BUILD ON CACHE BOOL "" FORCE)
set(NeoOnnx_BUILD_SHARED OFF CACHE BOOL "" FORCE)

if(MSVC) # static linking the standard library
set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
endif()

add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_BINARY_DIR}/NeoML)

# Build python module
Expand Down
2 changes: 1 addition & 1 deletion NeoML/Python/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ def get_long_description():
long_description=get_long_description(),
long_description_content_type='text/markdown',
url='http://github.com/neoml-lib/neoml',
install_requires=['numpy>=1.19.1, <2.0.0', 'scipy>=1.5.2', 'onnx==1.14.1', 'protobuf==3.20.*'],
install_requires=['numpy>=1.19.1, <2.0.0', 'scipy>=1.5.2', 'onnx==1.14.1', 'protobuf==5.28.*'],
ext_modules=[CMakeExtension("neoml.PythonWrapper")],
cmdclass={"build_ext": CMakeBuild},
include_package_data=True,
Expand Down
89 changes: 47 additions & 42 deletions NeoOnnx/src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
cmake_minimum_required(VERSION 3.11 FATAL_ERROR)

set(CMAKE_CXX_STANDARD 14)

if(NeoOnnx_BUILD_SHARED)
add_library(${PROJECT_NAME} SHARED common.cpp)
else()
Expand Down Expand Up @@ -142,62 +144,70 @@ endif()

configure_target(${PROJECT_NAME})

# Have to first set the compile flags and then go through your subfolders.
if(MSVC)
target_compile_options(${PROJECT_NAME} PRIVATE /W2)
if(NeoOnnx_BUILD_SHARED)
target_compile_options(${PROJECT_NAME} PRIVATE /MD$<$<CONFIG:Debug>:d>)
else()
target_compile_options(${PROJECT_NAME} PRIVATE /MT$<$<CONFIG:Debug>:d>)
endif()
# Because of the code generated by protobuf
set(CMAKE_CXX_FLAGS " /wd4946 /wd4251 /wd4141 /wd4068 /wd4530 /wd4715 /wd4018 /wd4267 /wd4267 ")
elseif(LINUX OR DARWIN)
target_compile_options(${PROJECT_NAME} PUBLIC -Wno-pedantic -Wno-array-bounds)
if(USE_FINE_OBJECTS)
target_compile_options(${PROJECT_NAME} PRIVATE -Wno-nonportable-include-path)
endif()
add_compile_options( -Wno-attributes )
endif()

if(DEFINED ENV{Protobuf_ROOT} AND (IOS OR ANDROID))
list(APPEND CMAKE_FIND_ROOT_PATH $ENV{Protobuf_ROOT})
endif()

#----------------------------------------------------------------------------------------------------------------------

set(CMAKE_FOLDER "protobuf")

#--------------------------
if(${CMAKE_VERSION} VERSION_GREATER "3.16.0")
set(CMAKE_UNITY_BUILD OFF)
endif()

set(protobuf_BUILD_TESTS OFF CACHE BOOL "")
set(protobuf_MSVC_STATIC_RUNTIME "${STATIC_NEOML}" CACHE BOOL "")
set(protobuf_WITH_ZLIB OFF CACHE BOOL "")
set(protobuf_BUILD_PROTOC_BINARIES ON CACHE BOOL "")
set(protobuf_BUILD_SHARED_LIBS OFF CACHE BOOL "")
set(protobuf_INSTALL OFF CACHE BOOL "Install protobuf binaries and files" )
set(protobuf_BUILD_TESTS OFF CACHE BOOL "Build tests" )
set(protobuf_BUILD_LIBUPB OFF CACHE BOOL "Build libupb" )
set(protobuf_BUILD_PROTOC_BINARIES ON CACHE BOOL "Build libprotoc and protoc compiler" )
set(protobuf_BUILD_SHARED_LIBS OFF CACHE BOOL "Build Shared Libraries" )
set(protobuf_WITH_ZLIB OFF CACHE BOOL "Build with zlib support" )
set(protobuf_MSVC_STATIC_RUNTIME ON CACHE BOOL "Link static runtime libraries" )
set(ABSL_IDE_FOLDER "protobuf/absl" CACHE BOOL "The IDE sub-folder" )

if(USE_FINE_OBJECTS)
add_subdirectory("${FINE_ROOT}/ThirdParty/protobuf/cmake"
add_subdirectory("${FINE_ROOT}/ThirdParty/protobuf"
"${CMAKE_BINARY_DIR}/protobuf" EXCLUDE_FROM_ALL)
else()
include(FetchContent)
FetchContent_Declare(
protobuf
GIT_REPOSITORY https://github.com/protocolbuffers/protobuf.git
GIT_TAG v3.11.4
GIT_TAG v28.0
)

FetchContent_GetProperties(protobuf)

if(NOT protobuf_POPULATED)
FetchContent_Populate(protobuf)
add_subdirectory(${protobuf_SOURCE_DIR}/cmake ${protobuf_BINARY_DIR} EXCLUDE_FROM_ALL)
add_subdirectory(${protobuf_SOURCE_DIR} ${protobuf_BINARY_DIR} EXCLUDE_FROM_ALL)
endif()
endif()

if(LINUX)
target_compile_options(libprotobuf PRIVATE -Wno-stringop-overflow)
target_compile_options(libprotobuf-lite PRIVATE -Wno-stringop-overflow)
endif()

if(DARWIN)
target_compile_options(libprotobuf PRIVATE -Wno-deprecated-declarations)
target_compile_options(libprotobuf-lite PRIVATE -Wno-deprecated-declarations)
endif()

#--------------------------
if(${CMAKE_VERSION} VERSION_GREATER "3.16.0")
set(CMAKE_UNITY_BUILD ${NeoML_UNITY_BUILD})
endif()

if(USE_FINE_OBJECTS)
target_link_libraries(${PROJECT_NAME} PRIVATE FineObjects)

# Todo: properly link FineStlStaticPart if any problems occure
if(MSVC)
target_link_libraries(${PROJECT_NAME} PRIVATE "msvcprt$<$<CONFIG:Debug>:d>")
endif()
endif()

set(PROTO_DIR ${CMAKE_CURRENT_BINARY_DIR}/cpp_proto/${CMAKE_CFG_INTDIR})
set(PROTO_SRCS ${PROTO_DIR}/onnx.pb.cc)
set(PROTO_HDRS ${PROTO_DIR}/onnx.pb.h)
Expand All @@ -216,15 +226,15 @@ add_custom_command(
target_sources(${PROJECT_NAME} PRIVATE ${PROTO_HDRS} ${PROTO_SRCS})
set_property(SOURCE ${PROTO_HDRS} ${PROTO_SRCS} PROPERTY SKIP_UNITY_BUILD_INCLUSION ON)

if(MSVC)
target_compile_options(${PROJECT_NAME} PRIVATE /W2)
target_compile_options(${PROJECT_NAME} PRIVATE /MD$<$<CONFIG:Debug>:d>)
# Because of the code generated by protobuf
target_compile_options(${PROJECT_NAME} PRIVATE /wd4946 /wd4251)
elseif(NOT WIN32)
set_property(SOURCE ${PROTO_SRCS} APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-pedantic -Wno-array-bounds ")
if(USE_FINE_OBJECTS)
target_compile_options(${PROJECT_NAME} PRIVATE -Wno-nonportable-include-path)
unset(CMAKE_FOLDER)

#----------------------------------------------------------------------------------------------------------------------

if(USE_FINE_OBJECTS)
target_link_libraries(${PROJECT_NAME} PRIVATE FineObjects)
# TODO: properly link FineStlStaticPart if any problems occure
if(MSVC)
target_link_libraries(${PROJECT_NAME} PRIVATE "msvcprt$<$<CONFIG:Debug>:d>")
endif()
endif()

Expand Down Expand Up @@ -261,12 +271,7 @@ if(NOT TARGET protobuf::libprotobuf)
message(FATAL_ERROR "Protobuf not found!")
endif()

# Fix for a known protobuf Windows dll issue https://github.com/protocolbuffers/protobuf/issues/2502
if((Protobuf_LIBRARY MATCHES ".*dll") OR (Protobuf_LIBRARY MATCHES ".*DLL"))
target_compile_definitions(${PROJECT_NAME} PRIVATE PROTOBUF_USE_DLLS)
endif()

target_link_libraries(${PROJECT_NAME} PRIVATE protobuf::libprotobuf PUBLIC NeoML)
target_link_libraries(${PROJECT_NAME} PRIVATE protobuf::libprotobuf ${protobuf_ABSL_USED_TARGETS} PUBLIC NeoML)
if(ANDROID)
target_link_libraries(${PROJECT_NAME} PRIVATE log)
endif()
Expand Down
4 changes: 1 addition & 3 deletions NeoOnnx/src/Operators/GatherOperator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ limitations under the License.
#include "../common.h"
#pragma hdrstop

#include <algorithm>

#include "GatherOperator.h"
#include "NeoOnnxCheck.h"

Expand Down Expand Up @@ -57,7 +55,7 @@ void CGatherOperator::AddLayers( const CTensorArray& inputs, CDnn& dnn, CTensorA
CPtr<const CTensorBase> data = inputs[0];
CTensorLayout dataLayout;
for( int i = 0; i < data->DimCount(); ++i ) {
dataLayout.Add( static_cast<TBlobDim>( std::max( 0, indices->DimCount() - 1 ) + i ) );
dataLayout.Add( static_cast<TBlobDim>( max( 0, indices->DimCount() - 1 ) + i ) );
}
if( axis != 0 ) {
std::swap( dataLayout[0], dataLayout[axis] );
Expand Down
2 changes: 1 addition & 1 deletion Sources.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ git;https://github.com/abbyyProduct/ThirdParty-MKL
get;ThirdParty/MKL;/;MKL 2022.0.2 1.0.8.0

git;https://github.com/abbyyProduct/ThirdParty-protobuf
get;ThirdParty/protobuf;/;v3.11.4
get;ThirdParty/protobuf;/;protobuf-v28.0

git;https://github.com/abbyyProduct/Tools_Libs-NeoMLTest
get;NeoMLTest;/;NeoMLTest-master 1.0.71.0
Expand Down