Skip to content

Commit e11e4af

Browse files
committed
Do not merge, commit for convinience. Still can't get @requires to work.
1 parent 24d5122 commit e11e4af

File tree

2 files changed

+18
-5
lines changed

2 files changed

+18
-5
lines changed

src/DistributedFactorGraphs.jl

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,18 +70,26 @@ include("LightDFG/LightDFG.jl")
7070
@reexport using .LightDFGs
7171

7272
function __init__()
73-
@require Neo4j="d2adbeaf-5838-5367-8a2f-e46d570981db" begin
74-
# Include the Cloudgraphs API
75-
include("CloudGraphsDFG/CloudGraphsDFG.jl")
76-
end
73+
@info "Looking for @require modules"
74+
#FIXME still can't figure @require out
75+
# @require Neo4j="d2adbeaf-5838-5367-8a2f-e46d570981db" begin
76+
# @info "Including CloudGraphsDFG"
77+
# # Include the Cloudgraphs API
78+
# include("CloudGraphsDFG/CloudGraphsDFG.jl")
79+
# end
7780

7881
@require GraphPlot = "a2cc645c-3eea-5389-862e-a155d0052231" begin
82+
@info "Including Plots"
7983
include("DFGPlots/DFGPlots.jl")
8084
@reexport using .DFGPlots
8185
end
8286

8387
end
8488

89+
#FIXME still can't figure @require out
90+
# Include the Cloudgraphs API
91+
include("CloudGraphsDFG/CloudGraphsDFG.jl")
92+
8593
# To be moved as necessary.
8694
include("Common.jl")
8795

src/entities/DFGFactor.jl

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,12 @@ end
7171
Retrieve solver data structure stored in a factor.
7272
"""
7373
function getData(f::DFGFactor)::GenericFunctionNodeData
74-
@warn "getData is deprecated, please use solverData()"
74+
#FIXME but back in later, it just slows everything down
75+
if !(@isdefined getDataWarnOnce)
76+
@warn "getData is deprecated, please use solverData(), future warnings in getData is suppressed"
77+
global getDataWarnOnce = true
78+
end
79+
# @warn "getData is deprecated, please use solverData()"
7580
return f.data
7681
end
7782

0 commit comments

Comments
 (0)