Merge pull request #380 from GEOS-ESM/feature/mathomp4/nvhpc-updates

Fixes for NVHPC
GEOS-ESM · Jun 14, 2024 · 92cbc55 · 92cbc55
2 parents 9eb4b03 + 45e54b5
commit 92cbc55
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,11 +9,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
-- Fix issue with use of `meson` and `f2py` with more complex codes
-  - NOTE: Requires a fix to `f2py` that is not yet released. You can see the change
-    in the `numpy` repo at https://github.com/numpy/numpy/pull/26659
-    This fix has been applied to GEOSpyD 2.44.0-0
-
 ### Removed
 
 ### Added
@@ -22,6 +17,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Deprecated
 
+## [4.0.1] - 2024-06-14
+
+### Fixed
+
+- Fixes for NVHPC
+- Fix issue with use of `meson` and `f2py` with more complex codes
+  - NOTE: Requires a fix to `f2py` that is not yet released. You can see the change
+    in the `numpy` repo at https://github.com/numpy/numpy/pull/26659
+    This fix has been applied to GEOSpyD 2.44.0-0
+
 ## [4.0.0] - 2024-05-21
 
 ### Added

diff --git a/external_libraries/FindBaselibs.cmake b/external_libraries/FindBaselibs.cmake
@@ -135,9 +135,11 @@ if (Baselibs_FOUND)
       execute_process (COMMAND ${CMAKE_C_COMPILER}   --print-file-name=libgcc.a        OUTPUT_VARIABLE libgcc OUTPUT_STRIP_TRAILING_WHITESPACE)
     endif()
   else ()
-    execute_process (COMMAND ${CMAKE_CXX_COMPILER} --print-file-name=libstdc++.so OUTPUT_VARIABLE stdcxx OUTPUT_STRIP_TRAILING_WHITESPACE)
-    execute_process (COMMAND ${CMAKE_CXX_COMPILER} --print-file-name=librt.so     OUTPUT_VARIABLE rt     OUTPUT_STRIP_TRAILING_WHITESPACE)
-    execute_process (COMMAND ${CMAKE_CXX_COMPILER} --print-file-name=libdl.so     OUTPUT_VARIABLE dl     OUTPUT_STRIP_TRAILING_WHITESPACE)
+    if (NOT CMAKE_CXX_COMPILER_ID MATCHES "NVHPC")
+      execute_process (COMMAND ${CMAKE_CXX_COMPILER} --print-file-name=libstdc++.so OUTPUT_VARIABLE stdcxx OUTPUT_STRIP_TRAILING_WHITESPACE)
+      execute_process (COMMAND ${CMAKE_CXX_COMPILER} --print-file-name=librt.so     OUTPUT_VARIABLE rt     OUTPUT_STRIP_TRAILING_WHITESPACE)
+      execute_process (COMMAND ${CMAKE_CXX_COMPILER} --print-file-name=libdl.so     OUTPUT_VARIABLE dl     OUTPUT_STRIP_TRAILING_WHITESPACE)
+    endif ()
   endif ()
 
   # ------------

diff --git a/python/f2py/FindF2PY.cmake b/python/f2py/FindF2PY.cmake
@@ -60,6 +60,8 @@ if(F2PY_EXECUTABLE)
        endif(CMAKE_Fortran_COMPILER_SUPPORTS_F90)
      elseif(CMAKE_Fortran_COMPILER_ID MATCHES "Intel")
        set(_fcompiler "intelem")
+     elseif(CMAKE_Fortran_COMPILER_ID MATCHES "NVHPC")
+       set(_fcompiler "nv")
      endif()
 
      set(F2PY_FCOMPILER ${_fcompiler} CACHE STRING

diff --git a/python/f2py2/FindF2PY2.cmake b/python/f2py2/FindF2PY2.cmake
@@ -75,6 +75,8 @@ if(F2PY2_EXECUTABLE)
        endif(CMAKE_Fortran_COMPILER_SUPPORTS_F90)
      elseif(CMAKE_Fortran_COMPILER_ID MATCHES "Intel")
        set(_fcompiler "intelem")
+     elseif(CMAKE_Fortran_COMPILER_ID MATCHES "NVHPC")
+       set(_fcompiler "nv")
      endif()
 
      set(F2PY2_FCOMPILER ${_fcompiler} CACHE STRING

diff --git a/python/f2py3/FindF2PY3.cmake b/python/f2py3/FindF2PY3.cmake
@@ -60,6 +60,8 @@ if(F2PY3_EXECUTABLE)
        endif(CMAKE_Fortran_COMPILER_SUPPORTS_F90)
      elseif(CMAKE_Fortran_COMPILER_ID MATCHES "Intel")
        set(_fcompiler "intelem")
+     elseif(CMAKE_Fortran_COMPILER_ID MATCHES "NVHPC")
+       set(_fcompiler "nv")
      endif()
 
      set(F2PY3_FCOMPILER ${_fcompiler} CACHE STRING