Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
hilbertJoin
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Martin Perdacher
hilbertJoin
Compare Revisions
593ba401095046288ccf8e5dfc0f3e14ebe82057...380c9204a26f9ac73f36ca28a31e49603c9d5984
Source
380c9204a26f9ac73f36ca28a31e49603c9d5984
Select Git revision
...
Target
593ba401095046288ccf8e5dfc0f3e14ebe82057
Select Git revision
Compare
Commits (3)
removed lboost
· 8c51121b
Martin Perdacher
authored
Apr 08, 2019
8c51121b
Merge branch 'master' of gitlab.cs.univie.ac.at:martinp16cs/hilbertJoin
· f9fb4f75
Martin Perdacher
authored
Apr 16, 2019
f9fb4f75
removed memkind
· 380c9204
Martin Perdacher
authored
Apr 16, 2019
380c9204
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
15 deletions
+19
-15
CMakeLists.txt
CMakeLists.txt
+18
-14
util/allocation.h
util/allocation.h
+1
-1
No files found.
CMakeLists.txt
View file @
380c9204
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
...
...
@@ -19,7 +19,9 @@ set(SOURCE_FILES_JOIN mainJoin.cpp hilbertjoin/egojoin.cpp hilbertjoin/hilloop.c
# adding MKL include directory
include_directories
(
$ENV{MKLROOT}/include
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-std=c++11 -march=knl -mtune=knl -ffast-math -fassociative-math -O3 -fopenmp -lmkl_core -lmkl_intel_lp64 -lmkl_intel_thread -liomp5 -lboost_system"
)
# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -march=knl -mtune=knl -ffast-math -fassociative-math -O3 -fopenmp -lmkl_core -lmkl_intel_lp64 -lmkl_intel_thread -liomp5 -lboost_system")
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-std=c++11 -march=knl -mtune=knl -ffast-math -fassociative-math -O3 -fopenmp -lmkl_core -lmkl_intel_lp64 -lmkl_intel_thread -liomp5"
)
# xeon-phi
link_directories
(
$ENV{MKLROOT}/lib/intel64
)
...
...
@@ -42,28 +44,30 @@ find_library ( mkl_omp_LIB NAMES libiomp5.a
####################
# cmake -DCMAKE_BUILD_TYPE=Debug ..
# and ignore the warning: "Manually-specified variables were not used by the project: CMAKE_BUID_TYPE"
set
(
CMAKE_CXX_FLAGS_DEBUG
"-std=c++11 -march=knl -mtune=knl -fpic -ffast-math -O0 -DNDDEBUG -fopenmp -lboost_system -lmkl_core -lmkl_intel_lp64 -lmkl_intel_thread -liomp5"
)
# set(CMAKE_CXX_FLAGS_DEBUG "-std=c++11 -march=knl -mtune=knl -fpic -ffast-math -O0 -DNDDEBUG -fopenmp -lboost_system -lmkl_core -lmkl_intel_lp64 -lmkl_intel_thread -liomp5")
set
(
CMAKE_CXX_FLAGS_DEBUG
"-std=c++11 -march=knl -mtune=knl -fpic -ffast-math -O0 -DNDDEBUG -fopenmp -lmkl_core -lmkl_intel_lp64 -lmkl_intel_thread -liomp5"
)
# add_executable(egoHilb ${SOURCE_FILES})
add_executable
(
hilbertJoinC
ardinalit
y
${
SOURCE_FILES_JOIN
}
)
add_executable
(
hilbertSelfJoinC
ardinalit
y
${
SOURCE_FILES_SELF
}
)
add_executable
(
hilbertJoinC
ountOnl
y
${
SOURCE_FILES_JOIN
}
)
add_executable
(
hilbertSelfJoinC
ountOnl
y
${
SOURCE_FILES_SELF
}
)
target_compile_definitions
(
hilbertJoinC
ardinalit
y PRIVATE -DCOUNT_ONLY
)
target_compile_definitions
(
hilbertSelfJoinC
ardinalit
y PRIVATE -DCOUNT_ONLY
)
target_compile_definitions
(
hilbertJoinC
ountOnl
y PRIVATE -DCOUNT_ONLY
)
target_compile_definitions
(
hilbertSelfJoinC
ountOnl
y PRIVATE -DCOUNT_ONLY
)
## for a
more
verbose version comment out the next two lines
# target_compile_definitions(hilbertJoinCardinalit
y PRIVATE -DOUTPUT)
# target_compile_definitions(hilbertSelfJoinCardinalit
y PRIVATE -DOUTPUT)
## for a
non-
verbose version comment out the next two lines
target_compile_definitions
(
hilbertJoinCountOnl
y PRIVATE -DOUTPUT
)
target_compile_definitions
(
hilbertSelfJoinCountOnl
y PRIVATE -DOUTPUT
)
if
(
$ENV{KBLOCK}
)
target_compile_definitions
(
hilbertJoinC
ardinalit
y PRIVATE -DKBLOCK=$ENV{KBLOCK}
)
target_compile_definitions
(
hilbertSelfJoinC
ardinalit
y PRIVATE -DKBLOCK=$ENV{KBLOCK}
)
target_compile_definitions
(
hilbertJoinC
ountOnl
y PRIVATE -DKBLOCK=$ENV{KBLOCK}
)
target_compile_definitions
(
hilbertSelfJoinC
ountOnl
y PRIVATE -DKBLOCK=$ENV{KBLOCK}
)
endif
()
if
(
$ENV{OMP_NUM_THREADS}
)
target_compile_definitions
(
hilbertJoinC
ardinalit
y PRIVATE -DNUM_THREADS=$ENV{OMP_NUM_THREADS}
)
target_compile_definitions
(
hilbertSelfJoinC
ardinalit
y PRIVATE -DNUM_THREADS=$ENV{OMP_NUM_THREADS}
)
target_compile_definitions
(
hilbertJoinC
ountOnl
y PRIVATE -DNUM_THREADS=$ENV{OMP_NUM_THREADS}
)
target_compile_definitions
(
hilbertSelfJoinC
ountOnl
y PRIVATE -DNUM_THREADS=$ENV{OMP_NUM_THREADS}
)
endif
()
...
...
util/allocation.h
View file @
380c9204
...
...
@@ -17,7 +17,7 @@
#endif
#endif
#include <hbwmalloc.h>
//
#include <hbwmalloc.h>
#include <errno.h>
#define ALIGNMENT 64
...
...