Skip to content

Commit 95a584e

Browse files
authored
Merge pull request #4078 from martin-frbg/nv_cmake
Add support for NVIDIA HPC (nvc,pgf95) in CMAKE builds
2 parents 5a4fac1 + d2144b2 commit 95a584e

File tree

3 files changed

+10
-2
lines changed

3 files changed

+10
-2
lines changed

cmake/cc.cmake

+8
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,14 @@ if (${CMAKE_C_COMPILER_ID} STREQUAL "PGI")
6565
endif ()
6666
endif ()
6767

68+
if (${CMAKE_C_COMPILER_ID} STREQUAL "NVHPC")
69+
if (POWER)
70+
set(CCOMMON_OPT "${CCOMMON_OPT} -tp pwr8")
71+
else ()
72+
set(CCOMMON_OPT "${CCOMMON_OPT} -tp px")
73+
endif ()
74+
endif ()
75+
6876
if (${CMAKE_C_COMPILER_ID} STREQUAL "PATHSCALE")
6977
if (BINARY64)
7078
set(CCOMMON_OPT "${CCOMMON_OPT} -m64")

cmake/fc.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ if (${F_COMPILER} STREQUAL "IBM")
121121
endif ()
122122
endif ()
123123

124-
if (${F_COMPILER} STREQUAL "PGI")
124+
if (${F_COMPILER} STREQUAL "PGI" OR ${F_COMPILER} STREQUAL "PGF95")
125125
set(CCOMMON_OPT "${CCOMMON_OPT} -DF_INTERFACE_PGI")
126126
set(COMMON_PROF "${COMMON_PROF} -DPGICOMPILER")
127127
if (BINARY64)

cmake/system.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ if (DEFINED TARGET)
5555
endif ()
5656

5757
# On x86_64 build getarch with march=native. This is required to detect AVX512 support in getarch.
58-
if (X86_64 AND NOT ${CMAKE_C_COMPILER_ID} STREQUAL "PGI")
58+
if (X86_64 AND NOT (${CMAKE_C_COMPILER_ID} STREQUAL "PGI" OR ${CMAKE_C_COMPILER_ID} STREQUAL "NVHPC"))
5959
set(GETARCH_FLAGS "${GETARCH_FLAGS} -march=native")
6060
endif ()
6161

0 commit comments

Comments
 (0)