F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

The mpi waf configuration code belongs in src/mpi/wscript, not toplevel wscript

Browse Source
This commit is contained in:
Gustavo J. A. M. Carneiro
2011-04-07 13:34:14 +01:00
parent 3e1a068ba8
commit b3a99c9300
2 changed files with 43 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
src/mpi/wscript
View File

@@ -1,27 +1,51 @@
## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
import sys
import subprocess
import Options
def configure(conf):
env = conf.env
conf.find_program('mpic++', var='MPI')
if Options.options.enable_mpi and conf.env['MPI']:
p = subprocess.Popen([conf.env['MPI'], '-showme:compile'], stdout=subprocess.PIPE)
flags = p.stdout.read().rstrip().split()
p.wait()
env.append_value("CXXFLAGS_MPI", flags)
p = subprocess.Popen([conf.env['MPI'], '-showme:link'], stdout=subprocess.PIPE)
flags = p.stdout.read().rstrip().split()
p.wait()
env.append_value("LINKFLAGS_MPI", flags)
env.append_value('CXXDEFINES', 'NS3_MPI')
conf.report_optional_feature("mpi", "MPI Support", True, '')
conf.env['ENABLE_MPI'] = True
else:
if Options.options.enable_mpi:
conf.report_optional_feature("mpi", "MPI Support", False, 'mpic++ not found')
else:
conf.report_optional_feature("mpi", "MPI Support", False, 'option --enable-mpi not selected')
def build(bld):
env = bld.env_of_name('default')
sim = bld.create_ns3_module('mpi', ['core', 'network'])
sim.source = [
'model/distributed-simulator-impl.cc',
'model/mpi-interface.cc',
'model/mpi-net-device.cc',
]
env = bld.env_of_name('default')
sim = bld.create_ns3_module('mpi', ['core', 'network'])
sim.source = [
'model/distributed-simulator-impl.cc',
'model/mpi-interface.cc',
'model/mpi-net-device.cc',
]
headers = bld.new_task_gen('ns3header')
headers.module = 'mpi'
headers.source = [
'model/distributed-simulator-impl.h',
'model/mpi-interface.h',
'model/mpi-net-device.h',
]
headers = bld.new_task_gen('ns3header')
headers.module = 'mpi'
headers.source = [
'model/distributed-simulator-impl.h',
'model/mpi-interface.h',
'model/mpi-net-device.h',
]
if env['ENABLE_MPI']:
sim.uselib = 'MPI'
if env['ENABLE_MPI']:
sim.uselib = 'MPI'
bld.ns3_python_bindings()
bld.ns3_python_bindings()

22
wscript
View File

@@ -304,27 +304,7 @@ def configure(conf):
modules_enabled]
conf.sub_config('bindings/python')
# for MPI
conf.find_program('mpic++', var='MPI')
if Options.options.enable_mpi and conf.env['MPI']:
p = subprocess.Popen([conf.env['MPI'], '-showme:compile'], stdout=subprocess.PIPE)
flags = p.stdout.read().rstrip().split()
p.wait()
env.append_value("CXXFLAGS_MPI", flags)
p = subprocess.Popen([conf.env['MPI'], '-showme:link'], stdout=subprocess.PIPE)
flags = p.stdout.read().rstrip().split()
p.wait()
env.append_value("LINKFLAGS_MPI", flags)
env.append_value('CXXDEFINES', 'NS3_MPI')
conf.report_optional_feature("mpi", "MPI Support", True, '')
conf.env['ENABLE_MPI'] = True
else:
if Options.options.enable_mpi:
conf.report_optional_feature("mpi", "MPI Support", False, 'mpic++ not found')
else:
conf.report_optional_feature("mpi", "MPI Support", False, 'option --enable-mpi not selected')
conf.sub_config('src/mpi')
# for suid bits
conf.find_program('sudo', var='SUDO')