Skip to content

Commit 4a98634

Browse files
committed
remove Eigen alignment detection dead code
1 parent a81d779 commit 4a98634

File tree

2 files changed

+4
-31
lines changed

2 files changed

+4
-31
lines changed

CMakeLists.txt

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -585,26 +585,10 @@ if (NOT MSVC AND MRPT_ENABLE_PRECOMPILED_HDRS)
585585
set_directory_properties(PROPERTIES COTIRE_ADD_UNITY_BUILD FALSE) # Disable unity targets
586586
endif()
587587

588-
# Detect Eigen Alignment to make MRPT compatible.
589-
# EIGEN_MAX_ALIGN_BYTES & EIGEN_MAX_STATIC_ALIGN_BYTES with selected compiler flags
590-
# ------------------------------------------------
591-
# DISABLED! Just go for the safer side: align=32 bytes
592-
# get_directory_property(mrpt_root_dir_COMPILE_OPTIONS COMPILE_OPTIONS)
593-
#try_run(RUN_EIGEN_RETVAL BUILD_EIGEN_SUCCESS
594-
# ${CMAKE_BINARY_DIR}
595-
# SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/parse-files/eigen_detect_alignment.cpp"
596-
# COMPILE_DEFINITIONS ""
597-
# CMAKE_FLAGS
598-
# -DINCLUDE_DIRECTORIES:STRING=${MRPT_EIGEN_INCLUDE_DIR}
599-
# -DCMAKE_CXX_FLAGS:STRING="${CMAKE_CXX_FLAGS} ${mrpt_root_dir_COMPILE_OPTIONS}"
600-
# OUTPUT_VARIABLE EIGEN_TEST_OUT)
601-
#if (BUILD_EIGEN_SUCCESS AND (RUN_EIGEN_RETVAL EQUAL 0))
602-
# string(REGEX MATCH "EIGEN_MAX_ALIGN_BYTES[ ]+[0-9]+" EIGEN_MAX_ALIGN_BYTES "${EIGEN_TEST_OUT}")
603-
# string(REGEX MATCH "[0-9]+" EIGEN_MAX_ALIGN_BYTES "${EIGEN_MAX_ALIGN_BYTES}")
604-
# string(REGEX MATCH "EIGEN_MAX_STATIC_ALIGN_BYTES[ ]+[0-9]+" EIGEN_MAX_STATIC_ALIGN_BYTES "${EIGEN_TEST_OUT}")
605-
# string(REGEX MATCH "[0-9]+" EIGEN_MAX_STATIC_ALIGN_BYTES "${EIGEN_MAX_STATIC_ALIGN_BYTES}")
606-
#else()
607-
#message(STATUS "Test Eigen build failed, falling back to default alignment (BUILD_EIGEN_SUCCESS=${BUILD_EIGEN_SUCCESS} RUN_EIGEN_RETVAL=${RUN_EIGEN_RETVAL} BUILD_EIGEN_OUT=${EIGEN_TEST_OUT})")
588+
# Eigen Alignment to make MRPT compatible with different compiler build flags.
589+
# EIGEN_MAX_ALIGN_BYTES & EIGEN_MAX_STATIC_ALIGN_BYTES
590+
# Just go for the safer side: align=32 bytes
591+
# ------------------------------------------------------
608592
if (MRPT_ARCH_INTEL_COMPATIBLE)
609593
set(EIGEN_MAX_ALIGN_BYTES 32)
610594
set(EIGEN_MAX_STATIC_ALIGN_BYTES 32)
@@ -613,7 +597,6 @@ else()
613597
set(EIGEN_MAX_ALIGN_BYTES 16)
614598
set(EIGEN_MAX_STATIC_ALIGN_BYTES 16)
615599
endif()
616-
#endif()
617600

618601
include(cmakemodules/script_create_config_h.cmake REQUIRED) # Build config.h
619602
include(cmakemodules/script_create_version_h.cmake REQUIRED) # Build version.h

parse-files/eigen_detect_alignment.cpp

Lines changed: 0 additions & 10 deletions
This file was deleted.

0 commit comments

Comments
 (0)