updating travis to use the latest infrastrcutre and not use that nasty single-line command line for docker. Also since we don't need torque anymore - none of that runner user stuff is necessary

3 files changed, 32 insertions, 1 deletions

diff --git a/.gitignore b/.gitignore
index 3689a49..4b343c5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -56,3 +56,8 @@ debug_tools/WatchYourStep/ptxjitplus/gpgpu*
 debug_tools/WatchYourStep/ptxjitplus/*.old
 debug_tools/WatchYourStep/ptxjitplus/ptxjitplus
 debug_tools/WatchYourStep/ptxjitplus/*.ptx
+
+# Accel-sim packages used for regressions
+accel-sim-framework/
+gpu-app-collection/
+
diff --git a/.travis.yml b/.travis.yml
index 82f0604..f720ce1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,4 +24,6 @@ matrix:
         - CUDA_INSTALL_PATH=/usr/local/cuda-9.1/
         - PTXAS_CUDA_INSTALL_PATH=/usr/local/cuda-9.1/
 
-script: docker run -v `pwd`:/home/runner/gpgpu-sim_distribution:rw tgrogers/gpgpu-sim_regress:volta_update /bin/bash -c "./start_torque.sh; chown -R runner /home/runner/gpgpu-sim_distribution; su - runner -c 'export CUDA_INSTALL_PATH=$CUDA_INSTALL_PATH && export PTXAS_CUDA_INSTALL_PATH=$PTXAS_CUDA_INSTALL_PATH && source /home/runner/gpgpu-sim_distribution/setup_environment && make -j -C /home/runner/gpgpu-sim_distribution && cd /home/runner/gpgpu-sim_simulations/ && git pull && /home/runner/gpgpu-sim_simulations/util/job_launching/run_simulations.py -C $CONFIG -B rodinia_2.0-ft -N regress && /home/runner/gpgpu-sim_simulations/util/job_launching/monitor_func_test.py -v -N regress'"
+script:
+    - docker run --env CONFIG=$CONFIG --env PTXAS_CUDA_INSTALL_PATH=$PTXAS_CUDA_INSTALL_PATH --env CUDA_INSTALL_PATH=$CUDA_INSTALL_PATH \
+        -v `pwd`:/gpgpu-sim:rw tgrogers/gpgpu-sim_regress:volta_update /bin/bash travis.sh
diff --git a/travis.sh b/travis.sh
new file mode 100755
index 0000000..247a516
--- /dev/null
+++ b/travis.sh
@@ -0,0 +1,24 @@
+if [ ! -n "$CUDA_INSTALL_PATH" ]; then
+	echo "ERROR ** Install CUDA Toolkit and set CUDA_INSTALL_PATH.";
+	exit;
+fi
+
+if [ ! -n "$CONFIG" ]; then
+	echo "ERROR ** set the CONFIG env variable to one of those found in ./accel-sim-framework/util/job_launching/configs/define-standard-cfgs.yml";
+	exit;
+fi
+
+export PATH=$CUDA_INSTALL_PATH/bin:$PATH
+source ./setup_environment
+make -j
+
+rm -rf gpu-app-collection
+git clone https://github.com/accel-sim/gpu-app-collection.git
+source gpu-app-collection/src/setup_environment
+make -j -C gpu-app-collection/src rodinia_2.0-ft
+./gpu-app-collection/get_regression_data.sh
+
+rm -rf accel-sim-framework
+git clone https://github.com/accel-sim/accel-sim-framework.git
+./accel-sim-framework/util/job_launching/run_simulations.py -C $CONFIG -B rodinia_2.0-ft -N regress
+./accel-sim-framework/util/job_launching/monitor_func_test.py -v -N regress