make compile and run on Lumi

ecmwf · Oct 14, 2024 · 9bacfe5 · 9bacfe5
1 parent e9d6e5d
commit 9bacfe5
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 14 deletions.
diff --git a/hic/src/hic/hic_runtime.h b/hic/src/hic/hic_runtime.h
@@ -23,17 +23,17 @@
   #include <cuda_runtime.h>
 #elif HIC_BACKEND_HIP
   #define HIC_BACKEND hip
-  #if defined(DEPRECATED)
-  #define DEFINED_OUTERSCOPE DEPRECATED
-  #undef DEPRECATED
-  #endif
+//#if defined(DEPRECATED)
+//  #define DEFINED_OUTERSCOPE DEPRECATED
+//  #undef DEPRECATED
+//  #endif
   #include <hip/hip_runtime.h>
-  #if defined(DEPRECATED)
-  #undef DEPRECATED
-  #endif
-  #if defined(DEFINED_OUTERSCOPE)
-  #define DEPRECATED DEFINED_OUTERSCOPE
-  #endif
+//  #if defined(DEPRECATED)
+//  #undef DEPRECATED
+//  #endif
+//  #if defined(DEFINED_OUTERSCOPE)
+//  #define DEPRECATED DEFINED_OUTERSCOPE
+//  #endif
 
 #if HIP_VERSION_MAJOR < 6
   enum hicMemoryType {

diff --git a/pluto/examples/CMakeLists.txt b/pluto/examples/CMakeLists.txt
@@ -7,6 +7,9 @@ function( add_example target )
   target_host_device_sources( ${target} PRIVATE ${_PAR_UNPARSED_ARGUMENTS})
   target_link_libraries( ${target} PRIVATE pluto )
   target_include_directories( ${target} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} )
+  if (ENABLE_HIP)
+    set_target_properties(${target} PROPERTIES LINKER_LANGUAGE HIP)
+  endif()
 endfunction()
 
 add_example(is_on_device is_on_device.cc)

diff --git a/pluto/src/CMakeLists.txt b/pluto/src/CMakeLists.txt
@@ -7,7 +7,7 @@
 # does it submit to any jurisdiction.
 
 
-pluto_host_device( pluto_host_device_src SOURCE pluto/device/MemoryResource.cc)
+#pluto_host_device( pluto_host_device_src SOURCE pluto/device/MemoryResource.cc)
 
 set(PLUTO_HAVE_CUDA ${HAVE_CUDA} )
 set(PLUTO_HAVE_HIP  ${HAVE_HIP} )
@@ -26,8 +26,8 @@ install( FILES
 
 ecbuild_add_library( TARGET pluto
   SOURCES
-    ${pluto_host_device_src}
-
+  #!${pluto_host_device_src}
+    pluto/device/MemoryResource.cc
     pluto/device/allocator.h
     pluto/device/make_copy.h
     pluto/device/MemoryResource.h

diff --git a/pluto/src/pluto/memory_resource/memory_resource.h b/pluto/src/pluto/memory_resource/memory_resource.h
@@ -37,7 +37,7 @@ using pool_options = STD_PMR::pool_options;
 inline memory_resource* null_memory_resource() { return STD_PMR::null_memory_resource(); }
 inline memory_resource* new_delete_resource()  { return STD_PMR::new_delete_resource();  }
 inline memory_resource* get_default_resource() { 
-    init();
+    //init();
     return STD_PMR::get_default_resource(); }
 inline void set_default_resource(memory_resource* mr) { STD_PMR::set_default_resource(mr); }
 

diff --git a/pluto/tests/sandbox/CMakeLists.txt b/pluto/tests/sandbox/CMakeLists.txt
@@ -7,6 +7,9 @@ function( add_sandbox target )
   target_host_device_sources( ${target} PRIVATE ${_PAR_UNPARSED_ARGUMENTS})
   target_link_libraries( ${target} PRIVATE pluto )
   target_include_directories( ${target} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} )
+  if( ENABLE_HIP )
+    set_target_properties(${target} PROPERTIES LINKER_LANGUAGE HIP )
+  endif()
 endfunction()
 
 add_sandbox(pluto-sandbox sandbox.cc kernel.cc)