Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "MadNCL"
uuid = "434a0bcb-5a7c-42b2-a9d3-9e3f760e7af0"
authors = ["fpacaud <francoispacaud8@gmail.com>", "amontoison <amontoison@anl.gov>"]
version = "0.2.2"
version = "0.2.3"

[deps]
Atomix = "a9b6321e-bd34-4604-b9c9-b65b8de01458"
Expand All @@ -14,21 +14,22 @@ Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"

[weakdeps]
CUDA = "052768ef-5323-5732-b1bb-66c8b64840ba"
MadNLPGPU = "d72a61cc-809d-412f-99be-fd81f4b8a598"

[extensions]
MadNCLCUDAExt = ["MadNLPGPU"]
MadNCLCUDAExt = ["CUDA", "MadNLPGPU"]

[compat]
Atomix = "1.1.2"
CUDA = "5.4.0"
CUDA = "6"
FiniteDiff = "2.27.0"
JuMP = "1.30"
KernelAbstractions = "0.9"
LinearAlgebra = "1.10"
MadNLP = "0.9.1"
MadNLPGPU = "0.8"
MadNLPTests = "0.6"
MadNLP = "0.10"
MadNLPGPU = "0.10"
MadNLPTests = "0.6.2"
NLPModels = "0.21.9"
NLPModelsJuMP = "0.13"
Printf = "1.10"
Expand All @@ -38,12 +39,12 @@ Test = "1.10"
julia = "1.10"

[extras]
CUDA = "052768ef-5323-5732-b1bb-66c8b64840ba"
CUDSS = "45b445bb-4962-46a0-9369-b4df9d0f772e"
FiniteDiff = "6a86dc24-6348-571c-b903-95158fe2bd41"
JuMP = "4076af6c-e467-56ae-b986-b466b2749572"
MadNLPTests = "b52a2a03-04ab-4a5f-9698-6a2deff93217"
NLPModelsJuMP = "792afdf1-32c1-5681-94e0-d7bf7a5df49e"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[targets]
test = ["CUDA", "FiniteDiff", "JuMP", "MadNLPGPU", "MadNLPTests", "NLPModelsJuMP", "Test"]
test = ["CUDA", "CUDSS", "FiniteDiff", "JuMP", "MadNLPGPU", "MadNLPTests", "NLPModelsJuMP", "Test"]
9 changes: 5 additions & 4 deletions ext/MadNCLCUDAExt.jl
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,14 @@ module MadNCLCUDAExt
using LinearAlgebra
using SparseArrays
import MadNLPGPU
import MadNLPGPU.CUDA: CUSPARSE, CuVector, CUDABackend
import CUDA: cuSPARSE, CUDACore
import CUDA: CuVector, CUDABackend
import KernelAbstractions: synchronize
import MadNLP
import MadNCL

function MadNLP.transfer!(
dest::CUSPARSE.CuSparseMatrixCSC{Tv},
dest::cuSPARSE.CuSparseMatrixCSC{Tv},
src::MadNLP.SparseMatrixCOO{Tv},
map::CuVector{Int},
) where {Tv}
Expand All @@ -23,7 +24,7 @@ end

function MadNCL.symul!(
y::CuVector{T},
A::CUSPARSE.CuSparseMatrixCSC{T},
A::cuSPARSE.CuSparseMatrixCSC{T},
x::CuVector{T},
alpha::Number,
beta::Number,
Expand All @@ -38,7 +39,7 @@ end

function MadNLP.build_condensed_aug_coord!(
kkt::MadNCL.K1sAuglagKKTSystem{T,VT,MT},
) where {T,VT,MT<:CUSPARSE.CuSparseMatrixCSC{T}}
) where {T,VT,MT<:cuSPARSE.CuSparseMatrixCSC{T}}
fill!(kkt.aug_com.nzVal, zero(T))
if length(kkt.hptr) > 0
MadNLPGPU._transfer_hessian_kernel!(CUDABackend())(
Expand Down
1 change: 1 addition & 0 deletions test/cuda_wrapper.jl
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@

using CUDA
using CUDSS
using MadNLPGPU

function test_model_gpu(ncl_cpu, ncl_gpu)
Expand Down
Loading