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.

Sign up for GitHub

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

WIP branch to debug running on OS X #141

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

WIP branch to debug running on OS X #141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ include(ExternalProject)

option(TRACING "Sample statistics with VTrace at regular intervals." OFF)
option(GASNET_USE_UDP "Force Gasnet to use UDP (typically set by configure script)" OFF)
option(GASNET_USE_SMP "Force Gasnet to use SMP for single node execution (typically set by configure script)" OFF)

set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)

Expand Down Expand Up @@ -152,7 +153,9 @@ endif()
######################################
# Gasnet
######################################
if(DEFINED APPLE OR GASNET_USE_UDP)
if(DEFINED APPLE OR GASNET_USE_SMP)
set(GASNET_CONDUIT "smp")
elseif(GASNET_USE_UDP)
set(GASNET_CONDUIT "udp")
else()
set(GASNET_CONDUIT "ibv") # values: ibv,mpi
Expand Down
2 changes: 1 addition & 1 deletion configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ def configure(generator, mode, opt)
`which ibv_devinfo`
if not $?.success?
puts "-- Unable to find `ibv_devinfo`, disabling IBV support."
args << "-DGASNET_USE_UDP:BOOL=ON"
args << "-DGASNET_USE_SMP:BOOL=ON"
end

if opt.tracing
Expand Down
4 changes: 4 additions & 0 deletions system/Aggregator.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,6 +308,10 @@ class Aggregator {
/// number of bytes in each aggregation buffer
static const unsigned int buffer_size_ = 65000 - 72;
#endif
#ifdef GASNET_CONDUIT_SMP
/// number of bytes in each aggregation buffer
static const unsigned int buffer_size_ = 4096 - 72;
#endif

/// buffer for sending non-aggregated messages
char raw_send_buffer_[ buffer_size_ ];
Expand Down