Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[AUTO] JuliaFormatter.jl run #53

Merged
merged 1 commit into from
May 17, 2023
+67 −69
Merged

[AUTO] JuliaFormatter.jl run #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions ext/DensityRatioEstimationChainRulesCoreExt.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
module DensityRatioEstimationChainRulesCoreExt

if isdefined(Base, :get_extension)
using DensityRatioEstimation
using ChainRulesCore
using DensityRatioEstimation
using ChainRulesCore
else
using ..DensityRatioEstimation
using ..ChainRulesCore
using ..DensityRatioEstimation
using ..ChainRulesCore
end

ChainRulesCore.@non_differentiable DensityRatioEstimation.safe_diagm(::Any,::Any)
ChainRulesCore.@non_differentiable DensityRatioEstimation.safe_diagm(::Any, ::Any)

end #module
24 changes: 12 additions & 12 deletions ext/DensityRatioEstimationConvexExt.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,18 @@
# ------------------------------------------------------------------
module DensityRatioEstimationConvexExt

if isdefined(Base, :get_extension)
using DensityRatioEstimation
using DensityRatioEstimation: KLIEP, ConvexLib
using Convex
using ECOS
else
using ..DensityRatioEstimation
using ..DensityRatioEstimation: KLIEP, ConvexLib
using ..Convex
using ..ECOS
end
if isdefined(Base, :get_extension)
using DensityRatioEstimation
using DensityRatioEstimation: KLIEP, ConvexLib
using Convex
using ECOS
else
using ..DensityRatioEstimation
using ..DensityRatioEstimation: KLIEP, ConvexLib
using ..Convex
using ..ECOS
end

include("../src/kliep/convex.jl")
include("../src/kliep/convex.jl")

end #module
28 changes: 14 additions & 14 deletions ext/DensityRatioEstimationGPUArraysExt.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,20 @@
# ------------------------------------------------------------------
module DensityRatioEstimationGPUArraysExt

if isdefined(Base, :get_extension)
using DensityRatioEstimation
using GPUArrays
else
using ..DensityRatioEstimation
using ..GPUArrays
end
using LinearAlgebra
if isdefined(Base, :get_extension)
using DensityRatioEstimation
using GPUArrays
else
using ..DensityRatioEstimation
using ..GPUArrays
end
using LinearAlgebra

# Aviod `mat + a * I` with CUDA which involes scalar operations and is slow
function DensityRatioEstimation.safe_diagm(mat::M, a::T) where M<:GPUArrays.AbstractGPUArray{T, 2} where T
diag = similar(mat,size(m,1))
fill!(diag,a)
LinearAlgebra.Diagonal(diag)
end
# Aviod `mat + a * I` with CUDA which involes scalar operations and is slow
function DensityRatioEstimation.safe_diagm(mat::M, a::T) where {M<:GPUArrays.AbstractGPUArray{T,2}} where {T}
diag = similar(mat, size(m, 1))
fill!(diag, a)
LinearAlgebra.Diagonal(diag)
end

end #module
39 changes: 19 additions & 20 deletions ext/DensityRatioEstimationJuMPExt.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,25 @@
# ------------------------------------------------------------------
module DensityRatioEstimationJuMPExt

if isdefined(Base, :get_extension)
using DensityRatioEstimation
using DensityRatioEstimation: LSIF, JuMPLib, AbstractKMM, uKMM, KMM
using DensityRatioEstimation.Parameters
using JuMP
using Ipopt
using LinearAlgebra
using Statistics
else
using ..DensityRatioEstimation
using ..DensityRatioEstimation: LSIF, JuMPLib, AbstractKMM, uKMM, KMM
using ..DensityRatioEstimation.Parameters
using ..JuMP
using ..Ipopt
using ..LinearAlgebra
using ..Statistics
end

if isdefined(Base, :get_extension)
using DensityRatioEstimation
using DensityRatioEstimation: LSIF, JuMPLib, AbstractKMM, uKMM, KMM
using DensityRatioEstimation.Parameters
using JuMP
using Ipopt
using LinearAlgebra
using Statistics
else
using ..DensityRatioEstimation
using ..DensityRatioEstimation: LSIF, JuMPLib, AbstractKMM, uKMM, KMM
using ..DensityRatioEstimation.Parameters
using ..JuMP
using ..Ipopt
using ..LinearAlgebra
using ..Statistics
end

include("../src/kmm/jump.jl")
include("../src/lsif/jump.jl")
include("../src/kmm/jump.jl")
include("../src/lsif/jump.jl")

end #module
24 changes: 12 additions & 12 deletions ext/DensityRatioEstimationOptimExt.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@
# ------------------------------------------------------------------
module DensityRatioEstimationOptimExt

if isdefined(Base, :get_extension)
using DensityRatioEstimation
using DensityRatioEstimation: KLIEP, LSIF, OptimLib
using Optim
else
using ..DensityRatioEstimation
using ..DensityRatioEstimation: KLIEP, LSIF, OptimLib
using ..Optim
end
using LinearAlgebra
include("../src/kliep/optim.jl")
include("../src/lsif/optim.jl")
if isdefined(Base, :get_extension)
using DensityRatioEstimation
using DensityRatioEstimation: KLIEP, LSIF, OptimLib
using Optim
else
using ..DensityRatioEstimation
using ..DensityRatioEstimation: KLIEP, LSIF, OptimLib
using ..Optim
end
using LinearAlgebra
include("../src/kliep/optim.jl")
include("../src/lsif/optim.jl")

end #module
11 changes: 5 additions & 6 deletions src/DensityRatioEstimation.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,11 @@ include("lcv.jl")
# pure Julia implementations
include("kmm/julia.jl")


if !isdefined(Base,:get_extension)
if !isdefined(Base, :get_extension)
using Requires
end
# implementations that require extra dependencies
@static if !isdefined(Base,:get_extension)
@static if !isdefined(Base, :get_extension)
function __init__()

#Solvers
Expand All @@ -46,7 +45,7 @@ end
@require JuMP = "4076af6c-e467-56ae-b986-b466b2749572" begin
@require Ipopt = "b6b21f68-93f8-5de0-b562-5493be1d77c9" begin
include("../ext/DensityRatioEstimationJuMPExt.jl")
end
end
end
#Optim: KLIEP, LSIF
@require Optim = "429524aa-4258-5aef-a3af-852621145aeb" begin
Expand All @@ -61,11 +60,11 @@ end
end

# AD and GPU libs
@require ChainRulesCore = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4" begin
@require ChainRulesCore = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4" begin
include("../ext/DensityRatioEstimationChainRulesCoreExt.jl")
end

@require GPUArrays = "0c68f7d7-f131-5f86-a1c3-88cf8149b2d7" begin
@require GPUArrays = "0c68f7d7-f131-5f86-a1c3-88cf8149b2d7" begin
include("../ext/DensityRatioEstimationGPUArraysExt.jl")
end
end
Expand Down