Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix HBW support #3343

Merged
merged 1 commit into from
Sep 4, 2020
Merged

Fix HBW support #3343

merged 1 commit into from
Sep 4, 2020

Conversation

masterleinad
Copy link
Contributor

Related to #2941 (comment). There was typo in cmake/KokkosCore_config.h.in and a missig define in cmake/kokkos_tpls.cmake so this could never be used with CMake. The corresponding Makefile logic is

kokkos/Makefile.kokkos

Lines 622 to 635 in 03ded4e

ifeq ($(KOKKOS_INTERNAL_USE_MEMKIND), 1)
ifneq ($(KOKKOS_CMAKE), yes)
ifneq ($(MEMKIND_PATH),)
KOKKOS_CPPFLAGS += -I$(MEMKIND_PATH)/include
KOKKOS_LIBDIRS += -L$(MEMKIND_PATH)/lib
KOKKOS_CXXLDFLAGS += -L$(MEMKIND_PATH)/lib
KOKKOS_TPL_INCLUDE_DIRS += $(MEMKIND_PATH)/include
KOKKOS_TPL_LIBRARY_DIRS += $(MEMKIND_PATH)/lib
endif
KOKKOS_LIBS += -lmemkind -lnuma
KOKKOS_TPL_LIBRARY_NAMES += memkind numa
endif
tmp := $(call kokkos_append_header,"$H""define KOKKOS_ENABLE_HBWSPACE")
endif
.
As a result, clang-tidy was complaining again and we needed some modifications related to the profiling interface.

(reinterpret_cast<uintptr_t>(ptr) & alignment_mask)) {
std::ostringstream msg;
msg << "Kokkos::Experimental::HBWSpace::allocate[ ";
switch (m_alloc_mech) {
case STD_MALLOC: msg << "STD_MALLOC"; break;
case POSIX_MEMALIGN: msg << "POSIX_MEMALIGN"; break;
case POSIX_MMAP: msg << "POSIX_MMAP"; break;
case INTEL_MM_ALLOC: msg << "INTEL_MM_ALLOC"; break;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Consider raising an error in default clause

@crtrott crtrott merged commit 7e85506 into kokkos:develop Sep 4, 2020
@masterleinad masterleinad deleted the fix_hbw branch March 22, 2022 12:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants