From bed09d43fec86a1f7d31bcee41996efe7e86a7ee Mon Sep 17 00:00:00 2001 From: Ye Luo Date: Fri, 23 Jul 2021 11:40:43 -0500 Subject: [PATCH] Rename PGI to NVHPC --- CMake/{PGICompilers.cmake => NVHPCCompilers.cmake} | 2 +- CMake/inspectCompiler.cmake | 6 +++--- README.md | 2 +- docs/installation.rst | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) rename CMake/{PGICompilers.cmake => NVHPCCompilers.cmake} (97%) diff --git a/CMake/PGICompilers.cmake b/CMake/NVHPCCompilers.cmake similarity index 97% rename from CMake/PGICompilers.cmake rename to CMake/NVHPCCompilers.cmake index 91ff7f486..bb502169c 100644 --- a/CMake/PGICompilers.cmake +++ b/CMake/NVHPCCompilers.cmake @@ -11,7 +11,7 @@ if(QMC_OMP) message(FATAL_ERROR "NVIDIA HPC compiler requires -gpu=ccXX option set based on the target GPU architecture! " "Please add -DOFFLOAD_ARCH=ccXX to cmake. For example, cc70 is for Volta.") endif() - set(CMAKE_CXX_FLAGS "-mp=gpu") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mp=gpu") set(OPENMP_OFFLOAD_COMPILE_OPTIONS "-gpu=${OFFLOAD_ARCH}") else() set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mp=allcores") diff --git a/CMake/inspectCompiler.cmake b/CMake/inspectCompiler.cmake index 0d546ed29..656a53b64 100644 --- a/CMake/inspectCompiler.cmake +++ b/CMake/inspectCompiler.cmake @@ -24,7 +24,7 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "XL") elseif(CMAKE_CXX_COMPILER_ID MATCHES "Intel" OR INTEL_ONEAPI_COMPILER_FOUND) set(COMPILER Intel) elseif(CMAKE_CXX_COMPILER_ID MATCHES "PGI" OR CMAKE_CXX_COMPILER_ID MATCHES "NVHPC") - set(COMPILER PGI) + set(COMPILER NVHPC) elseif(CMAKE_CXX_COMPILER_ID MATCHES "Cray") set(COMPILER Cray) elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang") @@ -46,8 +46,8 @@ elseif(COMPILER MATCHES "GNU") include(${PROJECT_CMAKE}/GNUCompilers.cmake) elseif(COMPILER MATCHES "Clang") include(${PROJECT_CMAKE}/ClangCompilers.cmake) -elseif(COMPILER MATCHES "PGI") - include(${PROJECT_CMAKE}/PGICompilers.cmake) +elseif(COMPILER MATCHES "NVHPC") + include(${PROJECT_CMAKE}/NVHPCCompilers.cmake) else() message(WARNING "No default file for compiler (${COMPILER})") endif() diff --git a/README.md b/README.md index ac4bb054a..b07e68454 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ particular emphasis is placed on code quality and reproducibility. * Python3. Older versions are not supported as of January 2020. We aim to support open source compilers and libraries released within two years of each QMCPACK release. Use of software versions -over two years old may work but is discouraged and untested. Proprietary compilers (Intel, PGI) are generally supported over the +over two years old may work but is discouraged and untested. Proprietary compilers (Intel, NVHPC) are generally supported over the same period but may require use of an exact version. We also aim to support the standard software environments on machines such as Summit at OLCF, Theta at ALCF, and Cori at NERSC. Use of the most recently released compilers and library versions is particularly encouraged for highest performance and easiest configuration. diff --git a/docs/installation.rst b/docs/installation.rst index 00889ba38..92037271d 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -1393,7 +1393,7 @@ Installing QMCPACK with Spack on Linux ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Spack works robustly on the standard flavors of Linux (Ubuntu, CentOS, -Ubuntu, etc.) using GCC, Clang, PGI, and Intel compilers. +Ubuntu, etc.) using GCC, Clang, NVHPC, and Intel compilers. Installing QMCPACK with Spack on Mac OS X ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -1449,7 +1449,7 @@ is non-intuitive for Spack newcomers: your-laptop> spack install quantum-espresso+qmcpack~patch~mpi~scalapack@6.7%gcc hdf5=serial QE Spack package is well tested with GCC and Intel compilers, but will not work -with the PGI compiler or in a cross-compile environment. +with the NVHPC compiler or in a cross-compile environment. Reporting Bugs ~~~~~~~~~~~~~~