[GitHub] marcoabreu closed pull request #12331: Moves f16c autodetection to its own cmake module

[GitBox <gi...@apache.org>]

marcoabreu closed pull request #12331: Moves f16c autodetection to its own cmake module
URL: https://github.com/apache/incubator-mxnet/pull/12331
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/CMakeLists.txt b/CMakeLists.txt
index adff5333665..0e4de0bd086 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -110,27 +110,17 @@ else(MSVC)
   endif()
   # For cross complication, turn off flag if target device does not support it
   if(USE_F16C)
-    check_cxx_compiler_flag("-mf16c"     COMPILER_SUPPORT_MF16C)
-    if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-      execute_process(COMMAND cat /proc/cpuinfo
-              COMMAND grep flags
-              COMMAND grep f16c
-              OUTPUT_VARIABLE CPU_SUPPORT_F16C)
-    elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
-      execute_process(COMMAND sysctl -a
-              COMMAND grep machdep.cpu.features
-              COMMAND grep F16C
-              OUTPUT_VARIABLE CPU_SUPPORT_F16C)
-    endif()
-    if(NOT CPU_SUPPORT_F16C)
-      message("CPU does not support F16C instructions")
-    endif()
-    if(CPU_SUPPORT_F16C AND COMPILER_SUPPORT_MF16C)
-      set(SUPPORT_F16C TRUE)
-    endif()
+    # Determine if hardware supports F16C instruction set
+    message(STATUS "Determining F16C support")
+    include(cmake/AutoDetectF16C.cmake)
   else()
     set(SUPPORT_F16C FALSE)
   endif()
+  if(SUPPORT_F16C)
+    set(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} -mf16c")
+  else()
+    add_definitions(-DMSHADOW_USE_F16C=0)
+  endif()
   set(CMAKE_POSITION_INDEPENDENT_CODE ON)
   set(CMAKE_C_FLAGS "-Wall -Wno-unknown-pragmas -Wno-sign-compare")
   if ("${CMAKE_CXX_COMPILER_ID}" MATCHES ".*Clang$")
diff --git a/cmake/AutoDetectF16C.cmake b/cmake/AutoDetectF16C.cmake
new file mode 100644
index 00000000000..04331c3ac71
--- /dev/null
+++ b/cmake/AutoDetectF16C.cmake
@@ -0,0 +1,53 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# Determines whether hardware and compiler support F16C 
+# instruction set
+#
+# The following are set after configuration is done:
+#  SUPPORT_F16C
+
+if(AUTO_DETECT_F16_CMAKE_INCLUDED)
+  return()
+endif()
+set(AUTO_DETECT_F16_CMAKE_INCLUDED True)
+
+set(SUPPORT_F16C False)
+if(MSVC)
+    message("F16C instruction set is not yet supported for MSVC")
+    return()
+endif()
+include(CheckCXXCompilerFlag)
+check_cxx_compiler_flag("-mf16c" COMPILER_SUPPORT_MF16C)
+if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+    execute_process(COMMAND cat /proc/cpuinfo
+            COMMAND grep flags
+            COMMAND grep f16c
+            OUTPUT_VARIABLE CPU_SUPPORT_F16C)
+elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+    execute_process(COMMAND sysctl -a
+            COMMAND grep machdep.cpu.features
+            COMMAND grep F16C
+            OUTPUT_VARIABLE CPU_SUPPORT_F16C)
+endif()
+if(NOT CPU_SUPPORT_F16C)
+    message("CPU does not support F16C instructions")
+    return()
+endif()
+if(CPU_SUPPORT_F16C AND COMPILER_SUPPORT_MF16C)	
+    set(SUPPORT_F16C TRUE)
+endif()


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services