github/concrete
1
1
Fork 0
mirror of https://github.com/zama-ai/concrete.git synced 2026-04-17 03:00:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix(backend): fix ci after 08e8012

Browse Source 
Google benchmark is built twice due to the new bench infrastructure for
concrete-cuda, this commit fixes it by introducing
CONCRETE_CUDA_BUILD_TESTS and CONCRETE_CUDA_BUILD_BENCHMARKS options to skip
unecessary builds.
This commit is contained in:
Pedro Alves
2023-03-28 17:50:40 -03:00
committed by Agnès Leroy
parent b6f1eb3d2f
commit dab31433d9
5 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/concrete_cuda_test.yml vendored
View File

@@ -42,7 +42,7 @@ jobs:
with:
mode: start
github-token: ${{ secrets.CONCRETE_ACTIONS_TOKEN }}
ec2-image-id: ami-03f11dc8c6a5f5c0a
ec2-image-id: ami-08e27480d79e82238
ec2-instance-type: p3.2xlarge
subnet-id: subnet-8123c9e7
security-group-id: sg-0466d33ced960ba35

13
backends/concrete-cuda/implementation/test_and_benchmark/CMakeLists.txt
View File

@@ -1,2 +1,11 @@
add_subdirectory(test)
add_subdirectory(benchmark)
option(CONCRETE_CUDA_BUILD_TESTS "Build the test tool" ON)
option(CONCRETE_CUDA_BUILD_BENCHMARKS "Build the benchmark tool" ON)
if(CONCRETE_CUDA_BUILD_TESTS)
message(STATUS "Building with Concrete CUDA test tool")
add_subdirectory(test)
endif()
if(CONCRETE_CUDA_BUILD_BENCHMARKS)
message(STATUS "Building with Concrete CUDA benchmark tool")
add_subdirectory(benchmark)
endif()

1
backends/concrete-cuda/implementation/test_and_benchmark/benchmark/CMakeLists.txt
View File

@@ -1,4 +1,3 @@
cmake_minimum_required(VERSION 3.8 FATAL_ERROR)
find_package(CUDAToolkit)
if(NOT CMAKE_BUILD_TYPE)

1
backends/concrete-cuda/implementation/test_and_benchmark/test/CMakeLists.txt
View File

@@ -1,3 +1,4 @@
find_package(CUDAToolkit)
include(FetchContent)
FetchContent_Declare(googletest
URL https://github.com/google/googletest/archive/03597a01ee50ed33e9dfd640b249b4be3799d395.zip)

2
compilers/concrete-compiler/compiler/CMakeLists.txt
View File

@@ -141,6 +141,8 @@ if(CONCRETELANG_CUDA_SUPPORT)
message(STATUS "Found CUDA version: ${CUDAToolkit_VERSION}")
message(STATUS "Found CUDA library dir: ${CUDAToolkit_LIBRARY_DIR}")
link_directories(${CUDAToolkit_LIBRARY_DIR})
set(CONCRETE_CUDA_BUILD_TESTS OFF)
set(CONCRETE_CUDA_BUILD_BENCHMARKS OFF)
add_subdirectory(${CONCRETE_CUDA_DIR} concrete-cuda)
include_directories(${CONCRETE_CUDA_DIR}/include)
include_directories(${CUDAToolkit_INCLUDE_DIRS})