Merge branch 'develop' into feature/refactor_pack_vector_fields

cmake/features/ACC.cmake

@@ -1,40 +1,27 @@
 ### OpenACC
 
-if( atlas_HAVE_ATLAS_FIELD )
+if( atlas_HAVE_ATLAS_FIELD AND HAVE_GPU )
 
-set( ATLAS_ACC_CAPABLE FALSE )
-if( HAVE_GPU )
-  if( CMAKE_Fortran_COMPILER_ID MATCHES "PGI|NVHPC" )
-    set( ATLAS_ACC_CAPABLE TRUE )
-  else()
-    find_package(OpenACC COMPONENTS C Fortran)
-    if(OpenACC_Fortran_FOUND AND OpenACC_C_FOUND)
-        set( ATLAS_ACC_CAPABLE TRUE )
+  if( DEFINED ATLAS_ENABLE_ACC )
+    set( ENABLE_ACC ${ATLAS_ENABLE_ACC} )
+  endif()
+  if( ENABLE_ACC )
+    if( NOT HAVE_FORTRAN )
+      enable_language(Fortran)
     endif()
+    find_package( OpenACC COMPONENTS Fortran CXX )
   endif()
-endif()
 
-ecbuild_add_option( FEATURE ACC
-                    DESCRIPTION  "OpenACC capable data structures"
-                    CONDITION ATLAS_ACC_CAPABLE )
-
-if( atlas_HAVE_ACC )
-  if( CMAKE_Fortran_COMPILER_ID MATCHES "PGI|NVHPC" )
-      #set( ACC_Fortran_FLAGS -acc -ta=tesla,nordc )
-    set( ACC_Fortran_FLAGS "-acc=gpu;-gpu=gvmode,lineinfo,fastmath,rdc" )
-    set( ACC_C_FLAGS ${ACC_Fortran_FLAGS} )
-    find_program( ACC_C_COMPILER NAMES pgcc HINTS ${PGI_DIR} ${NVPHC_DIR} ENV PGI_DIR NVHPC_DIR PATH_SUFFIXES bin )
-    if( NOT ACC_C_COMPILER )
-      ecbuild_error( "Could not find OpenACC capable C compiler" )
-    endif()
-  else()
-    set( ACC_Fortran_FLAGS ${OpenACC_Fortran_FLAGS} )
-    set( ACC_C_FLAGS       ${OpenACC_C_FLAGS} )
+  ecbuild_add_option( FEATURE ACC
+                      DESCRIPTION  "OpenACC capable data structures"
+                      CONDITION OpenACC_Fortran_FOUND )
+  if( HAVE_ACC )
+    set( ACC_LINK_OPTIONS ${OpenACC_Fortran_FLAGS} )
   endif()
-endif()
 
 else()
+
   set( HAVE_ACC 0 )
   set( atlas_HAVE_ACC 0 )
-endif()
 
+endif()

cmake/project_summary.cmake

@@ -42,9 +42,7 @@ endif()
 if( atlas_HAVE_ACC )
 
     ecbuild_info( "ACC" )
-    ecbuild_info( "    ACC_C_COMPILER     : [${ACC_C_COMPILER}]" )
-    ecbuild_info( "    ACC_C_FLAGS        : [${ACC_C_FLAGS}]" )
-    ecbuild_info( "    ACC_Fortran_FLAGS  : [${ACC_Fortran_FLAGS}]" )
+    ecbuild_info( "    OpenACC_Fortran_FLAGS  : [${OpenACC_Fortran_FLAGS}]" )
 
 endif()
 

src/atlas/CMakeLists.txt

@@ -1003,12 +1003,12 @@ ecbuild_add_library( TARGET atlas
 
 )
 
-if( HAVE_ACC )
+if( HAVE_ACC AND CMAKE_Fortran_COMPILER_ID MATCHES NVHPC )
   target_link_options( atlas INTERFACE
-      $<$<LINK_LANG_AND_ID:C,NVHPC>:SHELL:-acc=gpu>
-      $<$<LINK_LANG_AND_ID:CXX,NVHPC>:SHELL:-acc=gpu>
-      $<$<LINK_LANG_AND_ID:Fortran,NVHPC>:SHELL:-acc=gpu>
-      $<$<LINK_LANG_AND_ID:CUDA,NVIDIA>:SHELL:-acc=gpu> )
+      $<$<LINK_LANG_AND_ID:C,NVHPC>:SHELL:${ACC_LINK_OPTIONS}>
+      $<$<LINK_LANG_AND_ID:CXX,NVHPC>:SHELL:${ACC_LINK_OPTIONS}>
+      $<$<LINK_LANG_AND_ID:Fortran,NVHPC>:SHELL:${ACC_LINK_OPTIONS}>
+      $<$<LINK_LANG_AND_ID:CUDA,NVIDIA>:SHELL:${ACC_LINK_OPTIONS}> )
 endif()
 
 target_compile_features( atlas PUBLIC cxx_std_17 )

src/atlas/array/gridtools/GridToolsArray.cc

@@ -25,7 +25,7 @@
 #include "atlas/runtime/Log.h"
 
 #if ATLAS_HAVE_ACC
-#include "atlas_acc_support/atlas_acc_map_data.h"
+#include "atlas_acc_support/atlas_acc.h"
 #endif
 
 //------------------------------------------------------------------------------

src/atlas/array/gridtools/GridToolsDataStore.h

@@ -15,7 +15,7 @@
 #include "atlas/array/gridtools/GridToolsTraits.h"
 
 #if ATLAS_HAVE_ACC
-#include "atlas_acc_support/atlas_acc_map_data.h"
+#include "atlas_acc_support/atlas_acc.h"
 #endif
 
 //------------------------------------------------------------------------------

src/atlas/parallel/acc/acc.cc

@@ -13,14 +13,30 @@
 #include "atlas/library/defines.h"
 
 #if ATLAS_HAVE_ACC
-#include "atlas_acc_support/atlas_acc_map_data.h"
+#include "hic/hic.h"
+#include "atlas_acc_support/atlas_acc.h"
+static int hic_devices() {
+    static int devices_ = [](){
+        int n = 0;
+        auto err = hicGetDeviceCount(&n);
+        if (err != hicSuccess) {
+            n = 0;
+            static_cast<void>(hicGetLastError());
+        }
+        return n;
+    }();
+    return devices_;
+}
 #endif
 
 namespace atlas::acc {
 
 int devices() {
 #if ATLAS_HAVE_ACC
     static int num_devices = [](){
+        if (hic_devices() == 0) {
+            return 0;
+        }
         auto devicetype = atlas_acc_get_device_type();
         int _num_devices = atlas_acc_get_num_devices();
         if (_num_devices == 1 && devicetype == atlas_acc_device_host) {

src/atlas_acc_support/CMakeLists.txt

@@ -8,30 +8,15 @@
 
 if( atlas_HAVE_ACC )
 
-  if( NOT (CMAKE_C_COMPILER_ID MATCHES ${CMAKE_Fortran_COMPILER_ID}) )
-    add_custom_command(
-        OUTPUT  ${CMAKE_BINARY_DIR}/lib/libatlas_acc_support.so ${CMAKE_CURRENT_BINARY_DIR}/atlas_acc_map_data.c.o
-        COMMAND ${ACC_C_COMPILER} ${ACC_C_FLAGS} ${ACC_C_INCLUDE} -fPIC -o ${CMAKE_CURRENT_BINARY_DIR}/atlas_acc_map_data.c.o
-                -c ${CMAKE_CURRENT_SOURCE_DIR}/atlas_acc_map_data.c
-        COMMAND mkdir -p ${CMAKE_BINARY_DIR}/lib
-        COMMAND ${ACC_C_COMPILER} ${ACC_C_FLAGS} -shared -o ${CMAKE_BINARY_DIR}/lib/libatlas_acc_support.so
-                ${CMAKE_CURRENT_BINARY_DIR}/atlas_acc_map_data.c.o
-        DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/atlas_acc_map_data.c
-        COMMENT "Building atlas_acc_support with ${ACC_C_COMPILER}"
-    )
-    add_custom_target( build-atlas_acc_support ALL DEPENDS ${CMAKE_BINARY_DIR}/lib/libatlas_acc_support.so )
-    add_library( atlas_acc_support SHARED IMPORTED GLOBAL )
-    set_property( TARGET atlas_acc_support PROPERTY IMPORTED_LOCATION ${CMAKE_BINARY_DIR}/lib/libatlas_acc_support.so )
-    set_property( TARGET atlas_acc_support PROPERTY IMPORTED_NO_SONAME TRUE )
-    set_property( TARGET atlas_acc_support PROPERTY IMPORTED_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_SOURCE_DIR} )
-    add_dependencies( atlas_acc_support build-atlas_acc_support )
-    install( FILES ${CMAKE_BINARY_DIR}/lib/libatlas_acc_support.so DESTINATION ${INSTALL_LIB_DIR}/ )
-
+  if( CMAKE_CXX_COMPILER_ID MATCHES NVHPC )
+    if( NOT TARGET OpenACC::OpenACC_CXX )
+       ecbuild_error("ERROR: OpenACC::OpenACC_CXX TARGET not found")
+    endif()
+    ecbuild_add_library( TARGET atlas_acc_support SOURCES atlas_acc.cc )
+    target_link_libraries( atlas_acc_support PRIVATE OpenACC::OpenACC_CXX )
   else()
-
-    ecbuild_add_library( TARGET atlas_acc_support SOURCES atlas_acc_map_data.c )
-    target_compile_options( atlas_acc_support PRIVATE ${ACC_C_FLAGS} )
-    target_link_libraries( atlas_acc_support PRIVATE ${ACC_C_FLAGS} )
+    ecbuild_add_library( TARGET atlas_acc_support SOURCES atlas_acc.F90 )
+    target_link_libraries( atlas_acc_support PRIVATE OpenACC::OpenACC_Fortran )
   endif()
 
 endif()

src/atlas_acc_support/atlas_acc.F90

@@ -0,0 +1,70 @@
+module atlas_acc
+use openacc
+implicit none
+private
+
+public :: atlas_acc_get_num_devices
+public :: atlas_acc_map_data
+public :: atlas_acc_unmap_data
+public :: atlas_acc_is_present
+public :: atlas_acc_get_device_type
+public :: atlas_acc_deviceptr
+
+contains
+
+function atlas_acc_get_num_devices() bind(C,name="atlas_acc_get_num_devices") result(num_devices)
+  use, intrinsic :: iso_c_binding, only : c_int
+  integer(c_int) :: num_devices
+  integer(acc_device_kind) :: devicetype
+
+  devicetype = acc_get_device_type()
+  num_devices = acc_get_num_devices(devicetype)
+end function
+
+subroutine atlas_acc_map_data(data_arg, data_dev, bytes) bind(C,name="atlas_acc_map_data")
+  use, intrinsic :: iso_c_binding, only : c_ptr, c_size_t
+  type(*), dimension(*) :: data_arg
+  type(c_ptr), value :: data_dev
+  integer(c_size_t), value :: bytes
+  call acc_map_data(data_arg, data_dev, bytes)
+end subroutine
+
+subroutine atlas_acc_unmap_data(data_arg) bind(C,name="atlas_acc_unmap_data")
+  use, intrinsic :: iso_c_binding, only : c_ptr
+  type(*), dimension(*) :: data_arg
+  call acc_unmap_data(data_arg)
+end subroutine
+
+function atlas_acc_is_present(data_arg, bytes) bind(C,name="atlas_acc_is_present") result(is_present)
+  use, intrinsic :: iso_c_binding, only : c_size_t, c_ptr, c_char, c_int
+  integer(c_int) :: is_present
+  logical :: lpresent
+  type(c_ptr), value :: data_arg
+  integer(c_size_t), value :: bytes
+  character(kind=c_char), pointer :: data_f(:)
+  call c_f_pointer(data_arg, data_f,[bytes])
+  lpresent = acc_is_present(data_f)
+  is_present = 0
+  if (lpresent) is_present = 1
+end function
+
+function atlas_acc_deviceptr(data_arg) bind(C,name="atlas_acc_deviceptr") result(deviceptr)
+  use, intrinsic :: iso_c_binding, only : c_ptr
+  type(*), dimension(*) :: data_arg
+  type(c_ptr):: deviceptr
+  deviceptr = acc_deviceptr(data_arg)
+end function
+
+function atlas_acc_get_device_type() bind(C,name="atlas_acc_get_device_type") result(devicetype)
+  use, intrinsic :: iso_c_binding, only : c_int
+  integer(c_int) :: devicetype
+  integer(acc_device_kind) :: acc_devicetype
+  acc_devicetype = acc_get_device_type()
+  if (acc_devicetype == acc_device_host .or. acc_devicetype == acc_device_none) then
+    devicetype = 0
+  else 
+    devicetype = 1
+  endif
+end function
+
+end module 

src/atlas_acc_support/atlas_acc_map_data.c → src/atlas_acc_support/atlas_acc.cc

@@ -19,7 +19,9 @@
 #include <openacc.h>
 #include <string.h>
 
-#include "atlas_acc_map_data.h"
+#include "atlas_acc.h"
+
+extern "C" {
 
 void atlas_acc_map_data(void* cpu_ptr, void* gpu_ptr, unsigned long bytes) {
   acc_map_data(cpu_ptr, gpu_ptr, bytes);
@@ -125,3 +127,4 @@ const char* atlas_acc_info_str() {
 int atlas_acc_get_num_devices() {
   return acc_get_num_devices(acc_get_device_type());
 }
+}

src/atlas_acc_support/atlas_acc_map_data.h → src/atlas_acc_support/atlas_acc.h

@@ -10,6 +10,7 @@
 
 #pragma once
 
+#include <stddef.h>
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -19,18 +20,11 @@ typedef enum {
     atlas_acc_device_not_host = 1
 } atlas_acc_device_t;
 
-void atlas_acc_map_data(void* cpu_ptr, void* gpu_ptr, unsigned long bytes);
+void atlas_acc_map_data(void* cpu_ptr, void* gpu_ptr, size_t bytes);
 void atlas_acc_unmap_data(void* cpu_ptr);
-int atlas_acc_is_present(void* cpu_ptr, unsigned long bytes);
+int atlas_acc_is_present(void* cpu_ptr, size_t bytes);
 void* atlas_acc_deviceptr(void* cpu_ptr);
 atlas_acc_device_t atlas_acc_get_device_type();
-
-int atlas_acc_devices();
-
-const char* atlas_acc_version_str();
-
-const char* atlas_acc_info_str();
-
 int atlas_acc_get_num_devices();
 
 #ifdef __cplusplus

src/atlas_f/CMakeLists.txt

@@ -277,12 +277,12 @@ ecbuild_add_library( TARGET atlas_f
         $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
 )
 
-if( HAVE_ACC )
+if( HAVE_ACC AND CMAKE_Fortran_COMPILER_ID MATCHES NVHPC )
   target_link_options( atlas_f INTERFACE
-      $<$<LINK_LANG_AND_ID:C,NVHPC>:SHELL:-acc=gpu>
-      $<$<LINK_LANG_AND_ID:CXX,NVHPC>:SHELL:-acc=gpu>
-      $<$<LINK_LANG_AND_ID:Fortran,NVHPC>:SHELL:-acc=gpu>
-      $<$<LINK_LANG_AND_ID:CUDA,NVIDIA>:SHELL:-acc=gpu> )
+      $<$<LINK_LANG_AND_ID:C,NVHPC>:SHELL:${ACC_LINK_OPTIONS}>
+      $<$<LINK_LANG_AND_ID:CXX,NVHPC>:SHELL:${ACC_LINK_OPTIONS}>
+      $<$<LINK_LANG_AND_ID:Fortran,NVHPC>:SHELL:${ACC_LINK_OPTIONS}>
+      $<$<LINK_LANG_AND_ID:CUDA,NVIDIA>:SHELL:${ACC_LINK_OPTIONS}> )
 endif()
 
 fckit_target_preprocess_fypp( atlas_f

src/sandbox/fortran_acc_fields/CMakeLists.txt

@@ -10,10 +10,8 @@ if( atlas_HAVE_ACC )
     ecbuild_add_executable(
         TARGET  atlas-acc-fields
         SOURCES atlas-acc-fields.F90
-        LIBS    atlas_f
+        LIBS    atlas_f OpenACC::OpenACC_Fortran
         LINKER_LANGUAGE Fortran
         NOINSTALL
     )
-    target_compile_options( atlas-acc-fields PUBLIC ${ACC_Fortran_FLAGS} )
-    target_link_libraries( atlas-acc-fields ${ACC_Fortran_FLAGS} )
 endif()

src/tests/acc/CMakeLists.txt

@@ -6,33 +6,25 @@
 # granted to it by virtue of its status as an intergovernmental organisation nor
 # does it submit to any jurisdiction.
 
-if( HAVE_CUDA AND HAVE_TESTS AND HAVE_FCTEST AND HAVE_ACC )
+if( HAVE_GPU AND HAVE_TESTS AND HAVE_FCTEST AND HAVE_ACC )
 
-  string (REPLACE ";" " " ACC_Fortran_FLAGS_STR "${ACC_Fortran_FLAGS}")
-
-
-  set_source_files_properties( fctest_unified_memory_with_openacc.F90 PROPERTIES COMPILE_FLAGS ${ACC_Fortran_FLAGS_STR} )
   add_fctest( 
     TARGET atlas_test_unified_memory_with_openacc
     SOURCES fctest_unified_memory_with_openacc.F90
             fctest_unified_memory_with_openacc_cxx.cc
-    LIBS atlas_f
+    LIBS atlas_f OpenACC::OpenACC_Fortran hic
     LINKER_LANGUAGE Fortran
     ENVIRONMENT ${ATLAS_TEST_ENVIRONMENT} ATLAS_RUN_NGPUS=1
   )
-  target_link_libraries( atlas_test_unified_memory_with_openacc ${ACC_Fortran_FLAGS} hic )
-
   set_tests_properties( atlas_test_unified_memory_with_openacc PROPERTIES LABELS "gpu;acc")
 
   add_fctest( 
     TARGET atlas_test_connectivity_openacc
     SOURCES fctest_connectivity_openacc.F90
-    LIBS atlas_f
+    LIBS atlas_f OpenACC::OpenACC_Fortran
     LINKER_LANGUAGE Fortran
     ENVIRONMENT ${ATLAS_TEST_ENVIRONMENT} ATLAS_RUN_NGPUS=1
   )
-  target_link_libraries( atlas_test_connectivity_openacc ${ACC_Fortran_FLAGS} )
-  set_target_properties( atlas_test_connectivity_openacc PROPERTIES COMPILE_FLAGS "${ACC_Fortran_FLAGS_STR}" )
   set_tests_properties ( atlas_test_connectivity_openacc PROPERTIES LABELS "gpu;acc")
 
 endif()

src/tests/acc/fctest_unified_memory_with_openacc_cxx.cc

@@ -12,6 +12,6 @@
 
 extern "C" {
 void allocate_unified_impl(double** a, int N) {
-    hicMallocManaged(a, N * sizeof(double));
+    HIC_CALL(hicMallocManaged(a, N * sizeof(double)));
 }
 }