Upgrade minimum cmake and update ci (#78)

* always set msvc flag and upgrade minimum cmake

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

* update PATH for cmake

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

* update

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

* msvc dynamic runtime by default, override /usr/local/bin/cmake

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

* remove duplicated protobuf in ci, other changes

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

Author: daquexian

.github/workflows/build-and-test.yml

@@ -6,9 +6,8 @@ jobs:
   build_wheels:
     env:
       CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014
-      CIBW_BEFORE_ALL_LINUX: WD=`pwd` && /opt/python/cp38-cp38/bin/python -m pip install cmake && cp /opt/python/cp38-cp38/bin/cmake /usr/bin/cmake && mkdir temp && curl -L https://github.com/protocolbuffers/protobuf/releases/download/v3.13.0/protobuf-all-3.13.0.tar.gz -o protobuf.tar.gz && tar xf protobuf.tar.gz -C temp && rm -rf protobuf.tar.gz && cd temp/* && mkdir cmake/build && cd cmake/build && cmake -Dprotobuf_BUILD_TESTS=OFF -DBUILD_SHARED_LIBS=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_BUILD_TYPE=Release .. && cmake --build . -j4 && cmake -P cmake_install.cmake && cd $WD && rm -rf temp
-      CIBW_BEFORE_ALL_MACOS: WD=`pwd` && pip install cmake && git clone https://github.com/protocolbuffers/protobuf.git && cd protobuf && git checkout v3.13.0 && cd cmake && mkdir build && cd build && cmake -Dprotobuf_BUILD_TESTS=OFF -Dprotobuf_BUILD_EXAMPLES=OFF -DBUILD_SHARED_LIBS=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_BUILD_TYPE=Release .. && cmake --build . -j4 && cmake -P cmake_install.cmake && cd $WD && rm -rf protobuf
-      CIBW_BEFORE_ALL_WINDOWS: bash -c "WD=`pwd` && git clone https://github.com/protocolbuffers/protobuf.git  && cd protobuf && git checkout v3.13.0 && cd cmake && mkdir build && cd build && cmake -G \"Visual Studio 16 2019\" -A x64 -Dprotobuf_MSVC_STATIC_RUNTIME=OFF -Dprotobuf_BUILD_TESTS=OFF -Dprotobuf_BUILD_EXAMPLES=OFF -DCMAKE_INSTALL_PREFIX=C:/protobuf_install -DBUILD_SHARED_LIBS=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON .. && cmake --build . --config Release -j4 && cmake -P cmake_install.cmake --config Release && cd $WD && rm -rf protobuf"
+      CIBW_BEFORE_ALL_LINUX: WD=`pwd` && /opt/python/cp38-cp38/bin/python -m pip install cmake && cp /opt/_internal/cpython-3.8.6/bin/cmake /usr/local/bin/cmake && cmake --version && whereis cmake
+      CIBW_BEFORE_ALL_MACOS: WD=`pwd` && pip install cmake
       CIBW_TEST_REQUIRES_LINUX: pytest==5.4.3 nbval flake8 mypy onnxruntime
       CIBW_TEST_REQUIRES_MACOS: pytest==5.4.3 nbval
       CIBW_TEST_REQUIRES_WINDOWS: pytest==5.4.3 nbval
@@ -17,7 +16,7 @@ jobs:
       CIBW_TEST_COMMAND: pytest {project}/onnxoptimizer/test
       CIBW_TEST_COMMAND_LINUX: cd {project} && flake8 && ! grep -R --include='*.cc' --include='*.h' 'namespace onnx' . && ! grep -R --include='*.cc' --include='*.h' 'onnx::' . && pytest
       CIBW_ENVIRONMENT: CMAKE_ARGS="-DONNX_USE_PROTOBUF_SHARED_LIBS=OFF -DProtobuf_USE_STATIC_LIBS=ON -DONNX_USE_LITE_PROTO=ON"
-      CIBW_ENVIRONMENT_WINDOWS: CMAKE_PREFIX_PATH=C:/protobuf_install USE_MSVC_STATIC_RUNTIME=0 CMAKE_ARGS="-DONNX_USE_PROTOBUF_SHARED_LIBS=OFF -DProtobuf_USE_STATIC_LIBS=ON -DONNX_USE_LITE_PROTO=ON"
+      CIBW_ENVIRONMENT_WINDOWS: USE_MSVC_STATIC_RUNTIME=0 CMAKE_ARGS="-DONNX_USE_PROTOBUF_SHARED_LIBS=OFF -DProtobuf_USE_STATIC_LIBS=ON -DONNX_USE_LITE_PROTO=ON"
       # Only build on Python 3 and skip 32-bit builds
       CIBW_BUILD: cp3?-*
       # Skip python 3.5 and 3.6
@@ -39,6 +38,7 @@ jobs:
       run: |
         python -m pip install --upgrade pip
         python -m pip install cibuildwheel==1.7.2
+        cmake --version
         cibuildwheel --output-dir wheelhouse .
     - uses: actions/upload-artifact@v2
       with:

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.22)
 
 # For std::filesystem
 # Must be a cache variable and be set before project()
@@ -12,21 +12,17 @@ set(CMAKE_CXX_STANDARD 17)
 
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
-# Poor man's FetchContent
-function(add_subdirectory_if_no_target dir target)
-  if (NOT TARGET ${target})
-    add_subdirectory(${dir})
-  endif()
-endfunction()
+include(cmake/utils.cmake)
 
 # For integration with onnxruntime_webassembly etc.
 if (NOT DEFINED ONNX_TARGET_NAME)
   set(ONNX_TARGET_NAME onnx)
 endif()
 
-option(protobuf_BUILD_TESTS "" OFF)
 option(ONNX_OPT_USE_SYSTEM_PROTOBUF "" OFF)
 if(NOT ONNX_OPT_USE_SYSTEM_PROTOBUF)
+  option(protobuf_BUILD_TESTS "" OFF)
+  option(protobuf_MSVC_STATIC_RUNTIME "" ${ONNX_USE_MSVC_STATIC_RUNTIME})
   add_subdirectory_if_no_target(${PROJECT_SOURCE_DIR}/third_party/protobuf/cmake libprotobuf)
 endif()
 
@@ -42,14 +38,14 @@ file(GLOB_RECURSE onnx_opt_srcs "onnxoptimizer/*.cc"
     )
 list(REMOVE_ITEM onnx_opt_srcs "${PROJECT_SOURCE_DIR}/onnxoptimizer/cpp2py_export.cc")
 
-add_library(onnx_optimizer ${onnx_opt_srcs})
+onnxopt_add_library(onnx_optimizer ${onnx_opt_srcs})
 target_link_libraries(onnx_optimizer PUBLIC ${ONNX_TARGET_NAME})
 target_include_directories(onnx_optimizer PUBLIC
     $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}>
     $<INSTALL_INTERFACE:include>
     )
 
-add_executable(onnx_optimizer_exec examples/onnx_optimizer_exec.cpp)
+onnxopt_add_executable(onnx_optimizer_exec examples/onnx_optimizer_exec.cpp)
 target_link_libraries(onnx_optimizer_exec onnx_optimizer)
 
 if(BUILD_ONNX_PYTHON)
@@ -61,7 +57,7 @@ if(BUILD_ONNX_PYTHON)
     endif()
   endif()
 
-  add_library(onnx_opt_cpp2py_export MODULE "onnxoptimizer/cpp2py_export.cc")
+  onnxopt_add_library(onnx_opt_cpp2py_export MODULE "onnxoptimizer/cpp2py_export.cc")
   set_target_properties(onnx_opt_cpp2py_export PROPERTIES PREFIX "")
   set_target_properties(onnx_opt_cpp2py_export
                         PROPERTIES COMPILE_FLAGS "-fvisibility=hidden")
@@ -140,7 +136,6 @@ if(BUILD_ONNX_PYTHON)
                                              # clients of class 'type2'
                             )
     endif()
-    add_msvc_runtime_flag(onnx_opt_cpp2py_export)
   endif()
 endif()
 

cmake/utils.cmake

@@ -0,0 +1,22 @@
+include(${PROJECT_SOURCE_DIR}/third_party/onnx/cmake/Utils.cmake)
+
+# Poor man's FetchContent
+function(add_subdirectory_if_no_target dir target)
+  if (NOT TARGET ${target})
+    add_subdirectory(${dir})
+  endif()
+endfunction()
+
+function(onnxopt_add_library)
+  add_library(${ARGV})
+  if (MSVC)
+    add_msvc_runtime_flag(${ARGV0})
+  endif()
+endfunction()
+
+function(onnxopt_add_executable)
+  add_executable(${ARGV})
+  if (MSVC)
+    add_msvc_runtime_flag(${ARGV0})
+  endif()
+endfunction()

setup.py

@@ -30,8 +30,7 @@
 
 WINDOWS = (os.name == 'nt')
 
-CMAKE = find_executable('cmake3') or find_executable('cmake')
-MAKE = find_executable('make')
+CMAKE = find_executable('cmake')
 
 install_requires = []
 setup_requires = []
@@ -41,9 +40,7 @@
 # Global variables for controlling the build variant
 ################################################################################
 
-# Default value is set to TRUE\1 to keep the settings same as the current ones.
-# However going forward the recomemded way to is to set this to False\0
-USE_MSVC_STATIC_RUNTIME = bool(os.getenv('USE_MSVC_STATIC_RUNTIME', '1') == '1')
+USE_MSVC_STATIC_RUNTIME = bool(os.getenv('USE_MSVC_STATIC_RUNTIME', '0') == '1')
 ONNX_ML = not bool(os.getenv('ONNX_ML') == '0')
 ONNX_VERIFY_PROTO3 = bool(os.getenv('ONNX_VERIFY_PROTO3') == '1')
 ONNX_NAMESPACE = os.getenv('ONNX_NAMESPACE', 'onnx')
@@ -114,11 +111,6 @@ def run(self):
             f.write(dedent('''\
             # This file is generated by setup.py. DO NOT EDIT!
 
-            from __future__ import absolute_import
-            from __future__ import division
-            from __future__ import print_function
-            from __future__ import unicode_literals
-
             version = '{version}'
             git_version = '{git_version}'
             '''.format(**dict(VersionInfo._asdict()))))