Skip to content

Commit 8cc188d

Browse files
gdallegdalle
committed
Fix tests and add auto formatting
1 parent aadc8e4 commit 8cc188d

File tree

17 files changed

+100
-55
lines changed

17 files changed

+100
-55
lines changed

‎docs/Manifest.toml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,9 @@ version = "3.11.0"
9494

9595
[[deps.ChainRules]]
9696
deps = ["ChainRulesCore", "Compat", "IrrationalConstants", "LinearAlgebra", "Random", "RealDot", "SparseArrays", "Statistics"]
97-
git-tree-sha1 = "68938888dad80c4da1db4e7e3c4405c13d0afd13"
97+
git-tree-sha1 = "97fd0a3b7703948a847265156a41079730805c77"
9898
uuid = "082447d4-558c-5d27-93f4-14fc19e9eca2"
99-
version = "1.35.3"
99+
version = "1.36.0"
100100

101101
[[deps.ChainRulesCore]]
102102
deps = ["Compat", "LinearAlgebra", "SparseArrays"]
@@ -335,9 +335,9 @@ version = "8.3.2"
335335

336336
[[deps.GPUCompiler]]
337337
deps = ["ExprTools", "InteractiveUtils", "LLVM", "Libdl", "Logging", "TimerOutputs", "UUIDs"]
338-
git-tree-sha1 = "21b5d9da260afa6a8638ba2aaa0edbbb671c37bd"
338+
git-tree-sha1 = "47f63159f7cb5d0e5e0cfd2f20454adea429bec9"
339339
uuid = "61eb1bfa-7361-4325-ad38-22787b887f55"
340-
version = "0.16.0"
340+
version = "0.16.1"
341341

342342
[[deps.GeometryBasics]]
343343
deps = ["EarCut_jll", "IterTools", "LinearAlgebra", "StaticArrays", "StructArrays", "Tables"]

‎docs/make.jl‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,4 @@ makedocs(;
4747
],
4848
)
4949

50-
deploydocs(;
51-
repo="github.com/axelparmentier/InferOpt.jl",
52-
devbranch="main",
53-
)
50+
deploydocs(; repo="github.com/axelparmentier/InferOpt.jl", devbranch="main")

‎src/fenchel_young/fenchel_young.jl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ end
1212

1313
function Base.show(io::IO, fyl::FenchelYoungLoss)
1414
(; predictor) = fyl
15-
print(io, "FenchelYoungLoss($predictor)")
15+
return print(io, "FenchelYoungLoss($predictor)")
1616
end
1717

1818
## Forward pass

‎src/perturbed/additive.jl‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ end
1515

1616
function Base.show(io::IO, perturbed::PerturbedAdditive)
1717
(; maximizer, ε, rng, seed, nb_samples) = perturbed
18-
print(io, "PerturbedAdditive($maximizer, $ε, $(typeof(rng)), $seed, $nb_samples)")
18+
return print(
19+
io, "PerturbedAdditive($maximizer, $ε, $(typeof(rng)), $seed, $nb_samples)"
20+
)
1921
end
2022

2123
function PerturbedAdditive(

‎src/perturbed/multiplicative.jl‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ Differentiable log-normal perturbation of a black-box optimizer: the input under
55
66
See also: [`AbstractPerturbed{F}`](@ref).
77
"""
8-
struct PerturbedMultiplicative{F,R<:AbstractRNG,S<:Union{Nothing,Int}} <: AbstractPerturbed{F}
8+
struct PerturbedMultiplicative{F,R<:AbstractRNG,S<:Union{Nothing,Int}} <:
9+
AbstractPerturbed{F}
910
maximizer::F
1011
ε::Float64
1112
rng::R
@@ -15,7 +16,9 @@ end
1516

1617
function Base.show(io::IO, perturbed::PerturbedMultiplicative)
1718
(; maximizer, ε, rng, seed, nb_samples) = perturbed
18-
print(io, "PerturbedMultiplicative($maximizer, $ε, $(typeof(rng)), $seed, $nb_samples)")
19+
return print(
20+
io, "PerturbedMultiplicative($maximizer, $ε, $(typeof(rng)), $seed, $nb_samples)"
21+
)
1922
end
2023

2124
function PerturbedMultiplicative(

‎src/smart_predict_optimize/smart_predict_optimize.jl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ end
1414

1515
function Base.show(io::IO, spol::SPOPlusLoss)
1616
(; maximizer, α) = spol
17-
print(io, "SPOPlusLoss($maximizer, $α)")
17+
return print(io, "SPOPlusLoss($maximizer, $α)")
1818
end
1919

2020
SPOPlusLoss(maximizer; α=2.0) = SPOPlusLoss(maximizer, α)

‎src/structured_svm/structured_loss.jl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ end
5757

5858
function Base.show(io::IO, gsl::GeneralStructuredLoss)
5959
(; delta_loss, maximizer) = gsl
60-
print(io, "GeneralStructuredLoss($delta_loss, $maximizer)")
60+
return print(io, "GeneralStructuredLoss($delta_loss, $maximizer)")
6161
end
6262

6363
@traitimpl IsStructuredLossFunction{GeneralStructuredLoss}

‎src/structured_svm/structured_svm.jl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ end
1414

1515
function Base.show(io::IO, ssvml::StructuredSVMLoss)
1616
(; predictor, α) = ssvml
17-
print(io, "StructuredSVMLoss($predictor, $α)")
17+
return print(io, "StructuredSVMLoss($predictor, $α)")
1818
end
1919

2020
StructuredSVMLoss(predictor; α=1.0) = StructuredSVMLoss(predictor, α)

‎test/Manifest.toml‎

Lines changed: 32 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,12 @@ git-tree-sha1 = "eb4cb44a499229b3b8426dcfb5dd85333951ff90"
9292
uuid = "fa961155-64e5-5f13-b03f-caf6b980ea82"
9393
version = "0.4.2"
9494

95+
[[deps.CSTParser]]
96+
deps = ["Tokenize"]
97+
git-tree-sha1 = "b66abc140f8b90a1d6bc7bfad5c80070f8c1ddc6"
98+
uuid = "00ebfdb7-1f24-5e51-bd34-a7502290713f"
99+
version = "3.3.3"
100+
95101
[[deps.CUDA]]
96102
deps = ["AbstractFFTs", "Adapt", "BFloat16s", "CEnum", "CompilerSupportLibraries_jll", "ExprTools", "GPUArrays", "GPUCompiler", "LLVM", "LazyArtifacts", "Libdl", "LinearAlgebra", "Logging", "Printf", "Random", "Random123", "RandomNumbers", "Reexport", "Requires", "SparseArrays", "SpecialFunctions", "TimerOutputs"]
97103
git-tree-sha1 = "e4e5ece72fa2f108fb20c3c5538a5fa9ef3d668a"
@@ -100,9 +106,9 @@ version = "3.11.0"
100106

101107
[[deps.ChainRules]]
102108
deps = ["ChainRulesCore", "Compat", "IrrationalConstants", "LinearAlgebra", "Random", "RealDot", "SparseArrays", "Statistics"]
103-
git-tree-sha1 = "68938888dad80c4da1db4e7e3c4405c13d0afd13"
109+
git-tree-sha1 = "97fd0a3b7703948a847265156a41079730805c77"
104110
uuid = "082447d4-558c-5d27-93f4-14fc19e9eca2"
105-
version = "1.35.3"
111+
version = "1.36.0"
106112

107113
[[deps.ChainRulesCore]]
108114
deps = ["Compat", "LinearAlgebra", "SparseArrays"]
@@ -134,6 +140,12 @@ git-tree-sha1 = "417b0ed7b8b838aa6ca0a87aadf1bb9eb111ce40"
134140
uuid = "5ae59095-9a9b-59fe-a467-6f913c188581"
135141
version = "0.12.8"
136142

143+
[[deps.CommonMark]]
144+
deps = ["Crayons", "JSON", "URIs"]
145+
git-tree-sha1 = "4cd7063c9bdebdbd55ede1af70f3c2f48fab4215"
146+
uuid = "a80b9123-70ca-4bc0-993e-6e3bcb318db6"
147+
version = "0.8.6"
148+
137149
[[deps.CommonSubexpressions]]
138150
deps = ["MacroTools", "Test"]
139151
git-tree-sha1 = "7b8a93dba8af7e3b42fecabf646260105ac373f7"
@@ -341,9 +353,9 @@ version = "8.3.2"
341353

342354
[[deps.GPUCompiler]]
343355
deps = ["ExprTools", "InteractiveUtils", "LLVM", "Libdl", "Logging", "TimerOutputs", "UUIDs"]
344-
git-tree-sha1 = "21b5d9da260afa6a8638ba2aaa0edbbb671c37bd"
356+
git-tree-sha1 = "47f63159f7cb5d0e5e0cfd2f20454adea429bec9"
345357
uuid = "61eb1bfa-7361-4325-ad38-22787b887f55"
346-
version = "0.16.0"
358+
version = "0.16.1"
347359

348360
[[deps.GeometryBasics]]
349361
deps = ["EarCut_jll", "IterTools", "LinearAlgebra", "StaticArrays", "StructArrays", "Tables"]
@@ -427,6 +439,12 @@ git-tree-sha1 = "3c837543ddb02250ef42f4738347454f95079d4e"
427439
uuid = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
428440
version = "0.21.3"
429441

442+
[[deps.JuliaFormatter]]
443+
deps = ["CSTParser", "CommonMark", "DataStructures", "Pkg", "Tokenize"]
444+
git-tree-sha1 = "9f1e11d5bf6fff5a7592f2aa602fe6eb4c801da7"
445+
uuid = "98e50ef6-434e-11e9-1051-2b60c6c9e899"
446+
version = "1.0.3"
447+
430448
[[deps.JuliaVariables]]
431449
deps = ["MLStyle", "NameResolution"]
432450
git-tree-sha1 = "49fb3cb53362ddadb4415e9b73926d6b40709e70"
@@ -792,12 +810,22 @@ git-tree-sha1 = "464d64b2510a25e6efe410e7edab14fffdc333df"
792810
uuid = "a759f4b9-e2f1-59dc-863e-4aeb61b1ea8f"
793811
version = "0.5.20"
794812

813+
[[deps.Tokenize]]
814+
git-tree-sha1 = "2b3af135d85d7e70b863540160208fa612e736b9"
815+
uuid = "0796e94c-ce3b-5d07-9a54-7f471281c624"
816+
version = "0.5.24"
817+
795818
[[deps.Transducers]]
796819
deps = ["Adapt", "ArgCheck", "BangBang", "Baselet", "CompositionsBase", "DefineSingletons", "Distributed", "InitialValues", "Logging", "Markdown", "MicroCollections", "Requires", "Setfield", "SplittablesBase", "Tables"]
797820
git-tree-sha1 = "c76399a3bbe6f5a88faa33c8f8a65aa631d95013"
798821
uuid = "28d57a85-8fef-5791-bfe6-a80928e7c999"
799822
version = "0.4.73"
800823

824+
[[deps.URIs]]
825+
git-tree-sha1 = "97bbe755a53fe859669cd907f2d96aee8d2c1355"
826+
uuid = "5c2747f8-b7ea-4ff2-ba2e-563bfd36b1d4"
827+
version = "1.3.0"
828+
801829
[[deps.UUIDs]]
802830
deps = ["Random", "SHA"]
803831
uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"

‎test/Project.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
44
Flux = "587475ba-b771-5e3f-ad9e-33799f191a9c"
55
Graphs = "86223c79-3864-5bf0-83f7-82e725a168b6"
66
GridGraphs = "dd2b58c7-5af7-4f17-9e46-57c68ac813fb"
7+
JuliaFormatter = "98e50ef6-434e-11e9-1051-2b60c6c9e899"
78
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
89
Literate = "98b081ad-f1c9-55d3-8b20-4c87d4299306"
910
ProgressMeter = "92933f4c-e287-5a05-a399-4b506db050ca"

0 commit comments

Comments
 (0)