From b2365dd68dc001e2649f3cfda4fa60f818a7c24b Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Thu, 18 Nov 2021 14:23:03 +0200 Subject: [PATCH 1/7] Add cuda-linux, cuda-windows jobs to ci.yml --- .github/workflows/ci.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5083262..8c1dbab 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -443,3 +443,25 @@ jobs: run: | cd __build__ ctest --output-on-failure --no-tests=error + + cuda-linux: + + runs-on: ubuntu-20.04 + + steps: + - uses: actions/checkout@v2 + - uses: Jimver/cuda-toolkit@v0.2.4 + + - run: | + nvcc -x cu -I ./include -c test/mp11.cpp + + cuda-windows: + + runs-on: windows-2019 + + steps: + - uses: actions/checkout@v2 + - uses: Jimver/cuda-toolkit@v0.2.4 + + - run: | + nvcc -x cu -I ./include -c test/mp11.cpp From 754af9537950df008325ffbe9e22deddadada3ca Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Thu, 18 Nov 2021 15:18:37 +0200 Subject: [PATCH 2/7] Update ci.yml --- .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 8c1dbab..ad760ed 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -451,9 +451,12 @@ jobs: steps: - uses: actions/checkout@v2 - uses: Jimver/cuda-toolkit@v0.2.4 - - run: | nvcc -x cu -I ./include -c test/mp11.cpp + nvcc -x cu -I ./include -c test/mp_all.cpp + nvcc -x cu -I ./include -c test/mp_any.cpp + nvcc -x cu -I ./include -c test/mp_count.cpp + nvcc -x cu -I ./include -c test/mp_count_if.cpp cuda-windows: @@ -462,6 +465,10 @@ jobs: steps: - uses: actions/checkout@v2 - uses: Jimver/cuda-toolkit@v0.2.4 - + - uses: ilammy/msvc-dev-cmd@v1 - run: | nvcc -x cu -I ./include -c test/mp11.cpp + nvcc -x cu -I ./include -c test/mp_all.cpp + nvcc -x cu -I ./include -c test/mp_any.cpp + nvcc -x cu -I ./include -c test/mp_count.cpp + nvcc -x cu -I ./include -c test/mp_count_if.cpp From 6781db002b740e8fe50babe262770b012b8bd310 Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Thu, 18 Nov 2021 15:29:25 +0200 Subject: [PATCH 3/7] Update ci.yml --- .github/workflows/ci.yml | 44 ++++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ad760ed..994e64a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -444,31 +444,31 @@ jobs: cd __build__ ctest --output-on-failure --no-tests=error - cuda-linux: + cuda: + strategy: + fail-fast: false + matrix: + include: + - os: ubuntu-20.04 + - os: windows-2019 - runs-on: ubuntu-20.04 - - steps: - - uses: actions/checkout@v2 - - uses: Jimver/cuda-toolkit@v0.2.4 - - run: | - nvcc -x cu -I ./include -c test/mp11.cpp - nvcc -x cu -I ./include -c test/mp_all.cpp - nvcc -x cu -I ./include -c test/mp_any.cpp - nvcc -x cu -I ./include -c test/mp_count.cpp - nvcc -x cu -I ./include -c test/mp_count_if.cpp - - cuda-windows: - - runs-on: windows-2019 + runs-on: ${{matrix.os}} steps: - uses: actions/checkout@v2 - uses: Jimver/cuda-toolkit@v0.2.4 - uses: ilammy/msvc-dev-cmd@v1 - - run: | - nvcc -x cu -I ./include -c test/mp11.cpp - nvcc -x cu -I ./include -c test/mp_all.cpp - nvcc -x cu -I ./include -c test/mp_any.cpp - nvcc -x cu -I ./include -c test/mp_count.cpp - nvcc -x cu -I ./include -c test/mp_count_if.cpp + + - name: Setup Boost + run: | + git checkout https://github.com/boostorg/assert ../assert + git checkout https://github.com/boostorg/config ../config + git checkout https://github.com/boostorg/core ../core + + - name: Run Tests + run: | + nvcc -x cu -I ./include -I ../assert/include -I ../config/include -I ../core/include -c test/mp11.cpp + nvcc -x cu -I ./include -I ../assert/include -I ../config/include -I ../core/include -c test/mp_all.cpp + nvcc -x cu -I ./include -I ../assert/include -I ../config/include -I ../core/include -c test/mp_any.cpp + nvcc -x cu -I ./include -I ../assert/include -I ../config/include -I ../core/include -c test/mp_count.cpp + nvcc -x cu -I ./include -I ../assert/include -I ../config/include -I ../core/include -c test/mp_count_if.cpp From 8bece6d0a6638221b71e5f301f26b3c54a3a294a Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Thu, 18 Nov 2021 15:45:33 +0200 Subject: [PATCH 4/7] Update ci.yml --- .github/workflows/ci.yml | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 994e64a..cd80779 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -461,9 +461,17 @@ jobs: - name: Setup Boost run: | - git checkout https://github.com/boostorg/assert ../assert - git checkout https://github.com/boostorg/config ../config - git checkout https://github.com/boostorg/core ../core + echo GITHUB_BASE_REF: $GITHUB_BASE_REF + echo GITHUB_REF: $GITHUB_REF + REF=${GITHUB_BASE_REF:-$GITHUB_REF} + REF=${REF#refs/heads/} + echo REF: $REF + BOOST_BRANCH=develop && [ "$REF" == "master" ] && BOOST_BRANCH=master || true + echo BOOST_BRANCH: $BOOST_BRANCH + cd .. + git clone -b $BOOST_BRANCH --depth 1 https://github.com/boostorg/assert + git clone -b $BOOST_BRANCH --depth 1 https://github.com/boostorg/config + git clone -b $BOOST_BRANCH --depth 1 https://github.com/boostorg/core - name: Run Tests run: | From a01908774ac130842648048be2a11d4aea3e077b Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Thu, 18 Nov 2021 15:56:27 +0200 Subject: [PATCH 5/7] Update ci.yml --- .github/workflows/ci.yml | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cd80779..e031e29 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -461,17 +461,10 @@ jobs: - name: Setup Boost run: | - echo GITHUB_BASE_REF: $GITHUB_BASE_REF - echo GITHUB_REF: $GITHUB_REF - REF=${GITHUB_BASE_REF:-$GITHUB_REF} - REF=${REF#refs/heads/} - echo REF: $REF - BOOST_BRANCH=develop && [ "$REF" == "master" ] && BOOST_BRANCH=master || true - echo BOOST_BRANCH: $BOOST_BRANCH cd .. - git clone -b $BOOST_BRANCH --depth 1 https://github.com/boostorg/assert - git clone -b $BOOST_BRANCH --depth 1 https://github.com/boostorg/config - git clone -b $BOOST_BRANCH --depth 1 https://github.com/boostorg/core + git clone --depth 1 https://github.com/boostorg/assert + git clone --depth 1 https://github.com/boostorg/config + git clone --depth 1 https://github.com/boostorg/core - name: Run Tests run: | From de09706e795887e6ceafe5bd23747b1eb1f972c8 Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Thu, 18 Nov 2021 18:03:53 +0200 Subject: [PATCH 6/7] Update ci.yml --- .github/workflows/ci.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e031e29..0b06524 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -469,7 +469,12 @@ jobs: - name: Run Tests run: | nvcc -x cu -I ./include -I ../assert/include -I ../config/include -I ../core/include -c test/mp11.cpp + nvcc -x cu -I ./include -I ../assert/include -I ../config/include -I ../core/include -std=c++17 -c test/mp11.cpp nvcc -x cu -I ./include -I ../assert/include -I ../config/include -I ../core/include -c test/mp_all.cpp + nvcc -x cu -I ./include -I ../assert/include -I ../config/include -I ../core/include -std=c++17 -c test/mp_all.cpp nvcc -x cu -I ./include -I ../assert/include -I ../config/include -I ../core/include -c test/mp_any.cpp + nvcc -x cu -I ./include -I ../assert/include -I ../config/include -I ../core/include -std=c++17 -c test/mp_any.cpp nvcc -x cu -I ./include -I ../assert/include -I ../config/include -I ../core/include -c test/mp_count.cpp + nvcc -x cu -I ./include -I ../assert/include -I ../config/include -I ../core/include -std=c++17 -c test/mp_count.cpp nvcc -x cu -I ./include -I ../assert/include -I ../config/include -I ../core/include -c test/mp_count_if.cpp + nvcc -x cu -I ./include -I ../assert/include -I ../config/include -I ../core/include -std=c++17 -c test/mp_count_if.cpp From 86121bb76be25230fc5beacaa8ca487df113cd69 Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Thu, 18 Nov 2021 18:23:03 +0200 Subject: [PATCH 7/7] Update ci.yml --- .github/workflows/ci.yml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0b06524..59b044d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -468,13 +468,18 @@ jobs: - name: Run Tests run: | - nvcc -x cu -I ./include -I ../assert/include -I ../config/include -I ../core/include -c test/mp11.cpp + nvcc -x cu -I ./include -I ../assert/include -I ../config/include -I ../core/include -std=c++11 -c test/mp11.cpp + nvcc -x cu -I ./include -I ../assert/include -I ../config/include -I ../core/include -std=c++14 -c test/mp11.cpp nvcc -x cu -I ./include -I ../assert/include -I ../config/include -I ../core/include -std=c++17 -c test/mp11.cpp - nvcc -x cu -I ./include -I ../assert/include -I ../config/include -I ../core/include -c test/mp_all.cpp + nvcc -x cu -I ./include -I ../assert/include -I ../config/include -I ../core/include -std=c++11 -c test/mp_all.cpp + nvcc -x cu -I ./include -I ../assert/include -I ../config/include -I ../core/include -std=c++14 -c test/mp_all.cpp nvcc -x cu -I ./include -I ../assert/include -I ../config/include -I ../core/include -std=c++17 -c test/mp_all.cpp - nvcc -x cu -I ./include -I ../assert/include -I ../config/include -I ../core/include -c test/mp_any.cpp + nvcc -x cu -I ./include -I ../assert/include -I ../config/include -I ../core/include -std=c++11 -c test/mp_any.cpp + nvcc -x cu -I ./include -I ../assert/include -I ../config/include -I ../core/include -std=c++14 -c test/mp_any.cpp nvcc -x cu -I ./include -I ../assert/include -I ../config/include -I ../core/include -std=c++17 -c test/mp_any.cpp - nvcc -x cu -I ./include -I ../assert/include -I ../config/include -I ../core/include -c test/mp_count.cpp + nvcc -x cu -I ./include -I ../assert/include -I ../config/include -I ../core/include -std=c++11 -c test/mp_count.cpp + nvcc -x cu -I ./include -I ../assert/include -I ../config/include -I ../core/include -std=c++14 -c test/mp_count.cpp nvcc -x cu -I ./include -I ../assert/include -I ../config/include -I ../core/include -std=c++17 -c test/mp_count.cpp - nvcc -x cu -I ./include -I ../assert/include -I ../config/include -I ../core/include -c test/mp_count_if.cpp + nvcc -x cu -I ./include -I ../assert/include -I ../config/include -I ../core/include -std=c++11 -c test/mp_count_if.cpp + nvcc -x cu -I ./include -I ../assert/include -I ../config/include -I ../core/include -std=c++14 -c test/mp_count_if.cpp nvcc -x cu -I ./include -I ../assert/include -I ../config/include -I ../core/include -std=c++17 -c test/mp_count_if.cpp