From 4f1f106b4a3afdeced3cd74b146e054a60f468b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David--Cl=C3=A9ris=20Timoth=C3=A9e?= Date: Tue, 1 Oct 2024 07:06:42 +0000 Subject: [PATCH 01/18] enable ci --- .github/workflows/linux.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 584d86e..a5e33c5 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -13,9 +13,6 @@ env: jobs: testing: - # This thing is not yet functionnal - if: false - name: linux ${{ matrix.os }}, CUDA ${{matrix.cuda}} runs-on: ${{ matrix.os }} strategy: From ebd0c64a37fde5688e41b11cebf05c3fa9ede906 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David--Cl=C3=A9ris=20Timoth=C3=A9e?= Date: Tue, 1 Oct 2024 07:11:42 +0000 Subject: [PATCH 02/18] remove silent for cuda install, try fix --- .github/workflows/linux.yml | 3 +-- CMakeLists.txt | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index a5e33c5..2fb8dea 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -27,12 +27,11 @@ jobs: run: | mkdir -p /opt/AdaptiveCpp/cuda wget -q -O cuda.sh http://developer.download.nvidia.com/compute/cuda/11.0.2/local_installers/cuda_11.0.2_450.51.05_linux.run - sudo sh ./cuda.sh --override --silent --toolkit --no-man-page --no-drm --no-opengl-libs --installpath=/opt/cuda || true + sudo sh ./cuda.sh --override --toolkit --no-man-page --no-drm --no-opengl-libs --installpath=/opt/cuda || true echo "CUDA Version ${{matrix.cuda}}" | sudo tee /opt/cuda/version.txt - name: Configure CMake run: | - export CUDACXX=/opt/cuda/bin/nvcc cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_CUDA_ARCHITECTURES=all-major - name: Build diff --git a/CMakeLists.txt b/CMakeLists.txt index 73ced5d..9f591c9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,6 @@ cmake_minimum_required(VERSION 3.10) project(cuintercept CXX CUDA) - if (NOT DEFINED ENV{CUDA_HOME}) set(CUDA_HOME /opt/cuda) else() From dedf6ec3a6e45d2b4538b3f5745bc472ba8b45a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David--Cl=C3=A9ris=20Timoth=C3=A9e?= Date: Tue, 1 Oct 2024 07:13:58 +0000 Subject: [PATCH 03/18] remove silent for cuda install, try fix --- .github/workflows/linux.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 2fb8dea..bfe41dc 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -26,8 +26,8 @@ jobs: - name: install CUDA run: | mkdir -p /opt/AdaptiveCpp/cuda - wget -q -O cuda.sh http://developer.download.nvidia.com/compute/cuda/11.0.2/local_installers/cuda_11.0.2_450.51.05_linux.run - sudo sh ./cuda.sh --override --toolkit --no-man-page --no-drm --no-opengl-libs --installpath=/opt/cuda || true + wget -O cuda.sh http://developer.download.nvidia.com/compute/cuda/11.0.2/local_installers/cuda_11.0.2_450.51.05_linux.run + sudo sh ./cuda.sh --override --silent --toolkit --no-man-page --no-drm --no-opengl-libs --installpath=/opt/cuda || true echo "CUDA Version ${{matrix.cuda}}" | sudo tee /opt/cuda/version.txt - name: Configure CMake From ed4a98abf72875809ec00c64495f3b375819469b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David--Cl=C3=A9ris=20Timoth=C3=A9e?= Date: Tue, 1 Oct 2024 07:16:35 +0000 Subject: [PATCH 04/18] remove silent for cuda install, try fix --- .github/workflows/linux.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index bfe41dc..5fd8d38 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -25,8 +25,7 @@ jobs: - name: install CUDA run: | - mkdir -p /opt/AdaptiveCpp/cuda - wget -O cuda.sh http://developer.download.nvidia.com/compute/cuda/11.0.2/local_installers/cuda_11.0.2_450.51.05_linux.run + wget --progress=bar:force -O cuda.sh http://developer.download.nvidia.com/compute/cuda/11.0.2/local_installers/cuda_11.0.2_450.51.05_linux.run sudo sh ./cuda.sh --override --silent --toolkit --no-man-page --no-drm --no-opengl-libs --installpath=/opt/cuda || true echo "CUDA Version ${{matrix.cuda}}" | sudo tee /opt/cuda/version.txt From 8e016c43f1cd3334c46beead27a39da02fe76ffa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David--Cl=C3=A9ris=20Timoth=C3=A9e?= Date: Tue, 1 Oct 2024 07:21:32 +0000 Subject: [PATCH 05/18] use action to install cuda --- .github/workflows/linux.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 5fd8d38..eb3d8e6 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -23,12 +23,11 @@ jobs: steps: - uses: actions/checkout@v4 - - name: install CUDA - run: | - wget --progress=bar:force -O cuda.sh http://developer.download.nvidia.com/compute/cuda/11.0.2/local_installers/cuda_11.0.2_450.51.05_linux.run - sudo sh ./cuda.sh --override --silent --toolkit --no-man-page --no-drm --no-opengl-libs --installpath=/opt/cuda || true - echo "CUDA Version ${{matrix.cuda}}" | sudo tee /opt/cuda/version.txt - + - uses: Jimver/cuda-toolkit@v0.2.17 + id: cuda-toolkit + with: + cuda: '12.5.0' + - name: Configure CMake run: | cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_CUDA_ARCHITECTURES=all-major From f965232415d6747f142e5fc057c715d9c0b89cf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David--Cl=C3=A9ris=20Timoth=C3=A9e?= Date: Tue, 1 Oct 2024 07:32:56 +0000 Subject: [PATCH 06/18] change action behavior --- .github/workflows/linux.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index eb3d8e6..1858663 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -18,7 +18,7 @@ jobs: strategy: matrix: os: [ubuntu-22.04] - cuda: [11.0.2] + cuda: [12.5.0,11.0.2] steps: - uses: actions/checkout@v4 @@ -26,7 +26,9 @@ jobs: - uses: Jimver/cuda-toolkit@v0.2.17 id: cuda-toolkit with: - cuda: '12.5.0' + method: 'network' + linux-local-args: '["--toolkit"]' + cuda: ${{matrix.cuda}} - name: Configure CMake run: | From 9e62e5f1eecf76662c11333401c499f802188df9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David--Cl=C3=A9ris=20Timoth=C3=A9e?= Date: Tue, 1 Oct 2024 07:51:18 +0000 Subject: [PATCH 07/18] use cuda container --- .github/workflows/linux.yml | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 1858663..77ad88a 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -13,22 +13,18 @@ env: jobs: testing: - name: linux ${{ matrix.os }}, CUDA ${{matrix.cuda}} - runs-on: ${{ matrix.os }} + name: Container ${{ matrix.container }} + runs-on: ubuntu-latest + + container: + image: ${{ matrix.container }} + strategy: matrix: - os: [ubuntu-22.04] - cuda: [12.5.0,11.0.2] + container: [nvidia/cuda:12.6.1-devel-ubuntu22.04] steps: - uses: actions/checkout@v4 - - - uses: Jimver/cuda-toolkit@v0.2.17 - id: cuda-toolkit - with: - method: 'network' - linux-local-args: '["--toolkit"]' - cuda: ${{matrix.cuda}} - name: Configure CMake run: | From 2439691f91d29aa6d4ad93eedeeb99b9bcad9a6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David--Cl=C3=A9ris=20Timoth=C3=A9e?= Date: Tue, 1 Oct 2024 07:52:43 +0000 Subject: [PATCH 08/18] use cuda container --- .github/workflows/linux.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 77ad88a..060b1a7 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -21,7 +21,7 @@ jobs: strategy: matrix: - container: [nvidia/cuda:12.6.1-devel-ubuntu22.04] + container: ["nvidia/cuda:12.6.1-devel-ubuntu22.04"] steps: - uses: actions/checkout@v4 From f655fc50dbf27228572e930f0a4691530339fb9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David--Cl=C3=A9ris=20Timoth=C3=A9e?= Date: Tue, 1 Oct 2024 07:55:17 +0000 Subject: [PATCH 09/18] use cuda container --- .github/workflows/linux.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 060b1a7..2327d38 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -21,7 +21,12 @@ jobs: strategy: matrix: - container: ["nvidia/cuda:12.6.1-devel-ubuntu22.04"] + container: [ + "nvidia/cuda:12.6.1-devel-ubuntu20.04", + "nvidia/cuda:12.6.1-devel-ubuntu22.04", + "nvidia/cuda:12.6.1-devel-ubuntu24.04", + "nvidia/cuda:11.2.2-devel-ubuntu22.04", + ] steps: - uses: actions/checkout@v4 From c89719da42e63415bd7aeb96ec6de18708d84199 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David--Cl=C3=A9ris=20Timoth=C3=A9e?= Date: Tue, 1 Oct 2024 07:55:53 +0000 Subject: [PATCH 10/18] use cuda container --- .github/workflows/linux.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 2327d38..f992b1e 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -31,6 +31,9 @@ jobs: steps: - uses: actions/checkout@v4 + - name: Install cmake + run: sudo apt install cmake + - name: Configure CMake run: | cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_CUDA_ARCHITECTURES=all-major From c98f5ebbfda2448524bcbb41027f22e6dcd14c12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David--Cl=C3=A9ris=20Timoth=C3=A9e?= Date: Tue, 1 Oct 2024 07:56:45 +0000 Subject: [PATCH 11/18] use cuda container --- .github/workflows/linux.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index f992b1e..feb407f 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -25,7 +25,7 @@ jobs: "nvidia/cuda:12.6.1-devel-ubuntu20.04", "nvidia/cuda:12.6.1-devel-ubuntu22.04", "nvidia/cuda:12.6.1-devel-ubuntu24.04", - "nvidia/cuda:11.2.2-devel-ubuntu22.04", + #"nvidia/cuda:11.2.2-devel-ubuntu20.04", ] steps: @@ -33,7 +33,7 @@ jobs: - name: Install cmake run: sudo apt install cmake - + - name: Configure CMake run: | cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_CUDA_ARCHITECTURES=all-major From 26011fa5d4a612d45021fb0755d45114c2f51b9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David--Cl=C3=A9ris=20Timoth=C3=A9e?= Date: Tue, 1 Oct 2024 07:58:16 +0000 Subject: [PATCH 12/18] use cuda container --- .github/workflows/linux.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index feb407f..9eece23 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -32,7 +32,7 @@ jobs: - uses: actions/checkout@v4 - name: Install cmake - run: sudo apt install cmake + run: apt install cmake - name: Configure CMake run: | From f43da2f77574e951281af1fce9bdee08e9966002 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David--Cl=C3=A9ris=20Timoth=C3=A9e?= Date: Tue, 1 Oct 2024 08:00:13 +0000 Subject: [PATCH 13/18] use cuda container --- .github/workflows/linux.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 9eece23..c41a335 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -32,7 +32,7 @@ jobs: - uses: actions/checkout@v4 - name: Install cmake - run: apt install cmake + run: apt update && apt install cmake - name: Configure CMake run: | From fc62e275ee2e9d5f1046951a8d4425e02a41caf9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David--Cl=C3=A9ris=20Timoth=C3=A9e?= Date: Tue, 1 Oct 2024 08:02:01 +0000 Subject: [PATCH 14/18] use cuda container --- .github/workflows/linux.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index c41a335..bf93893 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -32,7 +32,7 @@ jobs: - uses: actions/checkout@v4 - name: Install cmake - run: apt update && apt install cmake + run: apt update && apt -y install cmake - name: Configure CMake run: | From e815f7943c0cb5fb84498f3cc7e345e98f4dbb4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David--Cl=C3=A9ris=20Timoth=C3=A9e?= Date: Tue, 1 Oct 2024 08:04:41 +0000 Subject: [PATCH 15/18] use cuda container --- .github/workflows/linux.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index bf93893..50d72c9 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -36,7 +36,7 @@ jobs: - name: Configure CMake run: | - cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_CUDA_ARCHITECTURES=all-major + cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_CUDA_COMPILER=`which nvcc` -DCMAKE_CUDA_ARCHITECTURES=all-major - name: Build run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} From 37812dbb316d72edc9bc41a08a40e3d60ccc9762 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David--Cl=C3=A9ris=20Timoth=C3=A9e?= Date: Tue, 1 Oct 2024 08:09:11 +0000 Subject: [PATCH 16/18] use cuda container --- .github/workflows/linux.yml | 2 +- CMakeLists.txt | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 50d72c9..f2668cc 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -36,7 +36,7 @@ jobs: - name: Configure CMake run: | - cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_CUDA_COMPILER=`which nvcc` -DCMAKE_CUDA_ARCHITECTURES=all-major + cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} - name: Build run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} diff --git a/CMakeLists.txt b/CMakeLists.txt index 9f591c9..ad39367 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,6 +7,10 @@ else() set(CUDA_HOME $ENV{CUDA_HOME}) endif() +if(NOT DEFINED CMAKE_CUDA_ARCHITECTURES) + set(CMAKE_CUDA_ARCHITECTURES 70) +endif() + #enable export compile commands set(CMAKE_EXPORT_COMPILE_COMMANDS ON) From 4b0d05e05f4be143d2be651c64e27821789904ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David--Cl=C3=A9ris=20Timoth=C3=A9e?= Date: Tue, 1 Oct 2024 08:09:33 +0000 Subject: [PATCH 17/18] use cuda container --- CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ad39367..3a01c64 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,4 @@ cmake_minimum_required(VERSION 3.10) -project(cuintercept CXX CUDA) if (NOT DEFINED ENV{CUDA_HOME}) set(CUDA_HOME /opt/cuda) @@ -11,6 +10,8 @@ if(NOT DEFINED CMAKE_CUDA_ARCHITECTURES) set(CMAKE_CUDA_ARCHITECTURES 70) endif() +project(cuintercept CXX CUDA) + #enable export compile commands set(CMAKE_EXPORT_COMPILE_COMMANDS ON) From d8ad37fb622950839faec9e547beeaf9d12fbb89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David--Cl=C3=A9ris=20Timoth=C3=A9e?= Date: Tue, 1 Oct 2024 08:13:17 +0000 Subject: [PATCH 18/18] use cuda container --- CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3a01c64..c365799 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,7 +24,8 @@ add_library(cuintercept SHARED ) set(LIBRARY_COMPILE_FLAGS -shared -fPIC -g -rdynamic -D_GNU_SOURCE -Wall) -include_directories(${CUDA_HOME}/include) +#include_directories(${CUDA_HOME}/include) +include_directories(${CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES}) target_compile_options(cuintercept PUBLIC ${LIBRARY_COMPILE_FLAGS}) target_link_libraries(cuintercept PUBLIC -lcuda)