From 4002df5707bedfed373d733c4c9527d77b284258 Mon Sep 17 00:00:00 2001 From: Jim Kring Date: Sat, 15 Oct 2022 12:51:09 -0700 Subject: [PATCH 01/15] try cuda 11.3.0 w jimkring fork of cuda installer --- .github/workflows/ci.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b787214d..785e8912 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,6 +12,9 @@ jobs: matrix: # `include` will only run specific combinations (not permutations of these) include: + - os: windows-2019 + cuda: "11.3.0" + visual_studio: "Visual Studio 16 2019" - os: windows-2019 cuda: "11.4.0" visual_studio: "Visual Studio 16 2019" @@ -46,7 +49,9 @@ jobs: pip install wheel - name: Install CUDA (Windows) - uses: Jimver/cuda-toolkit@v0.2.8 + # uses: Jimver/cuda-toolkit@v0.2.8 + # jimkring's branch adds support for more cuda versions + uses: jimkring/action-install-cuda-toolkit@master if: runner.os == 'Windows' with: sub-packages: '["nvcc", "visual_studio_integration", "cublas", "curand", "nvrtc", "cudart"]' @@ -55,7 +60,9 @@ jobs: use-github-cache: false - name: Install CUDA (Linux) - uses: Jimver/cuda-toolkit@v0.2.8 + # uses: Jimver/cuda-toolkit@v0.2.8 + # jimkring's branch adds support for more cuda versions + uses: jimkring/action-install-cuda-toolkit@master if: runner.os == 'Linux' with: sub-packages: '["nvcc", "nvrtc", "cudart"]' From 58f0c3024c48f23ddad3c38a886ba7d85528886e Mon Sep 17 00:00:00 2001 From: Jim Kring Date: Sat, 15 Oct 2022 13:13:28 -0700 Subject: [PATCH 02/15] forgot python version in cuda 11.3.0 build --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 785e8912..f3ecf559 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,6 +15,7 @@ jobs: - os: windows-2019 cuda: "11.3.0" visual_studio: "Visual Studio 16 2019" + python: "3.9" - os: windows-2019 cuda: "11.4.0" visual_studio: "Visual Studio 16 2019" From 962035d3e386a8cb067be4c97945846e9e84dc9a Mon Sep 17 00:00:00 2001 From: Jim Kring Date: Sat, 15 Oct 2022 13:17:16 -0700 Subject: [PATCH 03/15] Added cuda 11.3.0 build for ubuntu --- .github/workflows/ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f3ecf559..92efdac3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,6 +20,9 @@ jobs: cuda: "11.4.0" visual_studio: "Visual Studio 16 2019" python: "3.9" + - os: ubuntu-20.04 + cuda: "11.3.0" + python: "3.9" - os: ubuntu-20.04 cuda: "11.4.0" python: "3.9" From 44c5c0b51905d5f6d0b20fc6f7e15f09ee09ef05 Mon Sep 17 00:00:00 2001 From: Jim Kring Date: Sat, 15 Oct 2022 13:35:24 -0700 Subject: [PATCH 04/15] try a traditional matrix strategy --- .github/workflows/ci.yml | 38 +++++++++++++++++++++++--------------- 1 file changed, 23 insertions(+), 15 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 92efdac3..bbf4fafc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,22 +10,30 @@ jobs: strategy: fail-fast: false matrix: - # `include` will only run specific combinations (not permutations of these) - include: - - os: windows-2019 - cuda: "11.3.0" - visual_studio: "Visual Studio 16 2019" - python: "3.9" - - os: windows-2019 - cuda: "11.4.0" - visual_studio: "Visual Studio 16 2019" - python: "3.9" + os: [windows-2019, ubuntu-20.04] + cuda: ["11.3.0", "11.4.0"] + visual_studio: ["Visual Studio 16 2019"] + python: ["3.9"] + exclude: - os: ubuntu-20.04 - cuda: "11.3.0" - python: "3.9" - - os: ubuntu-20.04 - cuda: "11.4.0" - python: "3.9" + - visual_studio: ["Visual Studio 16 2019"] + + # # `include` will only run specific combinations (not permutations of these) + # include: + # - os: windows-2019 + # cuda: "11.3.0" + # visual_studio: "Visual Studio 16 2019" + # python: "3.9" + # - os: windows-2019 + # cuda: "11.4.0" + # visual_studio: "Visual Studio 16 2019" + # python: "3.9" + # - os: ubuntu-20.04 + # cuda: "11.3.0" + # python: "3.9" + # - os: ubuntu-20.04 + # cuda: "11.4.0" + # python: "3.9" env: build_dir: "build" From 28b968581a372ff1dcd24c76d41c8c7dd1b27bb6 Mon Sep 17 00:00:00 2001 From: Jim Kring Date: Sat, 15 Oct 2022 13:36:14 -0700 Subject: [PATCH 05/15] exclude visual_studio should be a scalar --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bbf4fafc..f03e22f1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,7 @@ jobs: python: ["3.9"] exclude: - os: ubuntu-20.04 - - visual_studio: ["Visual Studio 16 2019"] + - visual_studio: "Visual Studio 16 2019" # # `include` will only run specific combinations (not permutations of these) # include: From ef41c7e847db8d1356bf562fc5305d49283ea685 Mon Sep 17 00:00:00 2001 From: Jim Kring Date: Sat, 15 Oct 2022 13:37:29 -0700 Subject: [PATCH 06/15] don't exclude --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f03e22f1..f09074ac 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,9 +14,9 @@ jobs: cuda: ["11.3.0", "11.4.0"] visual_studio: ["Visual Studio 16 2019"] python: ["3.9"] - exclude: - - os: ubuntu-20.04 - - visual_studio: "Visual Studio 16 2019" + # exclude: + # - os: ubuntu-20.04 + # - visual_studio: "Visual Studio 16 2019" # # `include` will only run specific combinations (not permutations of these) # include: From e2a337f6e5b7a5895f4e72da92810b08845402cd Mon Sep 17 00:00:00 2001 From: Jim Kring Date: Sat, 15 Oct 2022 13:44:56 -0700 Subject: [PATCH 07/15] try 11.3.1 --- .github/workflows/ci.yml | 40 ++++++++++++++++------------------------ 1 file changed, 16 insertions(+), 24 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f09074ac..ac3a6061 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,30 +10,22 @@ jobs: strategy: fail-fast: false matrix: - os: [windows-2019, ubuntu-20.04] - cuda: ["11.3.0", "11.4.0"] - visual_studio: ["Visual Studio 16 2019"] - python: ["3.9"] - # exclude: - # - os: ubuntu-20.04 - # - visual_studio: "Visual Studio 16 2019" - - # # `include` will only run specific combinations (not permutations of these) - # include: - # - os: windows-2019 - # cuda: "11.3.0" - # visual_studio: "Visual Studio 16 2019" - # python: "3.9" - # - os: windows-2019 - # cuda: "11.4.0" - # visual_studio: "Visual Studio 16 2019" - # python: "3.9" - # - os: ubuntu-20.04 - # cuda: "11.3.0" - # python: "3.9" - # - os: ubuntu-20.04 - # cuda: "11.4.0" - # python: "3.9" + # `include` will only run specific combinations (not permutations of these) + include: + - os: windows-2019 + cuda: "11.3.1" + visual_studio: "Visual Studio 16 2019" + python: "3.9" + - os: windows-2019 + cuda: "11.4.0" + visual_studio: "Visual Studio 16 2019" + python: "3.9" + - os: ubuntu-20.04 + cuda: "11.3.1" + python: "3.9" + - os: ubuntu-20.04 + cuda: "11.4.0" + python: "3.9" env: build_dir: "build" From ddacd6070295fa67905448cb5cc464442ceb7eb0 Mon Sep 17 00:00:00 2001 From: Jim Kring Date: Sat, 15 Oct 2022 13:51:30 -0700 Subject: [PATCH 08/15] Set job name with matrix values --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ac3a6061..435ac0b2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,6 +6,7 @@ on: jobs: build: + name: ${{ matrix.os }}, cuda ${{ matrix.cuda }}, ${{ matrix.python }}, ${{ matrix.visual_studio }} runs-on: ${{ matrix.os }} strategy: fail-fast: false From a201c00fae69799a90ae184012426335119908e6 Mon Sep 17 00:00:00 2001 From: Jim Kring Date: Sat, 15 Oct 2022 13:52:39 -0700 Subject: [PATCH 09/15] added python name to job name --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 435ac0b2..f0adec2f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,7 +6,7 @@ on: jobs: build: - name: ${{ matrix.os }}, cuda ${{ matrix.cuda }}, ${{ matrix.python }}, ${{ matrix.visual_studio }} + name: ${{ matrix.os }}, cuda ${{ matrix.cuda }}, python ${{ matrix.python }}, ${{ matrix.visual_studio }} runs-on: ${{ matrix.os }} strategy: fail-fast: false From 35a8ea600143a8376b55aa34df4e43dc0df6d37c Mon Sep 17 00:00:00 2001 From: Jim Kring Date: Sat, 15 Oct 2022 14:27:52 -0700 Subject: [PATCH 10/15] pin jimkring/action-install-cuda-toolkit@v0 --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f0adec2f..ac7a1e68 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -56,7 +56,7 @@ jobs: - name: Install CUDA (Windows) # uses: Jimver/cuda-toolkit@v0.2.8 # jimkring's branch adds support for more cuda versions - uses: jimkring/action-install-cuda-toolkit@master + uses: jimkring/action-install-cuda-toolkit@v0 if: runner.os == 'Windows' with: sub-packages: '["nvcc", "visual_studio_integration", "cublas", "curand", "nvrtc", "cudart"]' @@ -67,7 +67,7 @@ jobs: - name: Install CUDA (Linux) # uses: Jimver/cuda-toolkit@v0.2.8 # jimkring's branch adds support for more cuda versions - uses: jimkring/action-install-cuda-toolkit@master + uses: jimkring/action-install-cuda-toolkit@v0 if: runner.os == 'Linux' with: sub-packages: '["nvcc", "nvrtc", "cudart"]' From c89c4242dd4e54c4a5dfd4d627810f9d87e8dc68 Mon Sep 17 00:00:00 2001 From: Jim Kring Date: Mon, 17 Oct 2022 14:38:33 -0700 Subject: [PATCH 11/15] try setting CMAKE_CXX_STANDARD --- .github/workflows/ci.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ac7a1e68..55e71118 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,16 +17,20 @@ jobs: cuda: "11.3.1" visual_studio: "Visual Studio 16 2019" python: "3.9" + cmake_cxx_standard: "17" - os: windows-2019 cuda: "11.4.0" visual_studio: "Visual Studio 16 2019" python: "3.9" + cmake_cxx_standard: "14" - os: ubuntu-20.04 cuda: "11.3.1" python: "3.9" + cmake_cxx_standard: "14" - os: ubuntu-20.04 cuda: "11.4.0" python: "3.9" + cmake_cxx_standard: "14" env: build_dir: "build" @@ -93,9 +97,9 @@ jobs: run: | if [ "${{ runner.os }}" -eq "Windows" ] then - cmake . -B "${{ env.build_dir }}" -G "${{ matrix.visual_studio }}" -A x64 + cmake . -B "${{ env.build_dir }}" -G "${{ matrix.visual_studio }}" -A x64 -DCMAKE_CXX_STANDARD=${{ os.cmake_cxx_standard }} else - cmake . -B "${{ env.build_dir }}" -DCMAKE_BUILD_TYPE=RELEASE + cmake . -B "${{ env.build_dir }}" -DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_CXX_STANDARD=${{ os.cmake_cxx_standard }} fi - name: Configure Error Processing From 89e5fe82a7726175a4db3786210179b8a4cae881 Mon Sep 17 00:00:00 2001 From: Jim Kring Date: Mon, 17 Oct 2022 14:39:26 -0700 Subject: [PATCH 12/15] typo --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 55e71118..7f0e850b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -97,9 +97,9 @@ jobs: run: | if [ "${{ runner.os }}" -eq "Windows" ] then - cmake . -B "${{ env.build_dir }}" -G "${{ matrix.visual_studio }}" -A x64 -DCMAKE_CXX_STANDARD=${{ os.cmake_cxx_standard }} + cmake . -B "${{ env.build_dir }}" -G "${{ matrix.visual_studio }}" -A x64 -DCMAKE_CXX_STANDARD=${{ matrix.cmake_cxx_standard }} else - cmake . -B "${{ env.build_dir }}" -DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_CXX_STANDARD=${{ os.cmake_cxx_standard }} + cmake . -B "${{ env.build_dir }}" -DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_CXX_STANDARD=${{ matrix.cmake_cxx_standard }} fi - name: Configure Error Processing From 5a6f153ca905071a8d6e8267fd63aa74af0e58b3 Mon Sep 17 00:00:00 2001 From: Jim Kring Date: Mon, 17 Oct 2022 14:40:32 -0700 Subject: [PATCH 13/15] added C++ standard to job name --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7f0e850b..254800e2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,7 +6,7 @@ on: jobs: build: - name: ${{ matrix.os }}, cuda ${{ matrix.cuda }}, python ${{ matrix.python }}, ${{ matrix.visual_studio }} + name: ${{ matrix.os }}, cuda ${{ matrix.cuda }}, python ${{ matrix.python }}, C++${{ matrix.cmake_cxx_standard }}, ${{ matrix.visual_studio }} runs-on: ${{ matrix.os }} strategy: fail-fast: false From 2f2693125977c6f6747848bdedda652a72963b84 Mon Sep 17 00:00:00 2001 From: Jim Kring Date: Mon, 17 Oct 2022 14:44:20 -0700 Subject: [PATCH 14/15] Update ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 254800e2..3214a512 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,7 +26,7 @@ jobs: - os: ubuntu-20.04 cuda: "11.3.1" python: "3.9" - cmake_cxx_standard: "14" + cmake_cxx_standard: "17" - os: ubuntu-20.04 cuda: "11.4.0" python: "3.9" From 9a6e57484df3dfbe4b132c145866d63d91d02a62 Mon Sep 17 00:00:00 2001 From: Jim Kring Date: Mon, 17 Oct 2022 14:48:59 -0700 Subject: [PATCH 15/15] removed attempt to set C++ standard --- .github/workflows/ci.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3214a512..540f1ef5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,20 +17,16 @@ jobs: cuda: "11.3.1" visual_studio: "Visual Studio 16 2019" python: "3.9" - cmake_cxx_standard: "17" - os: windows-2019 cuda: "11.4.0" visual_studio: "Visual Studio 16 2019" python: "3.9" - cmake_cxx_standard: "14" - os: ubuntu-20.04 cuda: "11.3.1" python: "3.9" - cmake_cxx_standard: "17" - os: ubuntu-20.04 cuda: "11.4.0" python: "3.9" - cmake_cxx_standard: "14" env: build_dir: "build" @@ -97,9 +93,9 @@ jobs: run: | if [ "${{ runner.os }}" -eq "Windows" ] then - cmake . -B "${{ env.build_dir }}" -G "${{ matrix.visual_studio }}" -A x64 -DCMAKE_CXX_STANDARD=${{ matrix.cmake_cxx_standard }} + cmake . -B "${{ env.build_dir }}" -G "${{ matrix.visual_studio }}" -A x64 else - cmake . -B "${{ env.build_dir }}" -DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_CXX_STANDARD=${{ matrix.cmake_cxx_standard }} + cmake . -B "${{ env.build_dir }}" -DCMAKE_BUILD_TYPE=RELEASE fi - name: Configure Error Processing