From ea43a208c76fdd5070b6b96609afafb53738efb9 Mon Sep 17 00:00:00 2001 From: juliohm Date: Wed, 17 May 2023 22:25:24 +0000 Subject: [PATCH] :robot: Format .jl files --- ...DensityRatioEstimationChainRulesCoreExt.jl | 10 ++--- ext/DensityRatioEstimationConvexExt.jl | 24 ++++++------ ext/DensityRatioEstimationGPUArraysExt.jl | 28 ++++++------- ext/DensityRatioEstimationJuMPExt.jl | 39 +++++++++---------- ext/DensityRatioEstimationOptimExt.jl | 24 ++++++------ src/DensityRatioEstimation.jl | 11 +++--- 6 files changed, 67 insertions(+), 69 deletions(-) diff --git a/ext/DensityRatioEstimationChainRulesCoreExt.jl b/ext/DensityRatioEstimationChainRulesCoreExt.jl index 70d63e7..0ec4884 100644 --- a/ext/DensityRatioEstimationChainRulesCoreExt.jl +++ b/ext/DensityRatioEstimationChainRulesCoreExt.jl @@ -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 diff --git a/ext/DensityRatioEstimationConvexExt.jl b/ext/DensityRatioEstimationConvexExt.jl index 97f9c3a..d70f848 100644 --- a/ext/DensityRatioEstimationConvexExt.jl +++ b/ext/DensityRatioEstimationConvexExt.jl @@ -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 diff --git a/ext/DensityRatioEstimationGPUArraysExt.jl b/ext/DensityRatioEstimationGPUArraysExt.jl index e3325f7..c16705a 100644 --- a/ext/DensityRatioEstimationGPUArraysExt.jl +++ b/ext/DensityRatioEstimationGPUArraysExt.jl @@ -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 diff --git a/ext/DensityRatioEstimationJuMPExt.jl b/ext/DensityRatioEstimationJuMPExt.jl index 96b987d..ee49421 100644 --- a/ext/DensityRatioEstimationJuMPExt.jl +++ b/ext/DensityRatioEstimationJuMPExt.jl @@ -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 diff --git a/ext/DensityRatioEstimationOptimExt.jl b/ext/DensityRatioEstimationOptimExt.jl index 7935313..4b1b4f8 100644 --- a/ext/DensityRatioEstimationOptimExt.jl +++ b/ext/DensityRatioEstimationOptimExt.jl @@ -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 diff --git a/src/DensityRatioEstimation.jl b/src/DensityRatioEstimation.jl index 447f82c..f933757 100644 --- a/src/DensityRatioEstimation.jl +++ b/src/DensityRatioEstimation.jl @@ -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 @@ -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 @@ -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