Commit 380c9204 authored by Martin Perdacher's avatar Martin Perdacher
Browse files

removed memkind

parent f9fb4f75

CMakeLists.txt

+12 −12
Original line number Diff line number Diff line 
cmake_minimum_required(VERSION 3.6)

project(ego2)

project(hilbertJoin)



## set gcc compiler, tested with gcc 6.1.0

# export CC=/opt/gcc6.1.0/usr/local/bin/gcc
@@ -50,24 +50,24 @@ set(CMAKE_CXX_FLAGS_DEBUG "-std=c++11 -march=knl -mtune=knl -fpic -ffast-math - 




# add_executable(egoHilb ${SOURCE_FILES})

add_executable(hilbertJoinCardinality ${SOURCE_FILES_JOIN})

add_executable(hilbertSelfJoinCardinality ${SOURCE_FILES_SELF})

add_executable(hilbertJoinCountOnly ${SOURCE_FILES_JOIN})

add_executable(hilbertSelfJoinCountOnly ${SOURCE_FILES_SELF})



target_compile_definitions(hilbertJoinCardinality PRIVATE -DCOUNT_ONLY)

target_compile_definitions(hilbertSelfJoinCardinality PRIVATE -DCOUNT_ONLY)

target_compile_definitions(hilbertJoinCountOnly PRIVATE -DCOUNT_ONLY)

target_compile_definitions(hilbertSelfJoinCountOnly PRIVATE -DCOUNT_ONLY)



## for a more verbose version comment out the next two lines

# target_compile_definitions(hilbertJoinCardinality PRIVATE -DOUTPUT)

# target_compile_definitions(hilbertSelfJoinCardinality PRIVATE -DOUTPUT)

## for a non-verbose version comment out the next two lines

target_compile_definitions(hilbertJoinCountOnly PRIVATE -DOUTPUT)

target_compile_definitions(hilbertSelfJoinCountOnly PRIVATE -DOUTPUT)



if ($ENV{KBLOCK})

    target_compile_definitions(hilbertJoinCardinality PRIVATE -DKBLOCK=$ENV{KBLOCK})

    target_compile_definitions(hilbertSelfJoinCardinality PRIVATE -DKBLOCK=$ENV{KBLOCK})

    target_compile_definitions(hilbertJoinCountOnly PRIVATE -DKBLOCK=$ENV{KBLOCK})

    target_compile_definitions(hilbertSelfJoinCountOnly PRIVATE -DKBLOCK=$ENV{KBLOCK})

endif()



if ($ENV{OMP_NUM_THREADS})

    target_compile_definitions(hilbertJoinCardinality PRIVATE -DNUM_THREADS=$ENV{OMP_NUM_THREADS})

    target_compile_definitions(hilbertSelfJoinCardinality PRIVATE -DNUM_THREADS=$ENV{OMP_NUM_THREADS})

    target_compile_definitions(hilbertJoinCountOnly PRIVATE -DNUM_THREADS=$ENV{OMP_NUM_THREADS})

    target_compile_definitions(hilbertSelfJoinCountOnly PRIVATE -DNUM_THREADS=$ENV{OMP_NUM_THREADS})

endif()

util/allocation.h

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
  #endif

#endif



#include <hbwmalloc.h>

// #include <hbwmalloc.h>

#include <errno.h>



#define ALIGNMENT 64