Merge branch 'dev' into dev

Author: tgrogers

.github/workflows/main.yml

@@ -84,22 +84,22 @@ jobs:
       - uses: actions/checkout@v4
       - name: Run Simulation
         run: /bin/bash $GITHUB_WORKSPACE/short-tests.sh
-  format-code:
-    if: github.event_name == 'pull_request'
-    runs-on: tgrogers-raid
-    needs: [build-TITANV, build-TITANV-LOCALXBAR, build-QV100, build-2060, build-3070]
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{github.event.pull_request.head.ref}}
-          repository: ${{github.event.pull_request.head.repo.full_name}}
-          ssh-key: ''
+  #format-code:
+  #  if: github.event_name == 'pull_request'
+  #  runs-on: tgrogers-raid
+  #  needs: [build-TITANV, build-TITANV-LOCALXBAR, build-QV100, build-2060, build-3070]
+  #  steps:
+  #    - uses: actions/checkout@v4
+  #      with:
+  #        ref: ${{github.event.pull_request.head.ref}}
+  #        repository: ${{github.event.pull_request.head.repo.full_name}}
+  #        ssh-key: ''
 
-      - name: Run clang-format
-        run: |
-          git config user.name "purdue-jenkins"
-          git config user.email "[email protected]"
-          git remote set-url origin [email protected]:${{github.event.pull_request.head.repo.full_name}}
-          git remote -v
-          /bin/bash ./format-code.sh
-          if git status --untracked-files=no | grep -q "nothing to commit"; then echo "No changes to commit."; else git commit -a -m "Automated Format"; git push; fi
+  #    - name: Run clang-format
+  #      run: |
+  #        git config user.name "purdue-jenkins"
+  #        git config user.email "[email protected]"
+  #        git remote set-url origin [email protected]:${{github.event.pull_request.head.repo.full_name}}
+  #        git remote -v
+  #        /bin/bash ./format-code.sh
+  #        if git status --untracked-files=no | grep -q "nothing to commit"; then echo "No changes to commit."; else git commit -a -m "Automated Format"; git push; fi

setup_environment

@@ -48,10 +48,9 @@ CC_VERSION=$(gcc --version | head -1 | awk '{for(i=1;i<=NF;i++){ if(match($i,/^[
 
 CUDA_VERSION_STRING=`$CUDA_INSTALL_PATH/bin/nvcc --version | awk '/release/ {print $5;}' | sed 's/,//'`;
 export CUDA_VERSION_NUMBER=`echo $CUDA_VERSION_STRING | sed 's/\./ /' | awk '{printf("%02u%02u", 10*int($1), 10*$2);}'`
-if [ $CUDA_VERSION_NUMBER -gt 11100 -o $CUDA_VERSION_NUMBER -lt 2030  ]; then
-	echo "ERROR ** GPGPU-Sim version $GPGPUSIM_VERSION_STRING not tested with CUDA version $CUDA_VERSION_STRING (please see README)";
+if [ $CUDA_VERSION_NUMBER -gt 12800 -o $CUDA_VERSION_NUMBER -lt 2030  ]; then
+	echo "WARNING ** GPGPU-Sim version $GPGPUSIM_VERSION_STRING not tested with CUDA version $CUDA_VERSION_STRING (please see README)";
 	echo $CUDA_VERSION_NUMBER
-    return 1;
 fi
 
 if [ $CUDA_VERSION_NUMBER -ge 6000 ]; then