Skip to content

Commit b42005a

Browse files
authored
Merge pull request #9 from Continuous-Collision-Detection/cuda-12.8.1
Update for CUDA 12.8.1
2 parents de61cd1 + 8267900 commit b42005a

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

.github/workflows/continuous.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060

6161
- name: Cache Build
6262
id: cache-build
63-
uses: actions/cache@v4.0.2
63+
uses: actions/cache@v4
6464
with:
6565
path: ${{ env.CACHE_PATH }}
6666
key: ${{ runner.os }}-${{ matrix.config }}-cache
@@ -132,10 +132,10 @@ jobs:
132132
sudo apt-get install ccache
133133
echo 'CACHE_PATH=~/.cache/ccache' >> "$GITHUB_ENV"
134134
135-
- uses: Jimver/cuda-toolkit@v0.2.17
135+
- uses: Jimver/cuda-toolkit@v0.2.22
136136
id: cuda-toolkit
137137
with:
138-
cuda: '12.4.0'
138+
cuda: '12.8.1'
139139
sub-packages: '["nvcc"]'
140140
method: 'network'
141141

@@ -145,7 +145,7 @@ jobs:
145145

146146
- name: Cache Build
147147
id: cache-build
148-
uses: actions/cache@v4.0.2
148+
uses: actions/cache@v4
149149
with:
150150
path: ${{ env.CACHE_PATH }}
151151
key: ${{ runner.os }}-${{ matrix.config }}-CUDA-cache

CMakeLists.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ if(SCALABLE_CCD_WITH_CUDA)
169169
# library to be built with -dc as the member functions could be called by
170170
# other libraries and executables.
171171
set_target_properties(scalable_ccd PROPERTIES CUDA_SEPARABLE_COMPILATION ON)
172-
172+
173173
if(DEFINED SCALABLE_CCD_CUDA_ARCHITECTURES)
174174
message(STATUS "CUDA_ARCHITECTURES was specified, skipping auto-detection")
175175
set(CMAKE_CUDA_ARCHITECTURES ${SCALABLE_CCD_CUDA_ARCHITECTURES})
@@ -195,11 +195,12 @@ if(SCALABLE_CCD_WITH_CUDA)
195195
BUILD_RPATH ${CMAKE_CUDA_IMPLICIT_LINK_DIRECTORIES})
196196
endif()
197197

198-
target_compile_options(scalable_ccd PRIVATE
198+
target_compile_options(scalable_ccd PRIVATE
199199
$<$<COMPILE_LANGUAGE:CUDA>:
200200
--generate-line-info
201201
--use_fast_math
202202
--relocatable-device-code=true
203+
--expt-relaxed-constexpr
203204
>
204205
)
205206

0 commit comments

Comments
 (0)