Menu
▾
▴
openss-cvs — Used for the OpenSpeedShop cvs commit messages
You can subscribe to this list here.
| 2009 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(224) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2010 |
Jan
(373) |
Feb
(86) |
Mar
(71) |
Apr
(39) |
May
(21) |
Jun
(71) |
Jul
(96) |
Aug
(88) |
Sep
(24) |
Oct
(300) |
Nov
(116) |
Dec
(47) |
| 2011 |
Jan
(43) |
Feb
|
Mar
|
Apr
|
May
(41) |
Jun
(39) |
Jul
(18) |
Aug
(20) |
Sep
(37) |
Oct
(113) |
Nov
(87) |
Dec
(28) |
| 2012 |
Jan
(39) |
Feb
(21) |
Mar
(19) |
Apr
(44) |
May
(56) |
Jun
(37) |
Jul
(32) |
Aug
(56) |
Sep
(34) |
Oct
(25) |
Nov
(30) |
Dec
(30) |
| 2013 |
Jan
(54) |
Feb
(66) |
Mar
(82) |
Apr
(66) |
May
(114) |
Jun
(34) |
Jul
(44) |
Aug
(28) |
Sep
(13) |
Oct
(40) |
Nov
(52) |
Dec
(56) |
| 2014 |
Jan
(21) |
Feb
(37) |
Mar
(34) |
Apr
(31) |
May
(12) |
Jun
(7) |
Jul
(29) |
Aug
(30) |
Sep
(33) |
Oct
(52) |
Nov
(34) |
Dec
(65) |
| 2015 |
Jan
(12) |
Feb
(7) |
Mar
(8) |
Apr
(19) |
May
(8) |
Jun
(31) |
Jul
(10) |
Aug
(6) |
Sep
(17) |
Oct
(25) |
Nov
(43) |
Dec
(11) |
| 2016 |
Jan
(9) |
Feb
(12) |
Mar
(43) |
Apr
(31) |
May
(21) |
Jun
(7) |
Jul
(24) |
Aug
(4) |
Sep
(8) |
Oct
(13) |
Nov
(16) |
Dec
(11) |
| 2017 |
Jan
(27) |
Feb
(12) |
Mar
(5) |
Apr
(5) |
May
(11) |
Jun
(2) |
Jul
(5) |
Aug
(15) |
Sep
(9) |
Oct
(2) |
Nov
|
Dec
|
|
From: Jim G. <jga...@us...> - 2017-10-05 20:53:31
|
Update of /cvsroot/openss/OpenSpeedShop_ROOT In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv26470 Modified Files: .support_for_install.sh Log Message: Enhance the build scrit to be able to use the passed in qt installation as the basis for running qmake to build the new gui. Found this on quartz at LLNL when using TCE qt5 installation. Index: .support_for_install.sh =================================================================== RCS file: /cvsroot/openss/OpenSpeedShop_ROOT/.support_for_install.sh,v retrieving revision 1.192 retrieving revision 1.193 diff -C2 -d -r1.192 -r1.193 *** .support_for_install.sh 5 Oct 2017 16:21:24 -0000 1.192 --- .support_for_install.sh 5 Oct 2017 20:53:28 -0000 1.193 *************** *** 5178,5181 **** --- 5178,5182 ---- if [ ! -z $KRELL_ROOT_QT ]; then export QTDIR=$KRELL_ROOT_QT + export LD_LIBRARY_PATH=$QTDIR/lib:$LD_LIBRARY_PATH echo "cbtf-argonavis-gui build: QTDIR=$KRELL_ROOT_QT" else *************** *** 5185,5188 **** --- 5186,5190 ---- export QTDIR=/usr/lib64/qt4 fi + echo "cbtf-argonavis-gui build: QTDIR=$QTDIR" fi *************** *** 5195,5198 **** --- 5197,5202 ---- # this is required - w/o the make clean we get build errors + echo "QTDIR/bin/qmake=${QTDIR}/bin/qmake" + ${QTDIR}/bin/qmake -o Makefile ./openss-gui.pro make clean |
|
From: Jim G. <jga...@us...> - 2017-10-05 16:21:27
|
Update of /cvsroot/openss/OpenSpeedShop_ROOT In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv27881 Modified Files: .support_for_install.sh Log Message: Fix typos in new gui build. Handle using elfutils dwarf code for building dyninst for new versions and use existing libdwarf for the default 9.3.2 version of dyninst. This change uses the version to pick the code. Index: .support_for_install.sh =================================================================== RCS file: /cvsroot/openss/OpenSpeedShop_ROOT/.support_for_install.sh,v retrieving revision 1.191 retrieving revision 1.192 diff -C2 -d -r1.191 -r1.192 *** .support_for_install.sh 26 Sep 2017 04:10:26 -0000 1.191 --- .support_for_install.sh 5 Oct 2017 16:21:24 -0000 1.192 *************** *** 32,36 **** libmonitorver=20130218 vampirtracever=5.3.2 ! #dyninstver=9.2.0 dyninstver=9.3.2 symtabapiver=8.1.2 --- 32,36 ---- libmonitorver=20130218 vampirtracever=5.3.2 ! #dyninstver=20171003 dyninstver=9.3.2 symtabapiver=8.1.2 *************** *** 49,53 **** # OMPT related versions omptver=20160808 ! llvm_openmpver=20170825 # OSS and CBTF versions --- 49,54 ---- # OMPT related versions omptver=20160808 ! #llvm_openmpver=20170825 ! llvm_openmpver=20170926 # OSS and CBTF versions *************** *** 3146,3152 **** #fi echo "Building cbtf with CBTFKRELL_CXX_FLAGS=${CBTFKRELL_CXX_FLAGS}" - echo "Building cbtf with CMAKE_LIBIOMP_PHRASE=${CMAKE_LIBIOMP_PHRASE}" ! echo "cmake .. -DCMAKE_BUILD_TYPE=None -DCMAKE_CXX_FLAGS=${CBTFKRELL_CXX_FLAGS} -DCMAKE_C_FLAGS=-g -O2 -DCMAKE_INSTALL_PREFIX=${CBTF_PREFIX} -DCMAKE_PREFIX_PATH=${KRELL_ROOT_PREFIX} ${CMAKE_RUNTIME_ONLY_PHRASE} ${CMAKE_TARGET_ARCH_PHRASE} ${CMAKE_RUNTIME_TARGET_ARCH_PHRASE} ${CMAKE_CBTF_PHRASE} ${CMAKE_BOOST_PHRASE1} ${CMAKE_BOOST_PHRASE2} ${CMAKE_BOOST_LIB_PHRASE} ${CMAKE_BOOST_SYSPATH_PHRASE} ${CMAKE_BOOST_CMAKE_PHRASE} ${CMAKE_PAPI_PHRASE} ${CMAKE_BINUTILS_PHRASE} ${CMAKE_LIBMONITOR_PHRASE} ${CMAKE_LIBUNWIND_PHRASE} ${CMAKE_XERCESC_PHRASE} ${CMAKE_DYNINST_PHRASE} ${CMAKE_MRNET_PHRASE} ${CMAKE_LIBIOMP_PHRASE} ${CMAKE_MPICH_PHRASE} ${CMAKE_MPICH2_PHRASE} ${CMAKE_MVAPICH_PHRASE} ${CMAKE_MVAPICH2_PHRASE} ${CMAKE_MPT_PHRASE} ${CMAKE_CN_CBTF_PHRASE} ${CMAKE_CN_CBTF_KRELL_PHRASE} ${CMAKE_CN_PAPI_PHRASE} ${CMAKE_CN_BOOST_PHRASE} ${CMAKE_CN_LIBMONITOR_PHRASE} ${CMAKE_CN_LIBUNWIND_PHRASE} ${CMAKE_CN_XERCESC_PHRASE} ${CMAKE_CN_DYNINST_PHRASE} ${CMAKE_CN_MRNET_PHRASE} ${CMAKE_OPENMPI_PHRASE} ${CMAKE_CRAYALPS_PHRASE} ${CMAKE_LTDL_PHRASE}" > ../build_cbtf_krell_cmake.txt --- 3147,3152 ---- #fi echo "Building cbtf with CBTFKRELL_CXX_FLAGS=${CBTFKRELL_CXX_FLAGS}" ! echo "cmake .. -DCMAKE_BUILD_TYPE=None -DCMAKE_CXX_FLAGS=${CBTFKRELL_CXX_FLAGS} -DCMAKE_C_FLAGS=-g -O2 -DCMAKE_INSTALL_PREFIX=${CBTF_PREFIX} -DCMAKE_PREFIX_PATH=${KRELL_ROOT_PREFIX} ${CMAKE_RUNTIME_ONLY_PHRASE} ${CMAKE_TARGET_ARCH_PHRASE} ${CMAKE_RUNTIME_TARGET_ARCH_PHRASE} ${CMAKE_CBTF_PHRASE} ${CMAKE_BOOST_PHRASE1} ${CMAKE_BOOST_PHRASE2} ${CMAKE_BOOST_LIB_PHRASE} ${CMAKE_BOOST_SYSPATH_PHRASE} ${CMAKE_BOOST_CMAKE_PHRASE} ${CMAKE_PAPI_PHRASE} ${CMAKE_BINUTILS_PHRASE} ${CMAKE_LIBMONITOR_PHRASE} ${CMAKE_LIBUNWIND_PHRASE} ${CMAKE_XERCESC_PHRASE} ${CMAKE_DYNINST_PHRASE} ${CMAKE_MRNET_PHRASE} ${CMAKE_MPICH_PHRASE} ${CMAKE_MPICH2_PHRASE} ${CMAKE_MVAPICH_PHRASE} ${CMAKE_MVAPICH2_PHRASE} ${CMAKE_MPT_PHRASE} ${CMAKE_CN_CBTF_PHRASE} ${CMAKE_CN_CBTF_KRELL_PHRASE} ${CMAKE_CN_PAPI_PHRASE} ${CMAKE_CN_BOOST_PHRASE} ${CMAKE_CN_LIBMONITOR_PHRASE} ${CMAKE_CN_LIBUNWIND_PHRASE} ${CMAKE_CN_XERCESC_PHRASE} ${CMAKE_CN_DYNINST_PHRASE} ${CMAKE_CN_MRNET_PHRASE} ${CMAKE_OPENMPI_PHRASE} ${CMAKE_CRAYALPS_PHRASE} ${CMAKE_LTDL_PHRASE}" > ../build_cbtf_krell_cmake.txt *************** *** 5181,5185 **** else if [ -f /usr/lib64/qt5/bin/qmake ]; then ! export QTDIR=/usr/lib65/qt4 elif [ -f /usr/lib64/qt4/bin/qmake ]; then export QTDIR=/usr/lib64/qt4 --- 5181,5185 ---- else if [ -f /usr/lib64/qt5/bin/qmake ]; then ! export QTDIR=/usr/lib64/qt5 elif [ -f /usr/lib64/qt4/bin/qmake ]; then export QTDIR=/usr/lib64/qt4 *************** *** 6185,6224 **** #echo "check libdwarf" ! if [ ! -z $KRELL_ROOT_LIBDWARF ] && [ -f $KRELL_ROOT_LIBDWARF/$LIBDIR/libdwarf.so ]; then ! #echo "KRELL_ROOT_LIBDWARF built libdwarf or user specified libdwarf found" ! export LIBDWARFDIR=$KRELL_ROOT_LIBDWARF ! export LIBDWARF_LIBNAME=$KRELL_ROOT_LIBDWARF/$LIBDIR/libdwarf.so ! elif [ ! -z $KRELL_ROOT_LIBDWARF ] && [ -f $KRELL_ROOT_LIBDWARF/$LIBDIR/libdwarf.a ]; then ! #echo "KRELL_ROOT_LIBDWARF built libdwarf or user specified libdwarf found" ! export LIBDWARFDIR=$KRELL_ROOT_LIBDWARF ! export LIBDWARF_LIBNAME=$KRELL_ROOT_LIBDWARF/$LIBDIR/libdwarf.a ! elif [ ! -z $KRELL_ROOT_PREFIX ] && [ -f $KRELL_ROOT_PREFIX/$LIBDIR/libdwarf.so ]; then ! #echo "KRELL_ROOT_PREFIX built libdwarf" ! export LIBDWARFDIR=$KRELL_ROOT_PREFIX ! export LIBDWARF_LIBNAME=$KRELL_ROOT_PREFIX/$LIBDIR/libdwarf.so ! elif [ ! -z $KRELL_ROOT_PREFIX ] && [ -f $KRELL_ROOT_PREFIX/$LIBDIR/libdwarf.a ]; then ! #echo "KRELL_ROOT_PREFIX built libdwarf" ! export LIBDWARFDIR=$KRELL_ROOT_PREFIX ! export LIBDWARF_LIBNAME=$KRELL_ROOT_PREFIX/$LIBDIR/libdwarf.a ! elif [ -d $KRELL_ROOT_PREFIX ] && [ -f $KRELL_ROOT_PREFIX/$LIBDIR/libdwarf.so ]; then ! #echo "root_prefix built libdwarf" ! export LIBDWARFDIR=$KRELL_ROOT_PREFIX ! export LIBDWARF_LIBNAME=$KRELL_ROOT_PREFIX/$LIBDIR/libdwarf.so ! elif [ -d $KRELL_ROOT_PREFIX ] && [ -f $KRELL_ROOT_PREFIX/$LIBDIR/libdwarf.a ]; then ! #echo "root_prefix built libdwarf" ! export LIBDWARFDIR=$KRELL_ROOT_PREFIX ! export LIBDWARF_LIBNAME=$KRELL_ROOT_PREFIX/$LIBDIR/libdwarf.a ! else ! export LIBDWARFDIR=/usr/lib ! export LIBDWARF_LIBNAME=/usr/lib/libdwarf.so ! fi ! if [ ! -z $KRELL_ROOT_LIBDWARF ] && [ -f $KRELL_ROOT_LIBDWARF/include/libdwarf.h ]; then ! export LIBDWARFINC=$KRELL_ROOT_LIBDWARF/include ! elif [ ! -z $KRELL_ROOT_PREFIX ] && [ -f $KRELL_ROOT_PREFIX/include/libdwarf.h ]; then ! export LIBDWARFINC=$KRELL_ROOT_PREFIX/include ! elif [ -d $KRELL_ROOT_PREFIX ] && [ -f $KRELL_ROOT_PREFIX/include/libdwarf.h ]; then ! export LIBDWARFINC=$KRELL_ROOT_PREFIX/include fi --- 6185,6240 ---- #echo "check libdwarf" ! # Find libdwarf libraries in elfutils for newer dyninst versions ! if [ $dyninstver == "20171003" ]; then ! if [ ! -z $KRELL_ROOT_LIBELF ] && [ -f $KRELL_ROOT_LIBELF/$LIBDIR/libdw.so ]; then ! export LIBDWARFDIR=$KRELL_ROOT_LIBELF ! export LIBDWARF_LIBNAME=$KRELL_ROOT_LIBELF/$LIBDIR/libdw.so ! elif [ ! -z $KRELL_ROOT_LIBELF ] && [ -f $KRELL_ROOT_LIBELF/$ALTLIBDIR/libdw.so ]; then ! export LIBDWARFDIR=$KRELL_ROOT_LIBELF ! export LIBDWARF_LIBNAME=$KRELL_ROOT_LIBELF/$ALTLIBDIR/libdw.so ! fi + elif [ $dyninstver == "9.3.2" ]; then + if [ ! -z $KRELL_ROOT_LIBDWARF ] && [ -f $KRELL_ROOT_LIBDWARF/$LIBDIR/libdwarf.so ]; then + #echo "KRELL_ROOT_LIBDWARF built libdwarf or user specified libdwarf found" + export LIBDWARFDIR=$KRELL_ROOT_LIBDWARF + export LIBDWARF_LIBNAME=$KRELL_ROOT_LIBDWARF/$LIBDIR/libdwarf.so + elif [ ! -z $KRELL_ROOT_LIBDWARF ] && [ -f $KRELL_ROOT_LIBDWARF/$LIBDIR/libdwarf.a ]; then + #echo "KRELL_ROOT_LIBDWARF built libdwarf or user specified libdwarf found" + export LIBDWARFDIR=$KRELL_ROOT_LIBDWARF + export LIBDWARF_LIBNAME=$KRELL_ROOT_LIBDWARF/$LIBDIR/libdwarf.a + elif [ ! -z $KRELL_ROOT_PREFIX ] && [ -f $KRELL_ROOT_PREFIX/$LIBDIR/libdwarf.so ]; then + #echo "KRELL_ROOT_PREFIX built libdwarf" + export LIBDWARFDIR=$KRELL_ROOT_PREFIX + export LIBDWARF_LIBNAME=$KRELL_ROOT_PREFIX/$LIBDIR/libdwarf.so + elif [ ! -z $KRELL_ROOT_PREFIX ] && [ -f $KRELL_ROOT_PREFIX/$LIBDIR/libdwarf.a ]; then + #echo "KRELL_ROOT_PREFIX built libdwarf" + export LIBDWARFDIR=$KRELL_ROOT_PREFIX + export LIBDWARF_LIBNAME=$KRELL_ROOT_PREFIX/$LIBDIR/libdwarf.a + elif [ -d $KRELL_ROOT_PREFIX ] && [ -f $KRELL_ROOT_PREFIX/$LIBDIR/libdwarf.so ]; then + #echo "root_prefix built libdwarf" + export LIBDWARFDIR=$KRELL_ROOT_PREFIX + export LIBDWARF_LIBNAME=$KRELL_ROOT_PREFIX/$LIBDIR/libdwarf.so + elif [ -d $KRELL_ROOT_PREFIX ] && [ -f $KRELL_ROOT_PREFIX/$LIBDIR/libdwarf.a ]; then + #echo "root_prefix built libdwarf" + export LIBDWARFDIR=$KRELL_ROOT_PREFIX + export LIBDWARF_LIBNAME=$KRELL_ROOT_PREFIX/$LIBDIR/libdwarf.a + else + export LIBDWARFDIR=/usr/lib + export LIBDWARF_LIBNAME=/usr/lib/libdwarf.so + fi + fi ! # Find libdwarf includes in elfutils for newer dyninst versions ! if [ $dyninstver == "20171003" ]; then ! export LIBDWARFINC=$KRELL_ROOT_LIBELF/include ! elif [ $dyninstver == "9.3.2" ]; then ! if [ ! -z $KRELL_ROOT_LIBDWARF ] && [ -f $KRELL_ROOT_LIBDWARF/include/libdwarf.h ]; then ! export LIBDWARFINC=$KRELL_ROOT_LIBDWARF/include ! elif [ ! -z $KRELL_ROOT_PREFIX ] && [ -f $KRELL_ROOT_PREFIX/include/libdwarf.h ]; then ! export LIBDWARFINC=$KRELL_ROOT_PREFIX/include ! elif [ -d $KRELL_ROOT_PREFIX ] && [ -f $KRELL_ROOT_PREFIX/include/libdwarf.h ]; then ! export LIBDWARFINC=$KRELL_ROOT_PREFIX/include ! fi fi *************** *** 6408,6412 **** export CC=gcc fi ! cmake . -DCMAKE_INSTALL_PREFIX=$RPM_BUILD_ROOT/$KRELL_ROOT_PREFIX -DINSTALL_LIB_DIR=$RPM_BUILD_ROOT/$KRELL_ROOT_PREFIX/$LIBDIR -DINSTALL_INCLUDE_DIR=$RPM_BUILD_ROOT/$KRELL_ROOT_PREFIX/include/dyninst -DCMAKE_PREFIX_PATH=$RPM_BUILD_ROOT/$KRELL_ROOT_PREFIX -DCMAKE_BUILD_TYPE=RelWithDebInfo -DLIBDWARF_LIBRARIES=$LIBDWARF_LIBNAME -DLIBDWARF_INCLUDE_DIR=$LIBDWARFINC -DLIBELF_LIBRARIES=$LIBELF_LIBNAME -DLIBELF_INCLUDE_DIR=$LIBELFINC -DPATH_BOOST=$DYNINST_BOOST_ROOT -DIBERTY_LIBRARIES=$LIBIBERTY_LIBNAME -DIBERTY_LIBRARY=$LIBIBERTY_LIBNAME -DBUILD_RTLIB_32=OFF -DCHECK_RTLIB_32=OFF fi --- 6424,6429 ---- export CC=gcc fi ! #cmake . -DCMAKE_INSTALL_PREFIX=$RPM_BUILD_ROOT/$KRELL_ROOT_PREFIX -Dcap_dwarf=1 -DCMAKE_CXX_FLAGS="-dcap_dwarf -std=c++11 -g -O2" -DCMAKE_C_FLAGS="-dcap_dwarf -std=c++11 -g -O2" -DINSTALL_LIB_DIR=$RPM_BUILD_ROOT/$KRELL_ROOT_PREFIX/$LIBDIR -DINSTALL_INCLUDE_DIR=$RPM_BUILD_ROOT/$KRELL_ROOT_PREFIX/include/dyninst -DCMAKE_PREFIX_PATH=$RPM_BUILD_ROOT/$KRELL_ROOT_PREFIX -DCMAKE_BUILD_TYPE=RelWithDebInfo -DLIBDWARF_LIBRARIES=$LIBDWARF_LIBNAME -DLIBDWARF_INCLUDE_DIR=$LIBDWARFINC -DLIBELF_LIBRARIES=$LIBELF_LIBNAME -DLIBELF_INCLUDE_DIR=$LIBELFINC -DPATH_BOOST=$DYNINST_BOOST_ROOT -DIBERTY_LIBRARIES=$LIBIBERTY_LIBNAME -DIBERTY_LIBRARY=$LIBIBERTY_LIBNAME -DBUILD_RTLIB_32=OFF -DCHECK_RTLIB_32=OFF ! cmake . -DCMAKE_INSTALL_PREFIX=$RPM_BUILD_ROOT/$KRELL_ROOT_PREFIX -Dcap_dwarf=1 -DINSTALL_LIB_DIR=$RPM_BUILD_ROOT/$KRELL_ROOT_PREFIX/$LIBDIR -DINSTALL_INCLUDE_DIR=$RPM_BUILD_ROOT/$KRELL_ROOT_PREFIX/include/dyninst -DCMAKE_PREFIX_PATH=$RPM_BUILD_ROOT/$KRELL_ROOT_PREFIX -DCMAKE_BUILD_TYPE=RelWithDebInfo -DLIBDWARF_LIBRARIES=$LIBDWARF_LIBNAME -DLIBDWARF_INCLUDE_DIR=$LIBDWARFINC -DLIBELF_LIBRARIES=$LIBELF_LIBNAME -DLIBELF_INCLUDE_DIR=$LIBELFINC -DPATH_BOOST=$DYNINST_BOOST_ROOT -DIBERTY_LIBRARIES=$LIBIBERTY_LIBNAME -DIBERTY_LIBRARY=$LIBIBERTY_LIBNAME -DBUILD_RTLIB_32=OFF -DCHECK_RTLIB_32=OFF fi *************** *** 7263,7267 **** else if [ -f /usr/lib64/qt5/bin/qmake ]; then ! export QTDIR=/usr/lib65/qt4 elif [ -f /usr/lib64/qt4/bin/qmake ]; then export QTDIR=/usr/lib64/qt4 --- 7280,7284 ---- else if [ -f /usr/lib64/qt5/bin/qmake ]; then ! export QTDIR=/usr/lib64/qt5 elif [ -f /usr/lib64/qt4/bin/qmake ]; then export QTDIR=/usr/lib64/qt4 *************** *** 7863,7867 **** echo "Need alternative for rpm here - elf" # Dyninst-9.3.1 and above need to use elfutils only, not libelf ! if [ $dyninstver == "9.3.2" ]; then if [ "$found_libz" = 0 ]; then build_zlib_routine --- 7880,7884 ---- echo "Need alternative for rpm here - elf" # Dyninst-9.3.1 and above need to use elfutils only, not libelf ! if [ $dyninstver == "9.3.2" -o $dyninstver == "20171003" ]; then if [ "$found_libz" = 0 ]; then build_zlib_routine |
|
From: Jim G. <jga...@us...> - 2017-09-26 04:10:29
|
Update of /cvsroot/openss/OpenSpeedShop_ROOT In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv2724 Modified Files: .support_for_install.sh Log Message: Fix issue with building elfutils with Intel compilers - switch to using gcc instead due to problems in the elfutils source that Intel compilers flag. Also, add the missing echo of the CMAKE_LIBIOMP_PHRASE to stdout. Then the echoed build line is valid to use in building a run cmake script for cbtf-krell. Index: .support_for_install.sh =================================================================== RCS file: /cvsroot/openss/OpenSpeedShop_ROOT/.support_for_install.sh,v retrieving revision 1.190 retrieving revision 1.191 diff -C2 -d -r1.190 -r1.191 *** .support_for_install.sh 1 Sep 2017 19:56:05 -0000 1.190 --- .support_for_install.sh 26 Sep 2017 04:10:26 -0000 1.191 *************** *** 908,919 **** --- 908,924 ---- if test -f $KRELL_ROOT_PREFIX/ompt/$LIBDIR/libiomp5.so; then export CMAKE_LIBIOMP_PHRASE="-DLIBIOMP_DIR=${KRELL_ROOT_PREFIX}/ompt" + #echo "setting-up: CMAKE_LIBIOMP_PHRASE is defined to $CMAKE_LIBIOMP_PHRASE." elif test -f $KRELL_ROOT_PREFIX/ompt/$ALTLIBDIR/libiomp5.so; then export CMAKE_LIBIOMP_PHRASE="-DLIBIOMP_DIR=${KRELL_ROOT_PREFIX}/ompt" + #echo "setting-up: ALT, CMAKE_LIBIOMP_PHRASE is defined to $CMAKE_LIBIOMP_PHRASE." else if test -f $KRELL_ROOT_PREFIX/$LIBDIR/libiomp5.so; then export CMAKE_LIBIOMP_PHRASE="-DLIBIOMP_DIR=${KRELL_ROOT_PREFIX}" + #echo "setting-up: noompt, CMAKE_LIBIOMP_PHRASE is defined to $CMAKE_LIBIOMP_PHRASE." elif test -f $KRELL_ROOT_PREFIX/$ALTLIBDIR/libiomp5.so; then export CMAKE_LIBIOMP_PHRASE="-DLIBIOMP_DIR=${KRELL_ROOT_PREFIX}" + #echo "setting-up: noompt,alt, CMAKE_LIBIOMP_PHRASE is defined to $CMAKE_LIBIOMP_PHRASE." else + echo "setting-up: KRELL_ROOT_OMPT_ROOT is undefined, setting to blanks" if [ "$display_summary" = 1 ] ; then echo "setting-up: KRELL_ROOT_OMPT_ROOT is undefined, setting to blanks" *************** *** 3141,3146 **** #fi echo "Building cbtf with CBTFKRELL_CXX_FLAGS=${CBTFKRELL_CXX_FLAGS}" ! echo "cmake .. -DCMAKE_BUILD_TYPE=None -DCMAKE_CXX_FLAGS=${CBTFKRELL_CXX_FLAGS} -DCMAKE_C_FLAGS=-g -O2 -DCMAKE_INSTALL_PREFIX=${CBTF_PREFIX} -DCMAKE_PREFIX_PATH=${KRELL_ROOT_PREFIX} ${CMAKE_RUNTIME_ONLY_PHRASE} ${CMAKE_TARGET_ARCH_PHRASE} ${CMAKE_RUNTIME_TARGET_ARCH_PHRASE} ${CMAKE_CBTF_PHRASE} ${CMAKE_BOOST_PHRASE1} ${CMAKE_BOOST_PHRASE2} ${CMAKE_BOOST_LIB_PHRASE} ${CMAKE_BOOST_SYSPATH_PHRASE} ${CMAKE_BOOST_CMAKE_PHRASE} ${CMAKE_PAPI_PHRASE} ${CMAKE_BINUTILS_PHRASE} ${CMAKE_LIBMONITOR_PHRASE} ${CMAKE_LIBUNWIND_PHRASE} ${CMAKE_XERCESC_PHRASE} ${CMAKE_DYNINST_PHRASE} ${CMAKE_MRNET_PHRASE} ${CMAKE_MPICH_PHRASE} ${CMAKE_MPICH2_PHRASE} ${CMAKE_MVAPICH_PHRASE} ${CMAKE_MVAPICH2_PHRASE} ${CMAKE_MPT_PHRASE} ${CMAKE_CN_CBTF_PHRASE} ${CMAKE_CN_CBTF_KRELL_PHRASE} ${CMAKE_CN_PAPI_PHRASE} ${CMAKE_CN_BOOST_PHRASE} ${CMAKE_CN_LIBMONITOR_PHRASE} ${CMAKE_CN_LIBUNWIND_PHRASE} ${CMAKE_CN_XERCESC_PHRASE} ${CMAKE_CN_DYNINST_PHRASE} ${CMAKE_CN_MRNET_PHRASE} ${CMAKE_OPENMPI_PHRASE} ${CMAKE_CRAYALPS_PHRASE} ${CMAKE_LTDL_PHRASE}" > ../build_cbtf_krell_cmake.txt --- 3146,3152 ---- #fi echo "Building cbtf with CBTFKRELL_CXX_FLAGS=${CBTFKRELL_CXX_FLAGS}" + echo "Building cbtf with CMAKE_LIBIOMP_PHRASE=${CMAKE_LIBIOMP_PHRASE}" ! echo "cmake .. -DCMAKE_BUILD_TYPE=None -DCMAKE_CXX_FLAGS=${CBTFKRELL_CXX_FLAGS} -DCMAKE_C_FLAGS=-g -O2 -DCMAKE_INSTALL_PREFIX=${CBTF_PREFIX} -DCMAKE_PREFIX_PATH=${KRELL_ROOT_PREFIX} ${CMAKE_RUNTIME_ONLY_PHRASE} ${CMAKE_TARGET_ARCH_PHRASE} ${CMAKE_RUNTIME_TARGET_ARCH_PHRASE} ${CMAKE_CBTF_PHRASE} ${CMAKE_BOOST_PHRASE1} ${CMAKE_BOOST_PHRASE2} ${CMAKE_BOOST_LIB_PHRASE} ${CMAKE_BOOST_SYSPATH_PHRASE} ${CMAKE_BOOST_CMAKE_PHRASE} ${CMAKE_PAPI_PHRASE} ${CMAKE_BINUTILS_PHRASE} ${CMAKE_LIBMONITOR_PHRASE} ${CMAKE_LIBUNWIND_PHRASE} ${CMAKE_XERCESC_PHRASE} ${CMAKE_DYNINST_PHRASE} ${CMAKE_MRNET_PHRASE} ${CMAKE_LIBIOMP_PHRASE} ${CMAKE_MPICH_PHRASE} ${CMAKE_MPICH2_PHRASE} ${CMAKE_MVAPICH_PHRASE} ${CMAKE_MVAPICH2_PHRASE} ${CMAKE_MPT_PHRASE} ${CMAKE_CN_CBTF_PHRASE} ${CMAKE_CN_CBTF_KRELL_PHRASE} ${CMAKE_CN_PAPI_PHRASE} ${CMAKE_CN_BOOST_PHRASE} ${CMAKE_CN_LIBMONITOR_PHRASE} ${CMAKE_CN_LIBUNWIND_PHRASE} ${CMAKE_CN_XERCESC_PHRASE} ${CMAKE_CN_DYNINST_PHRASE} ${CMAKE_CN_MRNET_PHRASE} ${CMAKE_OPENMPI_PHRASE} ${CMAKE_CRAYALPS_PHRASE} ${CMAKE_LTDL_PHRASE}" > ../build_cbtf_krell_cmake.txt *************** *** 7113,7117 **** else if [ "$build_with_intel" = 1 ]; then ! CC="icc" CFLAGS="-g -O2" ${ZLIB_INCLUDE} ${ZLIB_LIBS} ./configure --prefix=$KRELL_ROOT_PREFIX --libdir=$KRELL_ROOT_PREFIX/$LIBDIR --datadir=$KRELL_ROOT_PREFIX/share --enable-compat --enable-shared else ./configure --prefix=$KRELL_ROOT_PREFIX --libdir=$KRELL_ROOT_PREFIX/$LIBDIR CC="gcc" CFLAGS="-g -O2" ${ZLIB_INCLUDE} ${ZLIB_LIBS} --- 7119,7124 ---- else if [ "$build_with_intel" = 1 ]; then ! ./configure --prefix=$KRELL_ROOT_PREFIX --libdir=$KRELL_ROOT_PREFIX/$LIBDIR CC="gcc" CFLAGS="-g -O2" ${ZLIB_INCLUDE} ${ZLIB_LIBS} ! # BUG WITH INTEL CC="icc" CFLAGS="-g -O2" ./configure --prefix=$KRELL_ROOT_PREFIX --libdir=$KRELL_ROOT_PREFIX/$LIBDIR --datadir=$KRELL_ROOT_PREFIX/share --enable-compat --enable-shared ${ZLIB_INCLUDE} ${ZLIB_LIBS} else ./configure --prefix=$KRELL_ROOT_PREFIX --libdir=$KRELL_ROOT_PREFIX/$LIBDIR CC="gcc" CFLAGS="-g -O2" ${ZLIB_INCLUDE} ${ZLIB_LIBS} |
|
From: Jim G. <jga...@us...> - 2017-09-25 19:58:33
|
Update of /cvsroot/openss/OpenSpeedShop_ROOT/startup_files In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv15420/startup_files Modified Files: inl_falcon_build.sh Log Message: Update the inl build script. Index: inl_falcon_build.sh =================================================================== RCS file: /cvsroot/openss/OpenSpeedShop_ROOT/startup_files/inl_falcon_build.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** inl_falcon_build.sh 13 Jan 2017 18:12:44 -0000 1.1 --- inl_falcon_build.sh 25 Sep 2017 19:58:31 -0000 1.2 *************** *** 4,26 **** #FROM: falcon at INL: ! #module load MVAPICH2/2.0.1-GCC-4.9.2 ! module load CMake/3.2.3-GCC-4.9.3 #module load gcc/4.7.3 boost/1.50.0 cmake cuda/6.0 python/2.7.6 ! BASE_INSTALL=/home/galajame/OSS ! TOOL_VERS="_v2.3.1.beta1" ! MVAPICH2_INSTALL=/apps/local/easybuild/software/MVAPICH2/2.1-GCC-4.9.3 OPENMPI_INSTALL=/apps/local/easybuild/software/OpenMPI/1.8.7-GCC-4.9.3 MPICH_INSTALL=/apps/local/easybuild/software/impi/5.1.3.181-iccifort-2016.3.067-GCC-4.9.3-2.25 PYTHON_INSTALL=/apps/local/easybuild/software/Python/2.7.8-gmvolf-5.5.4 - ./install-tool --build-krell-root --krell-root-prefix ${BASE_INSTALL}/krellroot${TOOL_VERS} --with-mvapich2 ${MVAPICH2_INSTALL} --with-openmpi ${OPENMPI_INSTALL} --with-mpich ${MPICH_INSTALL} --with-python ${PYTHON_INSTALL} --with-mvapich2 /apps/local/easybuild/software/MVAPICH2/2.2-GCC-4.9.3 ! ./install-tool --build-cbtf-all --cbtf-install-prefix ${BASE_INSTALL}/cbtf${TOOL_VERS} --krell-root-prefix ${BASE_INSTALL}/krellroot${TOOL_VERS} --with-mvapich2 ${MVAPICH2_INSTALL} --with-openmpi ${OPENMPI_INSTALL} --with-mpich ${MPICH_INSTALL} --with-python ${PYTHON_INSTALL} --with-mvapich2 /apps/local/easybuild/software/MVAPICH2/2.2-GCC-4.9.3 ! ./install-tool --build-oss --openss-prefix ${BASE_INSTALL}/osscbtf${TOOL_VERS} --cbtf-install-prefix ${BASE_INSTALL}/cbtf${TOOL_VERS} --krell-root-prefix ${BASE_INSTALL}/krellroot${TOOL_VERS} --with-mvapich2 ${MVAPICH2_INSTALL} --with-openmpi ${OPENMPI_INSTALL} --with-mpich ${MPICH_INSTALL} --with-python ${PYTHON_INSTALL} --with-mvapich2 /apps/local/easybuild/software/MVAPICH2/2.2-GCC-4.9.3 ! #./install-tool --build-offline --openss-prefix ${BASE_INSTALL}/oss_offline${TOOL_VERS} --krell-root-prefix ${BASE_INSTALL}/krellroot${TOOL_VERS} --with-mvapich2 ${MVAPICH2_INSTALL} --with-openmpi ${OPENMPI_INSTALL} --with-mpich ${MPICH_INSTALL} --with-python ${PYTHON_INSTALL} --with-mvapich2 /apps/local/easybuild/software/MVAPICH2/2.2-GCC-4.9.3 --- 4,56 ---- #FROM: falcon at INL: ! #module load CMake/3.2.3-GCC-4.9.3 ! module load GCC/4.9.3 ! #module load GCC/6.3.0-2.27 #module load gcc/4.7.3 boost/1.50.0 cmake cuda/6.0 python/2.7.6 ! BASE_IDIR=/home/galajame/OSS ! TOOL_VERS="_v2.3.1.rc5" ! ROOT_VERS="_v2.3.1.rc5" ! GRAPHVIZ_VERS="-2.41.0" ! QTGRAPH_VERS="-1.0.0" ! ! #MVAPICH2_INSTALL=/apps/local/easybuild/software/MVAPICH2/2.1-GCC-4.9.3 ! MVAPICH2_INSTALL=/apps/local/easybuild/software/MVAPICH2/2.2-GCC-4.9.3 OPENMPI_INSTALL=/apps/local/easybuild/software/OpenMPI/1.8.7-GCC-4.9.3 MPICH_INSTALL=/apps/local/easybuild/software/impi/5.1.3.181-iccifort-2016.3.067-GCC-4.9.3-2.25 PYTHON_INSTALL=/apps/local/easybuild/software/Python/2.7.8-gmvolf-5.5.4 + GRAPHVIZ_IDIR=${BASE_IDIR}/graphviz${GRAPHVIZ_VERS} + QTGRAPH_IDIR=${BASE_IDIR}/QtGraph${QTGRAPH_VERS} + CBTF_IDIR=${BASE_IDIR}/cbtf${TOOL_VERS} + OSSCBTF_IDIR=${BASE_IDIR}/osscbtf${TOOL_VERS} + OSSOFF_IDIR=${BASE_IDIR}/ossoff${TOOL_VERS} + KROOT_IDIR=${BASE_IDIR}/krellroot${ROOT_VERS} ! ./install-tool --build-krell-root --krell-root-prefix ${KROOT_IDIR} --with-mvapich2 ${MVAPICH2_INSTALL} --with-openmpi ${OPENMPI_INSTALL} --with-mpich ${MPICH_INSTALL} --with-python ${PYTHON_INSTALL} --with-mvapich2 ${MVAPICH2_INSTALL} 2>&1 | tee install-tool_build-krell-root.log ! ./install-tool --build-cbtf-all --cbtf-install-prefix ${CBTF_IDIR} --krell-root-prefix ${KROOT_IDIR} --with-mvapich2 ${MVAPICH2_INSTALL} --with-openmpi ${OPENMPI_INSTALL} --with-mpich ${MPICH_INSTALL} --with-python ${PYTHON_INSTALL} --with-mvapich2 ${MVAPICH2_INSTALL} 2>&1 | tee install-tool_build-cbtf-all.log ! ./install-tool --build-oss --openss-prefix ${OSSCBTF_IDIR} --cbtf-install-prefix ${CBTF_IDIR} --krell-root-prefix ${KROOT_IDIR} --with-mvapich2 ${MVAPICH2_INSTALL} --with-openmpi ${OPENMPI_INSTALL} --with-mpich ${MPICH_INSTALL} --with-python ${PYTHON_INSTALL} --with-mvapich2 ${MVAPICH2_INSTALL} 2>&1 | tee install-tool_build-osscbtf.log ! ! rm -rf BUILD/falcon1/openspeedshop-2.3-cbtf ! mv BUILD/falcon1/openspeedshop-2.3 BUILD/falcon1/openspeedshop-2.3-cbtf ! ! ./install-tool --build-offline --openss-prefix ${OSSOFF_IDIR} --krell-root-prefix ${KROOT_IDIR} --with-mvapich2 ${MVAPICH2_INSTALL} --with-openmpi ${OPENMPI_INSTALL} --with-mpich ${MPICH_INSTALL} --with-python ${PYTHON_INSTALL} 2>&1 | tee install-tool_build-ossoff.log ! ! rm -rf BUILD/falcon1/openspeedshop-2.3-offline ! mv BUILD/falcon1/openspeedshop-2.3 BUILD/falcon1/openspeedshop-2.3-offline ! ! # Build graphviz for support of building the new cbtf-argonavis-gui ! #./install-tool --build-graphviz --krell-root-prefix ${GRAPHVIZ_IDIR} 2>&1 | tee install-tool_build-graphviz.log ! ! # Build QtGraph for support of building the new cbtf-argonavis-gui, uses graphviz ! #./install-tool --build-QtGraph --krell-root-prefix ${QTGRAPH_IDIR} --with-graphviz ${GRAPHVIZ_IDIR} --with-qt /usr/lib64/qt4 --with-boost ${KROOT_IDIR} 2>&1 | tee install-tool_build-QtGraph.log ! ! # Build new cbtf-argonavis-gui, uses graphviz and QtGraph ! #./install-tool --build-cbtfargonavisgui --with-openss ${OSSCBTF_IDIR} --with-cbtf ${CBTF_IDIR} --krell-root-prefix ${KROOT_IDIR} --with-graphviz ${GRAPHVIZ_IDIR} --with-QtGraph ${QTGRAPH_IDIR} --with-boost ${KROOT_IDIR} --with-qt /usr/lib64/qt4 2>&1 | tee install-tool_build-cbtfargogui.log + cp /apps/local/easybuild/software/GCCcore/4.9.3//lib64/libstdc++.so.6 ${BASE_IDIR}/krellroot${TOOL_VERS}/lib64/. + #cp /apps/local/easybuild/software/GCCcore/6.3.0/lib64/libstdc++.so.6 ${BASE_IDIR}/krellroot${TOOL_VERS}/lib64/. |
|
From: Jim G. <jga...@us...> - 2017-09-21 23:38:37
|
Update of /cvsroot/openss/OpenSpeedShop_ROOT/startup_files In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv21010/startup_files Added Files: example_cluster_build_script.sh Log Message: Add an example cluster build script to refer people to. --- NEW FILE: example_cluster_build_script.sh --- #!/bin/bash BASE_DIR=/opt/OSS TOOL_VERS="_v2.3.1.latest" ROOT_VERS="_v2.3.1.latest" GRAPHVIZ_VERS="-2.41.0" QTGRAPH_VERS="-1.0.0" OPENMPI_IDIR=/opt/openmpi-1.8.2 KROOT_IDIR=${BASE_DIR}/krellroot${ROOT_VERS} CBTF_IDIR=${BASE_DIR}/cbtf${TOOL_VERS} OSSCBTF_IDIR=${BASE_DIR}/osscbtf${TOOL_VERS} OSSOFF_IDIR=${BASE_DIR}/ossoff${TOOL_VERS} GRAPHVIZ_IDIR=${BASE_DIR}/graphviz${GRAPHVIZ_VERS} QTGRAPH_IDIR=${BASE_DIR}/QtGraph${QTGRAPH_VERS} BINUTILS_IDIR=${KROOT_IDIR}/binutils MRNET_IDIR=${BASE_DIR}/mrnet_20170810 # Build the root components ./install-tool --verbose --build-krell-root --krell-root-prefix ${KROOT_IDIR} --with-openmpi ${OPENMPI_IDIR} # Build the cbtf components ./install-tool --verbose --build-cbtf-all --cbtf-prefix ${CBTF_IDIR} --krell-root-prefix ${KROOT_IDIR} --with-openmpi ${OPENMPI_IDIR} # Build openspeedshop ./install-tool --verbose --build-oss --openss-prefix ${OSSCBTF_IDIR} --cbtf-prefix ${CBTF_IDIR} --krell-root-prefix ${KROOT_IDIR} --with-openmpi ${OPENMPI_IDIR} # Build graphviz for support of building the new cbtf-argonavis-gui ./install-tool --build-graphviz --krell-root-prefix ${GRAPHVIZ_IDIR} # Build QtGraph for support of building the new cbtf-argonavis-gui, uses graphviz # Point the --with-qt to the qt4 or qt5 version location on your system ./install-tool --build-QtGraph --krell-root-prefix ${QTGRAPH_IDIR} --with-graphviz ${GRAPHVIZ_IDIR} --with-qt /usr/lib64/qt5 # Build new cbtf-argonavis-gui, uses graphviz and QtGraph # Point the --with-qt to the qt4 or qt5 version location on your system ./install-tool --build-cbtfargonavisgui --with-openss ${OSSCBTF_IDIR} --with-cbtf ${CBTF_IDIR} --krell-root-prefix ${KROOT_IDIR} --with-graphviz ${GRAPHVIZ_IDIR} --with-QtGraph ${QTGRAPH_IDIR} --with-boost ${KROOT_IDIR} --with-qt /usr/lib64/qt5 |
|
From: Jim G. <jga...@us...> - 2017-09-20 03:34:54
|
Update of /cvsroot/openss/OpenSpeedShop_ROOT/startup_files In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv15158 Modified Files: lanl_moonlight_build.sh Log Message: Fix some bugs in the script when building the new GUI related to the with-boost argument. Index: lanl_moonlight_build.sh =================================================================== RCS file: /cvsroot/openss/OpenSpeedShop_ROOT/startup_files/lanl_moonlight_build.sh,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** lanl_moonlight_build.sh 20 Sep 2017 03:15:09 -0000 1.4 --- lanl_moonlight_build.sh 20 Sep 2017 03:34:52 -0000 1.5 *************** *** 77,84 **** # Build QtGraph for support of building the new cbtf-argonavis-gui, uses graphviz ! ./install-tool --build-QtGraph --krell-root-prefix ${QTGRAPH_IDIR} --with-graphviz ${GRAPHVIZ_IDIR} --with-qt /usr/lib64/qt4 # Build new cbtf-argonavis-gui, uses graphviz and QtGraph ! ./install-tool --build-cbtfargonavisgui --with-openss ${OSSCBTF_IDIR} --with-cbtf ${CBTF_IDIR} --krell-root-prefix ${KROOT_IDIR} --with-graphviz ${GRAPHVIZ_IDIR} --with-QtGraph ${QTGRAPH_IDIR} --with-boost ${KROOT_IDIR} --with-qt /usr/lib64/qt4 # copy over the libstdc++ that was used in the build, so it is available to mrnet when --- 77,84 ---- # Build QtGraph for support of building the new cbtf-argonavis-gui, uses graphviz ! ./install-tool --build-QtGraph --krell-root-prefix ${QTGRAPH_IDIR} --with-graphviz ${GRAPHVIZ_IDIR} --with-qt /usr/lib64/qt4 --with-boost ${ROOT_IDIR} # Build new cbtf-argonavis-gui, uses graphviz and QtGraph ! ./install-tool --build-cbtfargonavisgui --with-openss ${OSSCBTF_IDIR} --with-cbtf ${CBTF_IDIR} --krell-root-prefix ${ROOT_IDIR} --with-graphviz ${GRAPHVIZ_IDIR} --with-QtGraph ${QTGRAPH_IDIR} --with-boost ${ROOT_IDIR} --with-qt /usr/lib64/qt4 # copy over the libstdc++ that was used in the build, so it is available to mrnet when |
|
From: Jim G. <jga...@us...> - 2017-09-20 03:15:11
|
Update of /cvsroot/openss/OpenSpeedShop_ROOT/startup_files In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv12250 Modified Files: lanl_moonlight_build.sh Log Message: Update the LANL moonlight example build script to also build the new gui. Index: lanl_moonlight_build.sh =================================================================== RCS file: /cvsroot/openss/OpenSpeedShop_ROOT/startup_files/lanl_moonlight_build.sh,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** lanl_moonlight_build.sh 16 Aug 2017 14:41:16 -0000 1.3 --- lanl_moonlight_build.sh 20 Sep 2017 03:15:09 -0000 1.4 *************** *** 3,6 **** --- 3,7 ---- . /usr/share/Modules/init/bash + BASE_IDIR=/usr/projects/packages/openspeedshop/jegsgi/installs/moonlight *************** *** 8,12 **** # separate the TOOL_VERS from the ROOT_VERS # ! TOOL_VERS="_v2.3.1.rc2" CBTF_IDIR=${BASE_IDIR}/cbtf${TOOL_VERS} OSSCBTF_IDIR=${BASE_IDIR}/osscbtf${TOOL_VERS} --- 9,17 ---- # separate the TOOL_VERS from the ROOT_VERS # ! TOOL_VERS="_v2.3.1.rc5" ! ROOT_VERS="_v2.3.1.rc5" ! GRAPHVIZ_VERS="-2.41.0" ! QTGRAPH_VERS="-1.0.0" ! CBTF_IDIR=${BASE_IDIR}/cbtf${TOOL_VERS} OSSCBTF_IDIR=${BASE_IDIR}/osscbtf${TOOL_VERS} *************** *** 16,25 **** # separate the TOOL_VERS from the ROOT_VERS # - ROOT_VERS="_v2.3.1.rc2" ROOT_IDIR=${BASE_IDIR}/krellroot${ROOT_VERS} QT_IDIR=/usr/lib64/qt3 ! CUDA_IDIR=/opt/cudatoolkit-7.5 ! CUPTI_IDIR=/opt/cudatoolkit-7.5/extras/CUPTI PYTHON_IDIR=/nasa/python/2.7.9 MPICH_IDIR=/usr/projects/hpcsoft/toss2/common/intel-clusterstudio/2016.3.067/impi/5.1.3.210 --- 21,29 ---- # separate the TOOL_VERS from the ROOT_VERS # ROOT_IDIR=${BASE_IDIR}/krellroot${ROOT_VERS} QT_IDIR=/usr/lib64/qt3 ! CUDA_IDIR=/opt/cudatoolkit-8.0 ! CUPTI_IDIR=/opt/cudatoolkit-8.0/extras/CUPTI PYTHON_IDIR=/nasa/python/2.7.9 MPICH_IDIR=/usr/projects/hpcsoft/toss2/common/intel-clusterstudio/2016.3.067/impi/5.1.3.210 *************** *** 27,30 **** --- 31,37 ---- MVAPICH2_IDIR=/usr/projects/hpcsoft/toss2/moonlight/mvapich2/2.0_gcc-4.4.7 OPENMPI_IDIR=/usr/projects/hpcsoft/toss2/moonlight/openmpi/1.10.5-gcc-4.4.7 + GRAPHVIZ_IDIR=${BASE_IDIR}/graphviz${GRAPHVIZ_VERS} + QTGRAPH_IDIR=${BASE_IDIR}/QtGraph${QTGRAPH_VERS} + # ----------------------------------------------------- *************** *** 40,44 **** # ----------------------------------------------------- ! #./install-tool --build-mrnet --krell-root-prefix ${ROOT_IDIR} --with-boost ${ROOT_IDIR} ./install-tool --build-krell-root --krell-root-prefix ${ROOT_IDIR} --with-openmpi ${OPENMPI_IDIR} --with-mvapich2 ${MVAPICH2_IDIR} --with-cupti ${CUPTI_IDIR} --with-cuda ${CUDA_IDIR} --with-mpich ${MPICH_IDIR} --with-mpich2 ${MPICH2_IDIR} --- 47,51 ---- # ----------------------------------------------------- ! ##./install-tool --build-mrnet --krell-root-prefix ${ROOT_IDIR} --with-boost ${ROOT_IDIR} ./install-tool --build-krell-root --krell-root-prefix ${ROOT_IDIR} --with-openmpi ${OPENMPI_IDIR} --with-mvapich2 ${MVAPICH2_IDIR} --with-cupti ${CUPTI_IDIR} --with-cuda ${CUDA_IDIR} --with-mpich ${MPICH_IDIR} --with-mpich2 ${MPICH2_IDIR} *************** *** 60,65 **** # ----------------------------------------------------- ! #./install-tool --build-offline --openss-prefix ${OSSOFF_IDIR} --krell-root-prefix ${ROOT_IDIR} --with-openmpi ${OPENMPI_IDIR} --with-mvapich2 ${MVAPICH2_IDIR} --with-cupti ${CUPTI_IDIR} --with-cuda ${CUDA_IDIR} --with-mpich ${MPICH_IDIR} --with-mpich2 ${MPICH2_IDIR} cp /usr/projects/hpcsoft/toss2/common/gcc/5.3.0/lib64/libstdc++.so.6 ${ROOT_IDIR}/lib64/. --- 67,88 ---- # ----------------------------------------------------- ! ##./install-tool --build-offline --openss-prefix ${OSSOFF_IDIR} --krell-root-prefix ${ROOT_IDIR} --with-openmpi ${OPENMPI_IDIR} --with-mvapich2 ${MVAPICH2_IDIR} --with-cupti ${CUPTI_IDIR} --with-cuda ${CUDA_IDIR} --with-mpich ${MPICH_IDIR} --with-mpich2 ${MPICH2_IDIR} ! ! # ----------------------------------------------------- ! # Build graphviz, QtGraph, and cbtf-argonavis-gui ! # ----------------------------------------------------- + # Build graphviz for support of building the new cbtf-argonavis-gui + ./install-tool --build-graphviz --krell-root-prefix ${GRAPHVIZ_IDIR} + + # Build QtGraph for support of building the new cbtf-argonavis-gui, uses graphviz + ./install-tool --build-QtGraph --krell-root-prefix ${QTGRAPH_IDIR} --with-graphviz ${GRAPHVIZ_IDIR} --with-qt /usr/lib64/qt4 + + # Build new cbtf-argonavis-gui, uses graphviz and QtGraph + ./install-tool --build-cbtfargonavisgui --with-openss ${OSSCBTF_IDIR} --with-cbtf ${CBTF_IDIR} --krell-root-prefix ${KROOT_IDIR} --with-graphviz ${GRAPHVIZ_IDIR} --with-QtGraph ${QTGRAPH_IDIR} --with-boost ${KROOT_IDIR} --with-qt /usr/lib64/qt4 + + # copy over the libstdc++ that was used in the build, so it is available to mrnet when + # it executes on the compute nodes cp /usr/projects/hpcsoft/toss2/common/gcc/5.3.0/lib64/libstdc++.so.6 ${ROOT_IDIR}/lib64/. + |
|
From: Jim G. <jga...@us...> - 2017-09-09 22:03:57
|
Update of /cvsroot/openss/OpenSpeedShop_ROOT/startup_files In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv28511/startup_files Modified Files: dod_armstrong_build.sh Log Message: Update armstrong build script. Index: dod_armstrong_build.sh =================================================================== RCS file: /cvsroot/openss/OpenSpeedShop_ROOT/startup_files/dod_armstrong_build.sh,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** dod_armstrong_build.sh 18 Jan 2017 03:54:01 -0000 1.10 --- dod_armstrong_build.sh 9 Sep 2017 22:03:54 -0000 1.11 *************** *** 13,17 **** export CXX=g++ export BASE_IDIR=/app/PET/pkgs/openss ! export TOOL_VERS="_v2.3.1.beta1" export CMAKE_IDIR=${CMAKE_IDIR}/cmake-3.2.2 export PATH=${CMAKE_IDIR}/bin:$PATH --- 13,17 ---- export CXX=g++ export BASE_IDIR=/app/PET/pkgs/openss ! export TOOL_VERS="_v2.3.1.rc4" export CMAKE_IDIR=${CMAKE_IDIR}/cmake-3.2.2 export PATH=${CMAKE_IDIR}/bin:$PATH *************** *** 56,63 **** # BUILD PYTHON because I didn't see one available ! ./install-tool --build-cmake --krell-root-prefix ${CMAKE_IDIR} ./install-tool --build-python --krell-root-prefix ${PYTHON_IDIR} ! export PATH={CMAKE_IDIR}/bin:$PATH export LD_LIBRARY_PATH=${PYTHON_IDIR}/lib:$LD_LIBRARY_PATH --- 56,63 ---- # BUILD PYTHON because I didn't see one available ! #./install-tool --build-cmake --krell-root-prefix ${CMAKE_IDIR} ./install-tool --build-python --krell-root-prefix ${PYTHON_IDIR} ! #export PATH={CMAKE_IDIR}/bin:$PATH export LD_LIBRARY_PATH=${PYTHON_IDIR}/lib:$LD_LIBRARY_PATH |
|
From: Jim G. <jga...@us...> - 2017-09-08 03:44:06
|
Update of /cvsroot/openss/OpenSpeedShop_ROOT/startup_files In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv26758 Modified Files: snl_chama_skyb_build.sh snl_serrano_build.sh Log Message: Update the SNL serrano and skybridge build scripts to also build the new gui, graphviz, and QtGraph. Index: snl_chama_skyb_build.sh =================================================================== RCS file: /cvsroot/openss/OpenSpeedShop_ROOT/startup_files/snl_chama_skyb_build.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** snl_chama_skyb_build.sh 14 Apr 2016 19:49:28 -0000 1.2 --- snl_chama_skyb_build.sh 8 Sep 2017 03:44:03 -0000 1.3 *************** *** 1,41 **** #!/bin/bash ! . /usr/share/Modules/init/bash module use /ascldap/users/jgalaro/privatemodules module purge ! module load cmake/3.4.3 cudatoolkit/7.5 ! export BASE_INSTALL_DIR=/projects/OSS/tlcc2 ! export TOOL_VERS="_v2.2.4" ! export MVAPICH_PATH=/opt/mvapich-gnu-shmem-1.2 ! export OPENMPI_PATH=/opt/openmpi-1.8-gnu ! export MVAPICH2_PATH=/opt/mvapich2-gnu-shmem-1.7 ! export CUDA_PATH=/opt/cudatoolkit-7.5 ! export CUPTI_PATH=/opt/cudatoolkit-7.5/extras/CUPTI ! #echo "Step 1: BUILD OMPT: ./install-tool --build-ompt --krell-root-prefix ${BASE_INSTALL_DIR}/ompt${TOOL_VERS}" ! #./install-tool --build-ompt --krell-root-prefix ${BASE_INSTALL_DIR}/ompt${TOOL_VERS} - echo "Step 2: BUILD KRELLROOT: ./install-tool --build-krell-root --krell-root-prefix ${BASE_INSTALL_DIR}/krellroot${TOOL_VERS} --with-openmpi ${OPENMPI_PATH} --with-mvapich2 ${MVAPICH2_PATH} --with-mvapich ${MVAPICH_PATH} --force-papi-build --with-cuda ${CUDA_PATH} --with-cupti ${CUPTI_PATH}" ! ./install-tool --build-krell-root --krell-root-prefix ${BASE_INSTALL_DIR}/krellroot${TOOL_VERS} --with-openmpi ${OPENMPI_PATH} --with-mvapich2 ${MVAPICH2_PATH} --with-mvapich ${MVAPICH_PATH} --force-papi-build --with-cuda ${CUDA_PATH} --with-cupti ${CUPTI_PATH} ! #echo "Step 3: BUILD CBTF: ./install-tool --build-cbtf-all --cbtf-install-prefix ${BASE_INSTALL_DIR}/cbtf${TOOL_VERS} --krell-root-prefix ${BASE_INSTALL_DIR}/krellroot${TOOL_VERS} --with-openmpi ${OPENMPI_PATH} --with-mvapich2 ${MVAPICH2_PATH} --with-mvapich ${MVAPICH_PATH} --with-cuda ${CUDA_PATH} --with-cupti ${CUPTI_PATH} --with-ompt ${BASE_INSTALL_DIR}/ompt${TOOL_VERS}" ! echo "Step 3: BUILD CBTF: ./install-tool --build-cbtf-all --cbtf-install-prefix ${BASE_INSTALL_DIR}/cbtf${TOOL_VERS} --krell-root-prefix ${BASE_INSTALL_DIR}/krellroot${TOOL_VERS} --with-openmpi ${OPENMPI_PATH} --with-mvapich2 ${MVAPICH2_PATH} --with-mvapich ${MVAPICH_PATH} --with-cuda ${CUDA_PATH} --with-cupti ${CUPTI_PATH}" ! #./install-tool --build-cbtf-all --cbtf-install-prefix ${BASE_INSTALL_DIR}/cbtf${TOOL_VERS} --krell-root-prefix ${BASE_INSTALL_DIR}/krellroot${TOOL_VERS} --with-openmpi ${OPENMPI_PATH} --with-mvapich2 ${MVAPICH2_PATH} --with-mvapich ${MVAPICH_PATH} --with-cuda ${CUDA_PATH} --with-cupti ${CUPTI_PATH} --with-ompt ${BASE_INSTALL_DIR}/ompt${TOOL_VERS} ! ./install-tool --build-cbtf-all --cbtf-install-prefix ${BASE_INSTALL_DIR}/cbtf${TOOL_VERS} --krell-root-prefix ${BASE_INSTALL_DIR}/krellroot${TOOL_VERS} --with-openmpi ${OPENMPI_PATH} --with-mvapich2 ${MVAPICH2_PATH} --with-mvapich ${MVAPICH_PATH} --with-cuda ${CUDA_PATH} --with-cupti ${CUPTI_PATH} ! #echo "Step 4: BUILD OSSCBTF: ./install-tool --build-onlyosscbtf --openss-install-prefix ${BASE_INSTALL_DIR}/osscbtf${TOOL_VERS} --cbtf-install-prefix ${BASE_INSTALL_DIR}/cbtf${TOOL_VERS} --krell-root-prefix ${BASE_INSTALL_DIR}/krellroot${TOOL_VERS} --with-openmpi ${OPENMPI_PATH} --with-mvapich2 ${MVAPICH2_PATH} --with-mvapich ${MVAPICH_PATH} --with-cuda ${CUDA_PATH} --with-cupti ${CUPTI_PATH} --with-ompt ${BASE_INSTALL_DIR}/ompt${TOOL_VERS}" ! echo "Step 4: BUILD OSSCBTF: ./install-tool --build-onlyosscbtf --openss-install-prefix ${BASE_INSTALL_DIR}/osscbtf${TOOL_VERS} --cbtf-install-prefix ${BASE_INSTALL_DIR}/cbtf${TOOL_VERS} --krell-root-prefix ${BASE_INSTALL_DIR}/krellroot${TOOL_VERS} --with-openmpi ${OPENMPI_PATH} --with-mvapich2 ${MVAPICH2_PATH} --with-mvapich ${MVAPICH_PATH} --with-cuda ${CUDA_PATH} --with-cupti ${CUPTI_PATH}" - #./install-tool --build-onlyosscbtf --openss-install-prefix ${BASE_INSTALL_DIR}/osscbtf${TOOL_VERS} --cbtf-install-prefix ${BASE_INSTALL_DIR}/cbtf${TOOL_VERS} --krell-root-prefix ${BASE_INSTALL_DIR}/krellroot${TOOL_VERS} --with-openmpi ${OPENMPI_PATH} --with-mvapich2 ${MVAPICH2_PATH} --with-mvapich ${MVAPICH_PATH} --with-cuda ${CUDA_PATH} --with-cupti ${CUPTI_PATH} --with-ompt ${BASE_INSTALL_DIR}/ompt${TOOL_VERS} - ./install-tool --build-onlyosscbtf --openss-install-prefix ${BASE_INSTALL_DIR}/osscbtf${TOOL_VERS} --cbtf-install-prefix ${BASE_INSTALL_DIR}/cbtf${TOOL_VERS} --krell-root-prefix ${BASE_INSTALL_DIR}/krellroot${TOOL_VERS} --with-openmpi ${OPENMPI_PATH} --with-mvapich2 ${MVAPICH2_PATH} --with-mvapich ${MVAPICH_PATH} --with-cuda ${CUDA_PATH} --with-cupti ${CUPTI_PATH} - #echo "Step 5: BUILD OSSOFF: ./install-tool --build-offline --openss-prefix ${BASE_INSTALL_DIR}/ossoff${TOOL_VERS} --krell-root-prefix ${BASE_INSTALL_DIR}/krellroot${TOOL_VERS} --with-openmpi ${OPENMPI_PATH} --with-mvapich2 ${MVAPICH2_PATH} --with-mvapich ${MVAPICH_PATH} --with-cuda ${CUDA_PATH} --with-cupti ${CUPTI_PATH} --with-ompt ${BASE_INSTALL_DIR}/ompt${TOOL_VERS}" - echo "Step 5: BUILD OSSOFF: ./install-tool --build-offline --openss-prefix ${BASE_INSTALL_DIR}/ossoff${TOOL_VERS} --krell-root-prefix ${BASE_INSTALL_DIR}/krellroot${TOOL_VERS} --with-openmpi ${OPENMPI_PATH} --with-mvapich2 ${MVAPICH2_PATH} --with-mvapich ${MVAPICH_PATH} --with-cuda ${CUDA_PATH} --with-cupti ${CUPTI_PATH}" - #./install-tool --build-offline --openss-prefix ${BASE_INSTALL_DIR}/ossoff${TOOL_VERS} --krell-root-prefix ${BASE_INSTALL_DIR}/krellroot${TOOL_VERS} --with-openmpi ${OPENMPI_PATH} --with-mvapich2 ${MVAPICH2_PATH} --with-mvapich ${MVAPICH_PATH} --with-cuda ${CUDA_PATH} --with-cupti ${CUPTI_PATH} --with-ompt ${BASE_INSTALL_DIR}/ompt${TOOL_VERS} - ./install-tool --build-offline --openss-prefix ${BASE_INSTALL_DIR}/ossoff${TOOL_VERS} --krell-root-prefix ${BASE_INSTALL_DIR}/krellroot${TOOL_VERS} --with-openmpi ${OPENMPI_PATH} --with-mvapich2 ${MVAPICH2_PATH} --with-mvapich ${MVAPICH_PATH} --with-cuda ${CUDA_PATH} --with-cupti ${CUPTI_PATH} --- 1,51 ---- #!/bin/bash ! . /usr/share/lmod/lmod/init/bash ! ! #. /usr/share/Modules/init/bash module use /ascldap/users/jgalaro/privatemodules module purge ! module load cudatoolkit/8.0 ! export BASE_IDIR=/projects/OSS/tlcc2 ! export TOOL_VERS="_v2.3.1.latest.openmpi20" ! export ROOT_VERS="_v2.3.1.latest" ! export GRAPHVIZ_VERS="-2.41.0" ! export QTGRAPH_VERS="-1.0.0" ! #export MVAPICH_PATH=/opt/mvapich-gnu-shmem-1.2 ! #export OPENMPI_PATH=/opt/openmpi/1.10/gnu ! export OPENMPI_PATH=/opt/openmpi/2.0/gnu ! #export MVAPICH2_PATH=/opt/mvapich2-gnu-shmem-1.7 ! export CUDA_IDIR=/opt/cudatoolkit/8.0 ! export CUPTI_IDIR=/opt/cudatoolkit/8.0/extras/CUPTI ! export KROOT_IDIR=${BASE_IDIR}/krellroot${ROOT_VERS} ! export CBTF_IDIR=${BASE_IDIR}/cbtf${TOOL_VERS} ! export OSSCBTF_IDIR=${BASE_IDIR}/osscbtf${TOOL_VERS} ! export OSSOFF_IDIR=${BASE_IDIR}/ossoff${TOOL_VERS} ! export GRAPHVIZ_IDIR=${BASE_IDIR}/graphviz${GRAPHVIZ_VERS} ! export QTGRAPH_IDIR=${BASE_IDIR}/QtGraph${QTGRAPH_VERS} ! ./install-tool --build-krell-root --krell-root-prefix ${KROOT_IDIR} --with-openmpi ${OPENMPI_PATH} --with-cuda ${CUDA_IDIR} --with-cupti ${CUPTI_IDIR} ! ./install-tool --build-cbtf-all --cbtf-install-prefix ${CBTF_IDIR} --krell-root-prefix ${KROOT_IDIR} --with-openmpi ${OPENMPI_PATH} --with-cuda ${CUDA_IDIR} --with-cupti ${CUPTI_IDIR} ! ./install-tool --build-oss --openss-install-prefix ${OSSCBTF_IDIR} --cbtf-install-prefix ${CBTF_IDIR} --krell-root-prefix ${KROOT_IDIR} --with-openmpi ${OPENMPI_PATH} --with-cuda ${CUDA_IDIR} --with-cupti ${CUPTI_IDIR} ! #./install-tool --build-offline --openss-prefix ${OSSOFF_IDIR} --krell-root-prefix ${KROOT_IDIR} --with-openmpi ${OPENMPI_PATH} --with-cuda ${CUDA_IDIR} --with-cupti ${CUPTI_IDIR} ! ! ! # Build graphviz for support of building the new cbtf-argonavis-gui ! ./install-tool --build-graphviz --krell-root-prefix ${GRAPHVIZ_IDIR} ! ! # Build QtGraph for support of building the new cbtf-argonavis-gui, uses graphviz ! ./install-tool --build-QtGraph --krell-root-prefix ${QTGRAPH_IDIR} --with-graphviz ${GRAPHVIZ_IDIR} --with-qt /usr/lib64/qt5 ! ! # Build new cbtf-argonavis-gui, uses graphviz and QtGraph ! ./install-tool --build-cbtfargonavisgui --with-openss ${OSSCBTF_IDIR} --with-cbtf ${CBTF_IDIR} --krell-root-prefix ${KROOT_IDIR} --with-graphviz ${GRAPHVIZ_IDIR} --with-QtGraph ${QTGRAPH_IDIR} --with-boost ${KROOT_IDIR} --with-qt /usr/lib64/qt5 Index: snl_serrano_build.sh =================================================================== RCS file: /cvsroot/openss/OpenSpeedShop_ROOT/startup_files/snl_serrano_build.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** snl_serrano_build.sh 1 Sep 2017 20:32:40 -0000 1.1 --- snl_serrano_build.sh 8 Sep 2017 03:44:04 -0000 1.2 *************** *** 7,21 **** #module load cmake/3.4.3 cudatoolkit/7.5 ! export BASE_INSTALL_DIR=/projects/OSS/cts1 ! export TOOL_VERS="_v2.3.1.latest" export ROOT_VERS="_v2.3.1.latest" #export MVAPICH_IDIR=/opt/mvapich-gnu-shmem-1.2 ! export OPENMPI_IDIR=/opt/openmpi/1.10/gnu #export MVAPICH2_IDIR=/opt/mvapich2-gnu-shmem-1.7 export CUDA_IDIR=/opt/cudatoolkit-8.0 export CUPTI_IDIR=/opt/cudatoolkit-8.0/extras/CUPTI ! export KROOT_IDIR=${BASE_INSTALL_DIR}/krellroot${ROOT_VERS} ! export CBTF_IDIR=${BASE_INSTALL_DIR}/cbtf${TOOL_VERS} ! export OSSCBTF_IDIR=${BASE_INSTALL_DIR}/osscbtf${TOOL_VERS} ./install-tool --build-krell-root --krell-root-prefix ${KROOT_IDIR} --with-openmpi ${OPENMPI_IDIR} --- 7,29 ---- #module load cmake/3.4.3 cudatoolkit/7.5 ! export BASE_IDIR=/projects/OSS/cts1 ! export TOOL_VERS="_v2.3.1.latest.openmpi20" ! export ROOT_VERS="_v2.3.1.latest" export ROOT_VERS="_v2.3.1.latest" + export GRAPHVIZ_VERS="-2.41.0" + export QTGRAPH_VERS="-1.0.0" + #export MVAPICH_IDIR=/opt/mvapich-gnu-shmem-1.2 ! #export OPENMPI_IDIR=/opt/openmpi/1.10/gnu ! export OPENMPI_IDIR=/opt/openmpi/2.0/gnu #export MVAPICH2_IDIR=/opt/mvapich2-gnu-shmem-1.7 export CUDA_IDIR=/opt/cudatoolkit-8.0 export CUPTI_IDIR=/opt/cudatoolkit-8.0/extras/CUPTI ! export KROOT_IDIR=${BASE_IDIR}/krellroot${ROOT_VERS} ! export CBTF_IDIR=${BASE_IDIR}/cbtf${TOOL_VERS} ! export OSSCBTF_IDIR=${BASE_IDIR}/osscbtf${TOOL_VERS} ! export GRAPHVIZ_IDIR=${BASE_IDIR}/graphviz${GRAPHVIZ_VERS} ! export QTGRAPH_IDIR=${BASE_IDIR}/QtGraph${QTGRAPH_VERS} ! ./install-tool --build-krell-root --krell-root-prefix ${KROOT_IDIR} --with-openmpi ${OPENMPI_IDIR} *************** *** 25,27 **** ./install-tool --build-oss --openss-prefix ${OSSCBTF_IDIR} --cbtf-install-prefix ${CBTF_IDIR} --krell-root-prefix ${KROOT_IDIR} --with-openmpi ${OPENMPI_IDIR} ! #./install-tool --build-offline --openss-prefix ${BASE_INSTALL_DIR}/ossoff${TOOL_VERS} --krell-root-prefix ${BASE_INSTALL_DIR}/krellroot${TOOL_VERS} --with-openmpi ${OPENMPI_IDIR} --with-mvapich2 ${MVAPICH2_IDIR} --with-mvapich ${MVAPICH_IDIR} --with-cuda ${CUDA_IDIR} --with-cupti ${CUPTI_IDIR} --- 33,46 ---- ./install-tool --build-oss --openss-prefix ${OSSCBTF_IDIR} --cbtf-install-prefix ${CBTF_IDIR} --krell-root-prefix ${KROOT_IDIR} --with-openmpi ${OPENMPI_IDIR} ! #./install-tool --build-offline --openss-prefix ${BASE_IDIR}/ossoff${TOOL_VERS} --krell-root-prefix ${BASE_IDIR}/krellroot${TOOL_VERS} --with-openmpi ${OPENMPI_IDIR} --with-mvapich2 ${MVAPICH2_IDIR} --with-mvapich ${MVAPICH_IDIR} --with-cuda ${CUDA_IDIR} --with-cupti ${CUPTI_IDIR} ! ! # Build graphviz for support of building the new cbtf-argonavis-gui ! ./install-tool --build-graphviz --krell-root-prefix ${GRAPHVIZ_IDIR} ! ! # Build QtGraph for support of building the new cbtf-argonavis-gui, uses graphviz ! ./install-tool --build-QtGraph --krell-root-prefix ${QTGRAPH_IDIR} --with-graphviz ${GRAPHVIZ_IDIR} --with-qt /usr/lib64/qt5 ! ! # Build new cbtf-argonavis-gui, uses graphviz and QtGraph ! ./install-tool --build-cbtfargonavisgui --with-openss ${OSSCBTF_IDIR} --with-cbtf ${CBTF_IDIR} --krell-root-prefix ${KROOT_IDIR} --with-graphviz ${GRAPHVIZ_IDIR} --with-QtGraph ${QTGRAPH_IDIR} --with-boost ${KROOT_IDIR} --with-qt /usr/lib64/qt5 ! ! |
|
From: Jim G. <jga...@us...> - 2017-09-01 20:32:43
|
Update of /cvsroot/openss/OpenSpeedShop_ROOT/startup_files In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv7451 Added Files: snl_serrano_build.sh Log Message: Add serrano build script to examples. --- NEW FILE: snl_serrano_build.sh --- #!/bin/bash #. /usr/share/Modules/init/bash #module use /ascldap/users/jgalaro/privatemodules #module purge #module load cmake/3.4.3 cudatoolkit/7.5 export BASE_INSTALL_DIR=/projects/OSS/cts1 export TOOL_VERS="_v2.3.1.latest" export ROOT_VERS="_v2.3.1.latest" #export MVAPICH_IDIR=/opt/mvapich-gnu-shmem-1.2 export OPENMPI_IDIR=/opt/openmpi/1.10/gnu #export MVAPICH2_IDIR=/opt/mvapich2-gnu-shmem-1.7 export CUDA_IDIR=/opt/cudatoolkit-8.0 export CUPTI_IDIR=/opt/cudatoolkit-8.0/extras/CUPTI export KROOT_IDIR=${BASE_INSTALL_DIR}/krellroot${ROOT_VERS} export CBTF_IDIR=${BASE_INSTALL_DIR}/cbtf${TOOL_VERS} export OSSCBTF_IDIR=${BASE_INSTALL_DIR}/osscbtf${TOOL_VERS} ./install-tool --build-krell-root --krell-root-prefix ${KROOT_IDIR} --with-openmpi ${OPENMPI_IDIR} ./install-tool --build-cbtf-all --cbtf-install-prefix ${CBTF_IDIR} --krell-root-prefix ${KROOT_IDIR} --with-openmpi ${OPENMPI_IDIR} ./install-tool --build-oss --openss-prefix ${OSSCBTF_IDIR} --cbtf-install-prefix ${CBTF_IDIR} --krell-root-prefix ${KROOT_IDIR} --with-openmpi ${OPENMPI_IDIR} #./install-tool --build-offline --openss-prefix ${BASE_INSTALL_DIR}/ossoff${TOOL_VERS} --krell-root-prefix ${BASE_INSTALL_DIR}/krellroot${TOOL_VERS} --with-openmpi ${OPENMPI_IDIR} --with-mvapich2 ${MVAPICH2_IDIR} --with-mvapich ${MVAPICH_IDIR} --with-cuda ${CUDA_IDIR} --with-cupti ${CUPTI_IDIR} |
|
From: Jim G. <jga...@us...> - 2017-09-01 19:56:09
|
Update of /cvsroot/openss/OpenSpeedShop_ROOT In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv1574 Modified Files: .support_for_install.sh Log Message: Build llvm-openmp instead of ompt by default. Index: .support_for_install.sh =================================================================== RCS file: /cvsroot/openss/OpenSpeedShop_ROOT/.support_for_install.sh,v retrieving revision 1.189 retrieving revision 1.190 diff -C2 -d -r1.189 -r1.190 *** .support_for_install.sh 29 Aug 2017 03:50:38 -0000 1.189 --- .support_for_install.sh 1 Sep 2017 19:56:05 -0000 1.190 *************** *** 4895,4899 **** export LLVM_OPENMP_INSTALL_PATH=$KRELL_ROOT_PREFIX else ! export LLVM_OPENMP_INSTALL_PATH=$KRELL_ROOT_PREFIX/llvm-openmp fi --- 4895,4899 ---- export LLVM_OPENMP_INSTALL_PATH=$KRELL_ROOT_PREFIX else ! export LLVM_OPENMP_INSTALL_PATH=$KRELL_ROOT_PREFIX/ompt fi *************** *** 7695,7699 **** if [ "$OPENSS_BUILD_TASK" == "krellroot" ] ; then # if the user forces the build then build even if skip was also set ! if [ "$skip_ompt_build" = 1 -a "$force_ompt_build" = 0 ] ; then echo "SKIPPING OMPT build due to --skip-ompt-build on install tool line" else --- 7695,7699 ---- if [ "$OPENSS_BUILD_TASK" == "krellroot" ] ; then # if the user forces the build then build even if skip was also set ! if [ "$skip_ompt_build" = 1 -a "$force_ompt_build" = 0 -o "$use_llvm_openmp" = 1 ] ; then echo "SKIPPING OMPT build due to --skip-ompt-build on install tool line" else *************** *** 7721,7737 **** if [ "$OPENSS_BUILD_TASK" == "krellroot" ] ; then # if the user forces the build then build even if skip was also set ! if [ "$skip_llvm_openmp_build" = 1 -a "$force_llvm_openmp_build" = 0 ] ; then echo "SKIPPING LLVM-openmp build due to --skip-llvm_openmp-build on install tool line" else ! if [ "$machine_name" != "ppc64le" ]; then ! build_llvm_openmp_routine 0 ! if [ -f $KRELL_ROOT_PREFIX/ompt/include/ompt.h -a -f $KRELL_ROOT_PREFIX/ompt/lib/libiomp5.so ]; then ! echo "LLVM-openmp RUNTIME LIBRARY (libompt5.so) BUILT SUCCESSFULLY into $KRELL_ROOT_PREFIX/ompt" ! else ! echo "LLVM-openmp RUNTIME LIBRARY (libompt5.so) FAILED TO BUILD - TERMINATING BUILD SCRIPT. Please check for errors." ! exit ! fi else ! echo "SKIPPING LLVM-openmp build due to machine type == ppc64le" fi fi --- 7721,7733 ---- if [ "$OPENSS_BUILD_TASK" == "krellroot" ] ; then # if the user forces the build then build even if skip was also set ! if [ "$skip_llvm_openmp_build" = 1 -a "$force_llvm_openmp_build" = 0 -o "$use_llvm_openmp" = 0 ] ; then echo "SKIPPING LLVM-openmp build due to --skip-llvm_openmp-build on install tool line" else ! build_llvm_openmp_routine 0 ! if [ -f $KRELL_ROOT_PREFIX/ompt/include/omp.h -a -f $KRELL_ROOT_PREFIX/ompt/lib/libiomp5.so ]; then ! echo "LLVM-openmp RUNTIME LIBRARY (libompt5.so) BUILT SUCCESSFULLY into $KRELL_ROOT_PREFIX/ompt" else ! echo "LLVM-openmp RUNTIME LIBRARY (libompt5.so) FAILED TO BUILD - TERMINATING BUILD SCRIPT. Please check for errors." ! exit fi fi *************** *** 9802,9809 **** export skip_symtabapi_build=0 export skip_dyninst_build=0 ! # change this to 0 to enable building ! # ompt by default export skip_ompt_build=0 export force_ompt_build=0 export skip_xercesc_build=0 export skip_ptgf_build=0 --- 9798,9809 ---- export skip_symtabapi_build=0 export skip_dyninst_build=0 ! # change this to 1 to enable building ! # llvm_openmp instead of ompt by default ! export use_llvm_openmp=1 ! export skip_ompt_build=0 export force_ompt_build=0 + export skip_llvm_openmp_build=0 + export force_llvm_openmp_build=0 export skip_xercesc_build=0 export skip_ptgf_build=0 *************** *** 10269,10273 **** # 0 = part of normal --build-krell-root build_llvm_openmp_routine 1 ! if [ -f $KRELL_ROOT_PREFIX/include/ompt.h -a -f $KRELL_ROOT_PREFIX/lib/libiomp5.so ]; then echo "LLVM_OPENMP RUNTIME LIBRARY (libompt5.so) BUILT SUCCESSFULLY into $KRELL_ROOT_PREFIX" else --- 10269,10273 ---- # 0 = part of normal --build-krell-root build_llvm_openmp_routine 1 ! if [ -f $KRELL_ROOT_PREFIX/include/omp.h -a -f $KRELL_ROOT_PREFIX/lib/libiomp5.so ]; then echo "LLVM_OPENMP RUNTIME LIBRARY (libompt5.so) BUILT SUCCESSFULLY into $KRELL_ROOT_PREFIX" else |
|
From: Jim G. <jga...@us...> - 2017-08-30 22:19:26
|
Update of /cvsroot/openss/OpenSpeedShop_ROOT/startup_files In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv1677 Added Files: llnl_rzgenie_build.sh Log Message: Add LLNL rzgenie build script example to the example directory. --- NEW FILE: llnl_rzgenie_build.sh --- #!/bin/bash #use .adept . /usr/share/lmod/6.5/init/bash module load gcc/4.9.3 export cc=gcc export CC=gcc export CXX=g++ export BASE_IDIR=/collab/usr/global/tools/openspeedshop/oss-dev/x8664/cts1 export ROOT_VERS="_v2.3.1.timer3" export TOOL_VERS="_v2.3.1.timer3" export MPICH_IDIR=/usr/tce/packages/impi/impi-5.1.3-gcc-4.9.3 export MVAPICH2_IDIR=/usr/tce/packages/mvapich2/mvapich2-2.2-gcc-4.9.3 export MVAPICH_IDIR=/opt export OPENMPI_IDIR=/usr/tce/packages/openmpi/openmpi-2.0.0-gcc-4.9.3 export KROOT_IDIR=${BASE_IDIR}/krellroot${ROOT_VERS} export CBTF_IDIR=${BASE_IDIR}/cbtf${TOOL_VERS} export OSSCBTF_IDIR=${BASE_IDIR}/osscbtf${TOOL_VERS} #export CUDATOOLKIT_IDIR=/opt/cudatoolkit-7.5 #export CUDATOOLKIT_CUPTI_IDIR=/opt/cudatoolkit-7.5/extras/CUPTI #export PYTHON_IDIR=/usr/local/tools/python-2.7.7 #export PYTHON_VERS="2.7" # ----------------------------------------------------- # Build krellroot_latest # ----------------------------------------------------- ./install-tool --build-krell-root --krell-root-prefix ${KROOT_IDIR} --with-openmpi ${OPENMPI_IDIR} --with-mvapich2 ${MVAPICH2_IDIR} --with-mpich ${MPICH_IDIR} # ----------------------------------------------------- # Build cbtf,cbtf-krell, cbtf-argonavis, cbtf-lanl using krellroot_latest from above build # ----------------------------------------------------- ./install-tool --build-cbtf-all --cbtf-prefix ${CBTF_IDIR} --krell-root-prefix ${KROOT_IDIR} --with-openmpi ${OPENMPI_IDIR} --with-mvapich2 ${MVAPICH2_IDIR} --with-mpich ${MPICH_IDIR} # ----------------------------------------------------- # Build offline using krellroot_latest from above build # ----------------------------------------------------- #./install-tool --build-offline --openss-prefix ${OSSOFF_IDIR} --krell-root-prefix ${KROOT_IDIR} --with-openmpi ${OPENMPI_IDIR} --with-mvapich2 ${MVAPICH2_IDIR} --with-mpich ${MPICH_IDIR} # ----------------------------------------------------- # Build OpenSpeedShop for cbtf instrumentor using cbtf_latest and krellroot_latest from above builds # ----------------------------------------------------- ./install-tool --build-oss --openss-prefix ${OSSCBTF_IDIR} --cbtf-prefix ${CBTF_IDIR} --krell-root-prefix ${KROOT_IDIR} --with-openmpi ${OPENMPI_IDIR} --with-mvapich2 ${MVAPICH2_IDIR} --with-mpich ${MPICH_IDIR} cp /usr/tce/packages/gcc/gcc-4.9.3//lib64/libstdc++.so.6 ${KROOT_IDIR}/lib64/libstdc++.so.6 |
|
From: Jim G. <jga...@us...> - 2017-08-29 03:50:41
|
Update of /cvsroot/openss/OpenSpeedShop_ROOT In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv5309 Modified Files: install-tool .support_for_install.sh Log Message: Add more code to allow selection of qt4 or qt5 install paths to be used in building the new cbtf-argonavis-gui. Index: install-tool =================================================================== RCS file: /cvsroot/openss/OpenSpeedShop_ROOT/install-tool,v retrieving revision 1.85 retrieving revision 1.86 diff -C2 -d -r1.85 -r1.86 *** install-tool 28 Aug 2017 15:15:57 -0000 1.85 --- install-tool 29 Aug 2017 03:50:38 -0000 1.86 *************** *** 204,207 **** --- 204,208 ---- --with-python <directory> --with-python-vers <version number> + --with-qt <directory> --with-qt3 <directory> --with-sqlite <directory> *************** *** 1466,1469 **** --- 1467,1482 ---- ;; + --with-qt) + test "x$2" != x || die "missing argument: $*" + case "$2" in + /* ) dir="$2" ;; + * ) dir="`pwd`/$2" ;; + esac + test -d "$dir" || die "unable to find: $dir" + export KRELL_ROOT_QT="${dir}" + export QTDIR="${dir}" + shift ; shift + ;; + --with-qt3) test "x$2" != x || die "missing argument: $*" Index: .support_for_install.sh =================================================================== RCS file: /cvsroot/openss/OpenSpeedShop_ROOT/.support_for_install.sh,v retrieving revision 1.188 retrieving revision 1.189 diff -C2 -d -r1.188 -r1.189 *** .support_for_install.sh 28 Aug 2017 17:42:14 -0000 1.188 --- .support_for_install.sh 29 Aug 2017 03:50:38 -0000 1.189 *************** *** 5130,5136 **** fi fi - - #export LD_LIBRARY_PATH=/opt/OSS/osscbtf_v2.2.4/lib64:/opt/OSS/cbtf_v2.2.4/lib64:/opt/OSS/krellroot_v2.2.4/lib:/opt/OSS/krellroot_v2.2.4/lib64:$LD_LIBRARY_PATH - os_vers=`uname -r` --- 5130,5133 ---- *************** *** 5172,5176 **** export BOOST_ROOT=$KRELL_ROOT_BOOST ! export QTDIR=/usr/lib64/qt5 export GRAPHVIZ_ROOT=$KRELL_ROOT_GRAPHVIZ export QTGRAPHLIB_ROOT=$KRELL_ROOT_QTGRAPHLIB --- 5169,5184 ---- export BOOST_ROOT=$KRELL_ROOT_BOOST ! echo "cbtf-argonavis-gui build: KRELL_ROOT_QT=$KRELL_ROOT_QT" ! if [ ! -z $KRELL_ROOT_QT ]; then ! export QTDIR=$KRELL_ROOT_QT ! echo "cbtf-argonavis-gui build: QTDIR=$KRELL_ROOT_QT" ! else ! if [ -f /usr/lib64/qt5/bin/qmake ]; then ! export QTDIR=/usr/lib65/qt4 ! elif [ -f /usr/lib64/qt4/bin/qmake ]; then ! export QTDIR=/usr/lib64/qt4 ! fi ! fi ! export GRAPHVIZ_ROOT=$KRELL_ROOT_GRAPHVIZ export QTGRAPHLIB_ROOT=$KRELL_ROOT_QTGRAPHLIB *************** *** 7241,7245 **** fi export GRAPHVIZ_ROOT=$KRELL_ROOT_GRAPHVIZ ! /usr/lib64/qt5/bin/qmake make make install --- 7249,7267 ---- fi export GRAPHVIZ_ROOT=$KRELL_ROOT_GRAPHVIZ ! ! echo "QtGraph build: KRELL_ROOT_QT=$KRELL_ROOT_QT" ! if [ ! -z $KRELL_ROOT_QT ]; then ! export QTDIR=$KRELL_ROOT_QT ! echo "QtGraph build: QTDIR=$KRELL_ROOT_QT" ! else ! if [ -f /usr/lib64/qt5/bin/qmake ]; then ! export QTDIR=/usr/lib65/qt4 ! elif [ -f /usr/lib64/qt4/bin/qmake ]; then ! export QTDIR=/usr/lib64/qt4 ! fi ! fi ! ! ${QTDIR}/bin/qmake ! make make install |
|
From: Jim G. <jga...@us...> - 2017-08-28 17:42:21
|
Update of /cvsroot/openss/OpenSpeedShop_ROOT In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv17620 Modified Files: .support_for_install.sh Log Message: Update the cbtf-argonavis-gui build routine to match what we did to get it to build with spack. We made all the references to component installations explicit. spack wants to install each component in its own installation directory. The gui was lumping root component references into one root reference. Index: .support_for_install.sh =================================================================== RCS file: /cvsroot/openss/OpenSpeedShop_ROOT/.support_for_install.sh,v retrieving revision 1.187 retrieving revision 1.188 diff -C2 -d -r1.187 -r1.188 *** .support_for_install.sh 28 Aug 2017 15:15:57 -0000 1.187 --- .support_for_install.sh 28 Aug 2017 17:42:14 -0000 1.188 *************** *** 5163,5171 **** export KRELL_ROOT=$KRELL_ROOT_PREFIX export CBTF_ROOT=$KRELL_ROOT_CBTF export OSS_CBTF_ROOT=$KRELL_ROOT_OPENSPEEDSHOP export BOOST_ROOT=$KRELL_ROOT_BOOST ! export QTDIR=/usr/lib64/qt4 export GRAPHVIZ_ROOT=$KRELL_ROOT_GRAPHVIZ export QTGRAPHLIB_ROOT=$KRELL_ROOT_QTGRAPHLIB --- 5163,5176 ---- export KRELL_ROOT=$KRELL_ROOT_PREFIX + export KRELL_ROOT_MRNET=$KRELL_ROOT_PREFIX + export KRELL_ROOT_XERCES=$KRELL_ROOT_PREFIX export CBTF_ROOT=$KRELL_ROOT_CBTF + export CBTF_KRELL_ROOT=$KRELL_ROOT_CBTF + export CBTF_ARGONAVIS_ROOT=$KRELL_ROOT_CBTF export OSS_CBTF_ROOT=$KRELL_ROOT_OPENSPEEDSHOP + export INSTALL_PATH=$KRELL_ROOT_OPENSPEEDSHOP export BOOST_ROOT=$KRELL_ROOT_BOOST ! export QTDIR=/usr/lib64/qt5 export GRAPHVIZ_ROOT=$KRELL_ROOT_GRAPHVIZ export QTGRAPHLIB_ROOT=$KRELL_ROOT_QTGRAPHLIB *************** *** 5175,5181 **** # this is required - w/o the make clean we get build errors - make clean ! ${QTDIR}/bin/qmake make make install --- 5180,5186 ---- # this is required - w/o the make clean we get build errors ! ${QTDIR}/bin/qmake -o Makefile ./openss-gui.pro ! make clean make make install *************** *** 7236,7240 **** fi export GRAPHVIZ_ROOT=$KRELL_ROOT_GRAPHVIZ ! /usr/lib64/qt4/bin/qmake make make install --- 7241,7245 ---- fi export GRAPHVIZ_ROOT=$KRELL_ROOT_GRAPHVIZ ! /usr/lib64/qt5/bin/qmake make make install |
|
From: Jim G. <jga...@us...> - 2017-08-28 15:15:59
|
Update of /cvsroot/openss/OpenSpeedShop_ROOT In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv26141 Modified Files: install-tool .support_for_install.sh Log Message: Add code to the build scripts to build and install the llvm-openmp package. Index: install-tool =================================================================== RCS file: /cvsroot/openss/OpenSpeedShop_ROOT/install-tool,v retrieving revision 1.84 retrieving revision 1.85 diff -C2 -d -r1.84 -r1.85 *** install-tool 18 Aug 2017 01:26:32 -0000 1.84 --- install-tool 28 Aug 2017 15:15:57 -0000 1.85 *************** *** 134,137 **** --- 134,138 ---- --build-libmonitor --build-libunwind + --build-llvm-openmp --build-mrnet --build-ompt *************** *** 538,541 **** --- 539,547 ---- ;; + --build-llvm-openmp) + build_llvm_openmp="--build-llvm-openmp" + shift + ;; + --build-autotools) build_autotools="--devel" *************** *** 812,815 **** --- 818,827 ---- ;; + --force-llvm-openmp-build) + export OPENSS_FORCE_LLVM_OPENMP_BUILD=1 + export KRELL_ROOT_FORCE_LLVM_OPENMP_BUILD=1 + shift + ;; + --force-ompt-build) export OPENSS_FORCE_OMPT_BUILD=1 *************** *** 898,901 **** --- 910,919 ---- ;; + --skip-llvm-openmp-build) + export OPENSS_SKIP_LLVM_OPENMP_BUILD=1 + export KRELL_ROOT_SKIP_LLVM_OPENMP_BUILD=1 + shift + ;; + --skip-ompt-build) export OPENSS_SKIP_OMPT_BUILD=1 *************** *** 1667,1670 **** --- 1685,1700 ---- ;; + --with-llvm-openmp) + test "x$2" != x || die "missing argument: $*" + case "$2" in + /* ) dir="$2" ;; + * ) dir="`pwd`/$2" ;; + esac + test -d "$dir" || die "unable to find: $dir" + export CBTF_LIBIOMP_ROOT="${dir}" + export KRELL_ROOT_OMPT_ROOT="${dir}" + shift ; shift + ;; + --with-vt) test "x$2" != x || die "missing argument: $*" *************** *** 1786,1789 **** --- 1816,1823 ---- ./.support_for_install.sh $build_ompt + elif [ "$build_llvm_openmp" == "--build-llvm-openmp" ]; then + + ./.support_for_install.sh $build_llvm_openmp + elif [ "$build_xercesc" == "--xercesc" ]; then Index: .support_for_install.sh =================================================================== RCS file: /cvsroot/openss/OpenSpeedShop_ROOT/.support_for_install.sh,v retrieving revision 1.186 retrieving revision 1.187 diff -C2 -d -r1.186 -r1.187 *** .support_for_install.sh 20 Aug 2017 16:18:03 -0000 1.186 --- .support_for_install.sh 28 Aug 2017 15:15:57 -0000 1.187 *************** *** 49,52 **** --- 49,53 ---- # OMPT related versions omptver=20160808 + llvm_openmpver=20170825 # OSS and CBTF versions *************** *** 4815,4818 **** --- 4816,4938 ---- } + function build_llvm_openmp_routine() { + echo "" + echo "Building LLVM-opemmp." + echo "" + echo "The script will use $KRELL_ROOT_PREFIX as installation directory." + echo "" + + if [ $KRELL_ROOT_PREFIX ]; then + echo " " + echo " Using KRELL_ROOT_PREFIX=$KRELL_ROOT_PREFIX" + echo " " + else + echo " " + echo " PROBLEM: The installation path environment variable: KRELL_ROOT_PREFIX" + echo " is not set. " + echo " " + echo " PLEASE SET KRELL_ROOT_PREFIX and restart the install script. Thanks." + echo " " + exit + fi + + echo + echo "Continue the build process for LLVM-openmp? <y/n>" + echo + + # read answer + answer=Y + + if [ "$answer" = Y -o "$answer" = y ]; then + echo + echo "Continuing the LLVM-openmp build process." + echo + else + echo " " + exit + fi + + if [ -z $LD_LIBRARY_PATH ]; then + if [ $KRELL_ROOT_PREFIX ]; then + export LD_LIBRARY_PATH=$KRELL_ROOT_PREFIX/$LIBDIR + fi + else + if [ $KRELL_ROOT_PREFIX ]; then + export LD_LIBRARY_PATH=$KRELL_ROOT_PREFIX/$LIBDIR:$LD_LIBRARY_PATH + fi + fi + + if [ -z $PATH ]; then + if [ $KRELL_ROOT_PREFIX ]; then + export PATH=$KRELL_ROOT_PREFIX/bin:$PATH + fi + else + if [ $KRELL_ROOT_PREFIX ]; then + export PATH=$KRELL_ROOT_PREFIX/bin:$PATH + fi + fi + + os_vers=`uname -r` + echo "os_vers=$os_vers" + platform=`uname -i` + echo "platform=$platform" + + # Runtime tool interface library for openmp: LLVM-openmp + cd $build_root_home + mkdir -p BUILD + mkdir -p BUILD/$sys + rm -rf BUILD/$sys/LLVM-openmp-${llvm_openmpver}.tar.gz + cp SOURCES/LLVM-openmp-${llvm_openmpver}.tar.gz BUILD/$sys/. + pushd BUILD/$sys + rm -rf LLVM-openmp + tar -xzf LLVM-openmp-${llvm_openmpver}.tar.gz + pushd LLVM-openmp + # Is this a special --build-llvm-openmp request, if so only use ${KRELL_ROOT_PREFIX} + # as the CMAKE_INSTALL_PREFIX, otherwise add the ../llvm-openmp + # 1 = special --build-llvm-openmp request + # 0 = part of normal --build-krell-root + if [ $1 == 1 ] ; then + export LLVM_OPENMP_INSTALL_PATH=$KRELL_ROOT_PREFIX + else + export LLVM_OPENMP_INSTALL_PATH=$KRELL_ROOT_PREFIX/llvm-openmp + fi + + if [ "$build_with_intel" = 1 ]; then + cmake . \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_CXX_FLAGS="-g -O2" \ + -DCMAKE_C_FLAGS="-g -O2" \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DCMAKE_INSTALL_PREFIX=${LLVM_OPENMP_INSTALL_PATH} \ + -DLIBOMP_OMP_VERSION=50 \ + -DLIBOMP_USE_DEBUGGER=false \ + -DLIBOMP_STANDALONE_BUILD=true \ + -DCMAKE_C_COMPILER=icc \ + -DCMAKE_CXX_COMPILER=icpc \ + -DLIBOMP_OMPT_SUPPORT=on + else + cmake . \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_CXX_FLAGS="-g -O2" \ + -DCMAKE_C_FLAGS="-g -O2" \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DCMAKE_INSTALL_PREFIX=${LLVM_OPENMP_INSTALL_PATH} \ + -DLIBOMP_OMP_VERSION=50 \ + -DLIBOMP_USE_DEBUGGER=false \ + -DLIBOMP_STANDALONE_BUILD=true \ + -DCMAKE_C_COMPILER=gcc \ + -DCMAKE_CXX_COMPILER=g++ \ + -DLIBOMP_OMPT_SUPPORT=on + fi + make + make install + + export KRELL_ROOT_OMPT_ROOT=$KRELL_ROOT_PREFIX/ompt + popd + popd + } + function build_qt3_routine() { *************** *** 7569,7572 **** --- 7689,7718 ---- + echo "--------------------- BEGIN LLVM-openmp BUILD ---------------------------" + echo "--------------------- BEGIN LLVM-openmp BUILD ---------------------------" + + if [ "$OPENSS_BUILD_TASK" == "krellroot" ] ; then + # if the user forces the build then build even if skip was also set + if [ "$skip_llvm_openmp_build" = 1 -a "$force_llvm_openmp_build" = 0 ] ; then + echo "SKIPPING LLVM-openmp build due to --skip-llvm_openmp-build on install tool line" + else + if [ "$machine_name" != "ppc64le" ]; then + build_llvm_openmp_routine 0 + if [ -f $KRELL_ROOT_PREFIX/ompt/include/ompt.h -a -f $KRELL_ROOT_PREFIX/ompt/lib/libiomp5.so ]; then + echo "LLVM-openmp RUNTIME LIBRARY (libompt5.so) BUILT SUCCESSFULLY into $KRELL_ROOT_PREFIX/ompt" + else + echo "LLVM-openmp RUNTIME LIBRARY (libompt5.so) FAILED TO BUILD - TERMINATING BUILD SCRIPT. Please check for errors." + exit + fi + else + echo "SKIPPING LLVM-openmp build due to machine type == ppc64le" + fi + fi + fi + + echo "--------------------- END LLVM-openmp BUILD ---------------------------" + echo "--------------------- END LLVM-openmp BUILD ---------------------------" + + if [ "$nanswer" = 1 -o "$nanswer" = 9 ] ; then echo "OPENSS_BUILD_TASK=$OPENSS_BUILD_TASK" *************** *** 9864,9867 **** --- 10010,10014 ---- fi + # --------- OMPT ---------------------- if [ -z $KRELL_ROOT_FORCE_OMPT_BUILD ] ; then #echo "build debug: set force_ompt_build=0......" *************** *** 9882,9885 **** --- 10029,10053 ---- fi + + # --------- LLVM-OPENMP ---------------------- + + if [ -z $KRELL_ROOT_FORCE_LLVM_OPENMP_BUILD ] ; then + #echo "build debug: set force_llvm_openmp_build=0......" + force_llvm_openmp_build=0 + else + echo "BUILD NOTE: set force_ompt_build=1......" + force_llvm_openmp_build=1 + echo "BUILD NOTE: KRELL_ROOT_FORCE_LLVM_OPENMP_BUILD is set, ompt will be built..." + fi + + if [ -z $KRELL_ROOT_SKIP_LLVM_OPENMP_BUILD ] ; then + #echo "build debug: set skip_llvm_openmp_build=0......" + skip_llvm_openmp_build=0 + else + echo "BUILD NOTE: set skip_llvm_openmp_build=1......" + skip_llvm_openmp_build=1 + echo "BUILD NOTE: SKIPPING ompt build because KRELL_ROOT_SKIP_LLVM_OPENMP_BUILD is set." + fi + if [ -z $KRELL_ROOT_FORCE_LIBELF_BUILD ] ; then #echo "build debug: set force_libelf_build=0......" *************** *** 10068,10071 **** --- 10236,10252 ---- build_ptgfossgui_routine exit;; + --build-llvm-openmp) + # Is this a special --build-llvm-openmp request, if so only use ${KRELL_ROOT_PREFIX} + # as the CMAKE_INSTALL_PREFIX, otherwise add the ../ompt + # 1 = special --build-llvm-openmp request + # 0 = part of normal --build-krell-root + build_llvm_openmp_routine 1 + if [ -f $KRELL_ROOT_PREFIX/include/ompt.h -a -f $KRELL_ROOT_PREFIX/lib/libiomp5.so ]; then + echo "LLVM_OPENMP RUNTIME LIBRARY (libompt5.so) BUILT SUCCESSFULLY into $KRELL_ROOT_PREFIX" + else + echo "LLVM_OPENMP RUNTIME LIBRARY (libompt5.so) FAILED TO BUILD - TERMINATING BUILD SCRIPT. Please check for errors." + exit + fi + exit;; --build-ompt) # Is this a special --build-ompt request, if so only use ${KRELL_ROOT_PREFIX} |
|
From: Jim G. <jga...@us...> - 2017-08-25 19:53:42
|
Update of /cvsroot/openss/OpenSpeedShop_ROOT/SOURCES In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv17072 Added Files: LLVM-openmp-20170825.tar.gz Log Message: Add the latest version of the LLVM-openmp sources to the ROOT repository. --- NEW FILE: LLVM-openmp-20170825.tar.gz --- (This appears to be a binary file; contents omitted.) |
|
From: Jim G. <jga...@us...> - 2017-08-20 16:18:05
|
Update of /cvsroot/openss/OpenSpeedShop_ROOT In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv20324 Modified Files: .support_for_install.sh Log Message: Fix bug in finding fPIC version of libibery when building with the new binutils-2.28 patch. Index: .support_for_install.sh =================================================================== RCS file: /cvsroot/openss/OpenSpeedShop_ROOT/.support_for_install.sh,v retrieving revision 1.185 retrieving revision 1.186 diff -C2 -d -r1.185 -r1.186 *** .support_for_install.sh 18 Aug 2017 14:34:43 -0000 1.185 --- .support_for_install.sh 20 Aug 2017 16:18:03 -0000 1.186 *************** *** 6088,6153 **** #echo "check libiberty libdir" ! if [ ! -z $KRELL_ROOT_BINUTILS ] && [ -f $KRELL_ROOT_BINUTILS/$LIBDIR/libiberty.a ]; then ! #echo "KRELL_ROOT_BINUTILS built libiberty" ! export LIBIBERTYLIBDIR=$KRELL_ROOT_BINUTILS/$LIBDIR ! export LIBIBERTY_LIBNAME=$KRELL_ROOT_BINUTILS/$LIBDIR/libiberty.a ! elif [ ! -z $KRELL_ROOT_PREFIX ] && [ -f $KRELL_ROOT_PREFIX/$LIBDIR/libiberty.a ]; then ! #echo "KRELL_ROOT_PREFIX built libiberty" ! export LIBIBERTYLIBDIR=$KRELL_ROOT_PREFIX/$LIBDIR ! export LIBIBERTY_LIBNAME=$KRELL_ROOT_PREFIX/$LIBDIR/libiberty.a ! elif [ ! -z $KRELL_ROOT_BINUTILS ] && [ -f $KRELL_ROOT_BINUTILS/$LIBDIR/libiberty_pic.a ]; then ! #echo "KRELL_ROOT_BINUTILS built libiberty_pic" export LIBIBERTYLIBDIR=$KRELL_ROOT_BINUTILS/$LIBDIR export LIBIBERTY_LIBNAME=$KRELL_ROOT_BINUTILS/$LIBDIR/libiberty_pic.a elif [ ! -z $KRELL_ROOT_PREFIX ] && [ -f $KRELL_ROOT_PREFIX/$LIBDIR/libiberty_pic.a ]; then ! #echo "KRELL_ROOT_PREFIX built libiberty_pic" export LIBIBERTYLIBDIR=$KRELL_ROOT_PREFIX/$LIBDIR export LIBIBERTY_LIBNAME=$KRELL_ROOT_PREFIX/$LIBDIR/libiberty_pic.a ! elif [ -d $KRELL_ROOT_PREFIX ] && [ -f $KRELL_ROOT_PREFIX/$LIBDIR/libiberty_pic.a ]; then ! #echo "KRELL_ROOT_PREFIX built libdir, libiberty_pic, KRELL_ROOT_PREFIX=$KRELL_ROOT_PREFIX" export LIBIBERTYLIBDIR=$KRELL_ROOT_PREFIX/$LIBDIR export LIBIBERTY_LIBNAME=$KRELL_ROOT_PREFIX/$LIBDIR/libiberty_pic.a elif [ -d $KRELL_ROOT_PREFIX ] && [ -f $KRELL_ROOT_PREFIX/lib/libiberty_pic.a ]; then ! #echo "KRELL_ROOT_PREFIX built lib, libiberty_pic, KRELL_ROOT_PREFIX=$KRELL_ROOT_PREFIX" export LIBIBERTYLIBDIR=$KRELL_ROOT_PREFIX/lib export LIBIBERTY_LIBNAME=$KRELL_ROOT_PREFIX/lib/libiberty_pic.a elif [ -f /usr/lib/libiberty_pic.a ]; then ! #echo "found /usr/lib libiberty_pic, KRELL_ROOT_PREFIX=$KRELL_ROOT_PREFIX" export LIBIBERTYLIBDIR=/usr/lib export LIBIBERTY_LIBNAME=/usr/lib/libiberty_pic.a elif [ -f /usr/lib64/libiberty_pic.a ]; then ! #echo "found /usr/lib64 libiberty_pic, KRELL_ROOT_PREFIX=$KRELL_ROOT_PREFIX" export LIBIBERTYLIBDIR=/usr/lib64 export LIBIBERTY_LIBNAME=/usr/lib64/libiberty_pic.a elif [ ! -z $KRELL_ROOT_BINUTILS ] && [ -f $KRELL_ROOT_BINUTILS/$LIBDIR/libiberty_pic.a ]; then ! #echo "KRELL_ROOT_BINUTILS built libiberty_pic" export LIBIBERTYLIBDIR=$KRELL_ROOT_BINUTILS/$LIBDIR export LIBIBERTY_LIBNAME=$KRELL_ROOT_BINUTILS/$LIBDIR/libiberty_pic.a elif [ ! -z $KRELL_ROOT_PREFIX ] && [ -f $KRELL_ROOT_PREFIX/$LIBDIR/libiberty.a ]; then ! #echo "KRELL_ROOT_PREFIX built libiberty" export LIBIBERTYLIBDIR=$KRELL_ROOT_PREFIX/$LIBDIR export LIBIBERTY_LIBNAME=$KRELL_ROOT_PREFIX/$LIBDIR/libiberty.a elif [ -d $KRELL_ROOT_PREFIX ] && [ -f $KRELL_ROOT_PREFIX/$LIBDIR/libiberty_pic.a ]; then ! #echo "KRELL_ROOT_PREFIX built libdir, libiberty_pic, KRELL_ROOT_PREFIX=$KRELL_ROOT_PREFIX" export LIBIBERTYLIBDIR=$KRELL_ROOT_PREFIX/$LIBDIR export LIBIBERTY_LIBNAME=$KRELL_ROOT_PREFIX/$LIBDIR/libiberty_pic.a elif [ ! -z $KRELL_ROOT_BINUTILS ] && [ -f $KRELL_ROOT_BINUTILS/$LIBDIR/libiberty.a ]; then ! #echo "KRELL_ROOT_BINUTILS built libiberty" export LIBIBERTYLIBDIR=$KRELL_ROOT_BINUTILS/$LIBDIR export LIBIBERTY_LIBNAME=$KRELL_ROOT_BINUTILS/$LIBDIR/libiberty.a elif [ ! -z $KRELL_ROOT_PREFIX ] && [ -f $KRELL_ROOT_PREFIX/$LIBDIR/libiberty.a ]; then ! #echo "KRELL_ROOT_PREFIX built libiberty" export LIBIBERTYLIBDIR=$KRELL_ROOT_PREFIX export LIBIBERTY_LIBNAME=$KRELL_ROOT_PREFIX/$LIBDIR/libiberty.a elif [ -d $KRELL_ROOT_PREFIX ] && [ -f $KRELL_ROOT_PREFIX/lib/libiberty.a ]; then ! #echo "KRELL_ROOT_PREFIX built lib, libiberty, KRELL_ROOT_PREFIX=$KRELL_ROOT_PREFIX" export LIBIBERTYLIBDIR=$KRELL_ROOT_PREFIX/lib export LIBIBERTY_LIBNAME=$KRELL_ROOT_PREFIX/lib/libiberty.a elif [ -f /usr/lib/libiberty.a ]; then ! #echo "found /usr/lib libiberty, KRELL_ROOT_PREFIX=$KRELL_ROOT_PREFIX" export LIBIBERTYLIBDIR=/usr/lib export LIBIBERTY_LIBNAME=/usr/lib/libiberty.a elif [ -f /usr/lib64/libiberty.a ]; then ! #echo "found /usr/lib64 libiberty, KRELL_ROOT_PREFIX=$KRELL_ROOT_PREFIX" export LIBIBERTYLIBDIR=/usr/lib64 export LIBIBERTY_LIBNAME=/usr/lib64/libiberty.a --- 6088,6153 ---- #echo "check libiberty libdir" ! if [ ! -z $KRELL_ROOT_BINUTILS ] && [ -f $KRELL_ROOT_BINUTILS/$LIBDIR/libiberty_pic.a ]; then ! echo "KRELL_ROOT_BINUTILS built libiberty_pic" export LIBIBERTYLIBDIR=$KRELL_ROOT_BINUTILS/$LIBDIR export LIBIBERTY_LIBNAME=$KRELL_ROOT_BINUTILS/$LIBDIR/libiberty_pic.a elif [ ! -z $KRELL_ROOT_PREFIX ] && [ -f $KRELL_ROOT_PREFIX/$LIBDIR/libiberty_pic.a ]; then ! echo "KRELL_ROOT_PREFIX built libiberty_pic" export LIBIBERTYLIBDIR=$KRELL_ROOT_PREFIX/$LIBDIR export LIBIBERTY_LIBNAME=$KRELL_ROOT_PREFIX/$LIBDIR/libiberty_pic.a ! elif [ ! -z $KRELL_ROOT_BINUTILS ] && [ -f $KRELL_ROOT_BINUTILS/$LIBDIR/libiberty.a ]; then ! echo "KRELL_ROOT_BINUTILS built libiberty" ! export LIBIBERTYLIBDIR=$KRELL_ROOT_BINUTILS/$LIBDIR ! export LIBIBERTY_LIBNAME=$KRELL_ROOT_BINUTILS/$LIBDIR/libiberty.a ! elif [ ! -z $KRELL_ROOT_PREFIX ] && [ -f $KRELL_ROOT_PREFIX/$LIBDIR/libiberty.a ]; then ! echo "KRELL_ROOT_PREFIX built libiberty" ! export LIBIBERTYLIBDIR=$KRELL_ROOT_PREFIX/$LIBDIR ! export LIBIBERTY_LIBNAME=$KRELL_ROOT_PREFIX/$LIBDIR/libiberty.a ! elif [ -d $KRELL_ROOT_PREFIX ] && [ -f $KRELL_ROOT_PREFIX/$LIBDIR/libiberty_pic.a ]; then ! echo "KRELL_ROOT_PREFIX built libdir, libiberty_pic, KRELL_ROOT_PREFIX=$KRELL_ROOT_PREFIX" export LIBIBERTYLIBDIR=$KRELL_ROOT_PREFIX/$LIBDIR export LIBIBERTY_LIBNAME=$KRELL_ROOT_PREFIX/$LIBDIR/libiberty_pic.a elif [ -d $KRELL_ROOT_PREFIX ] && [ -f $KRELL_ROOT_PREFIX/lib/libiberty_pic.a ]; then ! echo "KRELL_ROOT_PREFIX built lib, libiberty_pic, KRELL_ROOT_PREFIX=$KRELL_ROOT_PREFIX" export LIBIBERTYLIBDIR=$KRELL_ROOT_PREFIX/lib export LIBIBERTY_LIBNAME=$KRELL_ROOT_PREFIX/lib/libiberty_pic.a elif [ -f /usr/lib/libiberty_pic.a ]; then ! echo "found /usr/lib libiberty_pic, KRELL_ROOT_PREFIX=$KRELL_ROOT_PREFIX" export LIBIBERTYLIBDIR=/usr/lib export LIBIBERTY_LIBNAME=/usr/lib/libiberty_pic.a elif [ -f /usr/lib64/libiberty_pic.a ]; then ! echo "found /usr/lib64 libiberty_pic, KRELL_ROOT_PREFIX=$KRELL_ROOT_PREFIX" export LIBIBERTYLIBDIR=/usr/lib64 export LIBIBERTY_LIBNAME=/usr/lib64/libiberty_pic.a elif [ ! -z $KRELL_ROOT_BINUTILS ] && [ -f $KRELL_ROOT_BINUTILS/$LIBDIR/libiberty_pic.a ]; then ! echo "KRELL_ROOT_BINUTILS built libiberty_pic" export LIBIBERTYLIBDIR=$KRELL_ROOT_BINUTILS/$LIBDIR export LIBIBERTY_LIBNAME=$KRELL_ROOT_BINUTILS/$LIBDIR/libiberty_pic.a elif [ ! -z $KRELL_ROOT_PREFIX ] && [ -f $KRELL_ROOT_PREFIX/$LIBDIR/libiberty.a ]; then ! echo "KRELL_ROOT_PREFIX built libiberty" export LIBIBERTYLIBDIR=$KRELL_ROOT_PREFIX/$LIBDIR export LIBIBERTY_LIBNAME=$KRELL_ROOT_PREFIX/$LIBDIR/libiberty.a elif [ -d $KRELL_ROOT_PREFIX ] && [ -f $KRELL_ROOT_PREFIX/$LIBDIR/libiberty_pic.a ]; then ! echo "KRELL_ROOT_PREFIX built libdir, libiberty_pic, KRELL_ROOT_PREFIX=$KRELL_ROOT_PREFIX" export LIBIBERTYLIBDIR=$KRELL_ROOT_PREFIX/$LIBDIR export LIBIBERTY_LIBNAME=$KRELL_ROOT_PREFIX/$LIBDIR/libiberty_pic.a elif [ ! -z $KRELL_ROOT_BINUTILS ] && [ -f $KRELL_ROOT_BINUTILS/$LIBDIR/libiberty.a ]; then ! echo "KRELL_ROOT_BINUTILS built libiberty" export LIBIBERTYLIBDIR=$KRELL_ROOT_BINUTILS/$LIBDIR export LIBIBERTY_LIBNAME=$KRELL_ROOT_BINUTILS/$LIBDIR/libiberty.a elif [ ! -z $KRELL_ROOT_PREFIX ] && [ -f $KRELL_ROOT_PREFIX/$LIBDIR/libiberty.a ]; then ! echo "KRELL_ROOT_PREFIX built libiberty" export LIBIBERTYLIBDIR=$KRELL_ROOT_PREFIX export LIBIBERTY_LIBNAME=$KRELL_ROOT_PREFIX/$LIBDIR/libiberty.a elif [ -d $KRELL_ROOT_PREFIX ] && [ -f $KRELL_ROOT_PREFIX/lib/libiberty.a ]; then ! echo "KRELL_ROOT_PREFIX built lib, libiberty, KRELL_ROOT_PREFIX=$KRELL_ROOT_PREFIX" export LIBIBERTYLIBDIR=$KRELL_ROOT_PREFIX/lib export LIBIBERTY_LIBNAME=$KRELL_ROOT_PREFIX/lib/libiberty.a elif [ -f /usr/lib/libiberty.a ]; then ! echo "found /usr/lib libiberty, KRELL_ROOT_PREFIX=$KRELL_ROOT_PREFIX" export LIBIBERTYLIBDIR=/usr/lib export LIBIBERTY_LIBNAME=/usr/lib/libiberty.a elif [ -f /usr/lib64/libiberty.a ]; then ! echo "found /usr/lib64 libiberty, KRELL_ROOT_PREFIX=$KRELL_ROOT_PREFIX" export LIBIBERTYLIBDIR=/usr/lib64 export LIBIBERTY_LIBNAME=/usr/lib64/libiberty.a |
|
From: Jim G. <jga...@us...> - 2017-08-18 15:40:36
|
Update of /cvsroot/openss/OpenSpeedShop_ROOT/startup_files In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv11124/startup_files Modified Files: dod_onyx_build.sh Log Message: Fix DOD onyx build script example. Index: dod_onyx_build.sh =================================================================== RCS file: /cvsroot/openss/OpenSpeedShop_ROOT/startup_files/dod_onyx_build.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** dod_onyx_build.sh 18 Aug 2017 01:24:08 -0000 1.1 --- dod_onyx_build.sh 18 Aug 2017 15:40:34 -0000 1.2 *************** *** 28,32 **** export CUPTI_IDIR=/opt/nvidia/cudatoolkit8.0/8.0.54_2.3.12_g180d272-2.2/extras/CUPTI ! ./install-tool --runtime-only --target-arch cray --target-shared --build-krell-root --krell-root-prefix ${KROOT_IDIR}/compute --with-mpich ${MPICH_IDIR} --with-cti /opt/cray/pe/cti/1.0.4 --skip-binutils-build ./install-tool --build-cbtf-all --runtime-only --target-arch cray --target-shared --cbtf-prefix ${CBTF_IDIR}/compute --krell-root-prefix ${KROOT_IDIR}/compute --with-mpich ${MPICH_IDIR} --with-cuda ${CUDA_IDIR} --with-cupti ${CUPTI_IDIR} --with-cti /opt/cray/pe/cti/1.0.4 --- 28,32 ---- export CUPTI_IDIR=/opt/nvidia/cudatoolkit8.0/8.0.54_2.3.12_g180d272-2.2/extras/CUPTI ! ./install-tool --use-cti --runtime-only --target-arch cray --target-shared --build-krell-root --krell-root-prefix ${KROOT_IDIR}/compute --with-mpich ${MPICH_IDIR} --with-cti /opt/cray/pe/cti/1.0.4 ./install-tool --build-cbtf-all --runtime-only --target-arch cray --target-shared --cbtf-prefix ${CBTF_IDIR}/compute --krell-root-prefix ${KROOT_IDIR}/compute --with-mpich ${MPICH_IDIR} --with-cuda ${CUDA_IDIR} --with-cupti ${CUPTI_IDIR} --with-cti /opt/cray/pe/cti/1.0.4 *************** *** 48,52 **** export CXX=g++ ! ./install-tool --use-cti --build-krell-root --krell-root-prefix ${KROOT_IDIR} --with-mpich ${MPICH_IDIR} --with-cti /opt/cray/pe/cti/1.0.4 --skip-binutils-build ./install-tool --runtime-target-arch cray --build-cbtf-all --cbtf-prefix ${CBTF_IDIR} --krell-root-prefix ${KROOT_IDIR} --with-mpich ${MPICH_IDIR} --with-cn-boost ${KROOT_IDIR}/compute --with-cn-mrnet ${KROOT_IDIR}/compute --with-cn-xercesc ${KROOT_IDIR}/compute --with-cn-libmonitor ${KROOT_IDIR}/compute --with-cn-libunwind ${KROOT_IDIR}/compute --with-cn-dyninst ${KROOT_IDIR}/compute --with-cn-papi ${KROOT_IDIR}/compute --with-cn-cbtf-krell ${CBTF_IDIR}/compute --with-cn-cbtf ${CBTF_IDIR}/compute --with-binutils ${KROOT_IDIR} --with-boost ${KROOT_IDIR} --with-mrnet ${KROOT_IDIR} --with-xercesc ${KROOT_IDIR} --with-libmonitor ${KROOT_IDIR} --with-libunwind ${KROOT_IDIR} --with-dyninst ${KROOT_IDIR} --with-papi ${KROOT_IDIR} --with-cuda ${CUDA_IDIR} --with-cupti ${CUPTI_IDIR} --with-cti /opt/cray/pe/cti/1.0.4 --- 48,52 ---- export CXX=g++ ! ./install-tool --use-cti --build-krell-root --krell-root-prefix ${KROOT_IDIR} --with-mpich ${MPICH_IDIR} --with-cti /opt/cray/pe/cti/1.0.4 ./install-tool --runtime-target-arch cray --build-cbtf-all --cbtf-prefix ${CBTF_IDIR} --krell-root-prefix ${KROOT_IDIR} --with-mpich ${MPICH_IDIR} --with-cn-boost ${KROOT_IDIR}/compute --with-cn-mrnet ${KROOT_IDIR}/compute --with-cn-xercesc ${KROOT_IDIR}/compute --with-cn-libmonitor ${KROOT_IDIR}/compute --with-cn-libunwind ${KROOT_IDIR}/compute --with-cn-dyninst ${KROOT_IDIR}/compute --with-cn-papi ${KROOT_IDIR}/compute --with-cn-cbtf-krell ${CBTF_IDIR}/compute --with-cn-cbtf ${CBTF_IDIR}/compute --with-binutils ${KROOT_IDIR} --with-boost ${KROOT_IDIR} --with-mrnet ${KROOT_IDIR} --with-xercesc ${KROOT_IDIR} --with-libmonitor ${KROOT_IDIR} --with-libunwind ${KROOT_IDIR} --with-dyninst ${KROOT_IDIR} --with-papi ${KROOT_IDIR} --with-cuda ${CUDA_IDIR} --with-cupti ${CUPTI_IDIR} --with-cti /opt/cray/pe/cti/1.0.4 |
|
From: Jim G. <jga...@us...> - 2017-08-18 14:34:46
|
Update of /cvsroot/openss/OpenSpeedShop_ROOT In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv828 Modified Files: .support_for_install.sh Log Message: Fix intel compiler missing code for building cmake. This reported by a user. Index: .support_for_install.sh =================================================================== RCS file: /cvsroot/openss/OpenSpeedShop_ROOT/.support_for_install.sh,v retrieving revision 1.184 retrieving revision 1.185 diff -C2 -d -r1.184 -r1.185 *** .support_for_install.sh 18 Aug 2017 01:26:32 -0000 1.184 --- .support_for_install.sh 18 Aug 2017 14:34:43 -0000 1.185 *************** *** 2285,2289 **** fi ! cc="gcc" CC="gcc" CXX="g++" ./bootstrap --prefix=$CMAKE_INSTALL_PATH; make; make install popd --- 2285,2293 ---- fi ! if [ "$build_with_intel" = 1 ]; then ! cc="gcc" CC="icc" CXX="icpc" ./bootstrap --prefix=$CMAKE_INSTALL_PATH; make; make install ! else ! cc="gcc" CC="gcc" CXX="g++" ./bootstrap --prefix=$CMAKE_INSTALL_PATH; make; make install ! fi popd |
|
From: Jim G. <jga...@us...> - 2017-08-18 01:53:20
|
Update of /cvsroot/openss/OpenSpeedShop_ROOT/SOURCES In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv25016 Added Files: binutils-2.28.patch Log Message: Add patch to binutils to create fPIC version of libiberty for the latest binutils.. --- NEW FILE: binutils-2.28.patch --- --- binutils-2.28/libiberty/Makefile.in 2016-12-23 02:40:18.000000000 -0600 +++ binutils-2.28-fixes/libiberty/Makefile.in 2017-08-17 20:36:35.000000000 -0500 @@ -67,6 +67,7 @@ MAKEOVERRIDES = TARGETLIB = ./libiberty.a +TARGETLIBPIC = ./libiberty_pic.a TESTLIB = ./testlib.a LIBOBJS = @LIBOBJS@ @@ -368,27 +369,27 @@ # since it will be passed the multilib flags. MULTIOSDIR = `$(CC) $(CFLAGS) -print-multi-os-directory` install_to_libdir: all - if test -n "${target_header_dir}"; then \ - ${mkinstalldirs} $(DESTDIR)$(libdir)/$(MULTIOSDIR); \ - $(INSTALL_DATA) $(TARGETLIB) $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)n; \ - ( cd $(DESTDIR)$(libdir)/$(MULTIOSDIR) ; chmod 644 $(TARGETLIB)n ;$(RANLIB) $(TARGETLIB)n ); \ - mv -f $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)n $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB); \ - case "${target_header_dir}" in \ - /*) thd=${target_header_dir};; \ - *) thd=${includedir}/${target_header_dir};; \ - esac; \ - ${mkinstalldirs} $(DESTDIR)$${thd}; \ - for h in ${INSTALLED_HEADERS}; do \ - ${INSTALL_DATA} $$h $(DESTDIR)$${thd}; \ - done; \ - fi + ${mkinstalldirs} $(DESTDIR)$(libdir)/$(MULTIOSDIR); \ + $(INSTALL_DATA) $(TARGETLIB) $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)n; \ + $(INSTALL_DATA) pic/$(TARGETLIB) $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIBPIC)n; \ + ( cd $(DESTDIR)$(libdir)/$(MULTIOSDIR) ; chmod 644 $(TARGETLIB)n ;$(RANLIB) $(TARGETLIB)n ); \ + ( cd $(DESTDIR)$(libdir)/$(MULTIOSDIR) ; chmod 644 $(TARGETLIBPIC)n ;$(RANLIB) $(TARGETLIBPIC)n ); \ + mv -f $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)n $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB); \ + mv -f $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIBPIC)n $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIBPIC); \ + ${mkinstalldirs} $(DESTDIR)$${includedir}; \ + for h in ${INSTALLED_HEADERS}; do \ + ${INSTALL_DATA} $$h $(DESTDIR)$${includedir}; \ + done; @$(MULTIDO) $(FLAGS_TO_PASS) multi-do DO=install install_to_tooldir: all ${mkinstalldirs} $(DESTDIR)$(tooldir)/lib/$(MULTIOSDIR) $(INSTALL_DATA) $(TARGETLIB) $(DESTDIR)$(tooldir)/lib/$(MULTIOSDIR)/$(TARGETLIB)n + $(INSTALL_DATA) pic/$(TARGETLIB) $(DESTDIR)$(tooldir)/lib/$(MULTIOSDIR)/$(TARGETLIBPIC)n ( cd $(DESTDIR)$(tooldir)/lib/$(MULTIOSDIR) ; chmod 644 $(TARGETLIB)n; $(RANLIB) $(TARGETLIB)n ) + ( cd $(DESTDIR)$(tooldir)/lib/$(MULTIOSDIR) ; chmod 644 $(TARGETLIBPIC)n; $(RANLIB) $(TARGETLIBPIC)n ) mv -f $(DESTDIR)$(tooldir)/lib/$(MULTIOSDIR)/$(TARGETLIB)n $(DESTDIR)$(tooldir)/lib/$(MULTIOSDIR)/$(TARGETLIB) + mv -f $(DESTDIR)$(tooldir)/lib/$(MULTIOSDIR)/$(TARGETLIBPIC)n $(DESTDIR)$(tooldir)/lib/$(MULTIOSDIR)/$(TARGETLIBPIC) @$(MULTIDO) $(FLAGS_TO_PASS) multi-do DO=install # required-list was used when building a shared bfd/opcodes/libiberty |
|
From: Jim G. <jga...@us...> - 2017-08-18 01:26:35
|
Update of /cvsroot/openss/OpenSpeedShop_ROOT In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv16220 Modified Files: .support_for_install.sh install-tool Log Message: Enhance the CTI MRNet support for Cray platforms using the CTI interface. UW says new Crays are using CTI. Index: install-tool =================================================================== RCS file: /cvsroot/openss/OpenSpeedShop_ROOT/install-tool,v retrieving revision 1.83 retrieving revision 1.84 diff -C2 -d -r1.83 -r1.84 *** install-tool 16 Aug 2017 15:45:45 -0000 1.83 --- install-tool 18 Aug 2017 01:26:32 -0000 1.84 *************** *** 335,338 **** --- 335,349 ---- ;; + --with-cti) + test "x$2" != x || die "missing argument: $*" + case "$2" in + /* ) dir="$2" ;; + * ) dir="`pwd`/$2" ;; + esac + test -d "$dir" || die "unable to find: $dir" + export KRELL_ROOT_CTI="${dir}" + shift + ;; + --with-alps) test "x$2" != x || die "missing argument: $*" Index: .support_for_install.sh =================================================================== RCS file: /cvsroot/openss/OpenSpeedShop_ROOT/.support_for_install.sh,v retrieving revision 1.183 retrieving revision 1.184 diff -C2 -d -r1.183 -r1.184 *** .support_for_install.sh 16 Aug 2017 15:45:45 -0000 1.183 --- .support_for_install.sh 18 Aug 2017 01:26:32 -0000 1.184 *************** *** 35,40 **** dyninstver=9.3.2 symtabapiver=8.1.2 ! mrnetver=20161003 ! #mrnetver=20170810 # Qt related versions --- 35,40 ---- dyninstver=9.3.2 symtabapiver=8.1.2 ! #mrnetver=20161003 ! mrnetver=20170810 # Qt related versions *************** *** 5237,5242 **** elif [ "$use_alps" = 0 -a "$KRELL_ROOT_TARGET_ARCH" == "cray" ]; then ! CXX="g++" CC="gcc" CXXFLAGS="${mrnet_include_clause} -O2 -g" ./configure --prefix=$KRELL_ROOT_PREFIX --enable-verbosebuild --enable-shared --with-boost=$KRELL_ROOT_BOOST --with-startup=cray-cti --enable-ltwt-threadsafe --libdir=$KRELL_ROOT_PREFIX/$LIBDIR $MRNET_WITH_EXPAT_CLAUSE ! elif [ "$KRELL_ROOT_TARGET_ARCH" == "bgq" ]; then --- 5237,5242 ---- elif [ "$use_alps" = 0 -a "$KRELL_ROOT_TARGET_ARCH" == "cray" ]; then ! CXX="g++" CC="gcc" CXXFLAGS="${mrnet_include_clause} -O2 -g" ./configure --prefix=$KRELL_ROOT_PREFIX --enable-verbosebuild --enable-shared --with-boost=$KRELL_ROOT_BOOST --with-startup=cray-cti --enable-ltwt-threadsafe --libdir=$KRELL_ROOT_PREFIX/$LIBDIR $MRNET_WITH_EXPAT_CLAUSE --with-craycti-lib=$KRELL_ROOT_CTI/lib --with-craycti-inc=$KRELL_ROOT_CTI/include ! elif [ "$KRELL_ROOT_TARGET_ARCH" == "bgq" ]; then *************** *** 9079,9086 **** echo "Before Build CBTF" ! if (! test -z $SYSROOT_DIR); then ! # If on a cray, need to make the libalps.so file visable, there is no module, at least on titan at ORNL ! export LD_LIBRARY_PATH=/opt/cray/xe-sysroot/default/usr/lib/alps:$LD_LIBRARY_PATH ! fi build_cbtf_routine --- 9079,9086 ---- echo "Before Build CBTF" ! #if (! test -z $SYSROOT_DIR); then ! # # If on a cray, need to make the libalps.so file visable, there is no module, at least on titan at ORNL ! # export LD_LIBRARY_PATH=/opt/cray/xe-sysroot/default/usr/lib/alps:$LD_LIBRARY_PATH ! #fi build_cbtf_routine |
|
From: Jim G. <jga...@us...> - 2017-08-18 01:24:10
|
Update of /cvsroot/openss/OpenSpeedShop_ROOT/startup_files In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv15461 Added Files: dod_onyx_build.sh Log Message: Add DOD Cray - onyx platform build script. --- NEW FILE: dod_onyx_build.sh --- #!/bin/bash # ----------------------------- # First Build the compute node version (root and oss versions if you use the recommended krell externals root build): # For COMPUTE NODE builds: # ---------------------------------- . /opt/modules/default/init/bash module unload PrgEnv-cray PrgEnv-pgi PrgEnv-gnu PrgEnv-intel module unload gcc module unload gcc/5.3.0 module unload gcc/4.8.2 module load PrgEnv-gnu module load craype-broadwell export CC=gcc export CXX=g++ export TOOL_VERS="_v2.3.1.rc2a" export ROOT_VERS="_v2.3.1.rc2a" export MPICH_IDIR=/opt/cray/pe/mpt/7.5.2/gni/mpich-gnu/5.1 export KROOT_IDIR=${BASE_IDIR}/krellroot${ROOT_VERS} export CBTF_IDIR=${BASE_IDIR}/cbtf${TOOL_VERS} export OSSCBTF_IDIR=${BASE_IDIR}/osscbtf${TOOL_VERS} export OSSOFF_IDIR=${BASE_IDIR}/ossoff${TOOL_VERS} export ALPS_IDIR=/opt/cray/alps/6.3.4-2.21 export CUDA_IDIR=/opt/nvidia/cudatoolkit8.0/8.0.54_2.3.12_g180d272-2.2 export CUPTI_IDIR=/opt/nvidia/cudatoolkit8.0/8.0.54_2.3.12_g180d272-2.2/extras/CUPTI ./install-tool --runtime-only --target-arch cray --target-shared --build-krell-root --krell-root-prefix ${KROOT_IDIR}/compute --with-mpich ${MPICH_IDIR} --with-cti /opt/cray/pe/cti/1.0.4 --skip-binutils-build ./install-tool --build-cbtf-all --runtime-only --target-arch cray --target-shared --cbtf-prefix ${CBTF_IDIR}/compute --krell-root-prefix ${KROOT_IDIR}/compute --with-mpich ${MPICH_IDIR} --with-cuda ${CUDA_IDIR} --with-cupti ${CUPTI_IDIR} --with-cti /opt/cray/pe/cti/1.0.4 #./install-tool --runtime-only --target-arch cray --target-shared --build-offline --openss-prefix ${OSSOFF_IDIR}/compute --krell-root-prefix ${KROOT_IDIR}/compute --with-mpich ${MPICH_IDIR} # ----------------------------- # Next build the login node version (root and oss versions if you use the recommended krell externals root build): # For LOGIN NODE builds: # ---------------------------------- module unload PrgEnv-cray PrgEnv-gnu craype-broadwell module unload gcc module unload gcc/5.3.0 module unload gcc/4.8.2 export cc=gcc export CC=gcc export CXX=g++ ./install-tool --use-cti --build-krell-root --krell-root-prefix ${KROOT_IDIR} --with-mpich ${MPICH_IDIR} --with-cti /opt/cray/pe/cti/1.0.4 --skip-binutils-build ./install-tool --runtime-target-arch cray --build-cbtf-all --cbtf-prefix ${CBTF_IDIR} --krell-root-prefix ${KROOT_IDIR} --with-mpich ${MPICH_IDIR} --with-cn-boost ${KROOT_IDIR}/compute --with-cn-mrnet ${KROOT_IDIR}/compute --with-cn-xercesc ${KROOT_IDIR}/compute --with-cn-libmonitor ${KROOT_IDIR}/compute --with-cn-libunwind ${KROOT_IDIR}/compute --with-cn-dyninst ${KROOT_IDIR}/compute --with-cn-papi ${KROOT_IDIR}/compute --with-cn-cbtf-krell ${CBTF_IDIR}/compute --with-cn-cbtf ${CBTF_IDIR}/compute --with-binutils ${KROOT_IDIR} --with-boost ${KROOT_IDIR} --with-mrnet ${KROOT_IDIR} --with-xercesc ${KROOT_IDIR} --with-libmonitor ${KROOT_IDIR} --with-libunwind ${KROOT_IDIR} --with-dyninst ${KROOT_IDIR} --with-papi ${KROOT_IDIR} --with-cuda ${CUDA_IDIR} --with-cupti ${CUPTI_IDIR} --with-cti /opt/cray/pe/cti/1.0.4 ./install-tool --target-arch cray --build-onlyosscbtf --openss-prefix ${OSSCBTF_IDIR} --with-cn-cbtf-krell ${CBTF_IDIR}/compute --krell-root-prefix ${KROOT_IDIR} --with-mpich ${MPICH_IDIR} --with-boost ${KROOT_IDIR} --with-mrnet ${KROOT_IDIR} --with-xercesc ${KROOT_IDIR} --with-libmonitor ${KROOT_IDIR} --with-libunwind ${KROOT_IDIR} --with-dyninst ${KROOT_IDIR} --with-libelf ${KROOT_IDIR} --with-libdwarf ${KROOT_IDIR} --with-binutils ${KROOT_IDIR} --cbtf-prefix ${CBTF_IDIR} --with-papi ${KROOT_IDIR} --with-cuda ${CUDA_IDIR} --with-cupti ${CUPTI_IDIR} #./install-tool --build-offline --openss-prefix ${OSSOFF_IDIR} --with-runtime-dir ${OSSOFF_IDIR}/compute --krell-root-prefix ${KROOT_IDIR} --with-mpich ${MPICH_IDIR} --with-papi ${KROOT_IDIR} |
|
From: Jim G. <jga...@us...> - 2017-08-16 15:45:47
|
Update of /cvsroot/openss/OpenSpeedShop_ROOT In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv13674 Modified Files: install-tool .support_for_install.sh Log Message: Add user requested fixes for the install scripts. Some options were not documented, allow skipping cmake builds. Index: install-tool =================================================================== RCS file: /cvsroot/openss/OpenSpeedShop_ROOT/install-tool,v retrieving revision 1.82 retrieving revision 1.83 diff -C2 -d -r1.82 -r1.83 *** install-tool 12 May 2017 15:17:36 -0000 1.82 --- install-tool 16 Aug 2017 15:45:45 -0000 1.83 *************** *** 159,162 **** --- 159,163 ---- --force-binutils-build --force-boost-build + --force-cmake-build --force-dyninst-build --force-libelf-build *************** *** 173,176 **** --- 174,178 ---- --skip-binutils-build --skip-boost-build + --skip-cmake-build --skip-dyninst-build --skip-libdwarf-build *************** *** 178,186 **** --skip-libunwind-build --skip-mrnet-build --skip-papi-build --skip-symtabapi-build --skip-vampirtrace-build ! --skip-qt3-build ! --skip-ompt-build --- 180,190 ---- --skip-libunwind-build --skip-mrnet-build + --skip-ompt-build --skip-papi-build + --skip-qt3-build + --skip-sqlite-build --skip-symtabapi-build --skip-vampirtrace-build ! --skip-xercesc-build *************** *** 734,737 **** --- 738,742 ---- export OPENSS_FORCE_BOOST_BUILD=1 export KRELL_ROOT_FORCE_BOOST_BUILD=1 + export KRELL_ROOT_FORCE_CMAKE_BUILD=1 export OPENSS_FORCE_LIBELF_BUILD=1 export KRELL_ROOT_FORCE_LIBELF_BUILD=1 *************** *** 765,768 **** --- 770,779 ---- ;; + --force-cmake-build) + export OPENSS_FORCE_CMAKE_BUILD=1 + export KRELL_ROOT_FORCE_CMAKE_BUILD=1 + shift + ;; + --force-dyninst-build) export OPENSS_FORCE_DYNINST_BUILD=1 *************** *** 833,836 **** --- 844,853 ---- ;; + --skip-cmake-build) + export OPENSS_SKIP_CMAKE_BUILD=1 + export KRELL_ROOT_SKIP_CMAKE_BUILD=1 + shift + ;; + --skip-papi-build) export OPENSS_SKIP_PAPI_BUILD=1 Index: .support_for_install.sh =================================================================== RCS file: /cvsroot/openss/OpenSpeedShop_ROOT/.support_for_install.sh,v retrieving revision 1.182 retrieving revision 1.183 diff -C2 -d -r1.182 -r1.183 *** .support_for_install.sh 10 Aug 2017 19:29:51 -0000 1.182 --- .support_for_install.sh 16 Aug 2017 15:45:45 -0000 1.183 *************** *** 25,28 **** --- 25,29 ---- zlibver=1.2.11 GOTCHAver=20170510 + #libdwarfver=20161124 libdwarfver=20170416 libunwindver=1.2.1 *************** *** 35,38 **** --- 36,40 ---- symtabapiver=8.1.2 mrnetver=20161003 + #mrnetver=20170810 # Qt related versions *************** *** 9614,9617 **** --- 9616,9621 ---- export build_oss_runtime_only=0 export report_missing_packages=1 + export skip_cmake_build=0 + export force_cmake_build=0 export skip_binutils=0 export skip_libelf_build=0 *************** *** 9663,9666 **** --- 9667,9678 ---- # + if [ -z $KRELL_ROOT_SKIP_CMAKE_BUILD ]; then + export skip_cmake_build=0 + else + echo "SKIPPING cmake build because KRELL_ROOT_SKIP_CMAKE_BUILD is set." + export skip_cmake_build=1 + fi + + if [ -z $KRELL_ROOT_ONLY_BUILD_PTGF ] ; then only_build_ptgf=0 *************** *** 9784,9787 **** --- 9796,9806 ---- fi + if [ -z $KRELL_ROOT_FORCE_CMAKE_BUILD ] ; then + force_cmake_build=0 + else + force_cmake_build=1 + echo "BUILD NOTE: KRELL_ROOT_FORCE_BOOST_CMAKE is set, cmake will be built..." + fi + if [ -z $KRELL_ROOT_SKIP_SYMTABAPI_BUILD ] ; then #echo "build debug: set skip_symtabapi_build=0......" |
|
From: Jim G. <jga...@us...> - 2017-08-16 14:41:19
|
Update of /cvsroot/openss/OpenSpeedShop_ROOT/startup_files In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv3468 Modified Files: lanl_moonlight_build.sh Added Files: lanl_woodchuck_build.sh Log Message: Update LANL build scripts for moonlight and woodchuck. --- NEW FILE: lanl_woodchuck_build.sh --- #!/bin/bash #. /usr/share/lmod//6.5/init/bash BASE_IDIR=/usr/projects/packages/openspeedshop/jegsgi/installs/woodchuck # So we don't have to continually build the root # separate the TOOL_VERS from the ROOT_VERS # TOOL_VERS="_v2.3.1.rc2" CBTF_IDIR=${BASE_IDIR}/cbtf${TOOL_VERS} OSSCBTF_IDIR=${BASE_IDIR}/osscbtf${TOOL_VERS} OSSOFF_IDIR=${BASE_IDIR}/ossoff${TOOL_VERS} # So we don't have to continually build the root # separate the TOOL_VERS from the ROOT_VERS # ROOT_VERS="_v2.3.1.rc2" ROOT_IDIR=${BASE_IDIR}/krellroot${ROOT_VERS} QT_IDIR=/usr/lib64/qt3 CUDA_IDIR=/opt/cudatoolkit/8.0 CUPTI_IDIR=/opt/cudatoolkit/8.0/extras/CUPTI MPICH_IDIR=/usr/projects/hpcsoft/toss3/common/intel-clusterstudio/2017.1.024/impi/2017.1.132 MPICH2_IDIR=/usr/projects/hpcsoft/toss3/common/intel-clusterstudio/2017.1.024/impi/2017.1.132 OPENMPI_IDIR=/usr/projects/hpcsoft/toss3/woodchuck/openmpi/1.10.5-gcc-4.8.5 PAPI_IDIR=/usr/projects/hpcsoft/toss3/common/papi/5.4.3 # ----------------------------------------------------- # Load cmake module and cudattoolkit module # ----------------------------------------------------- #module load gcc/5.3.0 cmake cudatoolkit/7.5 module load cudatoolkit/8.0 cmake --version gcc --version # ----------------------------------------------------- # Build krellroot_${ROOT_VERS} # ----------------------------------------------------- ./install-tool --build-krell-root --krell-root-prefix ${ROOT_IDIR} --with-openmpi ${OPENMPI_IDIR} --with-cupti ${CUPTI_IDIR} --with-cuda ${CUDA_IDIR} --with-mpich ${MPICH_IDIR} --with-mpich2 ${MPICH2_IDIR} # ----------------------------------------------------- # Build cbtf,cbtf-krell, cbtf-argonavis, cbtf-lanl using krellroot_v${ROOT_VERS} from above build # ----------------------------------------------------- ./install-tool --build-cbtf-all --cbtf-prefix ${CBTF_IDIR} --krell-root-prefix ${ROOT_IDIR} --with-openmpi ${OPENMPI_IDIR} --with-cupti ${CUPTI_IDIR} --with-cuda ${CUDA_IDIR} --with-mpich ${MPICH_IDIR} --with-mpich2 ${MPICH2_IDIR} # ----------------------------------------------------- # Build OpenSpeedShop for cbtf instrumentor using cbtf_${TOOL_VERS} and krellroot_${ROOT_VERS} from above builds # ----------------------------------------------------- ./install-tool --build-oss --openss-prefix ${OSSCBTF_IDIR} --cbtf-install-prefix ${CBTF_IDIR} --krell-root-prefix ${ROOT_IDIR} --with-openmpi ${OPENMPI_IDIR} --with-cupti ${CUPTI_IDIR} --with-cuda ${CUDA_IDIR} --with-mpich ${MPICH_IDIR} --with-mpich2 ${MPICH2_IDIR} # ----------------------------------------------------- # Build offline using krellroot_${ROOT_VERS} from above build # ----------------------------------------------------- #./install-tool --build-offline --openss-prefix ${OSSOFF_IDIR} --krell-root-prefix ${ROOT_IDIR} --with-openmpi ${OPENMPI_IDIR} --with-cupti ${CUPTI_IDIR} --with-cuda ${CUDA_IDIR} --with-mpich ${MPICH_IDIR} --with-mpich2 ${MPICH2_IDIR} Index: lanl_moonlight_build.sh =================================================================== RCS file: /cvsroot/openss/OpenSpeedShop_ROOT/startup_files/lanl_moonlight_build.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** lanl_moonlight_build.sh 7 Oct 2016 00:09:37 -0000 1.2 --- lanl_moonlight_build.sh 16 Aug 2017 14:41:16 -0000 1.3 *************** *** 3,7 **** . /usr/share/Modules/init/bash - BASE_IDIR=/usr/projects/packages/openspeedshop/jegsgi/installs/moonlight --- 3,6 ---- *************** *** 9,13 **** # separate the TOOL_VERS from the ROOT_VERS # ! TOOL_VERS="_v2.2.4" CBTF_IDIR=${BASE_IDIR}/cbtf${TOOL_VERS} OSSCBTF_IDIR=${BASE_IDIR}/osscbtf${TOOL_VERS} --- 8,12 ---- # separate the TOOL_VERS from the ROOT_VERS # ! TOOL_VERS="_v2.3.1.rc2" CBTF_IDIR=${BASE_IDIR}/cbtf${TOOL_VERS} OSSCBTF_IDIR=${BASE_IDIR}/osscbtf${TOOL_VERS} *************** *** 17,22 **** # separate the TOOL_VERS from the ROOT_VERS # ! ROOT_VERS="_v2.2.4" ! KRELLROOT_IDIR=${BASE_IDIR}/krellroot${ROOT_VERS} QT_IDIR=/usr/lib64/qt3 --- 16,21 ---- # separate the TOOL_VERS from the ROOT_VERS # ! ROOT_VERS="_v2.3.1.rc2" ! ROOT_IDIR=${BASE_IDIR}/krellroot${ROOT_VERS} QT_IDIR=/usr/lib64/qt3 *************** *** 27,32 **** MPICH2_IDIR=/usr/projects/hpcsoft/toss2/common/intel-clusterstudio/2016.3.067/impi/5.1.3.210 MVAPICH2_IDIR=/usr/projects/hpcsoft/toss2/moonlight/mvapich2/2.0_gcc-4.4.7 ! OPENMPI_IDIR=/usr/projects/hpcsoft/toss2.1/moonlight/openmpi/1.6.5-gcc-4.4 ! # ----------------------------------------------------- --- 26,30 ---- MPICH2_IDIR=/usr/projects/hpcsoft/toss2/common/intel-clusterstudio/2016.3.067/impi/5.1.3.210 MVAPICH2_IDIR=/usr/projects/hpcsoft/toss2/moonlight/mvapich2/2.0_gcc-4.4.7 ! OPENMPI_IDIR=/usr/projects/hpcsoft/toss2/moonlight/openmpi/1.10.5-gcc-4.4.7 # ----------------------------------------------------- *************** *** 39,65 **** # ----------------------------------------------------- ! # Build krellroot_v2.2.4 # ----------------------------------------------------- ! #./install-tool --build-krell-root --krell-root-prefix ${KRELLROOT_IDIR} --with-openmpi ${OPENMPI_IDIR} --with-mvapich2 ${MVAPICH2_IDIR} --with-cupti ${CUPTI_IDIR} --with-cuda ${CUDA_IDIR} --with-mpich ${MPICH_IDIR} --with-mpich2 ${MPICH2_IDIR} # ----------------------------------------------------- ! # Build cbtf,cbtf-krell, cbtf-argonavis, cbtf-lanl using krellroot_v2.2.4 from above build # ----------------------------------------------------- ! ./install-tool --build-cbtf-all --cbtf-prefix ${CBTF_IDIR} --krell-root-prefix ${KRELLROOT_IDIR} --with-openmpi ${OPENMPI_IDIR} --with-mvapich2 ${MVAPICH2_IDIR} --with-cupti ${CUPTI_IDIR} --with-cuda ${CUDA_IDIR} --with-mpich ${MPICH_IDIR} --with-mpich2 ${MPICH2_IDIR} # ----------------------------------------------------- ! # Build OpenSpeedShop for cbtf instrumentor using cbtf_v2.2.4 and krellroot_v2.2.4 from above builds # ----------------------------------------------------- ! ./install-tool --build-onlyosscbtf --openss-prefix ${OSSCBTF_IDIR} --cbtf-install-prefix ${CBTF_IDIR} --krell-root-prefix ${KRELLROOT_IDIR} --with-openmpi ${OPENMPI_IDIR} --with-mvapich2 ${MVAPICH2_IDIR} --with-cupti ${CUPTI_IDIR} --with-cuda ${CUDA_IDIR} --with-mpich ${MPICH_IDIR} --with-mpich2 ${MPICH2_IDIR} # ----------------------------------------------------- ! # Build offline using krellroot_v2.2.4 from above build # ----------------------------------------------------- ! ./install-tool --build-offline --openss-prefix ${OSSOFF_IDIR} --krell-root-prefix ${KRELLROOT_IDIR} --with-openmpi ${OPENMPI_IDIR} --with-mvapich2 ${MVAPICH2_IDIR} --with-cupti ${CUPTI_IDIR} --with-cuda ${CUDA_IDIR} --with-mpich ${MPICH_IDIR} --with-mpich2 ${MPICH2_IDIR} --- 37,65 ---- # ----------------------------------------------------- ! # Build krellroot_${ROOT_VERS} # ----------------------------------------------------- ! #./install-tool --build-mrnet --krell-root-prefix ${ROOT_IDIR} --with-boost ${ROOT_IDIR} + ./install-tool --build-krell-root --krell-root-prefix ${ROOT_IDIR} --with-openmpi ${OPENMPI_IDIR} --with-mvapich2 ${MVAPICH2_IDIR} --with-cupti ${CUPTI_IDIR} --with-cuda ${CUDA_IDIR} --with-mpich ${MPICH_IDIR} --with-mpich2 ${MPICH2_IDIR} # ----------------------------------------------------- ! # Build cbtf,cbtf-krell, cbtf-argonavis, cbtf-lanl using krellroot_v${ROOT_VERS} from above build # ----------------------------------------------------- ! ./install-tool --build-cbtf-all --cbtf-prefix ${CBTF_IDIR} --krell-root-prefix ${ROOT_IDIR} --with-openmpi ${OPENMPI_IDIR} --with-mvapich2 ${MVAPICH2_IDIR} --with-cupti ${CUPTI_IDIR} --with-cuda ${CUDA_IDIR} --with-mpich ${MPICH_IDIR} --with-mpich2 ${MPICH2_IDIR} # ----------------------------------------------------- ! # Build OpenSpeedShop for cbtf instrumentor using cbtf_${TOOL_VERS} and krellroot_${ROOT_VERS} from above builds # ----------------------------------------------------- ! ./install-tool --build-oss --openss-prefix ${OSSCBTF_IDIR} --cbtf-install-prefix ${CBTF_IDIR} --krell-root-prefix ${ROOT_IDIR} --with-openmpi ${OPENMPI_IDIR} --with-mvapich2 ${MVAPICH2_IDIR} --with-cupti ${CUPTI_IDIR} --with-cuda ${CUDA_IDIR} --with-mpich ${MPICH_IDIR} --with-mpich2 ${MPICH2_IDIR} # ----------------------------------------------------- ! # Build offline using krellroot_${ROOT_VERS} from above build # ----------------------------------------------------- ! #./install-tool --build-offline --openss-prefix ${OSSOFF_IDIR} --krell-root-prefix ${ROOT_IDIR} --with-openmpi ${OPENMPI_IDIR} --with-mvapich2 ${MVAPICH2_IDIR} --with-cupti ${CUPTI_IDIR} --with-cuda ${CUDA_IDIR} --with-mpich ${MPICH_IDIR} --with-mpich2 ${MPICH2_IDIR} + cp /usr/projects/hpcsoft/toss2/common/gcc/5.3.0/lib64/libstdc++.so.6 ${ROOT_IDIR}/lib64/. |
|
From: Jim G. <jga...@us...> - 2017-08-10 22:17:45
|
Update of /cvsroot/openss/OpenSpeedShop_ROOT/SOURCES In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv26891 Added Files: mrnet-20170810.tar.gz mrnet-20170810.config.patch mrnet-20170810.patch Log Message: Add latest MRNet tarball and patches. There are fixes we need to build on newer platforms with newer compilers. --- NEW FILE: mrnet-20170810.config.patch --- --- mrnet-20170810/conf/config.guess 2017-08-10 16:13:41.000000000 -0500 +++ mrnet-20170810-fixes/conf/config.guess 2017-08-10 16:17:25.236056408 -0500 @@ -1,8 +1,8 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2015 Free Software Foundation, Inc. +# Copyright 1992-2017 Free Software Foundation, Inc. -timestamp='2015-06-30' +timestamp='2017-08-08' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -27,7 +27,7 @@ # Originally written by Per Bothner; maintained since 2000 by Ben Elliston. # # You can get the latest version of this script from: -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess # # Please send patches to <con...@gn...>. @@ -50,7 +50,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2015 Free Software Foundation, Inc. +Copyright 1992-2017 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -186,9 +186,12 @@ *) machine=${UNAME_MACHINE_ARCH}-unknown ;; esac # The Operating System including object format, if it has switched - # to ELF recently, or will in the future. + # to ELF recently (or will in the future) and ABI. case "${UNAME_MACHINE_ARCH}" in - arm*|earm*|i386|m68k|ns32k|sh3*|sparc|vax) + earm*) + os=netbsdelf + ;; + arm*|i386|m68k|ns32k|sh3*|sparc|vax) eval $set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ELF__ @@ -221,7 +224,7 @@ release='-gnu' ;; *) - release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` + release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2` ;; esac # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: @@ -237,6 +240,10 @@ UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} exit ;; + *:LibertyBSD:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE} + exit ;; *:ekkoBSD:*:*) echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} exit ;; @@ -249,6 +256,12 @@ *:MirBSD:*:*) echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} exit ;; + *:Sortix:*:*) + echo ${UNAME_MACHINE}-unknown-sortix + exit ;; + *:Redox:*:*) + echo ${UNAME_MACHINE}-unknown-redox + exit ;; alpha:OSF1:*:*) case $UNAME_RELEASE in *4.0) @@ -265,42 +278,42 @@ ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` case "$ALPHA_CPU_TYPE" in "EV4 (21064)") - UNAME_MACHINE="alpha" ;; + UNAME_MACHINE=alpha ;; "EV4.5 (21064)") - UNAME_MACHINE="alpha" ;; + UNAME_MACHINE=alpha ;; "LCA4 (21066/21068)") - UNAME_MACHINE="alpha" ;; + UNAME_MACHINE=alpha ;; "EV5 (21164)") - UNAME_MACHINE="alphaev5" ;; + UNAME_MACHINE=alphaev5 ;; "EV5.6 (21164A)") - UNAME_MACHINE="alphaev56" ;; + UNAME_MACHINE=alphaev56 ;; "EV5.6 (21164PC)") - UNAME_MACHINE="alphapca56" ;; + UNAME_MACHINE=alphapca56 ;; "EV5.7 (21164PC)") - UNAME_MACHINE="alphapca57" ;; + UNAME_MACHINE=alphapca57 ;; "EV6 (21264)") - UNAME_MACHINE="alphaev6" ;; + UNAME_MACHINE=alphaev6 ;; "EV6.7 (21264A)") - UNAME_MACHINE="alphaev67" ;; + UNAME_MACHINE=alphaev67 ;; "EV6.8CB (21264C)") - UNAME_MACHINE="alphaev68" ;; + UNAME_MACHINE=alphaev68 ;; "EV6.8AL (21264B)") - UNAME_MACHINE="alphaev68" ;; + UNAME_MACHINE=alphaev68 ;; "EV6.8CX (21264D)") - UNAME_MACHINE="alphaev68" ;; + UNAME_MACHINE=alphaev68 ;; "EV6.9A (21264/EV69A)") - UNAME_MACHINE="alphaev69" ;; + UNAME_MACHINE=alphaev69 ;; "EV7 (21364)") - UNAME_MACHINE="alphaev7" ;; + UNAME_MACHINE=alphaev7 ;; "EV7.9 (21364A)") - UNAME_MACHINE="alphaev79" ;; + UNAME_MACHINE=alphaev79 ;; esac # A Pn.n version is a patched version. # A Vn.n version is a released version. # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` # Reset EXIT trap before exiting to avoid spurious non-zero exit code. exitcode=$? trap '' 0 @@ -373,16 +386,16 @@ exit ;; i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) eval $set_cc_for_build - SUN_ARCH="i386" + SUN_ARCH=i386 # If there is a compiler, see if it is configured for 64-bit objects. # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. # This test works for both compilers. - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if [ "$CC_FOR_BUILD" != no_compiler_found ]; then if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ grep IS_64BIT_ARCH >/dev/null then - SUN_ARCH="x86_64" + SUN_ARCH=x86_64 fi fi echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` @@ -407,7 +420,7 @@ exit ;; sun*:*:4.2BSD:*) UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` - test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 + test "x${UNAME_RELEASE}" = x && UNAME_RELEASE=3 case "`/bin/arch`" in sun3) echo m68k-sun-sunos${UNAME_RELEASE} @@ -632,13 +645,13 @@ sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` case "${sc_cpu_version}" in - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 + 523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0 + 528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1 532) # CPU_PA_RISC2_0 case "${sc_kernel_bits}" in - 32) HP_ARCH="hppa2.0n" ;; - 64) HP_ARCH="hppa2.0w" ;; - '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 + 32) HP_ARCH=hppa2.0n ;; + 64) HP_ARCH=hppa2.0w ;; + '') HP_ARCH=hppa2.0 ;; # HP-UX 10.20 esac ;; esac fi @@ -677,11 +690,11 @@ exit (0); } EOF - (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` + (CCOPTS="" $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` test -z "$HP_ARCH" && HP_ARCH=hppa fi ;; esac - if [ ${HP_ARCH} = "hppa2.0w" ] + if [ ${HP_ARCH} = hppa2.0w ] then eval $set_cc_for_build @@ -694,12 +707,12 @@ # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess # => hppa64-hp-hpux11.23 - if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | + if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | grep -q __LP64__ then - HP_ARCH="hppa2.0w" + HP_ARCH=hppa2.0w else - HP_ARCH="hppa64" + HP_ARCH=hppa64 fi fi echo ${HP_ARCH}-hp-hpux${HPUX_REV} @@ -804,14 +817,14 @@ echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) - FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` + FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; 5000:UNIX_System_V:4.*:*) - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'` echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) @@ -827,10 +840,11 @@ UNAME_PROCESSOR=`/usr/bin/uname -p` case ${UNAME_PROCESSOR} in amd64) - echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - *) - echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + UNAME_PROCESSOR=x86_64 ;; + i386) + UNAME_PROCESSOR=i586 ;; esac + echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin @@ -893,7 +907,7 @@ exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix @@ -916,7 +930,7 @@ EV68*) UNAME_MACHINE=alphaev68 ;; esac objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC="gnulibc1" ; fi + if test "$?" = 0 ; then LIBC=gnulibc1 ; fi echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; arc:Linux:*:* | arceb:Linux:*:*) @@ -962,6 +976,9 @@ ia64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; + k1om:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; m32r*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; @@ -987,6 +1004,9 @@ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ;; + mips64el:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; openrisc*:Linux:*:*) echo or1k-unknown-linux-${LIBC} exit ;; @@ -1019,6 +1039,9 @@ ppcle:Linux:*:*) echo powerpcle-unknown-linux-${LIBC} exit ;; + riscv32:Linux:*:* | riscv64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; s390:Linux:*:* | s390x:Linux:*:*) echo ${UNAME_MACHINE}-ibm-linux-${LIBC} exit ;; @@ -1117,7 +1140,7 @@ # uname -m prints for DJGPP always 'pc', but it prints nothing about # the processor, so we play safe by assuming i586. # Note: whatever this is, it MUST be the same as what config.sub - # prints for the "djgpp" host, or else GDB configury will decide that + # prints for the "djgpp" host, or else GDB configure will decide that # this is a cross-build. echo i586-pc-msdosdjgpp exit ;; @@ -1266,6 +1289,9 @@ SX-8R:SUPER-UX:*:*) echo sx8r-nec-superux${UNAME_RELEASE} exit ;; + SX-ACE:SUPER-UX:*:*) + echo sxace-nec-superux${UNAME_RELEASE} + exit ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} exit ;; @@ -1279,16 +1305,23 @@ UNAME_PROCESSOR=powerpc fi if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if [ "$CC_FOR_BUILD" != no_compiler_found ]; then if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null then case $UNAME_PROCESSOR in i386) UNAME_PROCESSOR=x86_64 ;; powerpc) UNAME_PROCESSOR=powerpc64 ;; esac fi + # On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc + if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_PPC >/dev/null + then + UNAME_PROCESSOR=powerpc + fi fi elif test "$UNAME_PROCESSOR" = i386 ; then # Avoid executing cc on OS X 10.9, as it ships with a stub @@ -1303,7 +1336,7 @@ exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) UNAME_PROCESSOR=`uname -p` - if test "$UNAME_PROCESSOR" = "x86"; then + if test "$UNAME_PROCESSOR" = x86; then UNAME_PROCESSOR=i386 UNAME_MACHINE=pc fi @@ -1312,15 +1345,18 @@ *:QNX:*:4*) echo i386-pc-qnx exit ;; - NEO-?:NONSTOP_KERNEL:*:*) + NEO-*:NONSTOP_KERNEL:*:*) echo neo-tandem-nsk${UNAME_RELEASE} exit ;; NSE-*:NONSTOP_KERNEL:*:*) echo nse-tandem-nsk${UNAME_RELEASE} exit ;; - NSR-?:NONSTOP_KERNEL:*:*) + NSR-*:NONSTOP_KERNEL:*:*) echo nsr-tandem-nsk${UNAME_RELEASE} exit ;; + NSX-*:NONSTOP_KERNEL:*:*) + echo nsx-tandem-nsk${UNAME_RELEASE} + exit ;; *:NonStop-UX:*:*) echo mips-compaq-nonstopux exit ;; @@ -1334,7 +1370,7 @@ # "uname -m" is not consistent, so use $cputype instead. 386 # is converted to i386 for consistency with other x86 # operating systems. - if test "$cputype" = "386"; then + if test "$cputype" = 386; then UNAME_MACHINE=i386 else UNAME_MACHINE="$cputype" @@ -1376,7 +1412,7 @@ echo i386-pc-xenix exit ;; i*86:skyos:*:*) - echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' + echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE} | sed -e 's/ .*$//'` exit ;; i*86:rdos:*:*) echo ${UNAME_MACHINE}-pc-rdos @@ -1387,23 +1423,25 @@ x86_64:VMkernel:*:*) echo ${UNAME_MACHINE}-unknown-esx exit ;; + amd64:Isilon\ OneFS:*:*) + echo x86_64-unknown-onefs + exit ;; esac cat >&2 <<EOF $0: unable to guess system type -This script, last modified $timestamp, has failed to recognize -the operating system you are using. It is advised that you -download the most up to date version of the config scripts from +This script (version $timestamp), has failed to recognize the +operating system you are using. If your script is old, overwrite *all* +copies of config.guess and config.sub with the latest versions from: - http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD + http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess and - http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD + http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub -If the version you run ($0) is already up to date, please -send the following data and any information you think might be -pertinent to <con...@gn...> in order to provide the needed -information to handle your system. +If $0 has already been updated, send the following data and any +information you think might be pertinent to con...@gn... to +provide the necessary information to handle your system. config.guess timestamp = $timestamp --- mrnet-20170810/conf/config.sub 2017-08-10 16:13:41.000000000 -0500 +++ mrnet-20170810-fixes/conf/config.sub 2017-08-10 16:17:30.490056572 -0500 @@ -1,8 +1,8 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright 1992-2015 Free Software Foundation, Inc. +# Copyright 1992-2017 Free Software Foundation, Inc. -timestamp='2015-03-08' +timestamp='2017-04-02' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -33,7 +33,7 @@ # Otherwise, we print the canonical config type on stdout and succeed. # You can get the latest version of this script from: -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub # This file is supposed to be the same for all GNU packages # and recognize all the CPU types, system types and aliases @@ -53,8 +53,7 @@ me=`echo "$0" | sed -e 's,.*/,,'` usage="\ -Usage: $0 [OPTION] CPU-MFR-OPSYS - $0 [OPTION] ALIAS +Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS Canonicalize a configuration name. @@ -68,7 +67,7 @@ version="\ GNU config.sub ($timestamp) -Copyright 1992-2015 Free Software Foundation, Inc. +Copyright 1992-2017 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -118,7 +117,7 @@ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \ - kopensolaris*-gnu* | \ + kopensolaris*-gnu* | cloudabi*-eabi* | \ storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` @@ -255,6 +254,7 @@ | arc | arceb \ | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ | avr | avr32 \ + | ba \ | be32 | be64 \ | bfin \ | c4x | c8051 | clipper \ @@ -263,7 +263,7 @@ | fido | fr30 | frv | ft32 \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | hexagon \ - | i370 | i860 | i960 | ia64 \ + | i370 | i860 | i960 | ia16 | ia64 \ | ip2k | iq2000 \ | k1om \ | le32 | le64 \ @@ -301,11 +301,12 @@ | open8 | or1k | or1knd | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ + | pru \ | pyramid \ | riscv32 | riscv64 \ | rl78 | rx \ | score \ - | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ @@ -314,6 +315,7 @@ | ubicom32 \ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ | visium \ + | wasm32 \ | we32k \ | x86 | xc16x | xstormy16 | xtensa \ | z8k | z80) @@ -376,6 +378,7 @@ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ + | ba-* \ | be32-* | be64-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* \ @@ -386,7 +389,7 @@ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | hexagon-* \ - | i*86-* | i860-* | i960-* | ia64-* \ + | i*86-* | i860-* | i960-* | ia16-* | ia64-* \ | ip2k-* | iq2000-* \ | k1om-* \ | le32-* | le64-* \ @@ -427,13 +430,15 @@ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ + | pru-* \ | pyramid-* \ + | riscv32-* | riscv64-* \ | rl78-* | romp-* | rs6000-* | rx-* \ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \ | tahoe-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ | tile*-* \ @@ -442,6 +447,7 @@ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ | vax-* \ | visium-* \ + | wasm32-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* \ | xstormy16-* | xtensa*-* \ @@ -518,7 +524,7 @@ basic_machine=i386-pc os=-aros ;; - asmjs) + asmjs) basic_machine=asmjs-unknown ;; aux) @@ -641,6 +647,14 @@ basic_machine=m68k-bull os=-sysv3 ;; + e500v[12]) + basic_machine=powerpc-unknown + os=$os"spe" + ;; + e500v[12]-*) + basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + os=$os"spe" + ;; ebmon29k) basic_machine=a29k-amd os=-ebmon @@ -936,6 +950,9 @@ nsr-tandem) basic_machine=nsr-tandem ;; + nsx-tandem) + basic_machine=nsx-tandem + ;; op50n-* | op60c-*) basic_machine=hppa1.1-oki os=-proelf @@ -1020,7 +1037,7 @@ ppc-* | ppcbe-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ;; - ppcle | powerpclittle | ppc-le | powerpc-little) + ppcle | powerpclittle) basic_machine=powerpcle-unknown ;; ppcle-* | powerpclittle-*) @@ -1030,7 +1047,7 @@ ;; ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` ;; - ppc64le | powerpc64little | ppc64-le | powerpc64-little) + ppc64le | powerpc64little) basic_machine=powerpc64le-unknown ;; ppc64le-* | powerpc64little-*) @@ -1231,6 +1248,9 @@ basic_machine=a29k-wrs os=-vxworks ;; + wasm32) + basic_machine=wasm32-unknown + ;; w65*) basic_machine=w65-wdc os=-none @@ -1376,18 +1396,18 @@ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ | -sym* | -kopensolaris* | -plan9* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ - | -aos* | -aros* | -cloudabi* \ + | -aos* | -aros* | -cloudabi* | -sortix* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ - | -bitrig* | -openbsd* | -solidbsd* \ + | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* | -cegcc* \ + | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ + | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ | -linux-newlib* | -linux-musl* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ @@ -1396,7 +1416,8 @@ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*) + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \ + | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1528,6 +1549,8 @@ ;; -nacl*) ;; + -ios) + ;; -none) ;; *) @@ -1623,6 +1646,9 @@ sparc-* | *-sun) os=-sunos4.1.1 ;; + pru-*) + os=-elf + ;; *-be) os=-beos ;; --- NEW FILE: mrnet-20170810.tar.gz --- (This appears to be a binary file; contents omitted.) --- NEW FILE: mrnet-20170810.patch --- --- mrnet-20170810/conf/Makefile.in 2017-08-10 16:13:41.000000000 -0500 +++ mrnet-20170810-fixes/conf/Makefile.in 2017-08-10 16:21:45.845064570 -0500 @@ -145,7 +145,7 @@ endif # SILENCE_WARNINGS - COMMNODE_LDFLAGS += -static-libstdc++ -static-libgcc + COMMNODE_LDFLAGS += endif #GNU options --- mrnet-20170810/src/lightweight/Packet.c 2017-08-10 16:13:41.000000000 -0500 +++ mrnet-20170810-fixes/src/lightweight/Packet.c 2017-08-10 16:20:50.182062827 -0500 @@ -11,6 +11,7 @@ #include "mrnet_lightweight/Network.h" #include "mrnet_lightweight/Packet.h" #include "xplat_lightweight/vector.h" +#include "stdbool.h" void delete_Packet_t(Packet_t* packet) { |
