Merge branch 'develop'

Author: lee218llnl

README.md

@@ -13,7 +13,6 @@ STAT is released under the Berkeley Software Distribution (BSD) license. Please
 
 ### BUILDING STAT
 STAT has several dependent libraries that must be installed:
-<<<<<<< HEAD
 * [MRNet](https://github.com/dyninst/mrnet)
 * [LaunchMON](https://github.com/LLNL/LaunchMON)
 * [GraphLib](https://github.com/LLNL/graphlib)
@@ -28,17 +27,6 @@ git clone https://github.com/spack/spack.git
 cd spack
 ./bin spack install stat
 ```
-=======
-* MRNet
-* [LaunchMON](https://github.com/LLNL/LaunchMON)
-* [GraphLib](https://github.com/LLNL/graphlib)
-* Stackwalker
-* libdwarf
-
-In addition, the STAT GUI requires Python with PyGTK, both of which are commonly preinstalled with many Linux operating systems. 
-
-Please refer to [INSTALL](/INSTALL) for instructions on building STAT.
->>>>>>> 7ff8f39... Minor readme updates
 
 ### SUPPORTED PLATFORMS
 STAT is able to run on any machine where all of the dependent libraries run.  This currently includes:

scripts/stat_cuda_gdb.py

@@ -51,11 +51,11 @@ def new_gdb_instance(pid, gdb_type='gdb'):
 
     try:
         if 'cuda-gdb' in os.environ['STAT_GDB']:
-            gdb = CudaGdbDriver(pid, 'debug', 'log.txt')
+            gdb = CudaGdbDriver(pid, 'error', 'stderr')
         else:
-            gdb = GdbDriver(pid, 'debug', 'log.txt')
+            gdb = GdbDriver(pid, 'error', 'stderr')
     except:
-        gdb = GdbDriver(pid, 'debug', 'log.txt')
+        gdb = GdbDriver(pid, 'error', 'stderr')
     if gdb.launch() is False:
         return -1
     gdb_instances[pid] = gdb

src/Makefile.am

@@ -16,6 +16,7 @@ AM_CXXFLAGS += -DOMP_STACKWALKER
 endif
 if ENABLE_GDB
 AM_CXXFLAGS += -DSTAT_GDB_BE
+SWIGFLAGS += -DSTAT_GDB_BE
 endif
 AM_LDFLAGS = $(CODE_COVERAGE_LIBS)