AL: Fixes for allowing user-defined CUDA flags

andrealani · Jul 5, 2018 · c546049 · c546049
1 parent 101cfd4
commit c546049
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/cmake/DefineBuildModes.cmake b/cmake/DefineBuildModes.cmake
@@ -138,6 +138,7 @@ IF(UNIX)
    LIST ( APPEND CF_Fortran_FLAGS_CUDA "-O3 -g -fPIC" )
    #LIST ( APPEND CF_CUDAC_FLAGS_CUDA   "-O3 -g -arch sm_20 -Xcompiler -fPIC" )
    LIST ( APPEND CF_CUDAC_FLAGS_CUDA   "-O3 -g -arch=sm_30 -Xcompiler -fPIC -Xcompiler ${CF_FOMP_FLAG}" )  
+   #LIST ( APPEND CF_CUDAC_FLAGS_CUDA  "-O3 -g -arch=sm_60 --compiler-options -fPIC" )
 
 #   SET(CMAKE_SHARED_LIBRARY_Fortran_FLAGS "-fPIC")  
 #   SET(CMAKE_SHARED_LIBRARY_C_FLAGS "-Xcompiler -fPIC")        
@@ -156,7 +157,8 @@ IF(UNIX)
    LIST ( APPEND CF_C_FLAGS_CUDARELEASE       "-O3 -DNDEBUG -fPIC" )
    LIST ( APPEND CF_CXX_FLAGS_CUDARELEASE     "-O3 -DNDEBUG -fPIC" )
    LIST ( APPEND CF_Fortran_FLAGS_CUDARELEASE "-O3 -DNDEBUG -fPIC" )
-   LIST ( APPEND CF_CUDAC_FLAGS_CUDARELEASE   "-O3 -DNDEBUG -arch=sm_30 -Xcompiler -fPIC" )
+   # LIST ( APPEND CF_CUDAC_FLAGS_CUDARELEASE   "-O3 -DNDEBUG -arch=sm_30 -Xcompiler -fPIC" )
+   LIST ( APPEND CF_CUDAC_FLAGS_CUDARELEASE   "-O3 -DNDEBUG -arch=sm_60 -Xcompiler -fPIC" )
 #   LIST ( APPEND CF_CUDAC_FLAGS_CUDARELEASE   "-O3 -DNDEBUG -code=compute_35 -arch=sm_35 -Xcompiler -fPIC" )
 
 #   SET(CMAKE_SHARED_LIBRARY_Fortran_FLAGS "-fPIC")  

diff --git a/cmake/DefineBuildRules.cmake b/cmake/DefineBuildRules.cmake
@@ -164,3 +164,10 @@ IF( NOT CF_SKIP_FORTRAN )
   MARK_AS_ADVANCED ( Fortran_FLAGS_LISTS )
 ENDIF()
 
+IF (CF_ENABLE_CUDA)
+STRING ( REGEX MATCHALL "[^ ]+" CUDAC_FLAGS_LIST "${CF_CUDAC_FLAGS}"  )
+SET ( CMAKE_CUDA_FLAGS "${CF_CUDAC_FLAGS}" )
+MARK_AS_ADVANCED ( CUDAC_FLAGS_LIST )
+ENDIF()
+
+