Skip to content

Commit ff638c9

Browse files
ppwwyyxxfacebook-github-bot
authored andcommitted
use OmegaConf.select in omegaconf2.1
Reviewed By: wat3rBro Differential Revision: D29738743 fbshipit-source-id: 08b49cabe5c1c43478418600e3f0076e443d2e22
1 parent 2413859 commit ff638c9

File tree

1 file changed

+4
-10
lines changed

1 file changed

+4
-10
lines changed

detectron2/engine/defaults.py

+4-10
Original file line numberDiff line numberDiff line change
@@ -150,16 +150,10 @@ def _try_get_key(cfg, *keys, default=None):
150150
if isinstance(cfg, CfgNode):
151151
cfg = OmegaConf.create(cfg.dump())
152152
for k in keys:
153-
# OmegaConf.select(default=) is supported only after omegaconf2.1,
154-
# but some internal users still rely on 2.0
155-
parts = k.split(".")
156-
# https://github.com/omry/omegaconf/issues/674
157-
for p in parts:
158-
if p not in cfg:
159-
break
160-
cfg = OmegaConf.select(cfg, p)
161-
else:
162-
return cfg
153+
none = object()
154+
p = OmegaConf.select(cfg, k, default=none)
155+
if p is not none:
156+
return p
163157
return default
164158

165159

0 commit comments

Comments
 (0)