Updates to get PFA to work with latest AMS.

LLNL · Jan 22, 2024 · 3e3d6ee · 3e3d6ee
1 parent 00589c2
commit 3e3d6ee
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -237,8 +237,7 @@ if (WITH_PERFFLOWASPECT)
   list(APPEND AMS_APP_DEFINES "-D__ENABLE_PERFFLOWASPECT__")
   list(APPEND AMS_APP_LIB_DIRS "${PERFFLOWASPECT_LIB_DIR}")
 
-  add_library(perfflowaspect_full INTERFACE)
-  target_link_libraries(perfflowaspect_full INTERFACE perfflowaspect::perfflow_runtime)
+  list(APPEND AMS_APP_LIBRARIES "perfflow_runtime")
 endif()
 
 # TODO: currently we are focusing only on BLASS. Try out other libraries.

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
@@ -18,9 +18,6 @@ function(ADDExec binary_name definitions)
   target_compile_definitions(${binary_name} PRIVATE ${definitions})
   target_link_directories(${binary_name} PRIVATE ${AMS_EXAMPLE_LIB_DIRS})
   target_link_libraries(${binary_name} PUBLIC AMS ${AMS_EXAMPLE_LIBRARIES})
-  if (WITH_PERFFLOWASPECT)
-      target_link_libraries(${binary_name} PUBLIC perfflowaspect_full)
-  endif()
 
   if (WITH_CUDA)
       set_source_files_properties(main.cpp PROPERTIES LANGUAGE CUDA)

diff --git a/examples/app/eos_ams.cpp b/examples/app/eos_ams.cpp
@@ -58,10 +58,10 @@ AMSEOS<FPType>::AMSEOS(EOS<FPType> *model,
   wf_ = AMSCreateExecutor(conf);
 }
 
+template <typename FPType>
 #ifdef __ENABLE_PERFFLOWASPECT__
 __attribute__((annotate("@critical_path(pointcut='around')")))
 #endif
-template <typename FPType>
 void AMSEOS<FPType>::Eval(const int length,
                           const FPType *density,
                           const FPType *energy,