diff --git a/.github/workflows/build-and-test-callable.yml b/.github/workflows/build-and-test-callable.yml index c44fe2d3..ebe93eaf 100644 --- a/.github/workflows/build-and-test-callable.yml +++ b/.github/workflows/build-and-test-callable.yml @@ -34,10 +34,10 @@ on: default: false cuda-toolkit-version: type: string - default: '12.4.1' + default: '12.6.0' cuda-driver-version: type: string - default: '550.54.15' + default: '560.28.03' libceed: description: 'Build with libCEED' type: boolean @@ -64,8 +64,7 @@ jobs: ${{ inputs.cuda && '| cuda' || '' }}${{ inputs.libceed && '| libceed' || '' }}${{ inputs.gslib && '| gslib' || '' }} env: - cuda-toolkit-version: '12.4.1' - cuda-driver-version: '550.54.15' + CUDA_HOME: '/usr/local/cuda' # These are all passed to setup.py as one concatenated string build-flags: >- ${{ inputs.parallel && '--with-parallel' || '' }} @@ -108,12 +107,12 @@ jobs: uses: actions/cache@v4 with: path: ~/cache - key: cuda-installer-${{ env.cuda-toolkit-version }}-${{ env.cuda-driver-version }} + key: cuda-installer-${{ inputs.cuda-toolkit-version }}-${{ inputs.cuda-driver-version }} - name: Download CUDA if: inputs.cuda && steps.cache-cuda.outputs.cache-hit == false run: | - CUDA_URL="https://developer.download.nvidia.com/compute/cuda/${{ env.cuda-toolkit-version }}/local_installers/cuda_${{ env.cuda-toolkit-version }}_${{ env.cuda-driver-version }}_linux.run" + CUDA_URL="https://developer.download.nvidia.com/compute/cuda/${{ inputs.cuda-toolkit-version }}/local_installers/cuda_${{ inputs.cuda-toolkit-version }}_${{ inputs.cuda-driver-version }}_linux.run" curl -o ~/cache/cuda.run --create-dirs $CUDA_URL - name: Install CUDA diff --git a/.github/workflows/build-and-test-dispatch.yml b/.github/workflows/build-and-test-dispatch.yml index 5b9961b3..5d74ea6b 100644 --- a/.github/workflows/build-and-test-dispatch.yml +++ b/.github/workflows/build-and-test-dispatch.yml @@ -25,7 +25,7 @@ jobs: # Build and test whole matrix of options on linux # ------------------------------------------------------------------------------------------------- test-linux-serial: - if: ${{ github.event_name == 'pull_request' || inputs.test_options == 'all' }} + if: ${{ github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'skip-ci') || inputs.test_options == 'all' }} strategy: fail-fast: false matrix: @@ -41,7 +41,7 @@ jobs: parallel: ${{ matrix.parallel }} test-linux-parallel: - if: ${{ github.event_name == 'pull_request' || inputs.test_options == 'all' }} + if: ${{ github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'skip-ci') || inputs.test_options == 'all' }} strategy: fail-fast: false matrix: @@ -78,7 +78,7 @@ jobs: # Specific cases (we want these to use defaults, and not expand the dimensions of the matrix) # ------------------------------------------------------------------------------------------------- test-macos: - if: ${{ github.event_name == 'pull_request' || inputs.test_options == 'all' }} + if: ${{ github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'skip-ci') || inputs.test_options == 'all' }} strategy: fail-fast: false matrix: @@ -90,21 +90,21 @@ jobs: mfem-branch: ${{ matrix.mfem-branch }} test-cuda: - if: ${{ github.event_name == 'pull_request' || inputs.test_options == 'all' || inputs.test_options == 'cuda'}} + if: ${{ github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'skip-ci') || inputs.test_options == 'all' || inputs.test_options == 'cuda'}} uses: ./.github/workflows/build-and-test-callable.yml with: cuda: true name: test-cuda test-libceed: - if: ${{ github.event_name == 'pull_request' || inputs.test_options == 'all' || inputs.test_options == 'libceed'}} + if: ${{ github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'skip-ci') || inputs.test_options == 'all' || inputs.test_options == 'libceed'}} uses: ./.github/workflows/build-and-test-callable.yml with: libceed: true name: test-libceed test-gslib: - if: ${{ github.event_name == 'pull_request' || inputs.test_options == 'all' || inputs.test_options == 'gslib'}} + if: ${{ github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'skip-ci') || inputs.test_options == 'all' || inputs.test_options == 'gslib'}} uses: ./.github/workflows/build-and-test-callable.yml with: gslib: true diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index 7a73a41b..00000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,2 +0,0 @@ -{ -} \ No newline at end of file diff --git a/ci_scripts/add_cuda_10_1.sh b/ci_scripts/add_cuda_10_1.sh deleted file mode 100755 index fbc8da44..00000000 --- a/ci_scripts/add_cuda_10_1.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash -set -ev - -UBUNTU_VERSION=$(lsb_release -sr) -UBUNTU_VERSION=ubuntu"${UBUNTU_VERSION//.}" -CUDA=10.1.105-1 -CUDA_SHORT=10.1 - -INSTALLER=cuda-repo-${UBUNTU_VERSION}_${CUDA}_amd64.deb -wget http://developer.download.nvidia.com/compute/cuda/repos/${UBUNTU_VERSION}/x86_64/${INSTALLER} -sudo dpkg -i ${INSTALLER} -wget https://developer.download.nvidia.com/compute/cuda/repos/${UBUNTU_VERSION}/x86_64/7fa2af80.pub -sudo apt-key add 7fa2af80.pub -sudo apt update -qq -sudo apt install -y cuda-core-${CUDA_SHORT/./-} cuda-cudart-dev-${CUDA_SHORT/./-} cuda-cufft-dev-${CUDA_SHORT/./-} -sudo apt clean - - - diff --git a/ci_scripts/add_cuda_11_1.sh b/ci_scripts/add_cuda_11_1.sh deleted file mode 100755 index c004d6dc..00000000 --- a/ci_scripts/add_cuda_11_1.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash -set -ev - -wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/cuda-ubuntu2004.pin -sudo mv cuda-ubuntu2004.pin /etc/apt/preferences.d/cuda-repository-pin-600 -wget https://developer.download.nvidia.com/compute/cuda/11.1.1/local_installers/cuda-repo-ubuntu2004-11-1-local_11.1.1-455.32.00-1_amd64.deb -sudo dpkg -i cuda-repo-ubuntu2004-11-1-local_11.1.1-455.32.00-1_amd64.deb -sudo apt-key add /var/cuda-repo-ubuntu2004-11-1-local/7fa2af80.pub -sudo apt-get update -sudo apt-get -y install cuda - diff --git a/ci_scripts/add_cuda_11_5.sh b/ci_scripts/add_cuda_11_5.sh deleted file mode 100644 index 0c3c23fa..00000000 --- a/ci_scripts/add_cuda_11_5.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash -set -ev -wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/cuda-ubuntu2004.pin -sudo mv cuda-ubuntu2004.pin /etc/apt/preferences.d/cuda-repository-pin-600 -wget https://developer.download.nvidia.com/compute/cuda/11.5.0/local_installers/cuda-repo-ubuntu2004-11-5-local_11.5.0-495.29.05-1_amd64.deb -sudo dpkg -i cuda-repo-ubuntu2004-11-5-local_11.5.0-495.29.05-1_amd64.deb -sudo apt-key add /var/cuda-repo-ubuntu2004-11-5-local/7fa2af80.pub -sudo apt-get update -sudo apt-get -y install cuda