Skip to content

Minor change to TH/CMakeLists.txt #1161

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

Open
Taicanium wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Minor change to TH/CMakeLists.txt #1161

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a3aad53
Minor change to TH/CMakeLists.txt
Jul 18, 2018
63b63ab
Revision of SIMD detection
Jul 25, 2018
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
17 changes: 13 additions & 4 deletions lib/TH/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,16 +217,25 @@ IF(C_AVX2_FOUND OR C_AVX_FOUND OR C_SSE4_2_FOUND OR C_SSE4_1_FOUND)
SET(simd generic/simd/convolve.c)
ENDIF(C_AVX2_FOUND OR C_AVX_FOUND OR C_SSE4_2_FOUND OR C_SSE4_1_FOUND)

# IF SSE4 FOUND
IF(C_SSE4_1_FOUND AND C_SSE4_2_FOUND)
SET(CMAKE_C_FLAGS "${C_SSE4_1_FLAGS} -DUSE_SSE4_1 ${C_SSE4_2_FLAGS} -DUSE_SSE4_2 ${CMAKE_C_FLAGS}")
# IF SSE4.1 FOUND
IF(C_SSE4_1_FOUND)
SET(CMAKE_C_FLAGS "${C_SSE4_1_FLAGS} -DUSE_SSE4_1")
ENDIF(C_SSE4_1_FOUND)

# IF SSE4.2 FOUND
IF(C_SSE4_2_FOUND)
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${C_SSE4_2_FLAGS} -DUSE_SSE4_2")
ENDIF(C_SSE4_2_FOUND)

# IF SSE4.1 OR SSE4.2 FOUND
IF(C_SSE4_1_FOUND OR C_SSE4_2_FOUND)
IF(MSVC)
SET_SOURCE_FILES_PROPERTIES(generic/simd/convolve5x5_sse.c PROPERTIES COMPILE_FLAGS "/Ox /fp:fast")
ELSE(MSVC)
SET_SOURCE_FILES_PROPERTIES(generic/simd/convolve5x5_sse.c PROPERTIES COMPILE_FLAGS "-O3 -ffast-math")
ENDIF(MSVC)
SET(simd ${simd} generic/simd/convolve5x5_sse.c)
ENDIF(C_SSE4_1_FOUND AND C_SSE4_2_FOUND)
ENDIF(C_SSE4_1_FOUND OR C_SSE4_2_FOUND)

# IF AVX FOUND
IF(C_AVX_FOUND)
Expand Down