Skip to content

Commit

Permalink
Merge pull request #12 from laristra/bb_merge
Browse files Browse the repository at this point in the history
GitHub version 1.1.1
  • Loading branch information
cferenba authored Oct 6, 2017
2 parents cc574f0 + 64452f8 commit 0b1388b
Show file tree
Hide file tree
Showing 15 changed files with 717 additions and 273 deletions.
1 change: 1 addition & 0 deletions app/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ Please see the license file at the root of this repository, or at:
add_subdirectory(apptest_cmp)
add_subdirectory(simple_mesh_app)
add_subdirectory(swarmapp)
add_subdirectory(msmapp)
if (Jali_DIR OR ENABLE_FleCSI)
add_subdirectory(portageapp)
endif (Jali_DIR OR ENABLE_FleCSI)
Expand Down
39 changes: 39 additions & 0 deletions app/msmapp/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
#[[
This file is part of the Ristra portage project.
Please see the license file at the root of this repository, or at:
https://github.com/laristra/portage/blob/master/LICENSE
]]


#------------------------------------------------------------------------------#
# Add a rule to build the executable
#------------------------------------------------------------------------------#

# Msm test
add_executable(msmapp msmapp.cc)
target_link_libraries(msmapp portage ${EXTRA_LIBS} ${LAPACKE_LIBRARIES})


#TCMalloc option
set(ENABLE_TCMALLOC TRUE CACHE BOOL "Use TCMalloc")
if(ENABLE_TCMALLOC)
set(TCMALLOC_LIB "${HOME}" CACHE STRING "Set the TCMalloc library")

target_link_libraries(msmapp ${TCMALLOC_LIB})
endif(ENABLE_TCMALLOC)

# Profiling option (to allow pausing and resuming profiling during execution)
set(ENABLE_PROFILE FALSE CACHE BOOL "Enable VTune Profiling")
if(ENABLE_PROFILE)
set(VTUNE_INCLUDE_DIR "${HOME}" CACHE PATH "Set the locaiton of VTune include")
set(VTUNE_LIB "${HOME}" CACHE STRING "Set the VTune library")

include_directories(${VTUNE_INCLUDE_DIR})

target_link_libraries(msmapp ${VTUNE_LIB})
endif(ENABLE_PROFILE)


#if (ENABLE_APP_TESTS)
# add_subdirectory(test)
#endif (ENABLE_APP_TESTS)
10 changes: 10 additions & 0 deletions app/msmapp/example_input
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
0. 0. 0.
1. 1. 1.
.2 .2 .2
.8 .8 .8
10 12 9
6 8 7
2
3
1.5
1
Loading

0 comments on commit 0b1388b

Please sign in to comment.