update the compiling system & travis script

Author: sixshotx

.travis.yml

@@ -38,7 +38,7 @@ before_install:
     - cd $QSIM_PREFIX
     - make release install
     - cd ..
-    - wget http://manifold.gatech.edu/wp-content/uploads/2016/10/kitfox-v1.1.tar.gz
+    - wget http://manifold.gatech.edu/wp-content/uploads/2017/01/kitfox-v1.1.tar.gz
     - tar xzvf kitfox-v1.1.tar.gz
     - cd kitfox-v1.1
     - sudo apt-get -y install flex bison
@@ -48,15 +48,17 @@ before_install:
     - cd ..
 script:
     - autoreconf -siv
-    - ./configure QSIMINC=${QSIM_PREFIX}/include KITFOXINC=${KITFOX_PREFIX}
+    - ./configure QSIMINC=${QSIM_PREFIX}/include --without-kitfox
     - make
     - cd ${MANIFOLD_DIR}/simulator/smp/QsimProxy
-    - make -f Makefile.kitfox
+    - make -f Makefile
     - cd ${MANIFOLD_DIR}
-    - ./configure QSIMINC=${QSIM_PREFIX}/include --without-kitfox
+    - make distclean
+    - ./configure QSIMINC=${QSIM_PREFIX}/include KITFOXINC=${KITFOX_PREFIX}
     - make
     - cd ${MANIFOLD_DIR}/simulator/smp/QsimProxy
-    - make -f Makefile
+    - make clean
+    - make -f Makefile.kitfox
 after_failure:
     - cat ${MANIFOLD_DIR}/config.log
 compiler:

setup.sh

@@ -84,5 +84,6 @@ fi
 if [ $? -eq "0" ]; then
   echo "\n${bold}Manifold built successfully!${normal}\n\n"
   echo "Simulation Example:"
-  echo "QsimProxy/smp_llp ../config/conf2x3_spx_torus_llp.cfg ../state/state.4 ../benchmark/graphbig_x86/bc.tar"
+  echo "cd simulator/smp/QsimProxy"
+  echo "smp_llp ../config/conf2x3_spx_torus_llp.cfg ../state/state.4 ../benchmark/graphbig_x86/bc.tar"
 fi

simulator/smp/QsimProxy/Makefile

@@ -2,7 +2,7 @@ CXX = mpic++
 QSIM_ROOT = ${QSIM_PREFIX}
 MODELS_DIR = ../../../models
 CPPFLAGS += -Wall -g -DUSE_QSIM -DSTATS -I$(QSIM_ROOT)/include -I ../../.. -I$(MODELS_DIR)/processor -I$(MODELS_DIR)/qsim -I$(MODELS_DIR)/cache -I$(MODELS_DIR)/network -I$(MODELS_DIR)/memory -I$(MODELS_DIR)/cross -std=c++11
-LDFLAGS = -lqsim -L$(QSIM_ROOT)/lib -lmcp-iris -L$(MODELS_DIR)/cross/mcp_cache-iris -liris -L$(MODELS_DIR)/network/iris -lmcp-cache -L$(MODELS_DIR)/cache/mcp-cache -lspx -L$(MODELS_DIR)/processor/spx -lqsim_proxy -L$(MODELS_DIR)/qsim/proxy -lqsim_interrupt_handler -L$(MODELS_DIR)/qsim/interrupt_handler -lkitfox_proxy -L$(MODELS_DIR)/kitfox/proxy  -lcaffdram -L$(MODELS_DIR)/memory/CaffDRAM -lDRAMSim2 -L$(MODELS_DIR)/memory/DRAMSim2 -lDRAMSim2proper -L$(MODELS_DIR)/memory/DRAMSim2/DRAMSim2-2.2.2  -L../../../kernel -lmanifold -ldl -lrt
+LDFLAGS = -lqsim -L$(QSIM_ROOT)/lib -lmcp-iris -L$(MODELS_DIR)/cross/mcp_cache-iris -liris -L$(MODELS_DIR)/network/iris -lmcp-cache -L$(MODELS_DIR)/cache/mcp-cache -lspx -L$(MODELS_DIR)/processor/spx -lqsim_proxy -L$(MODELS_DIR)/qsim/proxy -lqsim_interrupt_handler -L$(MODELS_DIR)/qsim/interrupt_handler -lcaffdram -L$(MODELS_DIR)/memory/CaffDRAM -lDRAMSim2 -L$(MODELS_DIR)/memory/DRAMSim2 -lDRAMSim2proper -L$(MODELS_DIR)/memory/DRAMSim2/DRAMSim2-2.2.2  -L../../../kernel -lmanifold -ldl -lrt
 
 VPATH = ../common