diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2024-06-23 12:04:25 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2024-06-23 12:04:58 +0200 |
| commit | 4404afaf4e64bca90046fe2bfe8d5066a5bb5d94 (patch) | |
| tree | 4607a519149e82589c00236a0b101e4e0f0f7160 | |
| parent | e7d6d6df0f2fe11730dd6699566797de75982aac (diff) | |
cmake: update 64-bit avx and 32-bit no-avx builds
| -rw-r--r-- | cmake/msvc.cmake | 12 | ||||
| -rw-r--r-- | cmake/opentrack-platform.cmake | 1 | ||||
| -rw-r--r-- | sdk-paths-sthalik@MSVC-windows.cmake | 4 |
3 files changed, 12 insertions, 5 deletions
diff --git a/cmake/msvc.cmake b/cmake/msvc.cmake index 311e261c..b390c120 100644 --- a/cmake/msvc.cmake +++ b/cmake/msvc.cmake @@ -112,11 +112,10 @@ endif() set(opentrack-simd "SSE2") if(CMAKE_PROJECT_NAME STREQUAL "onnxruntime") - set(opentrack-simd "AVX") sets(BOOL ONNX_USE_MSVC_STATIC_RUNTIME OFF protobuf_MSVC_STATIC_RUNTIME OFF - onnxruntime_USE_AVX ON + onnxruntime_USE_AVX OFF onnxruntime_USE_AVX2 OFF onnxruntime_USE_AVX512 OFF onnxruntime_BUILD_BENCHMARKS OFF @@ -132,7 +131,14 @@ if(CMAKE_PROJECT_NAME STREQUAL "onnxruntime") onnxruntime_DISABLE_CONTRIB_OPS ON BUILD_TESTING OFF ) -elseif(opentrack-64bit) + if(opentrack-64bit) + sets(BOOL + onnxruntime_USE_AVX ON + ) + endif() +endif() + +if(opentrack-64bit) set(opentrack-simd "AVX") endif() diff --git a/cmake/opentrack-platform.cmake b/cmake/opentrack-platform.cmake index f7db0dc8..638260f1 100644 --- a/cmake/opentrack-platform.cmake +++ b/cmake/opentrack-platform.cmake @@ -137,6 +137,7 @@ if(MSVC) add_link_options(-ignore:4020) add_link_options(-ignore:4217) # debug build + if(MSVC_VERSION GREATER_EQUAL 1913) if(NOT MSVC_VERSION GREATER_EQUAL 1929) add_compile_options(-experimental:external) diff --git a/sdk-paths-sthalik@MSVC-windows.cmake b/sdk-paths-sthalik@MSVC-windows.cmake index fa3fbaa3..e5818ad4 100644 --- a/sdk-paths-sthalik@MSVC-windows.cmake +++ b/sdk-paths-sthalik@MSVC-windows.cmake @@ -34,7 +34,7 @@ setq(Qt5_DIR "../qt-5.15-kde-amd64/lib/cmake/Qt5") setq(OpenCV_DIR "opencv/build-amd64/install") setq(SDK_ARUCO_LIBPATH "aruco/build-amd64/src/aruco.lib") setq(SDK_LIBUSB "libusb-msvc-amd64") -setq(ONNXRuntime_DIR "onnxruntime-1.17.0-amd64") +setq(ONNXRuntime_DIR "onnxruntime-1.18.0-amd64") setq(SDK_TRACKHAT_SENSOR "trackhat-c-library-driver/build-amd64/install") setq(SDK_OSCPACK "oscpack/build-amd64") elseif(CMAKE_SIZEOF_VOID_P EQUAL 4) @@ -42,7 +42,7 @@ setq(Qt5_DIR "../qt/qt-5.15-kde-msvc-32/lib/cmake/Qt5") setq(OpenCV_DIR "opencv/build/install") setq(SDK_ARUCO_LIBPATH "aruco/build/src/aruco.lib") setq(SDK_LIBUSB "libusb-msvc-x86") -setq(ONNXRuntime_DIR "onnxruntime-1.17.0") +setq(ONNXRuntime_DIR "onnxruntime-1.18.0") setq(SDK_TRACKHAT_SENSOR "trackhat-c-library-driver/build/install") setq(SDK_OSCPACK "oscpack/build") else() |