Skip to content

Commit 7441095

Browse files
rgsl888prabhurgsl888prabhu
authored
Remove cuda 11 specific changes from repo (#222)
This PR removes CUDA 11 pertaining changes since we have moved to CUDA 12 support only ## Issue closes #220 Authors: - Ramakrishnap (https://github.com/rgsl888prabhu) Approvers: - Kyle Edwards (https://github.com/KyleFromNVIDIA) - Trevor McKay (https://github.com/tmckayus) - Ishika Roy (https://github.com/Iroy30) - Nicolas Blin (https://github.com/Kh4ster) - Akif ÇÖRDÜK (https://github.com/akifcorduk) - Bradley Dice (https://github.com/bdice) URL: #222
1 parent 204c1d0 commit 7441095

File tree

9 files changed

+11
-56
lines changed

9 files changed

+11
-56
lines changed

‎.github/workflows/build.yaml‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ jobs:
4545
secrets: inherit
4646
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-25.08
4747
with:
48-
matrix_filter: map(select((.CUDA_VER | startswith("12"))))
4948
build_type: ${{ inputs.build_type || 'branch' }}
5049
branch: ${{ inputs.branch }}
5150
date: ${{ inputs.date }}
@@ -56,7 +55,6 @@ jobs:
5655
secrets: inherit
5756
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-25.08
5857
with:
59-
matrix_filter: map(select((.CUDA_VER | startswith("12")) and .PY_VER != "3.13"))
6058
build_type: ${{ inputs.build_type || 'branch' }}
6159
branch: ${{ inputs.branch }}
6260
date: ${{ inputs.date }}
@@ -80,7 +78,6 @@ jobs:
8078
sha: ${{ inputs.sha }}
8179
date: ${{ inputs.date }}
8280
script: ci/build_wheel_cuopt_mps_parser.sh
83-
matrix_filter: map(select((.CUDA_VER | startswith("12"))))
8481
package-name: cuopt_mps_parser
8582
package-type: python
8683
append-cuda-suffix: false
@@ -107,7 +104,7 @@ jobs:
107104
script: ci/build_wheel_libcuopt.sh
108105
package-name: libcuopt
109106
package-type: cpp
110-
matrix_filter: map(select((.CUDA_VER | startswith("12")) and .PY_VER == "3.12"))
107+
matrix_filter: group_by([.ARCH, (.CUDA_VER|split(".")|map(tonumber)|.[0])]) | map(max_by(.PY_VER|split(".")|map(tonumber)))
111108
wheel-publish-libcuopt:
112109
needs: wheel-build-libcuopt
113110
secrets: inherit
@@ -124,7 +121,6 @@ jobs:
124121
secrets: inherit
125122
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.08
126123
with:
127-
matrix_filter: map(select((.CUDA_VER | startswith("12"))))
128124
build_type: ${{ inputs.build_type || 'branch' }}
129125
branch: ${{ inputs.branch }}
130126
sha: ${{ inputs.sha }}
@@ -148,7 +144,6 @@ jobs:
148144
secrets: inherit
149145
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.08
150146
with:
151-
matrix_filter: map(select((.CUDA_VER | startswith("12"))))
152147
build_type: ${{ inputs.build_type || 'branch' }}
153148
branch: ${{ inputs.branch }}
154149
sha: ${{ inputs.sha }}
@@ -192,7 +187,6 @@ jobs:
192187
sha: ${{ inputs.sha }}
193188
date: ${{ inputs.date }}
194189
script: ci/build_wheel_cuopt_sh_client.sh
195-
matrix_filter: map(select((.CUDA_VER | startswith("12"))))
196190
package-name: cuopt_sh_client
197191
package-type: python
198192
append-cuda-suffix: false

‎.github/workflows/pr.yaml‎

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,6 @@ jobs:
122122
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-25.08
123123
with:
124124
build_type: pull-request
125-
matrix_filter: map(select((.CUDA_VER | startswith("12"))))
126125
script: ci/build_cpp.sh
127126
conda-cpp-tests:
128127
needs: [conda-cpp-build, changed-files]
@@ -131,15 +130,13 @@ jobs:
131130
#if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_cpp
132131
with:
133132
build_type: pull-request
134-
matrix_filter: map(select((.CUDA_VER | startswith("12"))))
135133
script: ci/test_cpp.sh
136134
conda-python-build:
137135
needs: conda-cpp-build
138136
secrets: inherit
139137
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-25.08
140138
with:
141139
build_type: pull-request
142-
matrix_filter: map(select((.CUDA_VER | startswith("12"))))
143140
script: ci/build_python.sh
144141
conda-python-tests:
145142
needs: [conda-python-build, changed-files]
@@ -149,7 +146,6 @@ jobs:
149146
with:
150147
run_codecov: false
151148
build_type: pull-request
152-
matrix_filter: map(select((.CUDA_VER | startswith("12"))))
153149
script: ci/test_python.sh
154150
docs-build:
155151
needs: conda-python-build
@@ -163,17 +159,6 @@ jobs:
163159
artifact-name: "cuopt_docs"
164160
container_image: "rapidsai/ci-conda:25.08-latest"
165161
script: "ci/build_docs.sh"
166-
#conda-notebook-tests:
167-
# needs: [conda-python-build, changed-files]
168-
# secrets: inherit
169-
# uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-25.08
170-
# #if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_notebooks
171-
# with:
172-
# build_type: pull-request
173-
# node_type: "gpu-l4-latest-1"
174-
# arch: "amd64"
175-
# container_image: "rapidsai/ci-conda:cuda11.8.0-ubuntu22.04-py3.10"
176-
# run_script: "ci/test_notebooks.sh"
177162
wheel-build-cuopt-mps-parser:
178163
secrets: inherit
179164
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.08
@@ -183,14 +168,13 @@ jobs:
183168
package-name: cuopt_mps_parser
184169
package-type: python
185170
append-cuda-suffix: false
186-
matrix_filter: map(select((.CUDA_VER | startswith("12"))))
187171
wheel-build-libcuopt:
188172
needs: wheel-build-cuopt-mps-parser
189173
secrets: inherit
190174
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.08
191175
with:
192176
# build for every combination of arch and CUDA version, but only for the latest Python
193-
matrix_filter: map(select((.CUDA_VER | startswith("12")) and .PY_VER == "3.12"))
177+
matrix_filter: group_by([.ARCH, (.CUDA_VER|split(".")|map(tonumber)|.[0])]) | map(max_by(.PY_VER|split(".")|map(tonumber)))
194178
package-type: cpp
195179
package-name: libcuopt
196180
build_type: pull-request
@@ -204,7 +188,6 @@ jobs:
204188
script: ci/build_wheel_cuopt.sh
205189
package-name: cuopt
206190
package-type: python
207-
matrix_filter: map(select((.CUDA_VER | startswith("12"))))
208191
wheel-tests-cuopt:
209192
needs: [wheel-build-cuopt, wheel-build-cuopt-mps-parser, changed-files]
210193
secrets: inherit
@@ -213,7 +196,6 @@ jobs:
213196
with:
214197
build_type: pull-request
215198
script: ci/test_wheel_cuopt.sh
216-
matrix_filter: map(select((.CUDA_VER | startswith("12"))))
217199
wheel-build-cuopt-server:
218200
needs: wheel-build-cuopt
219201
secrets: inherit
@@ -223,14 +205,12 @@ jobs:
223205
script: ci/build_wheel_cuopt_server.sh
224206
package-name: cuopt_server
225207
package-type: python
226-
matrix_filter: map(select((.CUDA_VER | startswith("12"))))
227208
wheel-build-cuopt-sh-client:
228209
secrets: inherit
229210
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.08
230211
with:
231212
build_type: pull-request
232213
script: ci/build_wheel_cuopt_sh_client.sh
233-
matrix_filter: map(select((.CUDA_VER | startswith("12"))))
234214
package-name: cuopt_sh_client
235215
package-type: python
236216
append-cuda-suffix: false
@@ -242,7 +222,6 @@ jobs:
242222
with:
243223
build_type: pull-request
244224
script: ci/test_wheel_cuopt_server.sh
245-
matrix_filter: map(select((.CUDA_VER | startswith("12"))))
246225
test-self-hosted-server:
247226
needs: [wheel-build-cuopt-server, changed-files]
248227
secrets: inherit

‎.github/workflows/test.yaml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ jobs:
4040
branch: ${{ inputs.branch }}
4141
date: ${{ inputs.date }}
4242
sha: ${{ inputs.sha }}
43-
matrix_filter: map(select((.CUDA_VER | startswith("12"))))
4443
script: ci/test_cpp.sh
4544
conda-python-tests:
4645
secrets: inherit
@@ -51,7 +50,6 @@ jobs:
5150
branch: ${{ inputs.branch }}
5251
date: ${{ inputs.date }}
5352
sha: ${{ inputs.sha }}
54-
matrix_filter: map(select((.CUDA_VER | startswith("12"))))
5553
script: ci/test_python.sh
5654
wheel-tests-cuopt:
5755
secrets: inherit
@@ -61,7 +59,6 @@ jobs:
6159
branch: ${{ inputs.branch }}
6260
date: ${{ inputs.date }}
6361
sha: ${{ inputs.sha }}
64-
matrix_filter: map(select((.CUDA_VER | startswith("12"))))
6562
script: ci/test_wheel_cuopt.sh
6663
wheel-tests-cuopt-server:
6764
secrets: inherit
@@ -71,5 +68,4 @@ jobs:
7168
branch: ${{ inputs.branch }}
7269
date: ${{ inputs.date }}
7370
sha: ${{ inputs.sha }}
74-
matrix_filter: map(select((.CUDA_VER | startswith("12"))))
7571
script: ci/test_wheel_cuopt_server.sh

‎build.sh‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -268,13 +268,8 @@ if [ ${BUILD_ALL_GPU_ARCH} -eq 1 ]; then
268268
echo "Building for *ALL* supported GPU architectures..."
269269
else
270270
if [ ${BUILD_CI_ONLY} -eq 1 ]; then
271-
if [[ ${CUDA_VERSION} == 11* ]]; then
272-
CUOPT_CMAKE_CUDA_ARCHITECTURES="70-real;80"
273-
echo "Building for Volta and Ampere architectures..."
274-
else
275-
CUOPT_CMAKE_CUDA_ARCHITECTURES="RAPIDS"
276-
echo "Building for Volta, Ampere and Hopper architectures..."
277-
fi
271+
CUOPT_CMAKE_CUDA_ARCHITECTURES="RAPIDS"
272+
echo "Building for RAPIDS supported architectures..."
278273
else
279274
CUOPT_CMAKE_CUDA_ARCHITECTURES="NATIVE"
280275
echo "Building for the architecture of the GPU in the system..."

‎cpp/CMakeLists.txt‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,6 @@ project(
3333
LANGUAGES CXX CUDA C
3434
)
3535

36-
if(${CMAKE_CUDA_COMPILER_VERSION} VERSION_LESS 12.0.0)
37-
list(REMOVE_ITEM CMAKE_CUDA_ARCHITECTURES "90")
38-
list(APPEND CMAKE_CUDA_ARCHITECTURES "80-virtual")
39-
endif()
40-
4136
set(DEPENDENT_LIB_MAJOR_VERSION "25")
4237
set(DEPENDENT_LIB_MINOR_VERSION "08")
4338

@@ -222,9 +217,7 @@ set(CUOPT_PRIVATE_CUDA_LIBS
222217
CUDA::cusolver
223218
OpenMP::OpenMP_CXX)
224219

225-
if(CMAKE_CUDA_COMPILER_ID STREQUAL "NVIDIA" AND CMAKE_CUDA_COMPILER_VERSION VERSION_GREATER_EQUAL 11.4)
226-
list(PREPEND CUOPT_PRIVATE_CUDA_LIBS CUDA::cublasLt)
227-
endif()
220+
list(PREPEND CUOPT_PRIVATE_CUDA_LIBS CUDA::cublasLt)
228221

229222
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/libmps_parser)
230223
set(CMAKE_LIBRARY_PATH ${CMAKE_CURRENT_BINARY_DIR}/libmps_parser/)

‎cpp/src/linear_programming/utilities/ping_pong_graph.cuh‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,12 @@ class ping_pong_graph_t {
5959
if (!is_batch_mode_) {
6060
if (total_pdlp_iterations % 2 == 0 && !even_initialized) {
6161
RAFT_CUDA_TRY(cudaStreamEndCapture(stream_view_.value(), &even_graph));
62-
// Extra NULL NULL 0 mandatory for cuda 11.8
63-
RAFT_CUDA_TRY(cudaGraphInstantiate(&even_instance, even_graph, nullptr, nullptr, 0));
62+
RAFT_CUDA_TRY(cudaGraphInstantiate(&even_instance, even_graph));
6463
even_initialized = true;
6564
RAFT_CUDA_TRY_NO_THROW(cudaGraphDestroy(even_graph));
6665
} else if (total_pdlp_iterations % 2 == 1 && !odd_initialized) {
6766
RAFT_CUDA_TRY(cudaStreamEndCapture(stream_view_.value(), &odd_graph));
68-
// Extra NULL NULL 0 mandatory for cuda 11.8
69-
RAFT_CUDA_TRY(cudaGraphInstantiate(&odd_instance, odd_graph, nullptr, nullptr, 0));
67+
RAFT_CUDA_TRY(cudaGraphInstantiate(&odd_instance, odd_graph));
7068
odd_initialized = true;
7169
RAFT_CUDA_TRY_NO_THROW(cudaGraphDestroy(odd_graph));
7270
}

‎cpp/src/mip/feasibility_jump/feasibility_jump.cu‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -785,7 +785,7 @@ void fj_t<i_t, f_t>::run_step_device(const rmm::cuda_stream_view& climber_stream
785785

786786
if (use_graph) {
787787
cudaStreamEndCapture(climber_stream, &graph);
788-
cudaGraphInstantiate(&graph_instance, graph, NULL, NULL, 0);
788+
cudaGraphInstantiate(&graph_instance, graph);
789789
RAFT_CHECK_CUDA(climber_stream);
790790
cudaGraphDestroy(graph);
791791
graph_created = true;

‎cpp/src/mip/presolve/load_balanced_bounds_presolve.cu‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,10 +203,10 @@ bool build_graph(managed_stream_pool& streams,
203203

204204
if (graph_exec != nullptr) {
205205
cudaGraphExecDestroy(graph_exec);
206-
cudaGraphInstantiate(&graph_exec, graph, NULL, NULL, 0);
206+
cudaGraphInstantiate(&graph_exec, graph);
207207
RAFT_CHECK_CUDA(handle_ptr->get_stream());
208208
} else {
209-
cudaGraphInstantiate(&graph_exec, graph, NULL, NULL, 0);
209+
cudaGraphInstantiate(&graph_exec, graph);
210210
RAFT_CHECK_CUDA(handle_ptr->get_stream());
211211
}
212212

‎cpp/src/routing/cuda_graph.cuh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ struct cuda_graph_t {
5454
if (graph_created) { cudaGraphExecDestroy(instance); }
5555
// Instantiate graphExec from graph. The error node and
5656
// error message parameters are unused here.
57-
cudaGraphInstantiate(&instance, graph, NULL, NULL, 0);
57+
cudaGraphInstantiate(&instance, graph);
5858
graph_created = true;
5959
}
6060
cudaGraphDestroy(graph);

0 commit comments

Comments
 (0)