Commit a9058d06 authored by buntinas's avatar buntinas
Browse files

Removed check for --enable-fast from setup_channel and setup_channel.args. ...

Removed check for --enable-fast from setup_channel and setup_channel.args.  The "bash-isms" in setup-channel.args were removed also.
parent 0aa40b87
......@@ -33,12 +33,9 @@ for path in $pathlist ; do
MPICH2_INCLUDE_FLAGS="$MPICH2_INCLUDE_FLAGS -I${master_top_builddir}/${path} -I${master_top_srcdir}/${path}"
done
#ARCH=`uname -m | sed -es/i.86/i386/`
#CPPFLAGS="$CPPFLAGS -D${ARCH}"
# include prototype
prototype_dir=${master_top_srcdir}/src/mpid/${device_name}/channels/${channel_name}/nemesis
#CPPFLAGS="$CPPFLAGS -I${prototype_dir}/include -I${prototype_dir}/utils/monitor"
MPICH2_INCLUDE_FLAGS="$MPICH2_INCLUDE_FLAGS -I${prototype_dir}/include -I${prototype_dir}/utils/monitor"
# Only include papi in CPPFLAGS configure will handle libs, and checking that it exists, etc.
......@@ -46,14 +43,11 @@ MPICH2_INCLUDE_FLAGS="$MPICH2_INCLUDE_FLAGS -I${prototype_dir}/include -I${proto
# By the time configure for nemesis is run, the ch3 configure has already AC_SUBSTed CPPFLAGS.
# This is run from the top of ch3's configure.
if test -n "${papi_dir}" ; then
#CPPFLAGS="$CPPFLAGS -I${papi_dir}/include"
MPICH2_INCLUDE_FLAGS=="$MPICH2_INCLUDE_FLAGS -I${papi_dir}/include"
# CPPFLAGS="$CPPFLAGS -I${perfctr_dir}/include -I${papi_dir}/include"
# LIBS="$LIBS ${papi_dir}/lib/libpapi.a ${papi_dir}/lib/libperfctr.a"
fi
if [ "${enable_fast}x" == "yesx" ] ; then
CFLAGS="$CFLAGS -O3"
fi
#if [ "${enable_fast}x" == "yesx" ] ; then
# CFLAGS="$CFLAGS -O3"
#fi
export nemesis_network
......@@ -14,16 +14,16 @@ else
fi
#eval _conf_array=($ac_configure_args)
eval _conf_array=\($ac_configure_args\)
#eval _conf_array=\($ac_configure_args\)
for arg in "${_conf_array[@]}" ; do
case "$arg" in
--with-papi=* )
papi_dir=`echo "$arg" | sed 's/--with-papi=//'`
;;
--enable-fast* )
enable_fast="yes"
;;
#for arg in "${_conf_array[@]}" ; do
# case "$arg" in
# --with-papi=* )
# papi_dir=`echo "$arg" | sed 's/--with-papi=//'`
# ;;
# --enable-fast* )
# enable_fast="yes"
# ;;
# --with-perfctr=* )
# perfctr_dir=`echo "$arg" | sed 's/--with-perfctr=//'`
# ;;
......@@ -36,7 +36,7 @@ for arg in "${_conf_array[@]}" ; do
# --with-gm-lib=* )
# gm_lib_dir=`echo "$arg" | sed 's/--with-gm-lib=//'`
# ;;
esac
done
# esac
#done
# export papi_dir perfctr_dir gm_dir gm_include_dir gm_lib_dir
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment