From 74a7988bf3217d8fbc22abcde5bd7fd820678f49 Mon Sep 17 00:00:00 2001 From: Seyong Lee Date: Mon, 9 Jan 2023 16:59:48 -0500 Subject: [PATCH] Minor bug fixes on CMake and Make configurations for the OpenACC backend. --- Makefile.kokkos | 4 ++-- core/src/Kokkos_Macros.hpp | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile.kokkos b/Makefile.kokkos index 5cc69bf054..815dd01a39 100644 --- a/Makefile.kokkos +++ b/Makefile.kokkos @@ -1230,8 +1230,8 @@ ifneq ($(KOKKOS_INTERNAL_NEW_CONFIG), 0) tmp := $(call kokkos_append_config_header,"$H""include ","KokkosCore_Config_DeclareBackend.hpp") endif ifeq ($(KOKKOS_INTERNAL_USE_OPENACC), 1) - tmp := $(call kokkos_append_config_header,"\#include ","KokkosCore_Config_FwdBackend.hpp") - tmp := $(call kokkos_append_config_header,"\#include ","KokkosCore_Config_DeclareBackend.hpp") + tmp := $(call kokkos_append_config_header,"$H""include ","KokkosCore_Config_FwdBackend.hpp") + tmp := $(call kokkos_append_config_header,"$H""include ","KokkosCore_Config_DeclareBackend.hpp") endif ifeq ($(KOKKOS_INTERNAL_USE_THREADS), 1) tmp := $(call kokkos_append_config_header,"$H""include ","KokkosCore_Config_FwdBackend.hpp") diff --git a/core/src/Kokkos_Macros.hpp b/core/src/Kokkos_Macros.hpp index e8067dc5a5..f251c2dab9 100644 --- a/core/src/Kokkos_Macros.hpp +++ b/core/src/Kokkos_Macros.hpp @@ -522,6 +522,7 @@ static constexpr bool kokkos_omp_on_host() { return false; } KOKKOS_IMPL_STRIP_PARENS(CODE) \ } #else +#include // FIXME_OPENACC acc_on_device is a non-constexpr function #define KOKKOS_IF_ON_DEVICE(CODE) \ if constexpr (acc_on_device(acc_device_not_host)) { \