From b2f0ebee9a964b93882188d84e6ccd0f61996087 Mon Sep 17 00:00:00 2001
From: JRPan <25518778+JRPan@users.noreply.github.com>
Date: Wed, 24 Jan 2024 16:16:57 -0500
Subject: update CI scripts

---
 .github/workflows/main.yml | 36 ++++++++++++++++++------------------
 short-tests.sh             | 22 ++++++++++++++++++++++
 travis.sh                  | 24 ------------------------
 3 files changed, 40 insertions(+), 42 deletions(-)
 create mode 100755 short-tests.sh
 delete mode 100755 travis.sh

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 115b11b..a5a736a 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -16,48 +16,48 @@ jobs:
   build-GTX480:
     runs-on: ubuntu-latest
     container:
-      image: tgrogers/gpgpu-sim_regress:volta_update
+      image: tgrogers/accel-sim_regress:Ubuntu-22.04-cuda-11.7
       env:
         CONFIG: GTX480
-        CUDA_INSTALL_PATH: /usr/local/cuda-4.2/
-        PTXAS_CUDA_INSTALL_PATH: /usr/local/cuda-4.2/
-        GPUAPPS_ROOT: /home/runner/gpgpu-sim_simulations/benchmarks
+        # CUDA_INSTALL_PATH: /usr/local/cuda-4.2/
+        # PTXAS_CUDA_INSTALL_PATH: /usr/local/cuda-4.2/
+        # GPUAPPS_ROOT: /home/runner/gpgpu-sim_simulations/benchmarks
         
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v2
+      - uses: actions/checkout
       - name: Run Simulation
-        run: /bin/bash $GITHUB_WORKSPACE/travis.sh
+        run: /bin/bash $GITHUB_WORKSPACE/short-tests.sh
   build-TITANV:
     runs-on: ubuntu-latest
     container:
-      image: tgrogers/gpgpu-sim_regress:volta_update
+      image: tgrogers/accel-sim_regress:Ubuntu-22.04-cuda-11.7
       env:
         CONFIG: TITANV
-        CUDA_INSTALL_PATH: /usr/local/cuda-9.1/
-        PTXAS_CUDA_INSTALL_PATH: /usr/local/cuda-9.1/
-        GPUAPPS_ROOT: /home/runner/gpgpu-sim_simulations/benchmarks
+        # CUDA_INSTALL_PATH: /usr/local/cuda-9.1/
+        # PTXAS_CUDA_INSTALL_PATH: /usr/local/cuda-9.1/
+        # GPUAPPS_ROOT: /home/runner/gpgpu-sim_simulations/benchmarks
         
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v2
+      - uses: actions/checkout
       - name: Run Simulation
-        run: /bin/bash $GITHUB_WORKSPACE/travis.sh
+        run: /bin/bash $GITHUB_WORKSPACE/short-tests.sh
   build-TITANV-LOCALXBAR:
     runs-on: ubuntu-latest
     container:
-      image: tgrogers/gpgpu-sim_regress:volta_update
+      image: tgrogers/accel-sim_regress:Ubuntu-22.04-cuda-11.7
       env:
         CONFIG: TITANV-LOCALXBAR
-        CUDA_INSTALL_PATH: /usr/local/cuda-9.1/
-        PTXAS_CUDA_INSTALL_PATH: /usr/local/cuda-9.1/
-        GPUAPPS_ROOT: /home/runner/gpgpu-sim_simulations/benchmarks
+        # CUDA_INSTALL_PATH: /usr/local/cuda-9.1/
+        # PTXAS_CUDA_INSTALL_PATH: /usr/local/cuda-9.1/
+        # GPUAPPS_ROOT: /home/runner/gpgpu-sim_simulations/benchmarks
         
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v2
+      - uses: actions/checkout
       - name: Run Simulation
-        run: /bin/bash $GITHUB_WORKSPACE/travis.sh
+        run: /bin/bash $GITHUB_WORKSPACE/short-tests.sh
diff --git a/short-tests.sh b/short-tests.sh
new file mode 100755
index 0000000..bb1c669
--- /dev/null
+++ b/short-tests.sh
@@ -0,0 +1,22 @@
+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
+
+if [ ! -n "$GPUAPPS_ROOT" ]; then
+	echo "ERROR ** GPUAPPS_ROOT to a location where the apps have been compiled";
+	exit;
+fi
+
+export PATH=$CUDA_INSTALL_PATH/bin:$PATH
+source ./setup_environment
+make -j
+
+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 -l local
+./accel-sim-framework/util/job_launching/monitor_func_test.py -v -N regress -j procman
diff --git a/travis.sh b/travis.sh
deleted file mode 100755
index bbdd19a..0000000
--- a/travis.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-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
-
-if [ ! -n "$GPUAPPS_ROOT" ]; then
-	echo "ERROR ** GPUAPPS_ROOT to a location where the apps have been compiled";
-	exit;
-fi
-
-export PATH=$CUDA_INSTALL_PATH/bin:$PATH
-source ./setup_environment
-make -j
-
-pip install psutil
-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 -l local
-./accel-sim-framework/util/job_launching/monitor_func_test.py -v -N regress -j procman
-- 
cgit v1.3